From 2b203a2087beea72298b1da6fc481174d57a98d1 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 9 Jan 2024 11:31:27 +0100
Subject: add 2024 key

---
 mkallrepo | 15 ++++++++++++---
 mkmodular |  4 +++-
 mkrepo    |  7 +++++--
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/mkallrepo b/mkallrepo
index 5720c90..313ec6e 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -7,10 +7,11 @@ TMPSIG2018=$(mktemp -t XXXXXXXX.2018)
 TMPSIG2021=$(mktemp -t XXXXXXXX.2021)
 TMPSIG2022=$(mktemp -t XXXXXXXX.2022)
 TMPSIG2023=$(mktemp -t XXXXXXXX.2023)
+TMPSIG2024=$(mktemp -t XXXXXXXX.2024)
 
 cd /home/rpmbuild/site/rpms
 
-for dep in fedora/{36,37,38,39}/*/{i386,x86_64,aarch64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
+for dep in fedora/{37,38,39}/*/{i386,x86_64,aarch64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
 do
 	[[ $dep =~ /modular ]] && continue
 	[[ $dep =~ /debug-modular ]] && continue
@@ -51,10 +52,18 @@ if [ -s $TMPSIG ]; then
     grep fc36    $TMPSIG  > $TMPSIG2022
     grep fc37    $TMPSIG >> $TMPSIG2022
 	# 2023
-    grep src.rpm $TMPSIG  > $TMPSIG2023
-    grep fc38    $TMPSIG >> $TMPSIG2023
+    grep fc38    $TMPSIG  > $TMPSIG2023
     grep fc39    $TMPSIG >> $TMPSIG2023
+	# 2024
+    grep src.rpm $TMPSIG  > $TMPSIG2024
 
+    if [ -s $TMPSIG2024 ]; then
+		echo "== Signature des $(cat $TMPSIG2023 | wc -l) nouveaux RPM (2024) =="
+		if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name CF1DF0057CE85DFF5B2F2A37C2FD3B2C2A0948E4" --addsign $(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)
diff --git a/mkmodular b/mkmodular
index 6d787a1..88132c9 100755
--- a/mkmodular
+++ b/mkmodular
@@ -341,7 +341,9 @@ chdir($dest);
 [$dis,$ver]=explode("/", $dest);
 $GPG_PATH="/home/remi/.gnupgrpm";
 if ($dis == "fedora") {
-	if ($ver >= 38) {
+	if ($ver >= 40) {
+		$GPG_NAME="CF1DF0057CE85DFF5B2F2A37C2FD3B2C2A0948E4";
+	} else if ($ver >= 38) {
 		$GPG_NAME="50A5E157DFE548EC7C05E9D8D5933DAB6DEFD35E";
 	} else if ($ver >= 36) {
 		$GPG_NAME="845160D23149DAD504F0A32D83C0639E1FEF0014";
diff --git a/mkrepo b/mkrepo
index e79f86d..429811d 100755
--- a/mkrepo
+++ b/mkrepo
@@ -12,7 +12,7 @@ then
 elif [ "$nom" = "SRPMS" ]
 then
   dis=fedora
-  ver=38
+  ver=40
   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 38 ]
+	if [ "$ver" -ge 40 ]
+	then echo "key 2024"
+		GPG_NAME="CF1DF0057CE85DFF5B2F2A37C2FD3B2C2A0948E4"
+	elif [ "$ver" -ge 38 ]
 	then echo "key 2023"
 		GPG_NAME="50A5E157DFE548EC7C05E9D8D5933DAB6DEFD35E"
 	elif [ "$ver" -ge 36 ]
-- 
cgit