Add some input validation for local repo handling

The local repo implementation makes some assumptions about the contents
of the package manager and mock conf files, so do some basic input
validation to assess whether the assumptions are correct, and exit with
informative errors if not.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>

Makefile.common

@@ -349,11 +349,6 @@ rekoji-nowait:
 logcheck:
 	@perl $(TOPLVL)/projects/common/logcheck.pl results/build.log
 
-$(TOPLVL)/repo:
-	@echo "Creating local RPM repository $(TOPLVL)/repo"
-	mkdir $(TOPLVL)/repo
-	$(MAKE) localrepocreate
-
 #help repoadd: Adds locally-built RPMs for this package to the local RPM
 #help repository. If this repository does not yet exist, it is created and
 #help enabled.
@@ -361,22 +356,16 @@ repoadd: $(TOPLVL)/repo
 	@if [ -z "${LATEST_RPMS}" ]; then \
 		echo "No rpms found in rpms/ directory."; \
 		exit 1; \
-	fi; \
-	if [ -f .repo-index ]; then \
-		echo "Cleaning old rpms:"; \
-		for r in `cat .repo-index`; do \
-			echo "-$$r"; \
-			rm -f $(TOPLVL)/repo/$$r; \
-		done; \
-		rm .repo-index; \
-	fi; \
-	for r in ${LATEST_RPMS}; do \
-		echo "+$$r"; \
-		echo $$(basename $$r) >> .repo-index; \
-		ln -f $$r $(TOPLVL)/repo/; \
-	done
-	$(MAKE) localrepocreate
-	$(call localrepoenable,${PM_CONF},${MOCK_CONF})
+	fi
+	$(MAKE) -s repodel NO_CREATEREPO=1
+	@echo "Adding new rpms:"; \
+	for rpm in ${LATEST_RPMS}; do \
+		echo "+$${rpm#rpms/}"; \
+		echo "$${rpm#rpms/}" >> .repo-index; \
+	done; \
+	flock $</repo.lock ln -f -t $< ${LATEST_RPMS}
+	$(MAKE) -s localrepocreate
+	$(MAKE) -s localrepoenable
 
 #help repostage: Stages locally-built RPMs for this package to the local RPM
 #help directory. If this directory does not yet exist, it is created and
@@ -385,37 +374,33 @@ repostage: $(TOPLVL)/repo
 	@if [ -z "${LATEST_RPMS}" ]; then \
 		echo "No rpms found in rpms/ directory."; \
 		exit 1; \
-	fi; \
-	if [ -f .repo-index ]; then \
-		echo "Cleaning old rpms:"; \
-		for r in `cat .repo-index`; do \
-			echo "-$$r"; \
-			rm -f $(TOPLVL)/repo/$$r; \
-		done; \
-		rm .repo-index; \
-	fi; \
-	for r in ${LATEST_RPMS}; do \
-		echo "+$$r"; \
-		echo $$(basename $$r) >> .repo-index; \
-		ln -f $$r $(TOPLVL)/repo/; \
-	done
+	fi
+	$(MAKE) -s repodel NO_CREATEREPO=1
+	@for r in ${LATEST_RPMS}; do \
+		echo "+$${rpm#rpms/}"; \
+		echo "$${rpm#rpms/}" >> .repo-index; \
+	done; \
+	flock $</repo.lock ln -f -t $< ${LATEST_RPMS}
 
 #help repodel: Removes RPMs from the local RPM repository that were
 #help previously added by 'make repoadd' for this package.
-repodel:
+repodel: $(TOPLVL)/repo
 	@if [ -f .repo-index ]; then \
 		echo "Cleaning old rpms:"; \
-		for r in `cat .repo-index`; do \
-			echo "-$$r"; \
-			rm -f $(TOPLVL)/repo/$$r; \
-		done; \
+		mapfile -t rpms < <(sed 's|.*|$</&|' .repo-index); \
+		for rpm in "$${rpms[@]}"; do \
+			echo "-$${rpm#$</}"; \
+		done < .repo-index; \
+		flock $</repo.lock rm -f "$${rpms[@]}"; \
 		rm .repo-index; \
