Update packages file for version 36610

Signed-off-by: clrbuilder <clrbuilder@intel.com>

Makefile.common

@@ -74,7 +74,7 @@ mockproper:
 	$(MOCK) --clean --uniqueext=$(PKG_NAME)
 
 configemail:
-	@test -d .git || git init
+	@test -d .git || git init -b main
 	@$(call subjectprefix,$(PKG_NAME))
 	@echo -n "Subject prefix email configured to: "
 	@git config --get format.subjectPrefix
@@ -132,7 +132,7 @@ $(SRPMFILE): $(SPECFILE) $(__allsources) localreponotice clean-old-content
 # initialized locally, or if the remote contains no commits.
 pullrebase:
 	@if [ -z "$$SKIP_GIT" ] && [ -e .git ]; then \
-		if ! git rev-parse --verify --quiet origin/master > /dev/null; then \
+		if ! git rev-parse --verify --quiet origin/main > /dev/null; then \
 			echo "Remote not yet initialized. Continuing."; \
 			exit 0; \
 		fi; \
@@ -146,7 +146,7 @@ pullrebase:
 			echo "Current branch up-to-date. Continuing."; \
 			exit 0; \
 		fi; \
-		echo "Rebasing to origin/master"; \
+		echo "Rebasing to origin/main"; \
 		if git status --porcelain | grep -q '^.[^?]'; \
 		then \
 			git stash save; \
@@ -310,8 +310,8 @@ prekoji-checks:
 koji: prekoji-checks kojidef
 	@$(MAKE) spdxcheck
 	@$(MAKE) checkblacklist
-	@if [ "$(CURRENT_BRANCH)" != "master" ] && [ "$(CURRENT_BRANCH)" != "main" ]; then \
-		echo "Error: Must be on the \"master\" or \"main\" branch to submit to koji" >&2; \
+	@if [ "$(CURRENT_BRANCH)" != "main" ]; then \
+		echo "Error: Must be on the \"main\" branch to submit to koji" >&2; \
 		exit 1; \
 	fi; \
 	if ! git diff --quiet HEAD -- ${SPECFILE}; then \
@@ -319,7 +319,7 @@ koji: prekoji-checks kojidef
 		exit 1; \
 	fi; \
 	git fetch; \
-	if git rev-parse --verify --quiet origin/master >/dev/null; then \
+	if git rev-parse --verify --quiet origin/main >/dev/null; then \
 		git pull --rebase; \
 	fi; \
 	if git ls-remote --tags --exit-code origin $(SRPMVERS) >/dev/null; then \
@@ -327,8 +327,14 @@ koji: prekoji-checks kojidef
 		exit 1; \
 	fi
 	git tag $(SRPMVERS)
-	git push origin $(CURRENT_BRANCH):master refs/tags/$(SRPMVERS)
+	git push origin $(CURRENT_BRANCH):main refs/tags/$(SRPMVERS)
 	$(KOJI_CMD) build $$KOJI_NOWAIT $(KOJI_TAG) $(PKG_BASE_URL)/$(PKG_NAME)?#$(SRPMVERS)
+	@if [ -f bump.list ]; then \
+		$(MAKE) koji-waitrepo; \
+		for bump_dep in $$(cat bump.list); do \
+			(cd ../"$$bump_dep" && $(MAKE) bump && $(MAKE) koji-nowait) \
+		done \
+	fi
 
 #help rekoji: In case a previous 'make koji' failed, trigger a rebuild for the
 #help same tag.
@@ -352,6 +358,44 @@ koji-nowait:
 rekoji-nowait:
 	$(MAKE) KOJI_NOWAIT="--nowait --background" rekoji
 
