From 3caa936d038453165f76a80d8fe2f7d2b9a28a79 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 12 Jan 2018 15:13:54 +0100
Subject: use new key to sign F28 and SRPM
---
mkallrepo | 23 ++++++++++++++++-------
mkrepo | 7 +++++--
2 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/mkallrepo b/mkallrepo
index bf8a796..616d251 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -33,19 +33,28 @@ if [ -s $TMPSIG ]; then
grep fc26 $TMPSIG > $TMPSIG2
grep fc27 $TMPSIG >> $TMPSIG2
- grep src.rpm $TMPSIG >> $TMPSIG2
+
+ grep fc28 $TMPSIG > $TMPSIG3
+ grep src.rpm $TMPSIG >> $TMPSIG3
+
+ if [ -s $TMPSIG3 ]; then
+ echo "== Signature des $(cat $TMPSIG3 | wc -l) nouveaux RPM (2018) =="
+ if rpmsign --define '_gpg_path /home/remi/.gnupg2018' --define "_gpg_name Remi's RPM repository" --addsign $(cat $TMPSIG3)
+ then echo done.
+ else exit 1
+ fi
+ fi
if [ -s $TMPSIG2 ]; then
- echo "== Signature des $(cat $TMPSIG2 | wc -l) nouveaux RPM (new) =="
+ echo "== Signature des $(cat $TMPSIG2 | wc -l) nouveaux RPM (2017) =="
if rpmsign --define '_gpg_path /home/remi/.gnupg2017' --define "_gpg_name Remi's RPM repository" --addsign $(cat $TMPSIG2)
then echo done.
else exit 1
fi
fi
-
- grep -v fc26 $TMPSIG | grep -v fc27 | grep -v src.rpm > $TMPSIG2
- if [ -s $TMPSIG2 ]; then
- echo "== Signature des $(cat $TMPSIG2 | wc -l) nouveaux RPM (old) =="
- if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name Remi Collet" --addsign $(cat $TMPSIG2)
+ grep -v fc26 $TMPSIG | grep -v fc27 | grep -v fc28 | grep -v src.rpm > $TMPSIG1
+ if [ -s $TMPSIG1 ]; then
+ echo "== Signature des $(cat $TMPSIG1 | wc -l) nouveaux RPM (old) =="
+ if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name Remi Collet" --addsign $(cat $TMPSIG1)
then echo done.
else exit 1
fi
diff --git a/mkrepo b/mkrepo
index c230b5c..51b4be8 100755
--- a/mkrepo
+++ b/mkrepo
@@ -6,7 +6,7 @@ nom=${PWD#/home/rpmbuild/site/rpms/}
if [ "$nom" = "SRPMS" ]
then
dis=fedora
- ver=26
+ ver=28
old=5
else
dis=${nom%%/*}
@@ -20,7 +20,10 @@ if [ ${1:-check} != nocheck ]; then
rpm -K *.rpm | grep -v 'gpg.*OK' | grep -v 'pgp.*OK' | cut -d: -f1 | tee $TMP
if [ -s $TMP ]
then
- if [ "$dis" == "fedora" -a "$ver" -ge 26 ]
+ if [ "$dis" == "fedora" -a "$ver" -ge 28 ]
+ then echo "key 2017"
+ rpmsign --define '_gpg_path /home/remi/.gnupg2018' --define "_gpg_name Remi's RPM repository" --addsign $(cat $TMP)
+ elif [ "$dis" == "fedora" -a "$ver" -ge 26 ]
then echo "key 2017"
rpmsign --define '_gpg_path /home/remi/.gnupg2017' --define "_gpg_name Remi's RPM repository" --addsign $(cat $TMP)
else echo "old key"
--
cgit