-		$(MAKE) localrepocreate; \
+		if [ -z "$$NO_CREATEREPO" ]; then \
+			$(MAKE) -s localrepocreate; \
+		fi; \
 	fi
 
 #help repoenable: Enables the local RPM repository for use with Yum/DNF and
 #help Mock. If this repository does not yet exist, it is created.
-repoenable: $(TOPLVL)/repo ; $(call localrepoenable,${PM_CONF},${MOCK_CONF})
+repoenable: localrepoenable ;
 
 #help repodisable: Disables the local RPM repository.
 repodisable: localrepodisable ;

Makefile.shared

@@ -62,33 +62,95 @@ define remotepkgname
 $(if $(USE_PACKAGE_MAPPING),$$(awk -v P="$(1)" '$$1 == P { res=$$2 } END { print res ? res : P }' $(TOPLVL)/projects/common/pkg-mapping),$(1))
 endef
 
+# Clone repo from the configured gitolite instance, but only if the repo exists
+# on that instance and matches the pattern "packages/..*".
+define try-clone-gitolite
+rpkg=$(call remotepkgname,$(1)); \
+if ssh $(GITOLITE_BASE_URL) info "packages/$$rpkg" | grep --quiet "packages/$$rpkg$$"; then \
+	git clone $(PKG_BASE_URL)/$$rpkg packages/$(1); \
+	cd packages/$(1); \
+	$(call gitoliteurl,packages/$(1)); \
+	$(call subjectprefix,$(1)); \
+fi
+endef
+
+# Clone repo from the configured package repo hosting location, as defined by
+# the PKG_BASE_URL variable, but only if the repo exists.
+define try-clone-other
+rpkg=$(call remotepkgname,$(1)); \
+if git ls-remote $(PKG_BASE_URL)/$$rpkg &> /dev/null; then \
+	git clone $(PKG_BASE_URL)/$$rpkg packages/$(1); \
+	cd packages/$(1); \
+	$(call subjectprefix,$(1)); \
+fi
+endef
+
+# First, try running `make clone_PKG`, where PKG is the first argument. If that
+# fails, proceed with fallback cloning strategies.
+define clone-if-available
+$(MAKE) clone_$(1) || { \
+	$(if $(GITOLITE_BASE_URL),$(call try-clone-gitolite,$(1)),$(call try-clone-other,$(1))); \
+}
+endef
+
+$(TOPLVL)/repo:
+	@echo "Creating local RPM repository $(TOPLVL)/repo"
+	mkdir $(TOPLVL)/repo
+
 # Enables the local RPM repo by installing package manager and Mock configs.
 # First argument is the path to the package manager config, and the second
 # argument is the path to the mock config. Each of these config files is
 # augmented for local repo support.
