Hi,
2010/9/3 Joey Hess <jo...@debian.org>:
> This seems to be a repeat of the situation in #316390, or a failure
> to cherry-pick that fix to 0.8.0.
Same shit, different cause.
The ongoing process in making apt-key obsolete resulted
in an interesting divergence in the option used and understand
in apt-key vs. libapt… this time is libapt the fault… *sign*
You can fix this easily by setting Dir::Etc::Trusted to the same
value as APT::GPGV::TrustedKeyring - the code in libapt which
should have done this does it unfortunately too early…
> Apt::GPGV::TrustedKeyring is a requirment for d-i to build, at least
> as long as /etc/apt/trusted.gpg has permission of 600 on (some, I don't
> know why it varies) systems. Daily builds are breaking left and right.
I honestly don't know why 600 - APT doesn't seem to set a mod on it
so it should be gpg at the time the first keyring is inserted…
Best regards
David Kalnischkies
=== modified file 'apt-pkg/indexcopy.cc'
--- apt-pkg/indexcopy.cc 2010-08-18 22:04:05 +0000
+++ apt-pkg/indexcopy.cc 2010-09-04 08:06:14 +0000
@@ -661,7 +661,7 @@
{
string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv");
// FIXME: remove support for deprecated APT::GPGV setting
- string const trustedFile = _config->FindFile("Dir::Etc::Trusted");
+ string const trustedFile = _config->Find("APT::GPGV::TrustedKeyring", _config->FindFile("Dir::Etc::Trusted"));
string const trustedPath = _config->FindDir("Dir::Etc::TrustedParts");
bool const Debug = _config->FindB("Debug::Acquire::gpgv", false);
=== modified file 'apt-pkg/init.cc'
--- apt-pkg/init.cc 2010-08-18 22:04:05 +0000
+++ apt-pkg/init.cc 2010-09-04 08:04:37 +0000
@@ -70,8 +70,7 @@
Cnf.Set("Dir::Etc::parts","apt.conf.d");
Cnf.Set("Dir::Etc::preferences","preferences");
Cnf.Set("Dir::Etc::preferencesparts","preferences.d");
- string const deprecated = _config->Find("APT::GPGV::TrustedKeyring");
- Cnf.Set("Dir::Etc::trusted", deprecated.empty() ? "trusted.gpg" : deprecated);
+ Cnf.Set("Dir::Etc::trusted", "trusted.gpg");
Cnf.Set("Dir::Etc::trustedparts","trusted.gpg.d");
Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods");
Cnf.Set("Dir::Media::MountPath","/media/apt");
=== modified file 'debian/changelog'
--- debian/changelog 2010-09-03 17:34:36 +0000
+++ debian/changelog 2010-09-04 08:10:02 +0000
@@ -7,8 +7,10 @@
* apt-pkg/deb/dpkgpm.cc:
- create Dir::Log if needed to support /var/log as tmpfs or similar,
inspired by Thomas Bechtold, thanks! (Closes: #523919, LP: #220239)
+ * apt-pkg/indexcopy.cc:
+ - support really still the APT::GPGV::TrustedKeyring setting
- -- David Kalnischkies <kalnischk...@gmail.com> Fri, 03 Sep 2010 19:29:01 +0200
+ -- David Kalnischkies <kalnischk...@gmail.com> Sat, 04 Sep 2010 10:09:04 +0200
apt (0.8.1) unstable; urgency=low
