From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 12 Feb 2008 13:17:02 +0000 (+0100)
Subject: * cmdline/apt-key:
X-Git-Tag: 0.7.24ubuntu1~92
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/b09e09c756861ab167647ec61ac59b85c2928be6?ds=inline

* cmdline/apt-key:
  - add "net-update" command that fetches the
    ubuntu-archive-keyring.gpg and add keys from it that are
    signed by the ubuntu-master-keyring.gpg
    (apt-archive-key-signatures spec)
---

b09e09c756861ab167647ec61ac59b85c2928be6
diff --cc cmdline/apt-key
index e2dbd8af7,5791f33c0..d4b61b356
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@@ -9,9 -9,13 +9,10 @@@ GPG_CMD="gpg --ignore-time-conflict --n
  GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg"
  
  
 -MASTER_KEYRING=""
 -ARCHIVE_KEYRING_URI=""
 -#MASTER_KEYRING=/usr/share/keyrings/debian-master-keyring.gpg
 -#ARCHIVE_KEYRING_URI=http://ftp.debian.org/debian/debian-archive-keyring.gpg
 -
 -ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
 -REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg
 +MASTER_KEYRING=/usr/share/keyrings/ubuntu-master-keyring.gpg
 +ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg
 +REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
++ARCHIVE_KEYRING_URI=http://archive.ubuntu.com/ubuntu/ubuntu-archive-keyring.gpg
  
  add_keys_with_verify_against_master_keyring() {
      ADD_KEYRING=$1
diff --cc debian/changelog
index 50def78bb,14abe5721..c71695fd1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,30 -1,14 +1,40 @@@
 -apt (0.7.11) UNRELEASED; urgency=low
++apt (0.7.9ubuntu10) hardy; urgency=low
++
++  * cmdline/apt-key:
++    - add "net-update" command that fetches the 
++      ubuntu-archive-keyring.gpg and add keys from it that are 
++      signed by the ubuntu-master-keyring.gpg 
++      (apt-archive-key-signatures spec)
++
++ --
++
 +apt (0.7.9ubuntu9) hardy; urgency=low
 +
 +  * fix FTBFS due to incorrect intltool build-depends
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 11 Feb 2008 16:04:37 +0100
 +
 +apt (0.7.9ubuntu8) hardy; urgency=low
 +
 +  * share/apt-auth-failure.note:
 +    - show update-notifier note if the nightly update fails with a
 +      authentication failure (apt-authentication-reliability spec)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 11 Feb 2008 14:04:56 +0100
 +
 +apt (0.7.9ubuntu7) hardy; urgency=low
 +
 +  * methods/connect.cc:
 +    - remember hosts with Resolve failures or connect Timeouts
 +      see https://wiki.ubuntu.com/NetworklessInstallationFixes
 +  * cmdlines/apt-key:
 +    - fix bug in the new apt-key update code that imports only
 +      keys signed with the master key (thanks to cjwatson)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 08 Feb 2008 11:38:35 +0100
 +
 +apt (0.7.9ubuntu6) hardy; urgency=low
  
 -  [ Colin Watson ]
 -  * apt-pkg/algorithms.cc:
 -    - Since APT::Get::List-Cleanup and APT::List-Cleanup both default to
 -      true, the effect of the compatibility code was to require both of them
 -      to be set to false in order to disable list cleanup; this broke the
 -      installer. Instead, disable list cleanup if either of them is set to
 -      false.
 -  
 -  [ Michael Vogt ]
    * cmdline/apt-key:
      - add support for a master-keyring that contains signing keys
        that can be used to sign the archive signing keys. This should