-define localrepoenable
-	@cp $(1) $(TOPLVL)/repo/yum.conf
-	@printf "\n\n[local]\nname=Local\nfailovermethod=priority\nenabled=1\ngpgcheck=0\npriority=1\n" >> $(TOPLVL)/repo/yum.conf
-	@printf "baseurl=file://$$(realpath $(TOPLVL))/repo/\n\n" >> $(TOPLVL)/repo/yum.conf
-	@cp $(2) $(TOPLVL)/repo/clear.cfg
-	@printf "\n\n[localrepo]\nname=Local repo\nfailovermethod=priority\nenabled=1\ngpgcheck=0\npriority=1\n" >> $(TOPLVL)/repo/clear.cfg
-	@printf "baseurl=file://$$(realpath $(TOPLVL))/repo/\n\n" >> $(TOPLVL)/repo/clear.cfg
-	@sed -i '/^"""/d; $$a"""' $(TOPLVL)/repo/clear.cfg
-endef
+localrepoenable: $(TOPLVL)/repo
+	@if grep -qx '\[localrepo\]' ${PM_CONF}; then \
+		echo "[ERROR] ${PM_CONF} contains section named [localrepo]."; \
+		echo "[ERROR] Remove that section and try again."; \
+		exit 1; \
+	fi >&2
+	@if grep -qx '\[localrepo\]' ${MOCK_CONF}; then \
+		echo "[ERROR] ${MOCK_CONF} contains section named [localrepo]."; \
+		echo "[ERROR] Remove that section and try again."; \
+		exit 1; \
+	fi >&2
+	@last="$$(tail -n 1 ${MOCK_CONF})"; \
+	if [[ "$$last" != "\"\"\"" ]]; then \
+		echo "[ERROR] Last line of ${MOCK_CONF} is malformed; expected: \"\"\"; actual: $$last"; \
+		echo "[ERROR] Fix that line and try again."; \
+		exit 1; \
+	fi >&2
+	@pm_new=$$(mktemp -p $< yum.conf.XXXXXXX); \
+	pm_orig=$</yum.conf; \
+	mock_new=$$(mktemp -p $< clear.cfg.XXXXXXX); \
+	mock_orig=$</clear.cfg; \
+	cp ${PM_CONF} $$pm_new; \
+	printf "\n\n[localrepo]\nname=localrepo\nfailovermethod=priority\nenabled=1\ngpgcheck=0\npriority=1\n" >> $$pm_new; \
+	printf "baseurl=file://$$(realpath $<)/\n\n" >> $$pm_new; \
+	if ! cmp -s $$pm_new $$pm_orig; then \
+		flock $</repo.lock mv $$pm_new $$pm_orig; \
+	fi; \
+	rm -f $$pm_new; \
+	cp ${MOCK_CONF} $$mock_new; \
+	sed -i '$$d' $$mock_new; \
+	printf "\n\n[localrepo]\nname=localrepo\nfailovermethod=priority\nenabled=1\ngpgcheck=0\npriority=1\n" >> $$mock_new; \
+	printf "baseurl=file://$$(realpath $<)/\n\n" >> $$mock_new; \
+	sed -i '$$a"""' $$mock_new; \
+	if ! cmp -s $$mock_new $$mock_orig; then \
+		flock $</repo.lock mv $$mock_new $$mock_orig; \
+	fi; \
+	rm -f $$mock_new
 
 # Disables the local RPM repo by removing the installed package manager and
 # Mock configuration files.
-localrepodisable:
-	@rm -f $(TOPLVL)/repo/yum.conf
-	@rm -f $(TOPLVL)/repo/clear.cfg
+localrepodisable: $(TOPLVL)/repo
+	flock $</repo.lock rm -f $</yum.conf $</clear.cfg
 
-# Runs createrepo_c (or createrepo) for the local RPM repo
-localrepocreate:
-	( cd $(TOPLVL)/repo ; if type createrepo_c 1>/dev/null 2>&1; then createrepo_c .; else createrepo .; fi );
+# Runs createrepo_c for the local RPM repo
+localrepocreate: $(TOPLVL)/repo
+	cd $< && flock repo.lock createrepo_c .
 
 # Remove all RPMs from the local RPM repo
-localrepoclean:
-	@find $(TOPLVL)/repo -maxdepth 1 -name '*.rpm' -delete
+localrepoclean: $(TOPLVL)/repo
+	flock $</repo.lock find $< -maxdepth 1 -name '*.rpm' -delete
 
 # Summarizes the local RPM repo status
 localrepostatus:

Makefile.toplevel

@@ -166,6 +166,15 @@ diff: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
 		(cd $$p ; git status | grep -q 'nothing to commit, working [^ ]* clean' || (echo "Uncommitted changes in: $$p"; git diff |diffstat -p1)) ;\
 	done
 
+#help log: Run git log origin/master..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 \
+		echo $$p ; git --no-pager log --pretty="format:%s" origin/master..HEAD ; echo ; echo;\
+		fi ; ) \
+	done
+
 #help versions: Displays the version of each package in the ./packages tree.
 versions: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
 	@for p in $(addprefix packages/,$(PKGS_LOCAL)); do \
@@ -196,7 +205,7 @@ autospecnew: preautospecnew-checks localreponotice
 		echo "Please specify NAME and URL. The ARCHIVES variable is optional."; \
 		exit 1; \
 	fi
-	-$(MAKE) clone_$(NAME)
+	$(call clone-if-available,$(NAME))
 	@if [ ! -d $(TOPLVL)/packages/$(NAME)/.git ]; then \
 		echo "no remote repository found, creating new package repository and running autospec"; \
 		mkdir -p $(TOPLVL)/packages/$(NAME); \
