Update packages file for version 22250

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

Makefile.common

@@ -119,17 +119,25 @@ $(SRPMFILE): $(SPECFILE) $(__allsources) localreponotice
 	@$(MAKE) spdxcheck
 	$(MOCK) --buildsrpm --source=./ --spec=$(SPECFILE) --result=results/ --no-cleanup-after --uniqueext=$(PKG_NAME)
 
-# Do a git fetch and a git rebase rather than a git pull so aborting
-# the git pull at a password prompt doesn't leave local changes stashed
-# Do the the git status dance so we only apply a stash we create
+# Do a git fetch and a git rebase to apply local commits on top of latest
+# commits from the remote. A git fetch/rebase is used rather than a git pull so
+# aborting the git pull at a password prompt doesn't leave local changes
+# stashed. Do the git status dance so we only apply a stash we create. Note
+# that a fetch/rebase is not attempted if the remote 'origin' is not
+# initialized locally, or if the remote contains no commits.
 pullrebase:
-	if [ -z "$$SKIP_GIT" ] && [ -e .git ]; then \
-		set -x ; \
+	@if [ -z "$$SKIP_GIT" ] && [ -e .git ]; then \
+		if ! git rev-parse --verify --quiet origin/master > /dev/null; then \
+			echo "Remote not yet initialized. Continuing."; \
+			exit 0; \
+		fi; \
+		echo "Fetching origin"; \
 		git fetch; \
 		if ! git rev-parse --verify --quiet FETCH_HEAD > /dev/null; then \
 			echo "No commits exist in remote. Continuing."; \
 			exit 0; \
 		fi; \
+		echo "Rebasing to origin/master"; \
 		if git status --porcelain | grep -q '^.[^?]'; \
 		then \
 			git stash save; \
@@ -151,11 +159,16 @@ autospec: pullrebase localreponotice
 		exit 1; \
 	fi
 	@printf 'PKG_NAME := %s\nURL = %s\nARCHIVES = %s\n\ninclude ../common/Makefile.common\n' $(PKG_NAME) '$(firstword $(value NEWURL) $(value URL))' '$(value ARCHIVES)' > Makefile
-	python3 $(TOPLVL)/projects/autospec/autospec/autospec.py -t . --integrity \
-		${NON_INTERACTIVE} --config "$(AUTOSPEC_CONF)" ${SKIP_GIT} \
-		$(firstword $(NEWURL) $(URL)) --name $(PKG_NAME) ${CLEANUP} \
-		$${SETVERSION:+ -v $${SETVERSION}} -a $(ARCHIVES) \
-		-m $(MOCK_CONFIG_VAL)
+	python3 $(TOPLVL)/projects/autospec/autospec/autospec.py \
+		--target . \
+		--integrity \
+		--config "$(AUTOSPEC_CONF)" \
+		--name $(PKG_NAME) \
+		--archives $(ARCHIVES) \
+		--mock-config $(MOCK_CONFIG_VAL) \
+		$${SETVERSION:+ --version $${SETVERSION}} \
+		${NON_INTERACTIVE} ${SKIP_GIT} ${CLEANUP} \
+		$(firstword $(NEWURL) $(URL));
 	@$(MAKE) spdxcheck
 	@$(MAKE) checkblacklist
 	@if [ -e update_changelog.sh ] && [ -z "$$SKIP_GIT" ] ; then \
@@ -192,30 +205,12 @@ bumpnogit:
 
 $(__missingsources): sources
 
