diff options
| author | Matt Zimmerman <matt.zimmerman@canonical.com> | 2005-04-06 16:44:08 +0000 |
|---|---|---|
| committer | Matt Zimmerman <matt.zimmerman@canonical.com> | 2005-04-06 16:44:08 +0000 |
| commit | 3e79ad48cd780defe869c6caf47dd338a9f5b984 (patch) | |
| tree | a05b0e6fee5624ea6a6c970a0f39487bb8078b81 /apt-pkg/indexcopy.cc | |
| parent | 0edc7fba37048fa7c9833d664c4231ee9ad2be40 (diff) | |
| parent | 6ead9d25018d517cd6cfe27399b7fd7e33c1ef19 (diff) | |
Merge apt--mvo--0
Patches applied:
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-14
* changelog entry for 0.6.34ubuntu1 added, MinAge default is 2 days now
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-15
* merged with matts tree
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-16
* changelog updated
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-17
* whitespace change to add incomplete log for last patch
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-18
* honor "Acquire::gpgv::Options" in apt-cdrom too
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-19
* corrected a incorrect use of string().c_str() (thanks to mdz!)
Diffstat (limited to 'apt-pkg/indexcopy.cc')
| -rw-r--r-- | apt-pkg/indexcopy.cc | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 4b6ac5ce0..1f65062f7 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -593,17 +593,45 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList, // verify the gpg signature of "Release" // gpg --verify "*I+Release.gpg", "*I+Release" + const char *Args[400]; + unsigned int i = 0; + string gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); string pubringpath = _config->Find("Apt::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg"); + string releasegpg = *I+"Release.gpg"; + string release = *I+"Release"; + + Args[i++] = gpgvpath.c_str(); + Args[i++] = "--keyring"; + Args[i++] = pubringpath.c_str(); + Configuration::Item const *Opts; + Opts = _config->Tree("Acquire::gpgv::Options"); + if (Opts != 0) + { + Opts = Opts->Child; + for (; Opts != 0; Opts = Opts->Next) + { + if (Opts->Value.empty() == true) + continue; + Args[i++] = Opts->Value.c_str(); + if(i >= 390) { + _error->Error("Argument list from Acquire::gpgv::Options too long. Exiting."); + return false; + } + } + } + + Args[i++] = releasegpg.c_str(); + Args[i++] = release.c_str(); + Args[i++] = NULL; + pid_t pid = ExecFork(); if(pid < 0) { _error->Error("Fork failed"); return false; } if(pid == 0) { - execlp(gpgvpath.c_str(), gpgvpath.c_str(), "--keyring", - pubringpath.c_str(), string(*I+"Release.gpg").c_str(), - string(*I+"Release").c_str(), NULL); + execvp(gpgvpath.c_str(), (char**)Args); } if(!ExecWait(pid, "gpgv")) { _error->Warning("Signature verification failed for: %s", |