summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcmdline/apt-key4
-rw-r--r--debian/changelog32
2 files changed, 22 insertions, 14 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key
index 7460a24be..90ecae2cf 100755
--- 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 1fd4922b6..8294c45d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,23 +21,31 @@ apt (0.6.47) UNRELEASED; urgency=low
* [ABI] apt-pkg/acquire.{cc,h}:
- deal better with duplicated sources.list entries (avoid
double queuing of URLs) - this fixes hangs in bzip/gzip
+ * merged from Christian Perrier:
+ * mr.po: New Marathi translation Closes: #416806
+ * zh_CN.po: Updated by Eric Pareja Closes: #416822
+ * tl.po: Updated by Eric Pareja Closes: #416638
+ * gl.po: Updated by Jacobo Tarrio
+ Closes: #412828
+ * da.po: Updated by Claus Hindsgaul
+ Closes: #409483
+ * fr.po: Remove a non-breakable space for usability
+ issues. Closes: #408877
+ * ru.po: Updated Russian translation. Closes: #405476
+ * *.po: Unfuzzy after upstream typo corrections
* apt-pkg/policy.cc:
- allow multiple packages (thanks to David Foerster)
- * merged from Christian Perrier:
- * mr.po: New Marathi translation Closes: #416806
- * zh_CN.po: Updated by Eric Pareja Closes: #416822
- * tl.po: Updated by Eric Pareja Closes: #416638
- * gl.po: Updated by Jacobo Tarrio
- Closes: #412828
- * da.po: Updated by Claus Hindsgaul
- Closes: #409483
- * fr.po: Remove a non-breakable space for usability
- issues. Closes: #408877
- * ru.po: Updated Russian translation. Closes: #405476
- * *.po: Unfuzzy after upstream typo corrections
-- 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)