kgess-mirror/debian-keyring
1
0
Fork 0
mirror of https://salsa.debian.org/debian-keyring/keyring.git synced 2026-01-11 20:06:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed add-key and replace-key to generate a proper git-commit- template snippet

Browse source
This commit is contained in:
Gunnar Wolf 2014-11-04 12:29:37 -06:00
parent 2f2ace76c0
commit 290f840bbd
No known key found for this signature in database
GPG key ID: 673A03E4C1DB921F
4 changed files with 53 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -3,3 +3,4 @@
output/sha512sums.txt
output/README
output/changelog
git-commit-template

2
debian/changelog vendored
View file

@ -54,6 +54,8 @@ debian-keyring (2014.10.xx) UNRELEASED; urgency=medium
Fredriksson) (RT #5446)
* Replace 0x02E93057444DD950 with 0xFE8D78F9FE4F4E10 (Sandro Tosi) (RT
#5428)
* Fixed add-key and replace-key to generate a proper git-commit-
template snippet
-- Jonathan McDowell <noodles@earth.li> Mon, 13 Oct 2014 20:18:03 +0100

1
scripts/add-key
View file

@ -53,6 +53,7 @@ else
gpg --quiet --keyserver the.earth.li --send-key $1
fi
gpg --keyring output/keyrings/debian-keyring.gpg \
--keyring output/keyrings/debian-nonupload.gpg \
--keyring output/keyrings/extra-keys.pgp --check-sigs \
--with-fingerprint --keyid-format 0xlong 0x$keyid | \
sensible-pager

51
scripts/replace-key
View file

@ -59,9 +59,32 @@ if [ -z "$oldkeyfile" -o -z "$keydir" ]; then
exit 1
fi
oldkeyfp=$(gpg --with-colons --fingerprint --no-auto-check-trustdb --no-default-keyring --keyring $oldkeyfile| grep '^fpr' | cut -d : -f 10)
newkeyfp=$(gpg --with-colons --fingerprint --no-auto-check-trustdb --no-default-keyring --keyring $newkeytemp| grep '^fpr' | cut -d : -f 10)
oldkeyuser=$(gpg --with-colons --keyid long --options /dev/null --no-auto-check-trustdb < $oldkeyfile| grep '^pub' | cut -d : -f 10)
newkeyuser=$(gpg --with-colons --keyid long --options /dev/null --no-auto-check-trustdb < $newkeytemp| grep '^pub' | cut -d : -f 10)
oldkeydata=$(gpg --with-colons --keyid long --options /dev/null --no-auto-check-trustdb < $oldkeyfile|grep '^pub')
newkeydata=$(gpg --with-colons --keyid long --options /dev/null --no-auto-check-trustdb < $newkeytemp|grep '^pub')
oldkeyuser=$(echo $oldkeydata | cut -d : -f 10)
newkeyuser=$(echo $newkeydata | cut -d : -f 10)
oldkeylen=$(echo $oldkeydata | cut -d : -f 3)
newkeylen=$(echo $newkeydata | cut -d : -f 3)
oldkeyalg=$(echo $oldkeydata | cut -d : -f 4)
if [ "$oldkeyalg" == "1" ]; then
oldkeyalg='R'
elif [ "$oldkeyalg" == "17" ]; then
oldkeyalg='D'
else
oldkeyalg='UNK'
fi
newkeyalg=$(echo $newkeydata | cut -d : -f 4)
if [ "$newkeyalg" == "1" ]; then
newkeyalg='R'
elif [ "$newkeyalg" == "17" ]; then
newkeyalg='D'
else
newkeyalg='UNK'
fi
echo $oldkeydata
echo ""
echo "About to replace key $oldkey ($oldkeyuser)"
@ -78,9 +101,16 @@ if [ "x$n" = "xy" -o "x$n" = "xY" ]; then
if [ "$keyring" = "debian-keyring-gpg" -o "$keyring" = "debian-nonupload-gpg" ]; then
name=`grep $newkey keyids | sed 's/^[^ ]* //'|sed s/\<.*//`
account=`grep $newkey keyids | sed 's/.*\<//'|sed s/\>$//`
if [ "$keyring" = "debian-nonupload-gpg" ]; then
role='DD-NU'
else
role='DD'
fi
elif [ "$keyring" = "debian-maintainers-gpg" ]; then
echo -n "Enter full name of new key: "
read name
role='DM'
else
echo "*** Key to be replaced is of a strange type (not DD, NonUplDD, DM)"
echo " Be sure you are doing the right thing before committing. Double-check"
@ -96,4 +126,21 @@ if [ "x$n" = "xy" -o "x$n" = "xY" ]; then
git mv $oldkeyfile removed-keys-gpg/
dch --multimaint-merge -D UNRELEASED -a "$log"
git add debian/changelog
cat > git-commit-template <<EOF
$log
Action: replace
Subject: $name
Username: $account
Role: $role
Old-key: $oldkeyfp
Old-key-type: $oldkeylen$oldkeyalg
New-key: $newkeyfp
New-key-type: $newkeylen$newkeyalg
RT-Ticket: $rtid
Request-signed-by: \$oldkey
New-key-certified-by: \$oldkey,
EOF
fi