+#help koji-waitrepo: Wait for current package changes to become available in the
+#help koji repo. If PKG_NAME is overridden on the command line, wait on changes for
+#help that package instead. This capability allows the developer to "chain" builds
+#help for submission to koji according to the state of the package repos on their
+#help system. Additional options for `koji wait-repo` can be specified via the
+#help WAIT_OPTS variable.
+koji-waitrepo: kojidef
+	@if [[ ! "${PKG_NAME}" =~ ^[A-Za-z0-9._+-]+$$ ]]; then \
+		echo "[ERROR] Invalid package name \"${PKG_NAME}\""; \
+		exit 1; \
+	fi; \
+	if [[ "${PKG_NAME}" != "$(notdir ${CURDIR})" ]]; then \
+		$(MAKE) -s -C ../${PKG_NAME} koji-waitrepo; \
+	else \
+		koji wait-repo --build=${SRPMVERS} ${WAIT_OPTS} ${KOJI_TAG}-build; \
+	fi
+
+update-versions:
+
+.PHONY: update
+#help update: Tries to run update.sh if it exists. update.sh is expected
+#help to check for version updates, exit (successfully) if none are found
+#help or update the package and push the update to koji.
+#help If no update.sh exists, update the version, autospec and push the
+#help update to koji (bumping the bump.list if found).
+update:
+	@if [ -f update.sh ]; then \
+		./update.sh; \
+	else \
+		$(MAKE) -s update-versions && \
+		$(MAKE) autospec CLEANUP=1 && \
+		if [ -f bump.list ]; then \
+			$(MAKE) -s koji; \
+		else \
+			$(MAKE) -s koji-nowait; \
+		fi \
+	fi \
+
 logcheck:
 	@perl $(TOPLVL)/projects/common/logcheck.pl results/build.log
 

Makefile.toplevel

@@ -68,13 +68,18 @@ ${PULL_PKGS}:
 	if [ ! -d "$$p/.git" ]; then echo "Nothing to pull for $$p - $$p/.git missing"; exit 0; fi; \
 	cd "$$p" ; \
 	if git remote | grep origin >/dev/null 2>&1; then \
-		O=$$(git rev-parse origin/master 2>/dev/null); \
+		case "$$p" in \
+			("projects/"*) BRANCH=master ;; \
+			("packages/"*) BRANCH=main ;; \
+			(*) BRANCH=master ;; \
+		esac; \
+		O=$$(git rev-parse origin/"$$BRANCH" 2>/dev/null); \
 		git fetch --tags origin >/dev/null 2>&1; \
-		N=$$(git rev-parse origin/master); \
+		N=$$(git rev-parse origin/"$$BRANCH"); \
 		if [ "$$O" != "$$N" ]; then \
 			echo "Updating: $$p"; \
-			if ! git merge --ff-only origin/master 2>/dev/null; then \
-				echo "$$p: Cannot fast-forward $$(git rev-parse --abbrev-ref HEAD) to origin/master" ; \
+			if ! git merge --ff-only origin/"$$BRANCH" 2>/dev/null; then \
+				echo "$$p: Cannot fast-forward $$(git rev-parse --abbrev-ref HEAD) to origin/$$BRANCH" ; \
 			fi ; \
 			git --no-pager log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit $$O..$$N; echo; \
 		fi ; \
@@ -166,12 +171,12 @@ diff: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
 		(cd $$p; git status --porcelain | grep -vq '^?? ' && (echo "Uncommitted changes in: $$p"; git diff --stat); :) ;\
 	done
 
-#help log: Run git log origin/master..HEAD for all package repos, thus
+#help log: Run git log origin/main..HEAD for all package repos, thus
 #help displaying any committed but unpushed changes.
 log: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
 	@for p in projects/common $(addprefix packages/,$(PKGS_LOCAL)); do \
