2023 key

3 files changed, 18 insertions, 4 deletions

diff --git a/mkallrepo b/mkallrepo
index 9ba5151..0f76a8b 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -6,6 +6,7 @@ TMPSIG2000=$(mktemp -t XXXXXXXX.2000)
 TMPSIG2018=$(mktemp -t XXXXXXXX.2018)
 TMPSIG2021=$(mktemp -t XXXXXXXX.2021)
 TMPSIG2022=$(mktemp -t XXXXXXXX.2022)
+TMPSIG2023=$(mktemp -t XXXXXXXX.2023)
 
 cd /home/rpmbuild/site/rpms
 
@@ -49,8 +50,16 @@ if [ -s $TMPSIG ]; then
 	# 2022
     grep fc36    $TMPSIG  > $TMPSIG2022
     grep fc37    $TMPSIG >> $TMPSIG2022
-    grep src.rpm $TMPSIG >> $TMPSIG2022
+	# 2023
+    grep src.rpm $TMPSIG  > $TMPSIG2023
 
+    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)
+		then	echo done.
+		else 	exit 1
+		fi
+	fi
     if [ -s $TMPSIG2022 ]; then
 		echo "== Signature des $(cat $TMPSIG2022 | wc -l) nouveaux RPM (2022) =="
 		if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 845160D23149DAD504F0A32D83C0639E1FEF0014" --addsign $(cat $TMPSIG2022)
diff --git a/mkmodular b/mkmodular
index 2c9a777..826fc6d 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 >= 36) {
+	if ($ver >= 38) {
+		$GPG_NAME="50A5E157DFE548EC7C05E9D8D5933DAB6DEFD35E";
+	} else if ($ver >= 36) {
 		$GPG_NAME="845160D23149DAD504F0A32D83C0639E1FEF0014";
 	} else if ($ver >= 34) {
 		$GPG_NAME="B1ABF71E14C9D74897E198A8B19527F1478F8947";
diff --git a/mkrepo b/mkrepo
index abca8e7..f2b2be1 100755
--- a/mkrepo
+++ b/mkrepo
@@ -12,7 +12,7 @@ then
 elif [ "$nom" = "SRPMS" ]
 then
   dis=fedora
-  ver=36
+  ver=38
   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 36 ]
+	if [ "$ver" -ge 38 ]
+	then echo "key 2023"
+		GPG_NAME="50A5E157DFE548EC7C05E9D8D5933DAB6DEFD35E"
+	elif [ "$ver" -ge 36 ]
 	then echo "key 2022"
 		GPG_NAME="845160D23149DAD504F0A32D83C0639E1FEF0014"
 	elif [ "$ver" -ge 34 ]