@@ -281,14 +290,9 @@ autospecnewgo: preautospecnew-checks localreponotice
 		exit 1; \
 	fi
 
-$(TOPLVL)/repo:
-	@echo "Creating local RPM repository $(TOPLVL)/repo"
-	mkdir $(TOPLVL)/repo
-	$(MAKE) localrepocreate
-
 #help repoenable: Enables the local RPM repository for use with Yum/DNF and
 #help Mock. If this repository does not yet exist, it is created.
-repoenable: $(TOPLVL)/repo ; $(call localrepoenable,${PM_CONF},${MOCK_CONF})
+repoenable: localrepoenable ;
 
 #help repodisable: Disables the local RPM repository.
 repodisable: localrepodisable ;

packages

@@ -34,10 +34,12 @@ Judy
 Keras
 Keras_Applications
 Keras_Preprocessing
+LPCNet
 LS_COLORS
 LVM2
 LibRaw
 LibVNCServer
+LibreCAD
 Linux-PAM
 LuaJIT
 LyX
@@ -161,7 +163,6 @@ R-R.cache
 R-R.methodsS3
 R-R.oo
 R-R.utils
-R-R2Cuba
 R-R2HTML
 R-R2WinBUGS
 R-R2jags
@@ -875,7 +876,6 @@ R-tis
 R-tm
 R-toOrdinal
 R-topicmodels
-R-treatSens
 R-tree
 R-triebeard
 R-trimcluster
@@ -1036,6 +1036,7 @@ alembic
 alsa-firmware
 alsa-lib
 alsa-plugins
+alsa-tools
 alsa-ucm-conf
 alsa-utils
 amazon-efs-utils
@@ -1044,12 +1045,14 @@ amtk
 analitza
 aniso8601
 ansible
+antlr4-python3-runtime
 anyjson
 apache-ant
 apache-libcloud
 apipkg
 appdirs
 applaunchservices
+applicationinsights
 appstream
 appstream-glib
 apr
@@ -1114,11 +1117,94 @@ avahi
 awesome-wm
 awscli
 axel
+azure-batch
+azure-cli
+azure-cli-command-modules-nspkg
+azure-cli-core
+azure-cli-nspkg
+azure-cli-telemetry
 azure-common
 azure-configs
+azure-core
+azure-cosmos
+azure-datalake-store
+azure-functions-devops-build
+azure-graphrbac
 azure-iot-sdk
+azure-keyvault
+azure-keyvault-certificates
+azure-keyvault-keys
+azure-keyvault-secrets
+azure-loganalytics
+azure-mgmt-advisor
+azure-mgmt-apimanagement
+azure-mgmt-appconfiguration
+azure-mgmt-applicationinsights
+azure-mgmt-authorization
+azure-mgmt-batch
+azure-mgmt-batchai
+azure-mgmt-billing
+azure-mgmt-botservice
+azure-mgmt-cdn
+azure-mgmt-cognitiveservices
+azure-mgmt-compute
+azure-mgmt-consumption
+azure-mgmt-containerinstance
+azure-mgmt-containerregistry
+azure-mgmt-containerservice
+azure-mgmt-core
+azure-mgmt-cosmosdb
+azure-mgmt-datalake-analytics
+azure-mgmt-datalake-nspkg
+azure-mgmt-datalake-store
+azure-mgmt-datamigration
+azure-mgmt-deploymentmanager
+azure-mgmt-devtestlabs
+azure-mgmt-dns
+azure-mgmt-eventgrid
+azure-mgmt-eventhub
+azure-mgmt-hdinsight
+azure-mgmt-imagebuilder
+azure-mgmt-iotcentral
+azure-mgmt-iothub
+azure-mgmt-iothubprovisioningservices
+azure-mgmt-keyvault
+azure-mgmt-kusto
+azure-mgmt-loganalytics
+azure-mgmt-managedservices
+azure-mgmt-managementgroups
+azure-mgmt-maps
+azure-mgmt-marketplaceordering
+azure-mgmt-media
+azure-mgmt-monitor
+azure-mgmt-msi
+azure-mgmt-netapp
+azure-mgmt-network
+azure-mgmt-nspkg
+azure-mgmt-policyinsights
+azure-mgmt-privatedns
+azure-mgmt-rdbms
+azure-mgmt-recoveryservices
+azure-mgmt-recoveryservicesbackup
+azure-mgmt-redhatopenshift
+azure-mgmt-redis
+azure-mgmt-relay
+azure-mgmt-reservations
+azure-mgmt-resource
+azure-mgmt-search
+azure-mgmt-security
+azure-mgmt-servicebus
+azure-mgmt-servicefabric
+azure-mgmt-signalr
+azure-mgmt-sql
+azure-mgmt-sqlvirtualmachine
+azure-mgmt-storage
+azure-mgmt-trafficmanager
+azure-mgmt-web
+azure-multiapi-storage
 azure-nspkg
 azure-servicebus