-#help sources: If SOURCES_URL is defined, download required upstream source
-#help files from that location. Otherwise, try to extract source files from the
-#help SRPM in the latest Clear Linux release, as specified by the LATEST_SRPMS
-#help variable. This will run automatically, as a dependency. NOTE: A Koji
-#help server can make use of this "make sources" command, since it lives in a
-#help repo named "common". If you use this makefile in Koji, ensure
-#help "make sources" continues to work for both remote and local builds, since
-#help it is a prerequisite of several commands for building packages.
-sources: upstream
-ifneq ($(strip $(SOURCES_URL)),)
-	while read u; do \
-		case "$$u" in \
-		    "")    continue ;; \
-		    *://*) n="$$u" ;; \
-		    *)     n="$(SOURCES_URL)/$$u" ;; \
-		esac; \
-		curl --fail --noproxy "*" "$$n" -o `basename "$$n"`; \
-	done < upstream
-else
-	@tmp=$$(mktemp -d -p "."); \
+# First argument is a Clear Linux build number (e.g. 22000)
+define fetch-from-srpm
+	tmp=$$(mktemp -d -p "."); \
 	srpm=$$(rpmspec --srpm -q --qf "%{NVR}.src.rpm\n" $(SPECFILE)); \
-	if cd "$$tmp" && ! curl -f -L -O $(LATEST_SRPMS)/$$srpm; then \
-		echo "Failed to download $$srpm from latest Clear Linux release." >&2; \
-		echo "Run \"git pull\" and try again." >&2; \
+	if cd "$$tmp" && ! curl -s -S -f -L -O $(DOWNLOAD_MIRROR)/releases/$(1)/clear/source/SRPMS/$$srpm; then \
+		echo "Failed to download $$srpm from Clear Linux release $(1)." >&2; \
 		cd .. && rm -rf "$$tmp"; \
 		exit 1; \
 	fi; \
@@ -223,14 +218,58 @@ else
 	cd ..; \
 	srclist=$$(rpmspec --srpm -q --qf "[%{SOURCE}\n]" $(SPECFILE)); \
 	for s in $$srclist; do \
-		if ! mv "$$tmp"/$$s .; then \
+		if ! mv --no-clobber "$$tmp"/$$s .; then \
 			echo "Missing source file \"$$s\" in $${srpm}." >&2; \
 			rm -rf "$$tmp"; \
 			exit 1; \
 		fi; \
 		echo "Retrieved source file $$s ..."; \
 	done; \
-	rm -rf "$$tmp";
+	rm -rf "$$tmp"
+endef
+
+#help sources: If SOURCES_URL is defined, download required upstream source files
+#help from that location. Otherwise, try to download source files according to the
+#help URLs listed in the spec file. If any of the source files fail to download,
+#help check for the relevant SRPM from published releases of Clear Linux OS, and
+#help extract the files if found. Note that SRPMs are taken from the DOWNLOAD_MIRROR
+#help location. This will run automatically, as a dependency. NOTE: A Koji server can
+#help make use of this "make sources" command, since it lives in a repo named
+#help "common". If you use this makefile in Koji, ensure "make sources" continues to
+#help work for both remote and local builds, since it is a prerequisite of several
+#help commands for building packages.
+ifneq ($(strip $(SOURCES_URL)),)
+sources: upstream
+	while read u; do \
+		case "$$u" in \
+			"")    continue ;; \
+			*://*) n="$$u" ;; \
+			*)     n="$(SOURCES_URL)/$$u" ;; \
+		esac; \
+		if ! curl --fail -L "$$n" -o `basename "$$n"`; then \
+			echo "Failed to download $$n"; \
+			exit 1; \
+		fi; \
+	done < upstream
+else
+sources:
+	@$(MAKE) generateupstream; \
+	[ $$? -eq 0 ] && exit 0; \
+	nvr="$$(rpmspec --srpm -q --qf '%{NAME}\t%{VERSION}\t%{RELEASE}\n' $(SPECFILE))"; \
+	latest_builds=$$(git -C $(TOPLVL)/projects/common tag -l | sort -rn); \
+	for b in $$latest_builds; do \
+		url="$(DOWNLOAD_MIRROR)/releases/$$b/clear/source/package-sources"; \
+		echo "Checking for source files in build $$b ..."; \
+		if grep -q "$$nvr" <(curl -s -f -L $$url); then \
+			$(call fetch-from-srpm,$$b); \
+			if [ $$? -eq 0 ]; then \
+				echo "Source files retrieved from build $$b"; \
+				exit 0; \
+			fi; \
+		fi; \
+	done; \
+	echo "Source files not found for package"; \
+	exit 1
 endif
 
 prekoji-checks:
