diff options
| -rwxr-xr-x | cmdline/apt-key | 30 | ||||
| -rw-r--r-- | debian/changelog | 6 |
2 files changed, 33 insertions, 3 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key index c7db9a25a..d716a088f 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -9,9 +9,27 @@ GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring --secret-k GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg" +MASTER_KEYRING="" +#MASTER_KEYRING=/usr/share/keyrings/debian-master-keyring.gpg ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg +add_keys_with_verify_against_master_keyring() { + # when adding new keys, make sure that the archive-master-keyring + # is honored. so: + # all keys that are exported and have the name + # "Ubuntu Archive Automatic Signing Key" must have a valid signature + # from a key in the ubuntu-master-keyring + add_keys=`$GPG_CMD --keyring $ARCHIVE_KEYRING --with-colons --list-keys | grep ^pub | cut -d: -f5` + master_keys=`$GPG_CMD --keyring $MASTER_KEYRING --with-colons --list-keys | grep ^pub | cut -d: -f5` + for add_key in $add_keys; do + for master_key in $master_keys; do + if $GPG --list-sigs --with-colons $add_key | grep ^sig | cut -d: -f5 | grep -q $master_key; then + $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export $add_key | $GPG --import + fi + done + done +} update() { if [ ! -f $ARCHIVE_KEYRING ]; then @@ -20,10 +38,15 @@ update() { exit 1 fi - # add new keys - $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --import + # add new keys, if no MASTER_KEYRING is used, use the traditional + # way + if [ -z "$MASTER_KEYRING" ]; then + $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --import + else + add_keys_with_verify_against_master_keyring + fi - # remove no-longer used keys + # remove no-longer supported/used keys keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5` for key in $keys; do if $GPG --list-keys --with-colons | grep ^pub | cut -d: -f5 | grep -q $key; then @@ -32,6 +55,7 @@ update() { done } + usage() { echo "Usage: apt-key [command] [arguments]" echo diff --git a/debian/changelog b/debian/changelog index 700e93af7..92fdcf57c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,12 @@ apt (0.7.11) UNRELEASED; urgency=low to be set to false in order to disable list cleanup; this broke the installer. Instead, disable list cleanup if either of them is set to false. + + [ Michael Vogt ] + * cmdline/apt-key: + - add support for a master-keyring that contains signing keys + that can be used to sign the archive signing keys. This should + make key-rollover easier. -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Jan 2008 12:06:12 +0100 |