* use the new cool rred method for the patchting

[apt.git] / methods / gpgv.cc

diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index b34ea8d8561c459e490653ee89e187a1f44df766..24e945b2c3c772d4dfc62d7a024b930302de4a94 100644 (file)
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -46,7 +46,7 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
    int status;
    struct stat buff;
    string gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv");
-   string pubringpath = _config->Find("Apt::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg");
+   string pubringpath = _config->Find("APT::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg");
    if (_config->FindB("Debug::Acquire::gpgv", false))
    {
       std::cerr << "gpgv path: " << gpgvpath << std::endl;
@@ -68,11 +68,41 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
    }
    else if (pid == 0)
    {
+      const char *Args[400];
+      unsigned int i = 0;
+
+      Args[i++] = gpgvpath.c_str();
+      Args[i++] = "--status-fd";
+      Args[i++] = "3";
+      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 >= 395) { 
+              std::cerr << "E: Argument list from Acquire::gpgv::Options too long. Exiting." << std::endl;
+              exit(111);
+           }
+         }
+      }
+      Args[i++] = file;
+      Args[i++] = outfile;
+      Args[i++] = NULL;
+
       if (_config->FindB("Debug::Acquire::gpgv", false))
       {
-         std::cerr << "Preparing to exec: " << gpgvpath
-                  << " --status-fd 3 --keyring " << pubringpath
-                  << " " << file << " " << outfile << std::endl;
+         std::cerr << "Preparing to exec: " << gpgvpath;
+        for(unsigned int j=0;Args[j] != NULL; j++)
+           std::cerr << " " << Args[j];
+        std::cerr << std::endl;
       }
       int nullfd = open("/dev/null", O_RDONLY);
       close(fd[0]);
@@ -85,8 +115,7 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
       putenv("LANG=");
       putenv("LC_ALL=");
       putenv("LC_MESSAGES=");
-      execlp(gpgvpath.c_str(), gpgvpath.c_str(), "--status-fd", "3", "--keyring", 
-            pubringpath.c_str(), file, outfile, NULL);
+      execvp(gpgvpath.c_str(), (char **)Args);
              
       exit(111);
    }