Update packages file for version 33000

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

Makefile.shared

@@ -62,6 +62,38 @@ 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
+
+
 # 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

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); \

packages

@@ -38,6 +38,7 @@ LS_COLORS
 LVM2
 LibRaw
 LibVNCServer
+LibreCAD
 Linux-PAM
 LuaJIT
 LyX
@@ -1036,6 +1037,7 @@ alembic
 alsa-firmware
 alsa-lib
 alsa-plugins
+alsa-tools
 alsa-ucm-conf
 alsa-utils
 amazon-efs-utils
@@ -1150,11 +1152,11 @@ bind-utils
 binutils
 binwalk
 bison
-bkcharts
 bleach
 blender
 blinken
 blinker
+blis
 blktrace
 blockdiag
 bluedevil
@@ -1204,7 +1206,6 @@ buildreq-nginx
 buildreq-php
 buildreq-qmake
 buildreq-scons
-bundle-chroot-builder
 bwidget
 byobu
 bz2file
@@ -1363,12 +1364,11 @@ compat-gtksourceview-soname3
 compat-guile-soname20
 compat-hwloc-soname5
 compat-hyperscan-soname4
-compat-icu4c-soname61
-compat-icu4c-soname63
 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
@@ -1380,10 +1380,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
@@ -1424,7 +1424,6 @@ cpuloadgen
 cracklib
 crcmod
 createrepo_c
-cri-containerd
 cri-o
 cri-tools
 cronie
@@ -1563,7 +1562,6 @@ efivar
 efl
 eid-mw
 eigen
-elasticsearch-dep
 electric-fence
 elementary-xfce
 elfutils
@@ -1605,6 +1603,7 @@ f2fs-tools
 faas-cli
 faba-icon-theme
 fakeroot
+fangfrisch
 fann
 fann2
 farstream
@@ -1643,6 +1642,7 @@ flake8-import-order
 flake8-polyfill
 flare-engine
 flare-game
+flask-restx
 flatpak
 flatpak-builder
 flatten_json
@@ -1671,6 +1671,7 @@ freezegun
 fribidi
 fritzing-app
 fs
+fsearch
 funcparserlib
 funcsigs
 fuse
@@ -1711,6 +1712,7 @@ geocode-glib
 geos
 gettext
 gevent
+geventhttpclient-wheels
 gexiv2
 gfbgraph
 gflags
@@ -1747,6 +1749,7 @@ gmic
 gmime
 gmp
 gmqtt
+gmsh
 gnocchiclient
 gnome-applets
 gnome-autoar
@@ -1763,6 +1766,7 @@ gnome-common
 gnome-contacts
 gnome-control-center
 gnome-desktop
+gnome-desktop-testing
 gnome-disk-utility
 gnome-flashback
 gnome-font-viewer
@@ -1860,7 +1864,6 @@ gtk-doc
 gtk-vnc
 gtk-xfce-engine
 gtk3
-gtkglext
 gtkmm2
 gtkmm3
 gtksourceview
@@ -1885,7 +1888,6 @@ haveged
 hdf5
 hdmedians
 hdparm
-heat
 helloworld
 helm
 help2man
@@ -1915,6 +1917,7 @@ hyperscan
 hyperstart
 hyphen
 hypothesis
+hypre
 i2c-tools
 i3
 i3blocks
@@ -1983,7 +1986,7 @@ ipmitool
 iproute2
 ipset
 iptables
-iptraf
+iptraf-ng
 iptstate
 iputils
 ipvsadm
@@ -2127,6 +2130,7 @@ kdiamond
 kdiff3
 kdnssd
 kdoctools
+kdsoap
 keditbookmarks
 keepalived
 keepassxc
@@ -2356,6 +2360,7 @@ libcomps
 libconfig
 libcroco
 libcryptui
+libcxx
 libdaemon
 libdatrie
 libdazzle
@@ -2384,6 +2389,7 @@ libfakekey
 libfastjson
 libffi
 libffmpeg-stub
+libflame
 libfm
 libfm-qt
 libfontenc
@@ -2473,6 +2479,7 @@ libnfnetlink
 libnftnl
 libnice
 libnl
