* Applied patch from Robert Millan <rmh@aybabtu.com> to make apt-key and

  apt-get to ignore time conflicts, closes: #451328.

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 3bd1a92d9c838ed847a4a086afb448fbba5eed1b..c7db9a25ae5cc94b42015d047ef8b122b5cad331 100755 (executable)
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -5,7 +5,7 @@ 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"
 
 
@@ -21,7 +21,7 @@ update() {
     fi
 
     # add new keys
-    $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --ignore-time-conflict --import
+    $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --import
 
     # remove no-longer used keys
     keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5`

diff --git a/debian/changelog b/debian/changelog
index aa324144e34880dc128e5398ba210b59b86d871a..8e3f9ab38d9a67a21c1e81145fb0cdaed52d0dcc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ apt (0.7.10) UNRELEASED; urgency=low
     to use 'min' as symbol for minute, closes: #219034.
   * Applied patch from Amos Waterland <apw@us.ibm.com> to allow apt to
     work properly in initramfs, closes: #448316.
+  * Applied patch from Robert Millan <rmh@aybabtu.com> to make apt-key and
+    apt-get to ignore time conflicts, closes: #451328.
 
   [ Program translations ]
     - Basque updated. Closes: #453088
@@ -41,7 +43,7 @@ apt (0.7.10) UNRELEASED; urgency=low
   * ftparchive/multicompress.cc:
     - support lzma output
 
- -- Otavio Salvador <otavio@ossystems.com.br>  Sun, 16 Dec 2007 18:21:14 -0200
+ -- Otavio Salvador <otavio@ossystems.com.br>  Sun, 16 Dec 2007 18:23:52 -0200
 
 apt (0.7.9) unstable; urgency=low
 

diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 01b2408561b5946e15df3142638158a44e350422..1ed26a30a1ac3da595f7cb00c557925839fa018d 100644 (file)
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -83,6 +83,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
       Args[i++] = gpgvpath.c_str();
       Args[i++] = "--status-fd";
       Args[i++] = "3";
+      Args[i++] = "--ignore-time-conflict";
       Args[i++] = "--keyring";
       Args[i++] = pubringpath.c_str();