* NMU

* Fix broken use of awk in apt-key that caused removal of the wrong keys
  from the keyring. Closes: #412572

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 7460a24..90ecae2 100755 (executable)
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -24,9 +24,9 @@ update() {
     $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --ignore-time-conflict --import
 
     # remove no-longer used keys
-    keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys|awk '/^pub/{FS=":";print $5}'`
+    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 | awk '/^pub/{FS=":";print $5}'|grep -q $key; then
+       if $GPG --list-keys --with-colons | grep ^pub | cut -d: -f5 | grep -q $key; then
            $GPG --quiet --batch --delete-key --yes ${key}
        fi
     done

diff --git a/debian/changelog b/debian/changelog
index 77f0224..8294c45 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,14 @@ apt (0.6.47) UNRELEASED; urgency=low
   
  -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Dec 2006 19:39:05 +0100
 
+apt (0.6.46.4-0.1) unstable; urgency=emergency
+  
+  * NMU
+  * Fix broken use of awk in apt-key that caused removal of the wrong keys
+    from the keyring. Closes: #412572
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 26 Feb 2007 16:00:22 -0500
+
 apt (0.6.46.4) unstable; urgency=high
 
   * ack NMU (closes: #401017)