summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2025-12-17 09:37:06 +0100
committerRemi Collet <remi@php.net>2025-12-17 09:37:06 +0100
commitb63f8c225c34318cbfc805dfe221ea3946d7d3cb (patch)
tree5042c51e0231b70b2cf7619ca5c10d2d38a62e25
parent4ad06e93df6c17fa25c712a9a16bb21babec17aa (diff)
switch back to addsignHEADmaster
-rwxr-xr-xcleanoldrpm2
-rwxr-xr-xmkallrepo12
-rwxr-xr-xmkrepo2
3 files changed, 8 insertions, 8 deletions
diff --git a/cleanoldrpm b/cleanoldrpm
index e4ee205..9e39d9b 100755
--- a/cleanoldrpm
+++ b/cleanoldrpm
@@ -25,7 +25,7 @@ $multi = [
'composer' => 1, // composer/2
'phan' => 1, // phan/3
'roundcubemail' => 4, // roundcubemail/1.x.
- 'remi-release' => 3, // remi-release/8.5
+ 'remi-release' => 4, // remi-release/8.5
'php-pear-PHP-CodeSniffer' => 1,
];
if (isset($_SERVER['argv'][1])) {
diff --git a/mkallrepo b/mkallrepo
index 48c0cae..49dd5f9 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -61,42 +61,42 @@ if [ -s $TMPSIG ]; then
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" --resign $(cat $TMPSIG2025)
+ 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" --resign $(cat $TMPSIG2024)
+ 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" --resign $(cat $TMPSIG2023)
+ 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 $TMPSIG2021 ]; then
echo "== Signature des $(cat $TMPSIG2021 | wc -l) nouveaux RPM (2021) =="
- if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name B1ABF71E14C9D74897E198A8B19527F1478F8947" --resign $(cat $TMPSIG2021)
+ if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name B1ABF71E14C9D74897E198A8B19527F1478F8947" --addsign $(cat $TMPSIG2021)
then echo done.
else exit 1
fi
fi
if [ -s $TMPSIG2018 ]; then
echo "== Signature des $(cat $TMPSIG2018 | wc -l) nouveaux RPM (2018) =="
- if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 6B38FEA7231F87F52B9CA9D8555097595F11735A" --resign $(cat $TMPSIG2018)
+ if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 6B38FEA7231F87F52B9CA9D8555097595F11735A" --addsign $(cat $TMPSIG2018)
then echo done.
else exit 1
fi
fi
if [ -s $TMPSIG2000 ]; then
echo "== Signature des $(cat $TMPSIG2000 | wc -l) nouveaux RPM (old) =="
- if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 1EE04CCE88A4AE4AA29A5DF5004E6F4700F97F56" --resign $(cat $TMPSIG2000)
+ if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 1EE04CCE88A4AE4AA29A5DF5004E6F4700F97F56" --addsign $(cat $TMPSIG2000)
then echo done.
else exit 1
fi
diff --git a/mkrepo b/mkrepo
index bd92fd3..8794dce 100755
--- a/mkrepo
+++ b/mkrepo
@@ -71,7 +71,7 @@ if [ ${1:-check} != nocheck ]; then
rpm -K *.rpm | grep -v 'signatures.*OK' | cut -d: -f1 | tee $TMP
if [ -s $TMP ]
then
- rpmsign --define "_gpg_path $GPG_PATH" --define "_gpg_name $GPG_NAME" --resign $(cat $TMP)
+ rpmsign --define "_gpg_path $GPG_PATH" --define "_gpg_name $GPG_NAME" --addsign $(cat $TMP)
else
echo OK.
fi