* added APT::Authentication::Trust-CDROM option

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..ed5cb80d1717f0e852a6be1d73ea8c93683d4f4d 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::Trust-CDROM", false))
+      if(URI.substr(0,strlen("cdrom:")) == "cdrom:")
+        return true;
+   
    if (FileExists(VerifiedSigFile))
       return true;
    return false;

diff --git a/debian/changelog b/debian/changelog
index 06bf36e0d122b70ed43920e32d5dcc5d94b38294..78a7f890af2c778744018c7f8bbeaa62a52f67a3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,9 @@ apt (0.6.41.1) unstable; urgency=low
     (closes: #316318, #327456)
   * fix leak in the mmap code, thanks to Daniel Burrows for the
     patch (closes: #250583)
-  * support for apt-get source -t (and honor pining)
+  * support for apt-get source -t (and honor pining) (closes: #152129)
+  * added "APT::Authentication::Trust-CDROM" option to make the life
+    for the installer people easier (closes: #334656)
   
  --
 

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