Update packages file for version 34340

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

Makefile.common

@@ -9,9 +9,11 @@ include $(TOPLVL)/projects/common/Makefile.shared
 
 SHELL  = /bin/bash
 
+CURRENT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
+
 SPECFILE = $(addsuffix .spec, $(PKG_NAME))
 
-SRPMVERS = $(shell [ ! -f $(SPECFILE) ] || rpmspec -D '_vendor clr' --srpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}\n' $(SPECFILE))
+SRPMVERS = $(shell [ ! -f $(SPECFILE) ] || $(call queryspec,%{NVR}\n,$(SPECFILE)))
 SRPMFILE = results/$(SRPMVERS).src.rpm
 
 LATEST_RPMS = $(wildcard rpms/*.rpm)
@@ -46,7 +48,7 @@ upstream:
 #help spdxcheck: Checks that the package license is a valid SPDX license,
 #help or that it is in the exceptions list.
 spdxcheck: $(SPECFILE)
-	@for LICENSE in `rpmspec -D '_vendor clr' --srpm -q --queryformat '%{LICENSE}\n' $(SPECFILE)`; do \
+	@for LICENSE in `$(call queryspec,%{LICENSE}\n,$(SPECFILE))`; do \
 		if ! grep -qx "$$LICENSE" $(TOPLVL)/projects/common/licenses-{spdx,exceptions,extra}; then FAIL=yes; echo "ERROR: License '$$LICENSE' is not an allowed SPDX license ID"; fi; \
 	done; test -z "$$FAIL"
 
@@ -217,12 +219,12 @@ bump:
 	git pull --rebase
 	$(MAKE) bumpnogit
 	git add $(SPECFILE) release
-	git commit -a -m "version bump from $(shell rpmspec -D '_vendor clr' --srpm -q --queryformat '%{VERSION}-%{RELEASE}\n' $(SPECFILE)) to `rpmspec -D '_vendor clr' --srpm -q --queryformat '%{VERSION}-%{RELEASE}\n' $(SPECFILE)`"
+	git commit -a -m "version bump from $(shell $(call queryspec,%{VERSION}-%{RELEASE}\n,$(SPECFILE))) to `$(call queryspec,%{VERSION}-%{RELEASE}\n,$(SPECFILE))`"
 
 #help bumpnogit: Increments the release file by one and does not commit changes.
 bumpnogit:
 	@$(MAKE) spdxcheck
-	oldrel=$(shell rpmspec -D '_vendor clr' --srpm -q --queryformat '%{RELEASE}\n' $(SPECFILE)); \
+	oldrel=$(shell $(call queryspec,%{RELEASE}\n,$(SPECFILE))); \
 	newrel=$$(($$oldrel + 1)); \
 	sed -i "s/^\(Release[[:blank:]]*:[[:blank:]]*\)$$oldrel$$/\1$$newrel/" $(SPECFILE); \
 	echo "$$newrel" > release;
@@ -232,7 +234,7 @@ $(__missingsources): sources
 # 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)); \
+	srpm=$$($(call queryspec,%{NVR}.src.rpm\n,$(SPECFILE))); \
 	if cd "$$tmp" && ! curl -s -S -f -L -O $(MIRROR_CURL_OPTS) $(DOWNLOAD_MIRROR)/releases/$(1)/clear/source/SRPMS/$$srpm; then \
 		echo "Failed to download $$srpm from Clear Linux release $(1)." >&2; \
 		cd .. && rm -rf "$$tmp"; \
@@ -240,7 +242,7 @@ define fetch-from-srpm
 	fi; \
 	rpm2cpio $$srpm | cpio --quiet -id; \
 	cd ..; \
-	srclist=$$(rpmspec --srpm -q --qf "[%{SOURCE}\n]" $(SPECFILE)); \
+	srclist=$$($(call queryspec,[%{SOURCE}\n],$(SPECFILE))); \
 	for s in $$srclist; do \
 		if ! mv --no-clobber "$$tmp"/$$s .; then \
 			echo "Missing source file \"$$s\" in $${srpm}." >&2; \
@@ -279,7 +281,7 @@ else
 sources:
 	@$(MAKE) generateupstream; \
 	[ $$? -eq 0 ] && exit 0; \
-	nvr="$$(rpmspec --srpm -q --qf '%{NAME}\t%{VERSION}\t%{RELEASE}\n' $(SPECFILE))"; \
+	nvr="$$($(call queryspec,%{NAME}\t%{VERSION}\t%{RELEASE}\n,$(SPECFILE)))"; \
 	git -C $(TOPLVL)/projects/common fetch --tags >/dev/null 2>&1; \
 	latest_builds=$$(git -C $(TOPLVL)/projects/common tag -l | sort -rn); \
 	for b in $$latest_builds; do \
@@ -305,8 +307,8 @@ prekoji-checks:
 koji: prekoji-checks kojidef
 	@$(MAKE) spdxcheck
 	@$(MAKE) checkblacklist
-	@if [ "$$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then \
-		echo "Error: Must be on the master branch to submit to koji" >&2; \
+	@if [ "$(CURRENT_BRANCH)" != "master" ] && [ "$(CURRENT_BRANCH)" != "main" ]; then \
+		echo "Error: Must be on the \"master\" or \"main\" branch to submit to koji" >&2; \
 		exit 1; \
 	fi; \
 	if ! git diff --quiet HEAD -- ${SPECFILE}; then \
@@ -322,7 +324,7 @@ koji: prekoji-checks kojidef
 		exit 1; \
 	fi
 	git tag $(SRPMVERS)
-	git push origin master refs/tags/$(SRPMVERS)
+	git push origin $(CURRENT_BRANCH):master refs/tags/$(SRPMVERS)
 	$(KOJI_CMD) build $$KOJI_NOWAIT $(KOJI_TAG) $(PKG_BASE_URL)/$(PKG_NAME)?#$(SRPMVERS)
 
 #help rekoji: In case a previous 'make koji' failed, trigger a rebuild for the
@@ -498,7 +500,7 @@ generateupstream:
 				exit 1; \
 			fi; \
 		fi; \
-		echo $$(sha1sum $$filename | cut -d\  -f1)/$$filename >> upstream; \
+		echo $$(sha1sum -- $$filename | cut -d\  -f1)/$$filename >> upstream; \
 	done
 	@rm -f upstream.bak
 	@cat upstream

Makefile.shared

@@ -47,6 +47,14 @@ define subjectprefix
 	git config format.subjectPrefix "PATCH $(1)"
 endef
 
+# Query the spec file (or spec files) listed in argument 2 for the field(s)
+# specified in argument 1. The fields are derived from the source rpm(s)
+# generated by the specs. Queried fields that are declared within the spec file
+# must be declared above the first %files section.
+define queryspec
+rpmspec --define='_vendor clr' --srpm --query --queryformat='$(1)' <(sed -n '1,/%files/p' $(2))
+endef
+
 # If GITOLITE_BASE_URL is defined, sets a repo's push URL for that gitolite
 # instance. Accepts one argument: the path to the repo on gitolite. If
 # GITOLITE_BASE_URL is not defined, no push URL is set -- the shell's null

Makefile.toplevel

@@ -178,13 +178,13 @@ log: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
 #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 \
-		(cd $$p; if ls *.spec &> /dev/null; then rpmspec -q --queryformat '%{NAME}-%{VERSION}\n' *.spec | head -n1; fi) ;\
+		(cd $$p; if ls *.spec &> /dev/null; then $(call queryspec,%{NAME}-%{VERSION}\n,*.spec) | head -n1; fi) ;\
 	done
 
 #help releases: Like 'make versions', but also displays the release number.
 releases: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
 	@for p in $(addprefix packages/,$(PKGS_LOCAL)); do \
-		(cd $$p; if ls *.spec &> /dev/null; then rpmspec -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}\n' *.spec | head -n1; fi) ;\
+		(cd $$p; if ls *.spec &> /dev/null; then $(call queryspec,%{NVR}\n,*.spec) | head -n1; fi) ;\
 	done
 
 #help provides:     Is used to find out which RPM package provides some file.

licenses-spdx

@@ -16,6 +16,7 @@ AMDPLPA
 AML
 AMPAS
 ANTLR-PD
+ANTLR-PD-fallback
 APAFML
 APL-1.0
 APSL-1.0
@@ -39,6 +40,7 @@ BSD-2-Clause
 BSD-2-Clause-FreeBSD
 BSD-2-Clause-NetBSD
 BSD-2-Clause-Patent
+BSD-2-Clause-Views
 BSD-3-Clause
 BSD-3-Clause-Attribution
 BSD-3-Clause-Clear
@@ -52,6 +54,7 @@ BSD-4-Clause-UC
 BSD-Protection
 BSD-Source-Code
 BSL-1.0
+BUSL-1.1
 Bahyph
 Barr
 Beerware
@@ -59,11 +62,15 @@ BitTorrent-1.0
 BitTorrent-1.1
 BlueOak-1.0.0
 Borceux
+CAL-1.0
+CAL-1.0-Combined-Work-Exception
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
 CC-BY-2.5
 CC-BY-3.0
+CC-BY-3.0-AT
+CC-BY-3.0-US
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
@@ -74,6 +81,7 @@ CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
 CC-BY-NC-ND-3.0
+CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
 CC-BY-NC-SA-2.0
@@ -87,8 +95,10 @@ CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
 CC-BY-SA-2.0
+CC-BY-SA-2.0-UK
 CC-BY-SA-2.5
 CC-BY-SA-3.0
+CC-BY-SA-3.0-AT
 CC-BY-SA-4.0
 CC-PDDC
 CC0-1.0
@@ -104,6 +114,9 @@ CECILL-B
 CECILL-C
 CERN-OHL-1.1
 CERN-OHL-1.2
+CERN-OHL-P-2.0
+CERN-OHL-S-2.0
+CERN-OHL-W-2.0
 CNRI-Jython
 CNRI-Python
 CNRI-Python-GPL-Compatible
@@ -125,6 +138,7 @@ ECL-1.0
 ECL-2.0
 EFL-1.0
 EFL-2.0
+EPICS
 EPL-1.0
 EPL-2.0
 EUDatagrid
@@ -142,15 +156,28 @@ Fair
 Frameworx-1.0
 FreeImage
 GFDL-1.1
+GFDL-1.1-invariants-only
+GFDL-1.1-invariants-or-later
+GFDL-1.1-no-invariants-only
+GFDL-1.1-no-invariants-or-later
 GFDL-1.1-only
 GFDL-1.1-or-later
 GFDL-1.2
+GFDL-1.2-invariants-only
+GFDL-1.2-invariants-or-later
+GFDL-1.2-no-invariants-only
+GFDL-1.2-no-invariants-or-later
 GFDL-1.2-only
 GFDL-1.2-or-later
 GFDL-1.3
+GFDL-1.3-invariants-only
+GFDL-1.3-invariants-or-later
+GFDL-1.3-no-invariants-only
+GFDL-1.3-no-invariants-or-later
 GFDL-1.3-only
 GFDL-1.3-or-later
 GL2PS
+GLWTPL
 GPL-1.0
 GPL-1.0+
 GPL-1.0-only
@@ -175,7 +202,9 @@ Glide
 Glulxe
 HPND
 HPND-sell-variant
+HTMLTIDY
 HaskellReport
+Hippocratic-2.1
 IBM-pibs
 ICU
 IJG
@@ -226,6 +255,7 @@ MIT-CMU
 MIT-advertising
 MIT-enna
 MIT-feh
+MIT-open-group
 MITNFA
 MPL-1.0
 MPL-1.1
@@ -238,12 +268,16 @@ MakeIndex
 MirOS
 Motosoto
 MulanPSL-1.0
+MulanPSL-2.0
 Multics
 Mup
 NASA-1.3
 NBPL-1.0
+NCGL-UK-2.0
 NCSA
 NGPL
+NIST-PD
+NIST-PD-fallback
 NLOD-1.0
 NLPL
 NOSL
@@ -260,6 +294,7 @@ Newsletr
 Nokia
 Noweb
 Nunit
+O-UDA-1.0
 OCCT-PL
 OCLC-2.0
 ODC-By-1.0
@@ -270,6 +305,7 @@ OFL-1.0-no-RFN
 OFL-1.1
 OFL-1.1-RFN
 OFL-1.1-no-RFN
+OGC-1.0
 OGL-Canada-2.0
 OGL-UK-1.0
 OGL-UK-2.0
@@ -305,7 +341,10 @@ PHP-3.0
 PHP-3.01
 PSF-2.0
 Parity-6.0.0
+Parity-7.0.0
 Plexus
+PolyForm-Noncommercial-1.0.0
+PolyForm-Small-Business-1.0.0
 PostgreSQL
 Python-2.0
 QPL-1.0

patchfilter.py

@@ -211,7 +211,7 @@ def main():
         with open (filename, "r") as myfile:
             lines = myfile.readlines()
     else:
-        output = subprocess.check_output("git format-patch -1 --stdout", shell=True).decode("latin-1")
+        output = subprocess.check_output("git format-patch -1 --stdout", shell=True).decode("utf-8", errors="replace")
         lines = output.split("\n")
         
     parse_patch(lines)