diff options
| -rw-r--r-- | apt-pkg/deb/debmetaindex.cc | 4 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | doc/examples/configure-index | 5 |
3 files changed, 12 insertions, 1 deletions
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 526c8c0b2..ed5cb80d1 100644 --- 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 06bf36e0d..78a7f890a 100644 --- 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 dee0c06ff..5ab84fe05 100644 --- 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"; |