Package: apt
Severity: Wishlist
Tags: Patch

Hi

Now the debian-edu-archive-keyring package entered Debian. Can you please 
consider including the following patch, which will honour the debian-edu 
archive key and include it into the local keyring with apt-key update?

Cheers
Steffen
--- apt-0.6.46/cmdline/apt-key	2006-03-03 01:28:27.000000000 +1100
+++ apt-0.6.47/cmdline/apt-key	2006-10-01 20:17:26.000000000 +1000
@@ -11,7 +11,8 @@
 
 ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
 REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg
-
+DEBIAN_EDU_ARCHIVE_KEYRING=/usr/share/keyrings/debian-edu-archive-keyring.gpg
+DEBIAN_EDU_ARCHIVE_REMOVED_KEYS=/usr/share/keyrings/debian-edu-archive-removed-keys.gpg
 
 update() {
     if [ ! -f $ARCHIVE_KEYRING ]; then
@@ -21,14 +22,32 @@
     fi
 
     # add new keys
-    $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --ignore-time-conflict --import
+    key_add $ARCHIVE_KEYRING
+    
+    # remove no-longer used keys
+    key_remove $REMOVED_KEYS
+
+    # handle debian-edu keys if available
+    if [ -f $DEBIAN_EDU_ARCHIVE_KEYRING ] ; then
+	key_add $DEBIAN_EDU_ARCHIVE_KEYRING
+    fi
+    if [ -f $DEBIAN_EDU_ARCHIVE_REMOVED_KEYS ] ; then
+	key_remove $DEBIAN_EDU_ARCHIVE_REMOVED_KEYS
+    fi
+}
+
+key_add() {
+    # add new keys
+    $GPG_CMD --quiet --batch --keyring $1 --export | $GPG --ignore-time-conflict --import
+}
 
+key_remove() {
     # remove no-longer used keys
-    keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys|awk '/^pub/{FS=":";print $5}'`
+    keys=`$GPG_CMD --keyring $1 --with-colons --list-keys|awk '/^pub/{FS=":";print $5}'`
     for key in $keys; do
-	if $GPG --list-keys --with-colons | awk '/^pub/{FS=":";print $5}'|grep -q $key; then
-	    $GPG --quiet --batch --delete-key --yes ${key}
-	fi
+        if $GPG --list-keys --with-colons | awk '/^pub/{FS=":";print $5}'|grep -q $key; then
+            $GPG --quiet --batch --delete-key --yes ${key}
+        fi
     done
 }
 

Attachment: pgpUscOoqP0lP.pgp
Description: PGP signature

Reply via email to