+azure-storage-blob
 azure-storage-common
 babeltrace
 babl
@@ -1154,6 +1240,7 @@ bleach
 blender
 blinken
 blinker
+blis
 blktrace
 blockdiag
 bluedevil
@@ -1203,7 +1290,6 @@ buildreq-nginx
 buildreq-php
 buildreq-qmake
 buildreq-scons
-bundle-chroot-builder
 bwidget
 byobu
 bz2file
@@ -1366,6 +1452,7 @@ compat-ilmbase-soname23
 compat-intel-gmmlib-soname1
 compat-ipset-soname10
 compat-iptables-soname0.1.0
+compat-ldc-soname90
 compat-libevent-soname6
 compat-libgit2-soname27
 compat-libical-soname2
@@ -1377,10 +1464,10 @@ compat-libvpx-soname5
 compat-libwebp-soname6
 compat-llvm-soname5
 compat-llvm-soname6
-compat-llvm-soname7
 compat-mariadb-soname18
 compat-mpfr-soname4
 compat-nettle-soname6
+compat-nettle-soname7
 compat-opencv-soname41
 compat-proj-soname13
 compat-protobuf-soname14
@@ -1421,7 +1508,6 @@ cpuloadgen
 cracklib
 crcmod
 createrepo_c
-cri-containerd
 cri-o
 cri-tools
 cronie
@@ -1577,6 +1663,7 @@ envs
 eog
 eog-plugins
 epm
+epson-inkjet-printer-escpr
 eternalegypt
 ethtool
 etr
@@ -1600,6 +1687,7 @@ extras
 f2fs-tools
 faas-cli
 faba-icon-theme
+fabric
 fakeroot
 fangfrisch
 fann
@@ -1640,6 +1728,7 @@ flake8-import-order
 flake8-polyfill
 flare-engine
 flare-game
+flask-restx
 flatpak
 flatpak-builder
 flatten_json
@@ -1668,6 +1757,7 @@ freezegun
 fribidi
 fritzing-app
 fs
+fsearch
 funcparserlib
 funcsigs
 fuse
@@ -1685,6 +1775,7 @@ gcab
 gcc
 gcc7
 gcc8
+gcc9
 gcompris-qt
 gcr
 gcs-oauth2-boto-plugin
@@ -1708,6 +1799,7 @@ geocode-glib
 geos
 gettext
 gevent
+geventhttpclient-wheels
 gexiv2
 gfbgraph
 gflags
@@ -1761,6 +1853,7 @@ gnome-common
 gnome-contacts
 gnome-control-center
 gnome-desktop
+gnome-desktop-testing
 gnome-disk-utility
 gnome-flashback
 gnome-font-viewer
@@ -1858,7 +1951,6 @@ gtk-doc
 gtk-vnc
 gtk-xfce-engine
 gtk3
-gtkglext
 gtkmm2
 gtkmm3
 gtksourceview
@@ -1912,6 +2004,7 @@ hyperscan
 hyperstart
 hyphen
 hypothesis
+hypre
 i2c-tools
 i3
 i3blocks
@@ -1964,12 +2057,12 @@ intel-media-driver
 intelhex
 intervaltree
 intltool
+invoke
 ioc-cbc-tools
 ioping
 ioport
 iotop
 ipaddr
-ipaddress
 ipcalc
 ipdb
 ipdbplugin
@@ -1980,7 +2073,7 @@ ipmitool
 iproute2
 ipset
 iptables
