X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/4a242c5b86679bde52bc42f1efb89a7ca8deb280..110277098f846c98cbb1f155fe7d53ecca64cc1a:/cmdline/apt-key

diff --git a/cmdline/apt-key b/cmdline/apt-key
index ed5847c55..c7db9a25a 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -5,18 +5,18 @@ set -e
 # We don't use a secret keyring, of course, but gpg panics and
 # implodes if there isn't one available
 
-GPG_CMD="gpg --no-options --no-default-keyring --secret-keyring /etc/apt/secring.gpg --trustdb-name /etc/apt/trustdb.gpg"
+GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring --secret-keyring /etc/apt/secring.gpg --trustdb-name /etc/apt/trustdb.gpg"
 GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg"
 
 
-ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg
-REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
+ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
+REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg
 
 
 update() {
     if [ ! -f $ARCHIVE_KEYRING ]; then
 	echo >&2 "ERROR: Can't find the archive-keyring"
-	echo >&2 "Is the ubuntu-keyring package installed?"
+	echo >&2 "Is the debian-archive-keyring package installed?"
 	exit 1
     fi
 
@@ -24,10 +24,10 @@ update() {
     $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --import
 
     # remove no-longer used keys
-    keys=`$GPG_CMD --keyring $REMOVED_KEYS --list-keys|awk '/^pub/{print $2}'`
+    keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5`
     for key in $keys; do
-	if $GPG --list-keys | awk '/^pub/{print $2}'|grep -q $key; then
-	    $GPG --quiet --batch --delete-key --yes "${key#*/}"
+	if $GPG --list-keys --with-colons | grep ^pub | cut -d: -f5 | grep -q $key; then
+	    $GPG --quiet --batch --delete-key --yes ${key}
 	fi
     done
 }
@@ -39,6 +39,8 @@ usage() {
     echo
     echo "  apt-key add <file>          - add the key contained in <file> ('-' for stdin)"
     echo "  apt-key del <keyid>         - remove the key <keyid>"
+    echo "  apt-key export <keyid>      - output the key <keyid>"
+    echo "  apt-key exportall           - output all trusted keys"
     echo "  apt-key update              - update keys using the keyring package"
     echo "  apt-key list                - list keys"
     echo
@@ -75,6 +77,12 @@ case "$command" in
     finger*)
         $GPG --batch --fingerprint
         ;;
+    export)
+        $GPG --armor --export "$1"
+        ;;
+    exportall)
+        $GPG --armor --export
+        ;;
     adv*)
         echo "Executing: $GPG $*"
         $GPG $*