Update packages file for version 33060

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

@@ -34,6 +34,7 @@ Judy
 Keras
 Keras_Applications
 Keras_Preprocessing
+LPCNet
 LS_COLORS
 LVM2
 LibRaw
@@ -1037,6 +1038,7 @@ alembic
 alsa-firmware
 alsa-lib
 alsa-plugins
+alsa-tools
 alsa-ucm-conf
 alsa-utils
 amazon-efs-utils
@@ -1045,12 +1047,14 @@ amtk
 analitza
 aniso8601
 ansible
+antlr4-python3-runtime
 anyjson
 apache-ant
 apache-libcloud
 apipkg
 appdirs
 applaunchservices
+applicationinsights
 appstream
 appstream-glib
 apr
@@ -1115,11 +1119,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
@@ -1155,6 +1242,7 @@ bleach
 blender
 blinken
 blinker
+blis
 blktrace
 blockdiag
 bluedevil
@@ -1204,7 +1292,6 @@ buildreq-nginx
 buildreq-php
 buildreq-qmake
 buildreq-scons
-bundle-chroot-builder
 bwidget
 byobu
 bz2file
@@ -1367,6 +1454,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
@@ -1381,6 +1469,7 @@ compat-llvm-soname6
 compat-mariadb-soname18
 compat-mpfr-soname4
 compat-nettle-soname6
+compat-nettle-soname7
 compat-opencv-soname41
 compat-proj-soname13
 compat-protobuf-soname14
@@ -1421,7 +1510,6 @@ cpuloadgen
 cracklib
 crcmod
 createrepo_c
-cri-containerd
 cri-o
 cri-tools
 cronie
@@ -1600,6 +1688,7 @@ extras
 f2fs-tools
 faas-cli
 faba-icon-theme
+fabric
 fakeroot
 fangfrisch
 fann
@@ -1640,6 +1729,7 @@ flake8-import-order
 flake8-polyfill
 flare-engine
 flare-game
+flask-restx
 flatpak
 flatpak-builder
 flatten_json
@@ -1668,6 +1758,7 @@ freezegun
 fribidi
 fritzing-app
 fs
+fsearch
 funcparserlib
 funcsigs
 fuse
@@ -1762,6 +1853,7 @@ gnome-common
 gnome-contacts
 gnome-control-center
 gnome-desktop
+gnome-desktop-testing
 gnome-disk-utility
 gnome-flashback
 gnome-font-viewer
@@ -1965,12 +2057,12 @@ intel-media-driver
 intelhex
 intervaltree
 intltool
+invoke
 ioc-cbc-tools
 ioping
 ioport
 iotop
 ipaddr
-ipaddress
 ipcalc
 ipdb
 ipdbplugin
@@ -1981,7 +2073,7 @@ ipmitool
 iproute2
 ipset
 iptables
-iptraf
+iptraf-ng
 iptstate
 iputils
 ipvsadm
@@ -2015,6 +2107,7 @@ jaraco.collections
 jaraco.functools
 jaraco.text
 jarn.viewdoc
+javaproperties
 jdcal
 jedi
 jedi-vim
@@ -2026,6 +2119,7 @@ joe
 josepy
 jpegoptim
 jq
+jsmin
 json-c
 json-glib
 json5
@@ -2125,6 +2219,7 @@ kdiamond
 kdiff3
 kdnssd
 kdoctools
+kdsoap
 keditbookmarks
 keepalived
 keepassxc
@@ -2205,6 +2300,7 @@ kmod
 kmousetool
 kmouth
 kmplot
+knack
 knavalbattle
 knetwalk
 knewstuff
@@ -2354,6 +2450,7 @@ libcomps
 libconfig
 libcroco
 libcryptui
+libcxx
 libdaemon
 libdatrie
 libdazzle
@@ -2382,6 +2479,7 @@ libfakekey
 libfastjson
 libffi
 libffmpeg-stub
+libflame
 libfm
 libfm-qt
 libfontenc
@@ -2471,6 +2569,7 @@ libnfnetlink
 libnftnl
 libnice
 libnl
+libnma
 libnotify
 libnova
 libnumbertext
@@ -2621,10 +2720,11 @@ lldb
 llfuse
 llvm
 llvm8
-llvmlite
+llvm9
 lm-sensors
 lmdb
 locket
+lockfile
 locustio
 log4cpp
 logilab-common
@@ -2735,6 +2835,8 @@ mock
 mod_perl
 mod_wsgi
 modemmanager-qt
+modsecurity
+modsecurity-nginx
 modules
 moka-icon-theme
 mokutil
@@ -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
@@ -3149,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
@@ -3477,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
@@ -3704,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
@@ -3972,6 +4079,7 @@ polkit-qt
 poppler
 poppler-data-clr-rename
 popt
+portalocker
 portaudio
 portend
 positional
@@ -3985,6 +4093,7 @@ potrace
 povray
 powerdevil
 powerline-fonts
+powerstat
 powertop
 poxml
 ppp
@@ -4089,6 +4198,7 @@ pytest-repeat
 pytest-rerunfailures
 pytest-runner
 pytest-sugar
+pytest-tap
 pytest-timeout
 pytest-xdist
 python
@@ -4141,7 +4251,6 @@ python-subunit
 python-swiftclient
 python-systemd
 python-tabulate
-python-tappy
 python-troveclient
 python-urwid
 python-utils
@@ -4173,6 +4282,7 @@ qpdf
 qqc2-desktop-style
 qrencode
 qscintilla
+qsstv
 qt-creator
 qt3d
 qt5ct
@@ -4305,7 +4415,6 @@ sassc
 satyr
 sbc
 sbsigntools
-scala
 scdoc
 scene-alembic
 scikit-build
@@ -4314,6 +4423,7 @@ scikit-learn
 scipy
 scons
 scowl
+scp
 screen
 scripttest
 scrypt
@@ -4416,6 +4526,7 @@ squashfs-tools
 squid
 sshfs
 sshpass
+sshtunnel
 ssocr
 sssd
 ssw
@@ -4457,7 +4568,6 @@ sweeper
 swift
 swig
 swupd-client
-swupd-client-pre-release
 swupd-overdue
 swupd-probe
 swupd-search
@@ -4481,6 +4591,7 @@ systemtap
 taglib
 talloc
 tallow
+tap.py
 tar
 taskflow
 taskwarrior
@@ -4512,6 +4623,7 @@ terminus-font
 tesseract
 test-generator
 testdisk
+testfixtures
 testpath
 testrepository
 testresources
@@ -4573,8 +4685,8 @@ trollius
 trustme
 twine
 typed_ast
-typing
 typing_extensions
+typing_inspect
 tzdata
 tzlocal
 ua-parser
@@ -4642,6 +4754,8 @@ voluptuous-serialize
 vpnc
 vpp
 vsqlite
+vsts
+vsts-cd-manager
 vte
 waffle
 waitress
@@ -4723,6 +4837,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 = ")