* merged the trust-cdrom branch

Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-79

 * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-1
   * implemented "TrustCDROM" mode

 * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-2
   * added APT::Authentication::TrustCDROM to the configure-index

diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index 526c8c0b242f28ea4a7f602e43f92e9bdfa245b9..85e5b16b328ba352315522e48313d212fb104dd0 100644 (file)
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -165,6 +165,10 @@ bool debReleaseIndex::IsTrusted() const
    string VerifiedSigFile = _config->FindDir("Dir::State::lists") +
       URItoFileName(MetaIndexURI("Release")) + ".gpg";
    
+   if(_config->FindB("APT::Authentication::TrustCDROM", false))
+      if(URI.substr(0,strlen("cdrom:")) == "cdrom:")
+        return true;
+   
    if (FileExists(VerifiedSigFile))
       return true;
    return false;

diff --git a/configure.in b/configure.in
index 1ee7e168b3d12dce19e60cfe91537ab11dbe7cf9..6158933ee10365fda628939cc8203e06905e6b87 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.6.40.2")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.40.1ubuntu2")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index 61f5be622a17b527a11be4baf815241e905d96df..a5f4f11ecbc1500293e32d7d4b45f90c823f227e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.6.40.2) unstable; urgency=low
+apt (0.6.40.1ubuntu2) breezy; urgency=low
 
   * improved the support for "error" and "conffile" reporting from
     dpkg, added the format to README.progress-reporting
@@ -11,14 +11,15 @@ apt (0.6.40.2) unstable; urgency=low
   * apt-pkg/acquire-item.cc:
     - fail early if a FailReason is TmpResolveFailure (avoids hangs during
       the install when no network is available)
+  * merged michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0
 
- --
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 23 Aug 2005 19:44:55 +0200
 
 apt (0.6.40.1ubuntu1) breezy; urgency=low
 
-  * Synchronize with Debian 
+  * Synchronize with Debian
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 5 Aug 2005 14:20:56 +0200
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri,  5 Aug 2005 14:20:56 +0200
 
 apt (0.6.40.1) unstable; urgency=low
 
@@ -27,13 +28,13 @@ apt (0.6.40.1) unstable; urgency=low
     conditions
   * 0.6.40 breaks the ABI but I accidentally didn't change the soname :/
 
- -- Michael Vogt <mvo@debian.org>  Fri, 5 Aug 2005 13:24:58 +0200
+ -- Michael Vogt <mvo@debian.org>  Fri,  5 Aug 2005 13:24:58 +0200
 
 apt (0.6.40ubuntu1) breezy; urgency=low
 
-   * Synchronize with Debian 
+   * Synchronize with Debian
 
- -- Matt Zimmerman <mdz@ubuntu.com>  Thu, 4 Aug 2005 15:53:22 -0700
+ -- Matt Zimmerman <mdz@ubuntu.com>  Thu,  4 Aug 2005 15:53:22 -0700
 
 apt (0.6.40) unstable; urgency=low
 

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index dee0c06ffeee1ed3b1003bb5daa7a358dbd89b44..a93b743492fade6c31f585d58fb73b4f554e8131 100644 (file)
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -72,6 +72,11 @@ APT
      NoAct "false";
   };
 
+  Authentication
+  {
+     TrustCDROM "false";            // consider the CDROM always trusted
+  };
+
   GPGV
   {
      TrustedKeyring "/etc/apt/trusted.gpg";