-iptraf
+iptraf-ng
 iptstate
 iputils
 ipvsadm
@@ -2014,6 +2107,7 @@ jaraco.collections
 jaraco.functools
 jaraco.text
 jarn.viewdoc
+javaproperties
 jdcal
 jedi
 jedi-vim
@@ -2025,6 +2119,7 @@ joe
 josepy
 jpegoptim
 jq
+jsmin
 json-c
 json-glib
 json5
@@ -2124,6 +2219,7 @@ kdiamond
 kdiff3
 kdnssd
 kdoctools
+kdsoap
 keditbookmarks
 keepalived
 keepassxc
@@ -2204,6 +2300,7 @@ kmod
 kmousetool
 kmouth
 kmplot
+knack
 knavalbattle
 knetwalk
 knewstuff
@@ -2353,6 +2450,7 @@ libcomps
 libconfig
 libcroco
 libcryptui
+libcxx
 libdaemon
 libdatrie
 libdazzle
@@ -2381,6 +2479,7 @@ libfakekey
 libfastjson
 libffi
 libffmpeg-stub
+libflame
 libfm
 libfm-qt
 libfontenc
@@ -2470,6 +2569,7 @@ libnfnetlink
 libnftnl
 libnice
 libnl
+libnma
 libnotify
 libnova
 libnumbertext
@@ -2620,10 +2720,11 @@ lldb
 llfuse
 llvm
 llvm8
-llvmlite
+llvm9
 lm-sensors
 lmdb
 locket
+lockfile
 locustio
 log4cpp
 logilab-common
@@ -2734,6 +2835,8 @@ mock
 mod_perl
 mod_wsgi
 modemmanager-qt
+modsecurity
+modsecurity-nginx
 modules
 moka-icon-theme
 mokutil
@@ -2749,7 +2852,6 @@ motif
 mox
 mox3
 mozjs
-mozjs52
 mozjs60
 mozjs68
 mpc
@@ -2760,6 +2862,8 @@ mpir
 mpmath
 mpv
 mraa
+msal
+msal-extensions
 msgpack
 msgpack-c
 msm
@@ -2879,7 +2983,6 @@ ntp
 ntplib
 numactl
 numatop
-numba
 numlockx
 numpy
 numpy-stl
@@ -2921,6 +3024,7 @@ openjade
 openjdk
 openjdk11
 openjdk13
+openjpeg
 openldap
 openmpi
 openscad
@@ -3003,7 +3107,6 @@ pandoc
 pandocfilters
 pango
 pangomm
-pangox-compat
 paper-icon-theme
 papi
 papirus-icon-theme
@@ -3150,6 +3253,7 @@ perl-Clone-PP
 perl-Compress-Bzip2
 perl-Compress-Raw-Lzma
 perl-Config-Any
+perl-Config-AutoConf
 perl-Config-General
 perl-Config-Grammar
 perl-Config-INI
@@ -3478,6 +3582,7 @@ perl-Math-Utils
 perl-Math-Vec
 perl-Memoize-ExpireLRU
 perl-Meta-Builder
+perl-Metrics-Any
 perl-Minion
 perl-Mixin-Linewise
 perl-Mock-Config
@@ -3705,6 +3810,7 @@ perl-Test-LectroTest
 perl-Test-LongString
 perl-Test-Manifest
 perl-Test-Memory-Cycle
+perl-Test-Metrics-Any
 perl-Test-MockModule
 perl-Test-MockTime
 perl-Test-More-UTF8
@@ -3973,6 +4079,7 @@ polkit-qt
 poppler
 poppler-data-clr-rename
 popt
+portalocker
 portaudio
 portend
 positional
@@ -3986,6 +4093,7 @@ potrace
 povray
 powerdevil
 powerline-fonts
+powerstat
 powertop
 poxml
 ppp
@@ -4039,7 +4147,6 @@ pycairo
 pycodestyle
 pycosat
 pycparser
-pycrypto
 pycurl
 pydocstyle
 pydot
@@ -4091,6 +4198,7 @@ pytest-repeat
 pytest-rerunfailures
 pytest-runner
 pytest-sugar
