Update packages file for version 37930

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

Makefile.common

@@ -20,7 +20,7 @@ LATEST_RPMS = $(wildcard rpms/*.rpm)
 DEBUGINFO_RPM = $(wildcard rpms/${PKG_NAME}-debuginfo-$(shell $(call queryspec,%{V}-%{R},${SPECFILE})).*.rpm)
 RPMS ?= $(LATEST_RPMS)
 
-WITH_SUDO = $(shell cmp /usr/bin/mock /usr/sbin/mock &> /dev/null && echo sudo )
+WITH_SUDO = sudo
 
 # MOCK_CONFIG_VAL is set in Makefile.shared
 MOCK_SMP_FLAGS=$(patsubst -j%, -D_smp_mflags\ -j%,$(filter -j%, $(MAKEFLAGS)))
@@ -217,14 +217,24 @@ autospecnostate:
 scanlicense:
 	python3 $(TOPLVL)/projects/autospec/autospec/autospec.py -t . --config $(AUTOSPEC_CONF) --license-only $(firstword $(NEWURL) $(URL)) --name $(PKG_NAME)
 
-#help bump: Increments the release file by one.
+#help bump: Increments the package release number by one and commits the result. If
+#help the variable BUMP_MSG is set, its value is used as the commit summary.
+#help Otherwise a generic commit summary is used.
 bump:
 	git pull --rebase
 	$(MAKE) bumpnogit
 	git add $(SPECFILE) release
-	git commit -a -m "version bump from $(shell $(call queryspec,%{VERSION}-%{RELEASE}\n,$(SPECFILE))) to `$(call queryspec,%{VERSION}-%{RELEASE}\n,$(SPECFILE))`"
+	fromver=$(shell $(call queryspec,%{VERSION}-%{RELEASE}\n,$(SPECFILE))); \
+	tover=`$(call queryspec,%{VERSION}-%{RELEASE}\n,$(SPECFILE))`; \
+	if [[ -n "$(BUMP_MSG)" ]]; then \
+		bumpmsg="$(BUMP_MSG)"; \
+	else \
+		bumpmsg="version bump from $$fromver to $$tover"; \
+	fi; \
+	git commit -a -m "$$bumpmsg"
 
-#help bumpnogit: Increments the release file by one and does not commit changes.
+#help bumpnogit: Increments the package release number by one and does not commit
+#help changes.
 bumpnogit:
 	@$(MAKE) spdxcheck
 	oldrel=$(shell $(call queryspec,%{RELEASE}\n,$(SPECFILE))); \
@@ -329,6 +339,13 @@ koji: prekoji-checks kojidef
 	git tag $(SRPMVERS)
 	git push origin $(CURRENT_BRANCH):main refs/tags/$(SRPMVERS)
 	$(KOJI_CMD) build $$KOJI_NOWAIT $(KOJI_TAG) $(PKG_BASE_URL)/$(PKG_NAME)?#$(SRPMVERS)
+	@if [ -f bump.list ]; then \
+		$(MAKE) koji-waitrepo; \
+		msg="Bump for $(shell $(call queryspec,%{NAME} %{VERSION}\n,$(SPECFILE)))"; \
+		for bump_dep in $$(cat bump.list); do \
+			(cd ../"$$bump_dep" && $(MAKE) bump BUMP_MSG="$$msg" && $(MAKE) koji-nowait) \
+		done \
+	fi
 
 #help rekoji: In case a previous 'make koji' failed, trigger a rebuild for the
 #help same tag.
@@ -352,6 +369,44 @@ koji-nowait:
 rekoji-nowait:
 	$(MAKE) KOJI_NOWAIT="--nowait --background" rekoji
 
+#help koji-waitrepo: Wait for current package changes to become available in the
+#help koji repo. If PKG_NAME is overridden on the command line, wait on changes for
+#help that package instead. This capability allows the developer to "chain" builds
+#help for submission to koji according to the state of the package repos on their
+#help system. Additional options for `koji wait-repo` can be specified via the
+#help WAIT_OPTS variable.
+koji-waitrepo: kojidef
+	@if [[ ! "${PKG_NAME}" =~ ^[A-Za-z0-9._+-]+$$ ]]; then \
+		echo "[ERROR] Invalid package name \"${PKG_NAME}\""; \
+		exit 1; \
+	fi; \
+	if [[ "${PKG_NAME}" != "$(notdir ${CURDIR})" ]]; then \
+		$(MAKE) -s -C ../${PKG_NAME} koji-waitrepo; \
+	else \
+		koji wait-repo --build=${SRPMVERS} ${WAIT_OPTS} ${KOJI_TAG}-build; \
+	fi
+
+update-versions:
+
+.PHONY: update
+#help update: Tries to run update.sh if it exists. update.sh is expected
+#help to check for version updates, exit (successfully) if none are found
+#help or update the package and push the update to koji.
+#help If no update.sh exists, update the version, autospec and push the
+#help update to koji (bumping the bump.list if found).
+update:
+	@if [ -f update.sh ]; then \
+		./update.sh; \
+	else \
+		$(MAKE) -s update-versions && \
+		$(MAKE) autospec CLEANUP=1 && \
+		if [ -f bump.list ]; then \
+			$(MAKE) -s koji; \
+		else \
+			$(MAKE) -s koji-nowait; \
+		fi \
+	fi \
+
 logcheck:
 	@perl $(TOPLVL)/projects/common/logcheck.pl results/build.log
 

Makefile.toplevel

@@ -52,7 +52,7 @@ $(clone_PKGS): $(PACKAGES_FILE) packages/common/Makefile.common
 	remotepkg=$(call remotepkgname,$$pkg); \
 	[ -d packages/$$pkg ] || ( \
 	echo "Checking out: packages/$$pkg"; \
-	git clone $(PKG_BASE_URL)/$$remotepkg packages/$$pkg; \
+	git clone -b main $(PKG_BASE_URL)/$$remotepkg packages/$$pkg; \
 	cd packages/$$pkg; \
 	$(call gitoliteurl,packages/$$pkg); \
 	$(call subjectprefix,$$pkg); \
@@ -168,7 +168,7 @@ status: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
 #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 --stat); :) ;\
+		(cd $$p; git status --porcelain | grep -vq '^?? ' && (echo "Uncommitted changes in: $$p"; git --no-pager diff --stat); :) ;\
 	done
 
 #help log: Run git log origin/main..HEAD for all package repos, thus

licenses-spdx

@@ -32,6 +32,7 @@ Apache-1.0
 Apache-1.1
 Apache-2.0
 App-s2p
+Arphic-1999
 Artistic-1.0
 Artistic-1.0-Perl
 Artistic-1.0-cl8
@@ -59,11 +60,13 @@ BSD-Protection
 BSD-Source-Code
 BSL-1.0
 BUSL-1.1
+Baekmuk
 Bahyph
 Barr
 Beerware
 BitTorrent-1.0
 BitTorrent-1.1
+Bitstream-Vera
 BlueOak-1.0.0
 Borceux
 C-UDA-1.0
@@ -77,6 +80,7 @@ CC-BY-2.5-AU
 CC-BY-3.0
 CC-BY-3.0-AT
 CC-BY-3.0-DE
+CC-BY-3.0-IGO
 CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-4.0
@@ -176,6 +180,7 @@ FDK-AAC
 FSFAP
 FSFUL
 FSFULLR
+FSFULLRWD
 FTL
 Fair
 Frameworx-1.0
@@ -248,6 +253,7 @@ JPNIC
 JSON
 Jam
 JasPer-2.0
+Knuth-CTAN
 LAL-1.2
 LAL-1.3
 LGPL-2.0
@@ -270,6 +276,8 @@ LPPL-1.1
 LPPL-1.2
 LPPL-1.3a
 LPPL-1.3c
+LZMA-SDK-9.11-to-9.20
+LZMA-SDK-9.22
 Latex2e
 Leptonica
 LiLiQ-P-1.1
@@ -291,10 +299,12 @@ MPL-1.0
 MPL-1.1
 MPL-2.0
 MPL-2.0-no-copyleft-exception
+MS-LPL
 MS-PL
 MS-RL
 MTLL
 MakeIndex
+Minpack
 MirOS
 Motosoto
 MulanPSL-1.0
@@ -307,6 +317,7 @@ NBPL-1.0
 NCGL-UK-2.0
 NCSA
 NGPL
+NICTA-1.0
 NIST-PD
 NIST-PD-fallback
 NLOD-1.0
@@ -381,6 +392,7 @@ PolyForm-Noncommercial-1.0.0
 PolyForm-Small-Business-1.0.0
 PostgreSQL
 Python-2.0
+Python-2.0.1
 QPL-1.0
 Qhull
 RHeCos-1.1
@@ -461,6 +473,7 @@ Zlib
 blessing
 bzip2-1.0.5
 bzip2-1.0.6
+checkmk
 copyleft-next-0.3.0
 copyleft-next-0.3.1
 curl
@@ -475,7 +488,10 @@ iMatix
 libpng-2.0
 libselinux-1.0
 libtiff
+libutil-David-Nugent
+mpi-permissive
 mpich2
+mplus
 psfrag
 psutils
 wxWindows