From f220aa433769b1df3b5aaa8e3cbbe6e7777a43f0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 12 Dec 2025 10:39:15 +0100
Subject: rpmsign: switch from --addsign (v4) to --resign (v6)

---
 mkallrepo | 12 ++++++------
 mkrepo    |  2 +-
 mockit    | 13 ++++++++++++-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/mkallrepo b/mkallrepo
index 49dd5f9..48c0cae 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -61,42 +61,42 @@ if [ -s $TMPSIG ]; then
 
 	if [ -s $TMPSIG2025 ]; then
 		echo "== Signature des $(cat $TMPSIG2025 | wc -l) nouveaux RPM (2025) =="
-		if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 83833E4687A4AA03B6AC94F2061566968F1F4B2D" --addsign $(cat $TMPSIG2025)
+		if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 83833E4687A4AA03B6AC94F2061566968F1F4B2D" --resign $(cat $TMPSIG2025)
 		then	echo done.
 		else 	exit 1
 		fi
 	fi
     if [ -s $TMPSIG2024 ]; then
 		echo "== Signature des $(cat $TMPSIG2024 | wc -l) nouveaux RPM (2024) =="
-		if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name CF1DF0057CE85DFF5B2F2A37C2FD3B2C2A0948E4" --addsign $(cat $TMPSIG2024)
+		if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name CF1DF0057CE85DFF5B2F2A37C2FD3B2C2A0948E4" --resign $(cat $TMPSIG2024)
 		then	echo done.
 		else 	exit 1
 		fi
 	fi
     if [ -s $TMPSIG2023 ]; then
 		echo "== Signature des $(cat $TMPSIG2023 | wc -l) nouveaux RPM (2023) =="
-		if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 50A5E157DFE548EC7C05E9D8D5933DAB6DEFD35E" --addsign $(cat $TMPSIG2023)
+		if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 50A5E157DFE548EC7C05E9D8D5933DAB6DEFD35E" --resign $(cat $TMPSIG2023)
 		then	echo done.
 		else 	exit 1
 		fi
 	fi
     if [ -s $TMPSIG2021 ]; then
 		echo "== Signature des $(cat $TMPSIG2021 | wc -l) nouveaux RPM (2021) =="
-		if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name B1ABF71E14C9D74897E198A8B19527F1478F8947" --addsign $(cat $TMPSIG2021)
+		if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name B1ABF71E14C9D74897E198A8B19527F1478F8947" --resign $(cat $TMPSIG2021)
 		then	echo done.
 		else 	exit 1
 		fi
 	fi
     if [ -s $TMPSIG2018 ]; then
 		echo "== Signature des $(cat $TMPSIG2018 | wc -l) nouveaux RPM (2018) =="
-		if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 6B38FEA7231F87F52B9CA9D8555097595F11735A" --addsign $(cat $TMPSIG2018)
+		if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 6B38FEA7231F87F52B9CA9D8555097595F11735A" --resign $(cat $TMPSIG2018)
 		then	echo done.
 		else 	exit 1
 		fi
 	fi
     if [ -s $TMPSIG2000 ]; then
 		echo "== Signature des $(cat $TMPSIG2000 | wc -l) nouveaux RPM (old) =="
-		if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 1EE04CCE88A4AE4AA29A5DF5004E6F4700F97F56" --addsign $(cat $TMPSIG2000)
+		if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 1EE04CCE88A4AE4AA29A5DF5004E6F4700F97F56" --resign $(cat $TMPSIG2000)
 		then	echo done.
 		else 	exit 1
 		fi
diff --git a/mkrepo b/mkrepo
index 8794dce..bd92fd3 100755
--- a/mkrepo
+++ b/mkrepo
@@ -71,7 +71,7 @@ if [ ${1:-check} != nocheck ]; then
 	rpm -K *.rpm | grep -v 'signatures.*OK' | cut -d: -f1 | tee $TMP
 	if [ -s $TMP ]
 	then
-		rpmsign --define "_gpg_path $GPG_PATH" --define "_gpg_name $GPG_NAME"  --addsign $(cat $TMP)
+		rpmsign --define "_gpg_path $GPG_PATH" --define "_gpg_name $GPG_NAME"  --resign $(cat $TMP)
 	else
 		echo OK.
 	fi
diff --git a/mockit b/mockit
index b4a5023..b4f2aee 100755
--- a/mockit
+++ b/mockit
@@ -10,7 +10,7 @@ if [ "$2" = "" ]; then
 	echo -e "\t--mock             distro is a mock config name\n"
 	echo -e "Targets:"
 	echo -e "\tDistribution: el8a el8x el9a el9x el10a el10x fc41a fc41x fc42a fc42x fc43a fc43x"
-	echo -e "\tPHP:          all, zts"
+	echo -e "\tPHP:          all, allx, zts"
 	echo -e "\tMemcached:    memcached"
 	echo -e "\tLibraries:    im6, im7, vips"
 	echo -e "\tRedis:        r60, r62, r70, r72, r80, r82, r84"
@@ -177,6 +177,17 @@ case $DIST in
 			echo Not supported for direct build
 		fi
 		;;
+	allx)
+		if [ $REDIS -ge 1 ]; then
+			for i in fc41x fc42x fc43x el8x el9x el10x
+			do
+				[ $BUILD_BASE -ge 1 ] && $0 --valkey --base $SRPM $i $MIN $MAX $@
+				[ $BUILD_SCLS -ge 1 ] && $0 --valkey --scl  $SRPM $i $MIN $MAX $@
+			done
+		else
+			echo Not supported for direct build
+		fi
+		;;
 	zts)
 		if [ $REDIS -ge 1 ]; then
 			[ $MAX -gt 83 ] && MAX=83
-- 
cgit