+pytest-tap
 pytest-timeout
 pytest-xdist
 python
@@ -4143,7 +4251,6 @@ python-subunit
 python-swiftclient
 python-systemd
 python-tabulate
-python-tappy
 python-troveclient
 python-urwid
 python-utils
@@ -4175,6 +4282,7 @@ qpdf
 qqc2-desktop-style
 qrencode
 qscintilla
+qsstv
 qt-creator
 qt3d
 qt5ct
@@ -4307,7 +4415,6 @@ sassc
 satyr
 sbc
 sbsigntools
-scala
 scdoc
 scene-alembic
 scikit-build
@@ -4315,7 +4422,9 @@ scikit-image
 scikit-learn
 scipy
 scons
+scour
 scowl
+scp
 screen
 scripttest
 scrypt
@@ -4418,6 +4527,7 @@ squashfs-tools
 squid
 sshfs
 sshpass
+sshtunnel
 ssocr
 sssd
 ssw
@@ -4459,7 +4569,6 @@ sweeper
 swift
 swig
 swupd-client
-swupd-client-pre-release
 swupd-overdue
 swupd-probe
 swupd-search
@@ -4483,6 +4592,7 @@ systemtap
 taglib
 talloc
 tallow
+tap.py
 tar
 taskflow
 taskwarrior
@@ -4514,6 +4624,7 @@ terminus-font
 tesseract
 test-generator
 testdisk
+testfixtures
 testpath
 testrepository
 testresources
@@ -4575,8 +4686,8 @@ trollius
 trustme
 twine
 typed_ast
-typing
 typing_extensions
+typing_inspect
 tzdata
 tzlocal
 ua-parser
@@ -4599,7 +4710,6 @@ unit
 unittest2
 unixODBC
 unzip
-upm
 upower
 uritemplate
 urllib3
@@ -4645,6 +4755,8 @@ voluptuous-serialize
 vpnc
 vpp
 vsqlite
+vsts
+vsts-cd-manager
 vte
 waffle
 waitress
@@ -4726,6 +4838,8 @@ xfce4-appfinder
 xfce4-dev-tools
 xfce4-notifyd
 xfce4-panel
+xfce4-pulseaudio-plugin
+xfce4-screensaver
 xfce4-screenshooter
 xfce4-session
 xfce4-settings

patchfilter.py

@@ -250,7 +250,9 @@ def main():
     zap_line_in_file_start(".spec", "export NM=gcc-nm")
     zap_line_in_file_start(".spec", "export CFLAGS=\"$CFLAGS -O3 -ffat-lto-objects -flto=4 \"")
     zap_line_in_file_start(".spec", "export FCFLAGS=\"$CFLAGS -O3 -ffat-lto-objects -flto=4 \"")
+    zap_line_in_file_start(".spec", "export FCFLAGS=\"$FFLAGS -O3 -ffat-lto-objects -flto=4 \"")
     zap_line_in_file_start(".spec", "export FFLAGS=\"$CFLAGS -O3 -ffat-lto-objects -flto=4 \"")
+    zap_line_in_file_start(".spec", "export FFLAGS=\"$FFLAGS -O3 -ffat-lto-objects -flto=4 \"")
     zap_line_in_file_start(".spec", "export CXXFLAGS=\"$CXXFLAGS -O3 -ffat-lto-objects -flto=4 \"")
     zap_line_in_file_start(".spec", "%setup -q -n ")
     zap_line_in_file_start(".spec", "URL      :")
@@ -287,10 +289,12 @@ def main():
     zap_line_in_file_start(".spec", "cp -a ")
     zap_line_in_file_start(".spec", "cd %{_builddir}/")
     zap_line_in_file_start(".spec", "export GCC_IGNORE_WERROR=1")
+    zap_line_in_file_start(".spec", "rm -rf %{buildroot}")
  
     zap_line_in_file_start("b/Makefile", "URL =")
     zap_line_in_file_start("b/Makefile", "PKG_NAME :=")
 
+    zap_line_in_file_start("b/options.conf", "name = ")
     zap_line_in_file("b/options.conf", "archives = ")
     zap_line_in_file("b/options.conf", "giturl = ")
     zap_line_in_file_start("b/options.conf", "url = ")