@@ -352,15 +391,20 @@ install:
 #help calculating their hashes. Autospec performs this step automatically, so ignore
 #help it for packages managed with autospec.
 generateupstream:
-	@rm -f upstream
-	@urls=$$(rpmspec -D '_vendor clr' -P $(SPECFILE) | grep Source | cut -d: -f2- | grep '://'); \
+	@[ -e upstream ] && mv upstream upstream.bak; \
+	urls=$$(rpmspec -D '_vendor clr' -P $(SPECFILE) | sed -n "s|^Source[0-9]*[[:blank:]]*:[[:blank:]]*\(..*://..*\)$$|\1|p"); \
 	for url in $$urls; do \
-	    filename=$$(basename $$url); \
-	    if [ ! -e $$filename ]; then \
-		curl --fail -L -O $$url; \
-	    fi; \
-	    echo $$(sha1sum $$filename | cut -d\  -f1)/$$filename >> upstream; \
+		filename=$$(basename $$url); \
+		if [ ! -e $$filename ]; then \
+			if ! curl --fail -L -O $$url; then \
+				echo "Failed to download $$url"; \
+				[ -e upstream.bak ] && mv --no-clobber upstream.bak upstream; \
+				exit 1; \
+			fi; \
+		fi; \
+		echo $$(sha1sum $$filename | cut -d\  -f1)/$$filename >> upstream; \
 	done
+	@rm -f upstream.bak
 	@cat upstream
 
 #help drop-abandoned: Remove all unused patches from the git tree

Makefile.shared

@@ -14,9 +14,9 @@ define loopup
 	@sudo partprobe /dev/loop$(DEVICE)
 	@sleep 1
 	@if [ -e /dev/loop$(DEVICE)p3 ]; then \
-	   sudo mount /dev/loop$(DEVICE)p3 $(TOPLVL)/image; \
+		sudo mount /dev/loop$(DEVICE)p3 $(TOPLVL)/image; \
 	else \
-	   sudo mount /dev/loop$(DEVICE)p2 $(TOPLVL)/image; \
+		sudo mount /dev/loop$(DEVICE)p2 $(TOPLVL)/image; \
 	fi
 	@sudo mount /dev/loop$(DEVICE)p1 $(TOPLVL)/image/boot
 endef

Makefile.toplevel

@@ -208,7 +208,16 @@ autospecnew: localreponotice
 			$(call subjectprefix,$(NAME)); \
 		); \
 		printf 'PKG_NAME := %s\nURL = %s\nARCHIVES = %s\n\ninclude ../common/Makefile.common\n' $(NAME) '$(value URL)' '$(value ARCHIVES)' > $(TOPLVL)/packages/$(NAME)/Makefile; \
