Browse Source

* 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
debian/1.8.y
Michael Vogt 17 years ago
parent
commit
e8cdc56aaf
  1. 4
      apt-pkg/deb/debmetaindex.cc
  2. 4
      debian/changelog
  3. 5
      doc/examples/configure-index

4
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;

4
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)
--

5
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";

Loading…
Cancel
Save