From 5496969d6018b02585651ba19caefd9b2988ce38 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 16 Jan 2025 16:29:59 +0100
Subject: use 2025 key

---
 mkallrepo | 13 +++++++++++--
 mkmodular |  4 +++-
 mkrepo    |  7 +++++--
 pkgup     |  2 +-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/mkallrepo b/mkallrepo
index 830b2b9..790ed54 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -7,6 +7,7 @@ TMPSIG2018=$(mktemp -t XXXXXXXX.2018)
 TMPSIG2021=$(mktemp -t XXXXXXXX.2021)
 TMPSIG2023=$(mktemp -t XXXXXXXX.2023)
 TMPSIG2024=$(mktemp -t XXXXXXXX.2024)
+TMPSIG2025=$(mktemp -t XXXXXXXX.2025)
 
 cd /home/rpmbuild/site/rpms
 
@@ -51,11 +52,19 @@ if [ -s $TMPSIG ]; then
 	# 2023
     grep fc39    $TMPSIG  > $TMPSIG2023
 	# 2024
-    grep src.rpm $TMPSIG  > $TMPSIG2024
-    grep fc40    $TMPSIG >> $TMPSIG2024
+    grep fc40    $TMPSIG  > $TMPSIG2024
     grep fc41    $TMPSIG >> $TMPSIG2024
     grep el10    $TMPSIG >> $TMPSIG2024
+	# 2025
+    grep src.rpm $TMPSIG  > $TMPSIG2025
 
+	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)
+		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)
diff --git a/mkmodular b/mkmodular
index ee088c6..60f3584 100755
--- a/mkmodular
+++ b/mkmodular
@@ -346,7 +346,9 @@ chdir($dest);
 [$dis,$ver]=explode("/", $dest);
 $GPG_PATH="/home/remi/.gnupgrpm";
 if ($dis == "fedora") {
-	if ($ver >= 40) {
+	if ($ver >= 42) {
+		$GPG_NAME="83833E4687A4AA03B6AC94F2061566968F1F4B2D";
+	} else if ($ver >= 40) {
 		$GPG_NAME="CF1DF0057CE85DFF5B2F2A37C2FD3B2C2A0948E4";
 	} else if ($ver >= 38) {
 		$GPG_NAME="50A5E157DFE548EC7C05E9D8D5933DAB6DEFD35E";
diff --git a/mkrepo b/mkrepo
index 4e33f69..e658031 100755
--- a/mkrepo
+++ b/mkrepo
@@ -12,7 +12,7 @@ then
 elif [ "$nom" = "SRPMS" ]
 then
   dis=fedora
-  ver=40
+  ver=42
   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 40 ]
+	if [ "$ver" -ge 42 ]
+	then echo "key 2025"
+		GPG_NAME="83833E4687A4AA03B6AC94F2061566968F1F4B2D"
+	elif [ "$ver" -ge 40 ]
 	then echo "key 2024"
 		GPG_NAME="CF1DF0057CE85DFF5B2F2A37C2FD3B2C2A0948E4"
 	elif [ "$ver" -ge 38 ]
diff --git a/pkgup b/pkgup
index 4ae31ce..a3b8189 100755
--- a/pkgup
+++ b/pkgup
@@ -24,7 +24,7 @@ sed --regexp-extended \
 	--expression "/^Version:/s/[0-9.]+$/$1/" \
     --expression "/github_version/s/[0-9.]+$/$1/" \
     --expression "/upstream_version/s/[0-9.]+$/$1/" \
-    --expression "/(github|gh)_commit/s/[0-9a-f]{40}$/$2/" \
+    --expression "/(github_|gh_| )commit /s/[0-9a-f]{40}$/$2/" \
     --expression "/(github|gh)_date/s/[0-9\-]{10}$/$date/" \
     --expression '/^Release:/s/[0-9.]+/1/' \
     --expression "s/%changelog/%changelog\n* $rpmdate $vendor - $1-1\n- update to $1\n/" \
-- 
cgit