add 2026 gnupg keyHEADmaster

3 files changed, 20 insertions, 6 deletions

diff --git a/mkallrepo b/mkallrepo
index 49dd5f9..2733703 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -8,6 +8,7 @@ TMPSIG2021=$(mktemp -t XXXXXXXX.2021)
 TMPSIG2023=$(mktemp -t XXXXXXXX.2023)
 TMPSIG2024=$(mktemp -t XXXXXXXX.2024)
 TMPSIG2025=$(mktemp -t XXXXXXXX.2025)
+TMPSIG2026=$(mktemp -t XXXXXXXX.2026)
 
 cd /home/rpmbuild/site/rpms
 
@@ -55,10 +56,18 @@ if [ -s $TMPSIG ]; then
     grep fc41    $TMPSIG  > $TMPSIG2024
     grep el10    $TMPSIG >> $TMPSIG2024
 	# 2025
-    grep src.rpm $TMPSIG  > $TMPSIG2025
-    grep fc42    $TMPSIG >> $TMPSIG2025
+    grep fc42    $TMPSIG  > $TMPSIG2025
     grep fc43    $TMPSIG >> $TMPSIG2025
+	# 2026
+    grep src.rpm $TMPSIG  > $TMPSIG2026
 
+	if [ -s $TMPSIG2026 ]; then
+		echo "== Signature des $(cat $TMPSIG2026 | wc -l) nouveaux RPM (2026) =="
+		if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 2E375FE24EDFF0F2E0D8E165ED5B58C5BEFA00E2" --addsign $(cat $TMPSIG2026)
+		then	echo done.
+		else 	exit 1
+		fi
+	fi
 	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)
diff --git a/mkmodular b/mkmodular
index d489eec..c7d38e2 100755
--- a/mkmodular
+++ b/mkmodular
@@ -389,7 +389,9 @@ chdir($dest);
 [$dis,$ver]=explode("/", $dest);
 $GPG_PATH="/home/remi/.gnupgrpm";
 if ($dis == "fedora") {
-	if ($ver >= 42) {
+	if ($ver >= 44) {
+		$GPG_NAME="2E375FE24EDFF0F2E0D8E165ED5B58C5BEFA00E2";
+	} else if ($ver >= 42) {
 		$GPG_NAME="83833E4687A4AA03B6AC94F2061566968F1F4B2D";
 	} else if ($ver >= 40) {
 		$GPG_NAME="CF1DF0057CE85DFF5B2F2A37C2FD3B2C2A0948E4";
@@ -415,7 +417,7 @@ if ($dis == "fedora") {
 		$GPG_NAME="1EE04CCE88A4AE4AA29A5DF5004E6F4700F97F56";
 	}
 }
-echo "Metadata, signing with $GPG_PATH, ";
+echo "Metadata, ";
 
 // Repository content
 exec("mkrepo nocheck noclean");
diff --git a/mkrepo b/mkrepo
index 8794dce..53d9681 100755
--- a/mkrepo
+++ b/mkrepo
@@ -12,7 +12,7 @@ then
 elif [ "$nom" = "SRPMS" -o "$nom" = "php8.4" ]
 then
   dis=fedora
-  ver=43
+  ver=44
   old=8
   dst=/data/rpms/SRPMS.remi
 else
@@ -26,7 +26,10 @@ fi
 GPG_PATH=/home/remi/.gnupgrpm
 if [ "$dis" == "fedora" ]; then
 	# Fedora
-	if [ "$ver" -ge 42 ]
+	if [ "$ver" -ge 44 ]
+	then echo "key 2026"
+		GPG_NAME="2E375FE24EDFF0F2E0D8E165ED5B58C5BEFA00E2"
+	elif [ "$ver" -ge 42 ]
 	then echo "key 2025"
 		GPG_NAME="83833E4687A4AA03B6AC94F2061566968F1F4B2D"
 	elif [ "$ver" -ge 40 ]