Update packages file for version 36530

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 \
+	@if [ "$(CURRENT_BRANCH)" != "main" ]; then \
-		echo "Error: Must be on the \"master\" or \"main\" branch to submit to koji" >&2; \
+		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,7 +327,7 @@ 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)
 
 #help rekoji: In case a previous 'make koji' failed, trigger a rebuild for the

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 \
+			if ! git merge --ff-only origin/"$$BRANCH" 2>/dev/null; then \
-				echo "$$p: Cannot fast-forward $$(git rev-parse --abbrev-ref HEAD) to origin/master" ; \
+				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 ; \
@@ -159,19 +164,19 @@ status: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
 	if [ -d "$$p/.git" ] &&  [ -n "$$(git -C $$p status -uno --porcelain)" ]; then echo "Uncommitted changes in $$p:"; git -C "$$p" status --short; fi ;\
 	done
 
-#help diff: Runs git diff for all package repos and displays the output using
+#help diff: Runs git diff for all package repos and displays the diffstat using
-#help diffstat. Requires that diffstat is installed.
+#help the --stat flag.
 diff: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
 	@for p in projects/common $(addprefix packages/,$(PKGS_LOCAL)); do \
-		(cd $$p; git status --porcelain | grep -vq '^?? ' && (echo "Uncommitted changes in: $$p"; git diff | diffstat -p1); :) ;\
+		(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 [ "$$(git rev-parse --verify HEAD)" != "$$(git rev-parse --verify origin/master)" ] ; then \
+		( cd $$p; if [ -n "$$(git rev-list origin/main..HEAD)" ] ; then \
-		echo $$p ; git --no-pager log --pretty="format:%s" origin/master..HEAD ; echo ; echo;\
+		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

@@ -49,6 +49,7 @@ QGIS
 R
 R-AER
 R-AMORE
+R-ATR
 R-Amelia
 R-AmesHousing
 R-BB
@@ -408,6 +409,7 @@ R-fixest
 R-flashClust
 R-flexmix
 R-flexsurv
+R-flextable
 R-float
 R-fontBitstreamVera
 R-fontLiberation
@@ -431,6 +433,9 @@ R-future
 R-future.apply
 R-g.data
 R-gam
+R-gamlss
+R-gamlss.data
+R-gamlss.dist
 R-gamm4
 R-gargle
 R-gbRd
@@ -587,6 +592,7 @@ R-mda
 R-measures
 R-memisc
 R-memoise
+R-metadat
 R-metafor
 R-mi
 R-mice
@@ -640,12 +646,14 @@ R-npsurv
 R-numDeriv
 R-nws
 R-nycflights13
+R-officer
 R-openssl
 R-openxlsx
 R-optextras
 R-optimx
 R-optparse
 R-ordinal
+R-ordinalCont
 R-orthopolynom
 R-pROC
 R-packrat
@@ -935,6 +943,7 @@ R-tm
 R-tmvnsim
 R-toOrdinal
 R-topicmodels
+R-tram
 R-tree
 R-triebeard
 R-trimcluster
@@ -1059,9 +1068,7 @@ analitza
 ansible
 ansible-core
 antlr4-python3-runtime
-anyio
 apache-ant
-applaunchservices
 appstream
 appstream-glib
 apr
@@ -1125,6 +1132,7 @@ bcache-tools
 bcc
 bcftools
 bdftopcf
+bemenu
 bijiben
 bind-utils
 binutils
@@ -1177,6 +1185,7 @@ byobu
 bz2file
 bzip2
 c-ares
+c-basic-meta
 cJSON
 c_rehash
 ca-certs
@@ -1200,7 +1209,6 @@ cdparanoia
 ceph
 ceph-deploy
 cereal
-certbot
 cfitsio
 cgdb
 cgit
@@ -1292,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
@@ -1494,7 +1503,6 @@ fribidi
 fritzing-app
 fs
 fsearch
-funcparserlib
 fuse
 fwupd
 fwupd-efi
@@ -1503,6 +1511,7 @@ gawk
 gc
 gcab
 gcc
+gcc11
 gcc7
 gcc8
 gcc9
@@ -2010,6 +2019,7 @@ ledmon
 lensfun
 leptonica
 less
+level-zero
 leveldb
 lftp
 libArcus
@@ -2068,6 +2078,7 @@ libcomps
 libconfig
 libcroco
 libcryptui
+libcuckoo
 libcxx
 libdaemon
 libdatrie
@@ -2323,6 +2334,7 @@ lksctp-tools
 llvm
 llvm11
 llvm12
+llvm13
 lm-sensors
 lmdb
 logrotate
@@ -2603,6 +2615,7 @@ pbzip2
 pciutils
 pcmanfm
 pcmanfm-qt
+pcp
 pcre
 pcre2
 pcs
@@ -3057,6 +3070,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
@@ -3596,17 +3610,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
@@ -3618,8 +3637,10 @@ pypi-astunparse
 pypi-asv
 pypi-async_generator
 pypi-async_timeout
+pypi-asyncssh
 pypi-asynctest
 pypi-atomicwrites
+pypi-atpublic
 pypi-attrs
 pypi-awesomeversion
 pypi-awscrt
@@ -3638,6 +3659,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
@@ -3669,8 +3691,11 @@ pypi-cached_property
 pypi-cachetools
 pypi-cachy
 pypi-capturer
+pypi-cattrs
 pypi-cchardet
 pypi-cerberus
+pypi-certbot
+pypi-certbot_dns_google
 pypi-certifi
 pypi-cffi
 pypi-cffsubr
@@ -3701,7 +3726,6 @@ pypi-columnize
 pypi-commonmark
 pypi-complete
 pypi-compreffor
-pypi-comtypes
 pypi-configargparse
 pypi-configparser
 pypi-cons
@@ -3746,6 +3770,7 @@ pypi-django_compressor
 pypi-django_discover_runner
 pypi-django_nose
 pypi-django_pyscss
+pypi-dnacentersdk
 pypi-dns_lexicon
 pypi-dnspython
 pypi-docker
@@ -3764,6 +3789,7 @@ pypi-envs
 pypi-eternalegypt
 pypi-etuples
 pypi-evdev
+pypi-exceptiongroup
 pypi-exdir
 pypi-execnet
 pypi-executing
@@ -3781,14 +3807,18 @@ pypi-flake8_blind_except
 pypi-flake8_class_newline
 pypi-flake8_docstrings
 pypi-flake8_import_order
+pypi-flaky
 pypi-flask
 pypi-flatten_json
 pypi-flit
 pypi-flit_core
+pypi-flit_scm
 pypi-fontmath
 pypi-freezegun
 pypi-frozenlist
 pypi-fsspec
+pypi-ftfy
+pypi-funcparserlib
 pypi-future
 pypi-gast
 pypi-gcs_oauth2_boto_plugin
@@ -3822,6 +3852,7 @@ pypi-h11
 pypi-h2
 pypi-h5py
 pypi-hammock
+pypi-hatch_vcs
 pypi-hatchling
 pypi-heapdict
 pypi-hkp4py
@@ -3857,6 +3888,7 @@ pypi-iniconfig
 pypi-inspursmsdk
 pypi-intervaltree
 pypi-invoke
+pypi-iocapture
 pypi-ipaddress
 pypi-ipdb
 pypi-ipdbplugin
@@ -3919,6 +3951,7 @@ pypi-khal
 pypi-kiwisolver
 pypi-krb5
 pypi-kubernetes
+pypi-langcodes
 pypi-lark_parser
 pypi-latexcodec
 pypi-lazy_object_proxy
@@ -3932,6 +3965,8 @@ pypi-logical_unification
 pypi-logilab_common
 pypi-lxml
 pypi-lz4
+pypi-m2r
+pypi-macholib
 pypi-mako
 pypi-markdown
 pypi-markdown2
@@ -3948,7 +3983,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
@@ -3981,12 +4018,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
@@ -3999,11 +4038,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
@@ -4012,8 +4053,10 @@ pypi-pastedeploy
 pypi-pastel
 pypi-pathlib
 pypi-pathspec
+pypi-pathtools
 pypi-patsy
 pypi-pbr
+pypi-pdm_pep517
 pypi-pdocs
 pypi-pecan
 pypi-ped
@@ -4028,6 +4071,7 @@ pypi-pickleshare
 pypi-pid
 pypi-pillow
 pypi-pip
+pypi-pip_tools
 pypi-pkgconfig
 pypi-pkginfo
 pypi-platformdirs
@@ -4038,6 +4082,7 @@ pypi-pockets
 pypi-poetry
 pypi-poetry_core
 pypi-polib
+pypi-port_for
 pypi-portalocker
 pypi-portend
 pypi-portray
@@ -4095,6 +4140,7 @@ pypi-pylint
 pypi-pyls_black
 pypi-pymdown_extensions
 pypi-pynacl
+pypi-pynetbox
 pypi-pynsist
 pypi-pyopengl
 pypi-pyopenssl
@@ -4154,6 +4200,7 @@ pypi-python_slugify
 pypi-python_string_utils
 pypi-python_xlib
 pypi-pythran
+pypi-pytoolconfig
 pypi-pytz
 pypi-pytz_deprecation_shim
 pypi-pyu2f
@@ -4253,6 +4300,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
@@ -4265,9 +4313,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
@@ -4294,6 +4344,7 @@ pypi-testpath
 pypi-text_unidecode
 pypi-textdistance
 pypi-textfsm
+pypi-texttable
 pypi-theano
 pypi-threadpoolctl
 pypi-three_merge
@@ -4306,6 +4357,7 @@ pypi-tomli_w
 pypi-tomlkit
 pypi-toolz
 pypi-tornado
+pypi-tornado_xstatic
 pypi-tox
 pypi-tqdm
 pypi-traitlets
@@ -4340,6 +4392,7 @@ pypi-ua_parser
 pypi-uamqp
 pypi-uc_micro_py
 pypi-ufolib2
+pypi-uharfbuzz
 pypi-ujson
 pypi-uncertainpy
 pypi-unicodedata2
@@ -4365,11 +4418,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
@@ -4477,6 +4532,7 @@ qtwebchannel
 qtwebengine
 qtwebsockets
 qtx11extras
+qtxdg-tools
 qtxmlpatterns
 quagga
 quassel
@@ -4663,13 +4719,13 @@ tevent
 texinfo
 texlive
 texmaker
-texttable
 tgt
 the_silver_searcher
 thermal_daemon
 thermal_monitor
 thin-provisioning-tools
 threadweaver
+thrift
 thunar-volman
 thunderbird
 thunderbolt-software-user-space
@@ -4701,6 +4757,7 @@ udisks2
 udunits
 uget
 uhttpmock
+umockdev
 unbundle
 unibilium
 unifdef
@@ -4720,6 +4777,7 @@ usrbinjava
 usrbinpython
 usrbinvi
 utf8cpp
+utf8proc
 util-linux
 util-macros
 uwsgi
@@ -4875,3 +4933,4 @@ zopfli
 zsh
 zstd
 zstd-bin
+zxing