-		python3 $(TOPLVL)/projects/autospec/autospec/autospec.py --integrity -t packages/$(NAME) --config $(AUTOSPEC_CONF) $(URL) --name $(NAME) -m $(MOCK_CONFIG_VAL); \
+		python3 $(TOPLVL)/projects/autospec/autospec/autospec.py \
+			--target packages/$(NAME) \
+			--integrity \
+			--config "$(AUTOSPEC_CONF)" \
+			--name $(NAME) \
+			--archives $(ARCHIVES) \
+			--mock-config $(MOCK_CONFIG_VAL) \
+			$${SETVERSION:+ --version $${SETVERSION}} \
+			${NON_INTERACTIVE} ${SKIP_GIT} ${CLEANUP} \
+			$(URL); \
 		$(TOPLVL)/projects/common/checkblacklist.sh $(TOPLVL)/projects/common/blacklist $(TOPLVL)/packages/${NAME}/results/*.rpm; \
 	else \
 		echo "$(NAME) already exists at $(TOPLVL)/packages/$(NAME)"; \

packages

@@ -37,7 +37,9 @@ R-Brobdingnag
 R-CVST
 R-Cairo
 R-CircStats
+R-ClustVarLV
 R-Cubist
+R-DAAG
 R-DBI
 R-DBItest
 R-DEoptim
@@ -61,11 +63,14 @@ R-ICSNP
 R-IRdisplay
 R-IRkernel
 R-ISwR
+R-Iso
 R-Lahman
 R-LearnBayes
+R-MCMCpack
 R-Matching
 R-MatrixModels
 R-ModelMetrics
+R-NADA
 R-NLP
 R-NMF
 R-NMOF
@@ -126,6 +131,7 @@ R-bayesplot
 R-bdsmatrix
 R-betareg
 R-bibtex
+R-biglm
 R-bindr
 R-bindrcpp
 R-bipartite
@@ -141,6 +147,7 @@ R-broom
 R-caTools
 R-callr
 R-car
+R-carData
 R-caret
 R-cclust
 R-cellranger
@@ -149,6 +156,7 @@ R-chron
 R-circlize
 R-classInt
 R-cli
+R-clue
 R-clustMixType
 R-coda
 R-coin
@@ -197,6 +205,7 @@ R-e1071
 R-earth
 R-ellipse
 R-energy
+R-estimability
 R-evaluate
 R-expint
 R-expm
@@ -221,6 +230,7 @@ R-gamm4
 R-gbm
 R-gclus
 R-gdata
+R-geepack
 R-geometry
 R-getopt
 R-ggjoy
@@ -248,8 +258,10 @@ R-htmltools
 R-htmlwidgets
 R-httpuv
 R-httr
+R-hunspell
 R-ica
 R-igraph
+R-import
 R-inline
 R-inum
 R-ipred
@@ -269,6 +281,7 @@ R-latticeExtra
 R-lava
 R-lazyeval
 R-lda
+R-leaflet
 R-leaps
 R-lfe
 R-libcoin
@@ -278,10 +291,12 @@ R-lmtest
 R-locfit
 R-loo
 R-lpSolve
+R-lsmeans
 R-lubridate
 R-magic
 R-magrittr
 R-manipulate
+R-manipulateWidget
 R-mapproj
 R-maps
 R-maptools
@@ -290,6 +305,7 @@ R-matrixStats
 R-matrixcalc
 R-maxLik
 R-mclust
+R-mcmc
 R-mda
 R-memisc
 R-memoise
@@ -308,6 +324,7 @@ R-modelr
 R-modeltools
 R-mondate
 R-multcomp
+R-multcompView
 R-multiwayvcov
 R-munsell
 R-mvoutlier
@@ -320,6 +337,7 @@ R-nortest
 R-numDeriv
 R-nycflights13
 R-openssl
+R-openxlsx
 R-optparse
 R-packrat
 R-pamr
@@ -352,6 +370,7 @@ R-pracma
 R-praise
 R-prettyunits
 R-princurve
+R-processx
 R-prodlim
 R-profileModel
 R-progress
@@ -382,6 +401,7 @@ R-reshape2
 R-reticulate
 R-rgenoud
 R-rgl
+R-rio
 R-rlang
 R-rmarkdown
 R-rms
@@ -428,9 +448,12 @@ R-sourcetools
 R-sp
 R-spData
 R-spam
+R-spatstat
 R-spatstat.data
 R-spatstat.utils
 R-spdep
+R-speedglm
+R-spelling
 R-spls
 R-statmod
 R-statnet.common
@@ -469,13 +492,16 @@ R-vegan
 R-viridis
 R-viridisLite
 R-visNetwork
+R-webshot
 R-whisker
 R-withr
 R-xml2
 R-xtable
 R-xts
 R-yaml
+R-zCompositions
 R-zoo
+Remmina
 SDL
 SDL2
 SDL2_gfx
@@ -503,6 +529,7 @@ WebOb
 WebTest
 Werkzeug
 Whoosh
+Z3
 abireport
 absl-py
 accountsservice
@@ -537,7 +564,9 @@ asio
 asn1crypto
 aspell
 aspell-en
+astor
 astroid
+astunparse
 at
 at-spi2-atk
 at-spi2-core
@@ -552,6 +581,7 @@ augeas
 authconfig
 autoconf
 autoconf-archive
+autoconf213
 autofs
 autogen
 automake
@@ -559,12 +589,14 @@ awscli
 azure-configs
 babeltrace
 babl
+backcall
 backports.functools_lru_cache
 backports.ssl_match_hostname
 backports.weakref
 baobab
 bash
 bash-completion
+bash.static
 bash_kernel
 bashdb
 bats
@@ -582,6 +614,7 @@ bkcharts
 bleach
 blktrace
 bluez
+bmap-tools
 bndl-lamp-basic
 bokeh
 boost
@@ -590,6 +623,7 @@ boto
 boto3
 botocore
 bridge-utils
+brotli
 bsdiff
 btrfs-progs
 bundle-chroot-builder
@@ -604,6 +638,7 @@ cached-property
 cairo
 cairomm
 cantarell-fonts
+capnproto
 cargo
 caribou
 catch2
@@ -650,6 +685,7 @@ clr-systemd-config
 clr-update-triggers
 clr-wallpapers
 clrtrust
+clucene-core
 clutter
 clutter-gst
 clutter-gtk
@@ -668,21 +704,27 @@ compat-SDL2-soname1
 compat-efivar-soname0
 compat-fuse-soname2
 compat-gegl
+compat-gegl-0.3
 compat-glew-soname1
+compat-gtksourceview-soname3
 compat-guile-soname20
+compat-ipset-soname10
 compat-libical-soname2
 compat-libpng-soname12
 compat-libwebp-soname6
 compat-llvm-soname4
+compat-llvm-soname5
 compat-mpfr-soname4
 compat-opencv-soname32
 compat-opencv-soname33
+compat-protobuf-soname14
 compat-readline
 component
 compositeproto
 compute-image-packages
 configobj
 configparser
+confuse
 connect-proxy
 connman
 connman-gtk
@@ -728,12 +770,14 @@ defusedxml
 dejagnu
 desktop-file-utils
 dfc
+dfu-util
 dhcp
 dialog
 diffoscope
 diffstat
 diffutils
 dist-pam-configs
+dmenu
 dmidecode
 dmxproto
 dnf
@@ -744,6 +788,7 @@ docbook-utils
 docbook-xml
 docker
 docker-py
+dockerpy-creds
 docutils
 dogtail
 dos2unix
@@ -755,6 +800,7 @@ dracut
 dri2proto
 dri3proto
 dstat
+dtc
 e2fsprogs
 ebtables
 ecdsa
@@ -827,6 +873,7 @@ functools32
 fuse
 futures
 garcon
+gast
 gawk
 gc
 gcab
@@ -934,6 +981,7 @@ grig
 grilo
 grilo-plugins
 groff
+grpcio
 grub
 gsettings-desktop-schemas
 gsl
@@ -977,11 +1025,16 @@ httpd
 httplib2
 httpretty
 hub
+hugo
 hunspell
 hwloc
+hyperscan
 hyperstart
 hypothesis
 i2c-tools
+i3
+i3lock
+i3status
 ibus
 icalendar
 icdiff
@@ -990,6 +1043,7 @@ icon-naming-utils
 icu4c
 idna
 imagesize
+imapfilter
 indent
 infiniband-diags
 iniparse
@@ -1027,11 +1081,13 @@ ister
 itstool
 iw
 ixpdimm_sw
+jansson
 jedi
 jedi-vim
 jemalloc
 jmespath
 joe
+josepy
 jq
 json-c
 json-glib
@@ -1043,13 +1099,17 @@ jupyter-notebook-gist
 jupyter_client
 jupyter_console
 jupyter_core
+jupyterlab
+jupyterlab_launcher
 kafka-dep
 kbd
 kbproto
+kernel-install
 kexec-tools
 keyring
 keyutils
 khal
+kiwisolver
 kmod
 koji
 krb5
@@ -1110,10 +1170,12 @@ libconfig
 libcroco
 libcryptui
 libdatrie
+libdazzle
 libdmx
 libdnf
 libdrm
 libepoxy
+libev
 libevdev
 libevent
 libexif
@@ -1149,6 +1211,7 @@ libmediaart
 libmnl
 libmspack
 libmtp
+libmypaint
 libndp
 libnetfilter_conntrack
 libnetfilter_cthelper
@@ -1171,14 +1234,18 @@ libpthread-stubs
 libpwquality
 librepo
 librsvg
+librtlsdr
 libsamplerate
+libsass
 libseccomp
 libsecret
 libsigc++
+libsmi
 libsndfile
 libsolv
 libsoup
 libspectre
+libsrtp
 libssh
 libssh2
 libstoragemgmt
@@ -1229,9 +1296,11 @@ linux-hyperv-mini
 linux-kvm
 linux-libc-headers
 linux-lts
+linux-oracle
 linux-pk414
 linux-steam-integration
 linux-tools
+linuxptp
 llvm
 llvmlite
 lmdb
@@ -1249,6 +1318,7 @@ lzip
 lzo
 m4
 make
+makedepend
 man-db
 man-pages
 mariadb
@@ -1283,6 +1353,7 @@ motd-update
 motif
 mozjs
 mozjs38
+mozjs52
 mpc
 mpfr
 mpg123
@@ -1297,6 +1368,7 @@ murrine
 musl
 mutt
 mutter
+mypaint-brushes
 mypy
 nagios-plugins
 nano
@@ -1306,7 +1378,6 @@ nbconvert
 nbformat
 nbsphinx
 ncurses
-ncurses-compat
 ndctl
 ndg_httpsclient
 neofetch
@@ -1343,11 +1414,11 @@ nss
 nss-altfiles
 ntfs-3g
 numactl
+numatop
 numba
 numpy
 numpydoc
 nvme-cli
-nvml
 oauth2client
 ocl-icd
 offlineimap
@@ -1375,7 +1446,9 @@ openvswitch
 opus
 opusfile
 orc
+orca
 ordereddict
+osinfo-db-tools
 ostree
 ovirt-guest-agent
 p11-kit
@@ -1410,7 +1483,9 @@ perl-B-Hooks-EndOfScope
 perl-CPAN-Meta-Check
 perl-Capture-Tiny
 perl-Class-Data-Inheritable
+perl-Class-Inspector
 perl-Class-Singleton
+perl-Class-Tiny
 perl-Crypt-SSLeay
 perl-DBI
 perl-DateTime
@@ -1426,7 +1501,14 @@ perl-Error
 perl-Eval-Closure
 perl-Exception-Class
 perl-Exporter-Tiny
+perl-ExtUtils-Config
+perl-ExtUtils-Helpers
+perl-ExtUtils-InstallPaths
+perl-File-Copy-Recursive
 perl-File-Listing
+perl-File-MMagic
+perl-File-ShareDir
+perl-File-ShareDir-Install
 perl-File-Slurp
 perl-HTML-Parser
 perl-HTML-Tagset
@@ -1451,6 +1533,7 @@ perl-MIME-Base64
 perl-MRO-Compat
 perl-Math-BigInt-GMP
 perl-Module-Build
+perl-Module-Build-Tiny
 perl-Module-Implementation
 perl-Module-Install
 perl-Module-Pluggable
@@ -1463,6 +1546,7 @@ perl-Package-Stash
 perl-Params-Validate
 perl-Params-ValidationCompiler
 perl-Path-Class
+perl-Path-Tiny
 perl-Role-Tiny
 perl-Scope-Guard
 perl-Specio
@@ -1470,10 +1554,14 @@ perl-Sub-Exporter-Progressive
 perl-Sub-Identify
 perl-Sub-Info
 perl-Sub-Quote
+perl-Sub-Uplevel
 perl-TAP-Harness-Archive
 perl-Term-Table
 perl-Test-Deep
+perl-Test-Exception
 perl-Test-Fatal
+perl-Test-File
+perl-Test-File-ShareDir-Dist
 perl-Test-Needs
 perl-Test-NoWarnings
 perl-Test-Output
@@ -1481,7 +1569,9 @@ perl-Test-Pod
 perl-Test-Requires
 perl-Test-Simple
 perl-Test-Taint
+perl-Test-Warn
 perl-Test-Warnings
+perl-Test-utf8
 perl-Test2-Suite
 perl-Text-Autoformat
 perl-Text-CSV_XS
@@ -1516,8 +1606,10 @@ pkcs11-helper
 pkg-config
 pluggy
 ply
+pmdk
 polkit
 poppler
+poppler-data
 popt
 portaudio
 posix_ipc
@@ -1550,7 +1642,6 @@ pyatspi
 pycairo
 pycodestyle
 pycparser
-pycrypto
 pycurl
 pydot
 pydot_ng
@@ -1576,7 +1667,6 @@ python-augeas
 python-dateutil
 python-future
 python-gflags
-python-keyczar
 python-krbV
 python-magic
 python-memcached
@@ -1631,6 +1721,7 @@ qtx11extras
 qtxmlpatterns
 quagga
 quilt
+ragel
 randrproto
 rdma-core
 re2c
@@ -1649,6 +1740,7 @@ rng-tools
 rope
 rpcbind
 rpm
+rr
 rsa
 rsync
 ruby
@@ -1659,6 +1751,8 @@ rxvt-unicode
 s2tc
 s3transfer
 samba
+sane-backends
+sassc
 satyr
 sbc
 sbsigntools
@@ -1676,6 +1770,7 @@ seaborn
 seahorse
 secretstorage
 sed
+serf
 setproctitle
 setserial
 setuptools
@@ -1685,6 +1780,7 @@ shared-mime-info
 sharutils
 shim
 siege
+simple-scan
 simplegeneric
 simplejson
 sip
@@ -1700,6 +1796,7 @@ soundmodem
 source-code-pro
 source-highlight
 sox
+spandsp
 spark-dep
 speex
 speexdsp
@@ -1719,8 +1816,10 @@ startup-notification
 stow
 strace
 subunit
+subversion
 sudo
 sure
+suricata
 swig
 swupd-client
 swupd-overdue
@@ -1784,6 +1883,7 @@ tzdata
 tzlocal
 udisks2
 uhttpmock
+unbundle
 unicode-xid
 unifdef
 unittest2
@@ -1801,6 +1901,7 @@ util-linux
 util-macros
 uwsgi
 v4l-utils
+vala
 valgrind
 vcversioner
 videoproto
@@ -1831,6 +1932,9 @@ wget
 wheel
 which
 widgetsnbextension
+wireless-regdb-master
+wireshark
+woff2
 wol
 wpa_supplicant
 wrapt
@@ -1842,13 +1946,17 @@ xauth
 xbitmaps
 xcb-proto
 xcb-util
+xcb-util-cursor
 xcb-util-image
 xcb-util-keysyms
+xcb-util-renderutil
 xcb-util-wm
+xcb-util-xrm
 xclip
 xcmiscproto
 xcursor-themes
 xcursorgen
+xdg-desktop-portal
 xdg-user-dirs
 xdg-user-dirs-gtk
 xdg-utils

user-setup.sh

@@ -149,4 +149,4 @@ fi
 echo -en "\n************************\n"
 
 echo 'Workspace has been set up in the "clearlinux" directory'
-echo 'NOTE: logout and log back in or run "newgrp kvm" to finalize the setup process'
+echo 'NOTE: logout and log back in to finalize the setup process'