Browse Source

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

apt-get to ignore time conflicts, closes: #451328.
tags/debian/0.7.21
Otavio Salvador 14 years ago
parent
commit
9129f2af99
3 changed files with 6 additions and 3 deletions
  1. +2
    -2
      cmdline/apt-key
  2. +3
    -1
      debian/changelog
  3. +1
    -0
      methods/gpgv.cc

+ 2
- 2
cmdline/apt-key View File

@@ -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`


+ 3
- 1
debian/changelog View File

@@ -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



+ 1
- 0
methods/gpgv.cc View File

@@ -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();



Loading…
Cancel
Save