-		( cd $$p; if [ -n "$$(git rev-list origin/master..HEAD)" ] ; then \
-		echo $$p ; git --no-pager log --pretty="format:%s" origin/master..HEAD ; echo ; echo;\
+		( cd $$p; if [ -n "$$(git rev-list origin/main..HEAD)" ] ; then \
+		echo $$p ; git --no-pager log --pretty="format:%s" origin/main..HEAD ; echo ; echo;\
 		fi ; ) \
 	done
 
@@ -211,7 +216,7 @@ autospecnew: preautospecnew-checks localreponotice
 		mkdir -p $(TOPLVL)/packages/$(NAME); \
 		( \
 			cd $(TOPLVL)/packages/$(NAME); \
-			git init; \
+			git init -b main; \
 			git remote add origin $(PKG_BASE_URL)/$(NAME); \
 			$(call gitoliteurl,packages/$(NAME)); \
 			$(call subjectprefix,$(NAME)); \
@@ -262,7 +267,7 @@ autospecnewgo: preautospecnew-checks localreponotice
 		mkdir -p $(TOPLVL)/packages/$(NAME); \
 		( \
 			cd $(TOPLVL)/packages/$(NAME); \
-			git init; \
+			git init -b main; \
 			git remote add origin $(PKG_BASE_URL)/$(NAME); \
 			$(call gitoliteurl,packages/$(NAME)); \
 			$(call subjectprefix,$(NAME)); \

README.md

@@ -23,7 +23,7 @@ Download the [user setup](user-setup.sh) script and run it on your Clear Linux
 system as an unprivileged user.
 
 ```
-$ curl -O https://raw.githubusercontent.com/clearlinux/common/master/user-setup.sh
+$ curl -O https://raw.githubusercontent.com/clearlinux/common/main/user-setup.sh
 $ chmod +x user-setup.sh
 $ ./user-setup.sh
 ```

packages

@@ -433,6 +433,7 @@ R-future
 R-future.apply
 R-g.data
 R-gam
+R-gamlss
 R-gamlss.data
 R-gamlss.dist
 R-gamm4
@@ -507,6 +508,7 @@ R-influenceR
 R-ini
 R-inline
 R-insight
+R-interp
 R-inum
 R-invgamma
 R-ipred
@@ -591,6 +593,7 @@ R-mda
 R-measures
 R-memisc
 R-memoise
+R-metadat
 R-metafor
 R-mi
 R-mice
@@ -941,6 +944,7 @@ R-tm
 R-tmvnsim
 R-toOrdinal
 R-topicmodels
+R-tram
 R-tree
 R-triebeard
 R-trimcluster
@@ -1065,9 +1069,7 @@ analitza
 ansible
 ansible-core
 antlr4-python3-runtime
-anyio
 apache-ant
-applaunchservices
 appstream
 appstream-glib
 apr
@@ -1131,6 +1133,7 @@ bcache-tools
 bcc
 bcftools
 bdftopcf
+bemenu
 bijiben
 bind-utils
 binutils
@@ -1206,7 +1209,6 @@ cdparanoia
 ceph
 ceph-deploy
 cereal
-certbot
 cfitsio
 cgdb
 cgit
@@ -1298,6 +1300,7 @@ compat-lua-53
 compat-nettle-soname7
 compat-pangomm-soname14
 compat-poppler-soname112
+compat-poppler-soname117
 compat-protobuf-soname23
 compat-readline-soname5
 compat-rest-soname07
@@ -1370,6 +1373,7 @@ diffutils
 digikam
 ding-libs
 dino
+directx-headers
 direwolf
 dist-pam-configs
 distro
@@ -1500,7 +1504,6 @@ fribidi
 fritzing-app
 fs
 fsearch
-funcparserlib
 fuse
 fwupd
 fwupd-efi
@@ -2017,6 +2020,7 @@ ledmon
 lensfun
 leptonica
 less
+level-zero
 leveldb
 lftp
 libArcus
@@ -2075,6 +2079,7 @@ libcomps
 libconfig
 libcroco
 libcryptui
+libcuckoo
 libcxx
 libdaemon
 libdatrie
@@ -2330,6 +2335,7 @@ lksctp-tools
 llvm
 llvm11
 llvm12
+llvm13
 lm-sensors
 lmdb
 logrotate
@@ -2401,6 +2407,9 @@ mesa
 mesa-demos
 meson
 messagelib
+meta-c-basic
+meta-desktop-gnome
+meta-desktop-kde
 metacity
 metis
 metrics-discovery
@@ -2610,6 +2619,7 @@ pbzip2
 pciutils
 pcmanfm
 pcmanfm-qt
+pcp
 pcre
 pcre2
 pcs
@@ -3064,6 +3074,7 @@ perl-Metrics-Any
 perl-Minion
 perl-Mixin-Linewise
 perl-Mock-Config
+perl-Mock-Sub
 perl-Modern-Perl
 perl-Module-Build
 perl-Module-Build-Tiny
@@ -3603,17 +3614,22 @@ pypi-aiofiles
 pypi-aiohttp
 pypi-aiohttp_cors
 pypi-aiosignal
+pypi-aiosmtpd
 pypi-alabaster
+pypi-altgraph
 pypi-ansi2html
 pypi-ansible_compat
 pypi-ansible_pygments
+pypi-anyio
 pypi-apacheconfig
 pypi-apipkg
 pypi-appdirs
 pypi-applicationinsights
 pypi-argcomplete
+pypi-argh
 pypi-argon2_cffi
 pypi-argon2_cffi_bindings
+pypi-argparse
 pypi-arrow
 pypi-asgiref
 pypi-asn1crypto
@@ -3625,9 +3641,12 @@ pypi-astunparse
 pypi-asv
 pypi-async_generator
 pypi-async_timeout
+pypi-asyncssh
 pypi-asynctest
 pypi-atomicwrites
+pypi-atpublic
 pypi-attrs
+pypi-automat
 pypi-awesomeversion
 pypi-awscrt
 pypi-awxkit
@@ -3645,6 +3664,7 @@ pypi-backcall
 pypi-backports.cached_property
 pypi-backports.entry_points_selectable
 pypi-backports.functools_lru_cache
+pypi-backports.shutil_get_terminal_size
 pypi-backports.ssl_match_hostname
 pypi-backports.weakref
 pypi-bash_kernel
@@ -3679,6 +3699,8 @@ pypi-capturer
 pypi-cattrs
 pypi-cchardet
 pypi-cerberus
+pypi-certbot
+pypi-certbot_dns_google
 pypi-certifi
 pypi-cffi
 pypi-cffsubr
@@ -3709,10 +3731,10 @@ pypi-columnize
 pypi-commonmark
 pypi-complete
 pypi-compreffor
-pypi-comtypes
 pypi-configargparse
 pypi-configparser
 pypi-cons
+pypi-constantly
 pypi-contextlib2
 pypi-contextvars
 pypi-cookiecutter
@@ -3754,6 +3776,7 @@ pypi-django_compressor
 pypi-django_discover_runner
 pypi-django_nose
 pypi-django_pyscss
+pypi-dnacentersdk
 pypi-dns_lexicon
 pypi-dnspython
 pypi-docker
@@ -3770,6 +3793,7 @@ pypi-enrich
 pypi-entrypoints
 pypi-envs
 pypi-eternalegypt
+pypi-etils
 pypi-etuples
 pypi-evdev
 pypi-exceptiongroup
@@ -3790,6 +3814,7 @@ pypi-flake8_blind_except
 pypi-flake8_class_newline
 pypi-flake8_docstrings
 pypi-flake8_import_order
+pypi-flaky
 pypi-flask
 pypi-flatten_json
 pypi-flit
@@ -3799,6 +3824,8 @@ pypi-fontmath
 pypi-freezegun
 pypi-frozenlist
 pypi-fsspec
+pypi-ftfy
+pypi-funcparserlib
 pypi-future
 pypi-gast
 pypi-gcs_oauth2_boto_plugin
@@ -3832,6 +3859,7 @@ pypi-h11
 pypi-h2
 pypi-h5py
 pypi-hammock
+pypi-hatch_vcs
 pypi-hatchling
 pypi-heapdict
 pypi-hkp4py
@@ -3846,6 +3874,7 @@ pypi-hug
 pypi-humanfriendly
 pypi-humanize
 pypi-hyperframe
+pypi-hyperlink
 pypi-hypothesis
 pypi-icalendar
 pypi-identify
@@ -3858,6 +3887,7 @@ pypi-imagesize
 pypi-immutables
 pypi-importlib_metadata
 pypi-importlib_resources
+pypi-incremental
 pypi-infi.dtypes.iqn
 pypi-infi.dtypes.wwn
 pypi-inflect
@@ -3867,6 +3897,7 @@ pypi-iniconfig
 pypi-inspursmsdk
 pypi-intervaltree
 pypi-invoke
+pypi-iocapture
 pypi-ipaddress
 pypi-ipdb
 pypi-ipdbplugin
@@ -3929,6 +3960,7 @@ pypi-khal
 pypi-kiwisolver
 pypi-krb5
 pypi-kubernetes
+pypi-langcodes
 pypi-lark_parser
 pypi-latexcodec
 pypi-lazy_object_proxy
@@ -3942,6 +3974,8 @@ pypi-logical_unification
 pypi-logilab_common
 pypi-lxml
 pypi-lz4
+pypi-m2r
+pypi-macholib
 pypi-mako
 pypi-markdown
 pypi-markdown2
@@ -3958,7 +3992,9 @@ pypi-mkdocs
 pypi-mkdocs_material
 pypi-mkdocs_material_extensions
 pypi-mock
+pypi-modulegraph
 pypi-molecule
+pypi-molecule_docker
 pypi-monotonic
 pypi-more_itertools
 pypi-moreorless
@@ -3991,12 +4027,14 @@ pypi-netdisco
 pypi-netifaces
 pypi-networkx
 pypi-nibabel
+pypi-nltk
 pypi-nocasedict
 pypi-nocaselist
 pypi-nodeenv
 pypi-nose
 pypi-nose_timer
 pypi-notebook
+pypi-notebook_shim
 pypi-numpoly
 pypi-numpy
 pypi-numpydoc
@@ -4009,11 +4047,13 @@ pypi-openshift
 pypi-opt_einsum
 pypi-ouimeaux
 pypi-outcome
+pypi-ovirt_imageio
 pypi-packaging
 pypi-paho_mqtt
 pypi-pandocfilters
 pypi-paramiko
 pypi-parse
+pypi-parse_type
 pypi-parsedatetime
 pypi-parso
 pypi-partd
@@ -4022,8 +4062,10 @@ pypi-pastedeploy
 pypi-pastel
 pypi-pathlib
 pypi-pathspec
+pypi-pathtools
 pypi-patsy
 pypi-pbr
+pypi-pdm_pep517
 pypi-pdocs
 pypi-pecan
 pypi-ped
@@ -4038,6 +4080,7 @@ pypi-pickleshare
 pypi-pid
 pypi-pillow
 pypi-pip
+pypi-pip_tools
 pypi-pkgconfig
 pypi-pkginfo
 pypi-platformdirs
@@ -4048,6 +4091,7 @@ pypi-pockets
 pypi-poetry
 pypi-poetry_core
 pypi-polib
+pypi-port_for
 pypi-portalocker
 pypi-portend
 pypi-portray
@@ -4105,6 +4149,7 @@ pypi-pylint
 pypi-pyls_black
 pypi-pymdown_extensions
 pypi-pynacl
+pypi-pynetbox
 pypi-pynsist
 pypi-pyopengl
 pypi-pyopenssl
@@ -4164,6 +4209,7 @@ pypi-python_slugify
 pypi-python_string_utils
 pypi-python_xlib
 pypi-pythran
+pypi-pytoolconfig
 pypi-pytz
 pypi-pytz_deprecation_shim
 pypi-pyu2f
@@ -4263,6 +4309,7 @@ pypi-sphinx_last_updated_by_git
 pypi-sphinx_notfound_page
 pypi-sphinx_rtd_theme
 pypi-sphinx_thebe
+pypi-sphinx_theme_builder
 pypi-sphinx_togglebutton
 pypi-sphinxcontrib_apidoc
 pypi-sphinxcontrib_applehelp
@@ -4275,9 +4322,11 @@ pypi-sphinxcontrib_httpdomain
 pypi-sphinxcontrib_jsmath
 pypi-sphinxcontrib_napoleon
 pypi-sphinxcontrib_newsfeed
+pypi-sphinxcontrib_openapi
 pypi-sphinxcontrib_plantuml
 pypi-sphinxcontrib_programoutput
 pypi-sphinxcontrib_qthelp
+pypi-sphinxcontrib_redoc
 pypi-sphinxcontrib_seqdiag
 pypi-sphinxcontrib_serializinghtml
 pypi-sphinxcontrib_svg2pdfconverter
@@ -4304,6 +4353,7 @@ pypi-testpath
 pypi-text_unidecode
 pypi-textdistance
 pypi-textfsm
+pypi-texttable
 pypi-theano
 pypi-threadpoolctl
 pypi-three_merge
@@ -4316,10 +4366,12 @@ pypi-tomli_w
 pypi-tomlkit
 pypi-toolz
 pypi-tornado
+pypi-tornado_xstatic
 pypi-tox
 pypi-tqdm
 pypi-traitlets
 pypi-trampolim
+pypi-trimesh
 pypi-trio
 pypi-trio_websocket
 pypi-ttp
@@ -4350,6 +4402,7 @@ pypi-ua_parser
 pypi-uamqp
 pypi-uc_micro_py
 pypi-ufolib2
+pypi-uharfbuzz
 pypi-ujson
 pypi-uncertainpy
 pypi-unicodedata2
@@ -4375,11 +4428,13 @@ pypi-webcolors
 pypi-webencodings
 pypi-webob
 pypi-websocket_client
+pypi-websockets
 pypi-webtest
 pypi-werkzeug
 pypi-wheel
 pypi-widgetsnbextension
 pypi-wikipedia
+pypi-wordfreq
 pypi-wrapt
 pypi-wsgiproxy2
 pypi-wsproto
@@ -4487,6 +4542,7 @@ qtwebchannel
 qtwebengine
 qtwebsockets
 qtx11extras
+qtxdg-tools
 qtxmlpatterns
 quagga
 quassel
@@ -4562,6 +4618,7 @@ sddm-kcm
 seahorse
 seatd
 sed
+seer
 serf
 setserial
 setxkbmap
@@ -4673,7 +4730,6 @@ tevent
 texinfo
 texlive
 texmaker
-texttable
 tgt
 the_silver_searcher
 thermal_daemon
@@ -4702,7 +4758,6 @@ trace-cmd
 traceroute
 tracker
 tracker-miners
-traefik
 tree
 tree-sitter
 tzdata
@@ -4712,6 +4767,7 @@ udisks2
 udunits
 uget
 uhttpmock
+umockdev
 unbundle
 unibilium
 unifdef
@@ -4731,6 +4787,7 @@ usrbinjava
 usrbinpython
 usrbinvi
 utf8cpp
+utf8proc
 util-linux
 util-macros
 uwsgi
@@ -4767,6 +4824,7 @@ which
 whois
 wine
 wireless-regdb-master
+wireplumber
 wireshark
 wlroots
 wmctrl
@@ -4886,3 +4944,4 @@ zopfli
 zsh
 zstd
 zstd-bin
+zxing