+libnma
 libnotify
 libnova
 libnumbertext
@@ -2623,10 +2630,11 @@ lldb
 llfuse
 llvm
 llvm8
-llvmlite
+llvm9
 lm-sensors
 lmdb
 locket
+lockfile
 locustio
 log4cpp
 logilab-common
@@ -2689,6 +2697,7 @@ matplotlib
 mc
 mccabe
 mcelog
+md4c
 mdadm
 mdds
 media-player-info
@@ -2736,6 +2745,8 @@ mock
 mod_perl
 mod_wsgi
 modemmanager-qt
+modsecurity
+modsecurity-nginx
 modules
 moka-icon-theme
 mokutil
@@ -2751,7 +2762,6 @@ motif
 mox
 mox3
 mozjs
-mozjs52
 mozjs60
 mozjs68
 mpc
@@ -2881,7 +2891,6 @@ ntp
 ntplib
 numactl
 numatop
-numba
 numlockx
 numpy
 numpy-stl
@@ -2923,6 +2932,7 @@ openjade
 openjdk
 openjdk11
 openjdk13
+openjpeg
 openldap
 openmpi
 openscad
@@ -3005,7 +3015,6 @@ pandoc
 pandocfilters
 pango
 pangomm
-pangox-compat
 paper-icon-theme
 papi
 papirus-icon-theme
@@ -3152,6 +3161,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
@@ -3931,6 +3941,7 @@ picmi
 picocom
 pidgin
 pidgin-sipe
+pigeonhole
 piglit
 pigz
 pika
@@ -3987,6 +3998,7 @@ potrace
 povray
 powerdevil
 powerline-fonts
+powerstat
 powertop
 poxml
 ppp
@@ -4040,7 +4052,6 @@ pycairo
 pycodestyle
 pycosat
 pycparser
-pycrypto
 pycurl
 pydocstyle
 pydot
@@ -4092,6 +4103,7 @@ pytest-repeat
 pytest-rerunfailures
 pytest-runner
 pytest-sugar
+pytest-tap
 pytest-timeout
 pytest-xdist
 python
@@ -4144,7 +4156,6 @@ python-subunit
 python-swiftclient
 python-systemd
 python-tabulate
-python-tappy
 python-troveclient
 python-urwid
 python-utils
@@ -4176,6 +4187,7 @@ qpdf
 qqc2-desktop-style
 qrencode
 qscintilla
+qsstv
 qt-creator
 qt3d
 qt5ct
@@ -4308,7 +4320,6 @@ sassc
 satyr
 sbc
 sbsigntools
-scala
 scdoc
 scene-alembic
 scikit-build
@@ -4484,6 +4495,7 @@ systemtap
 taglib
 talloc
 tallow
+tap.py
 tar
 taskflow
 taskwarrior
@@ -4515,6 +4527,7 @@ terminus-font
 tesseract
 test-generator
 testdisk
+testfixtures
 testpath
 testrepository
 testresources
@@ -4576,8 +4589,8 @@ trollius
 trustme
 twine
 typed_ast
-typing
 typing_extensions
+typing_inspect
 tzdata
 tzlocal
 ua-parser
@@ -4600,7 +4613,6 @@ unit
 unittest2
 unixODBC
 unzip
-upm
 upower
 uritemplate
 urllib3

patchfilter.py

@@ -244,14 +244,15 @@ def main():
     
     zap_line_in_file_start(".spec", "Release  :")
     zap_line_in_file_start(".spec", "Source99 :")
-    zap_line_in_file_start(".spec", "Source0  :")
     zap_line_in_file_start(".spec", "export SOURCE_DATE_EPOCH")
     zap_line_in_file_start(".spec", "export AR=gcc-ar")
     zap_line_in_file_start(".spec", "export RANLIB=gcc-ranlib")
     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      :")
@@ -288,13 +289,15 @@ 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("b/options.conf", "url = ")
+    zap_line_in_file_start("b/options.conf", "url = ")
     zap_line_in_file("b/options.conf", "[package]")
     zap_line_in_file("b/options.conf", "")
     zap_line_in_file("b/options.conf", "[autospec]")