* cmdline/apt-key:

  - use a tmpfile instead of /etc/apt/secring.gpg (Closes: #632596)
* debian/apt.postinst:
  - remove /etc/apt/secring.gpg if it is an empty file

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 843163f82c5fc3367f9a4d023817763888af8312..8a995dadd701840c8d97cf04034b59acb462251b 100755 (executable)
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -5,9 +5,12 @@ unset GREP_OPTIONS
 
 # We don't use a secret keyring, of course, but gpg panics and
 # implodes if there isn't one available
-GPG_CMD='gpg --ignore-time-conflict --no-options --no-default-keyring --secret-keyring /etc/apt/secring.gpg'
+SECRETKEYRING="$(mktemp)"
+trap "rm -f '${SECRETKEYRING}'" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
+GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring --secret-keyring '${SECRETKEYRING}'"
 
 if [ "$(id -u)" -eq 0 ]; then
+       # we could use a tmpfile here too, but creation of this tends to be time-consuming
        GPG_CMD="$GPG_CMD --trustdb-name /etc/apt/trustdb.gpg"
 fi
 

diff --git a/debian/apt.postinst b/debian/apt.postinst
index cc0d8b1fec4ef94f8edfbb6584e26704a2aa8e4e..4d87c4e256f8ab3ee936a6037a6f0b748ef53580 100644 (file)
--- a/debian/apt.postinst
+++ b/debian/apt.postinst
@@ -15,6 +15,11 @@ set -e
 
 case "$1" in
     configure)
+       SECRING='/etc/apt/secring.gpg'
+       # test if secring is an empty normal file
+       if test -f $SECRING -a ! -s $SECRING; then
+               rm -f $SECRING
+       fi
        apt-key update
     ;;
 

diff --git a/debian/changelog b/debian/changelog
index 2e22e64d8611a76375fdfe6bbfc04d9359e54404..914c538019064dcd5679247c039099ae14be0296 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,8 +21,12 @@ apt (0.8.15.3) UNRELEASED; urgency=low
     - use CndSet in pkgInitConfig (Closes: #629617)
   * apt-pkg/depcache.cc:
     - change default of APT::AutoRemove::SuggestsImportant to true
+  * cmdline/apt-key:
+    - use a tmpfile instead of /etc/apt/secring.gpg (Closes: #632596)
+  * debian/apt.postinst:
+    - remove /etc/apt/secring.gpg if it is an empty file
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 15 Jul 2011 09:29:37 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 16 Jul 2011 14:19:51 +0200
 
 apt (0.8.15.2) unstable; urgency=high