test framework: Correctly generate new paths in noopchroot

[apt.git] / apt-pkg / contrib / gpgv.cc

diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc
index 56e26ab9964ee06d612c671a4a4783e5fe794d4b..ef84da0d82936b938a1d6bf35ec21c10bae45302 100644 (file)
--- a/apt-pkg/contrib/gpgv.cc
+++ b/apt-pkg/contrib/gpgv.cc
@@ -16,6 +16,8 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include <stddef.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include <stddef.h>

+
+#include <algorithm>

 #include <iostream>
 #include <string>
 #include <vector>
 #include <iostream>
 #include <string>
 #include <vector>


@@ -42,7 +44,7 @@ static char * GenerateTemporaryFileTemplate(const char *basename)     /*{{{*/
    of the lifting in regards to merging keyrings. Fun for the whole family.
 */
 void ExecGPGV(std::string const &File, std::string const &FileGPG,
    of the lifting in regards to merging keyrings. Fun for the whole family.
 */
 void ExecGPGV(std::string const &File, std::string const &FileGPG,

-             int const &statusfd, int fd[2])
+             int const &statusfd, int fd[2], std::string const &key)

 {
    #define EINTERNAL 111
    std::string const aptkey = _config->FindFile("Dir::Bin::apt-key", "/usr/bin/apt-key");
 {
    #define EINTERNAL 111
    std::string const aptkey = _config->FindFile("Dir::Bin::apt-key", "/usr/bin/apt-key");


@@ -54,7 +56,21 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG,
 
    Args.push_back(aptkey.c_str());
    Args.push_back("--quiet");
 
    Args.push_back(aptkey.c_str());
    Args.push_back("--quiet");

-   Args.push_back("adv");
+   Args.push_back("--readonly");
+   if (key.empty() == false)
+   {
+      if (key[0] == '/')
+      {
+        Args.push_back("--keyring");
+        Args.push_back(key.c_str());
+      }
+      else
+      {
+        Args.push_back("--keyid");
+        Args.push_back(key.c_str());
+      }
+   }
+   Args.push_back("verify");

 
    char statusfdstr[10];
    if (statusfd != -1)
 
    char statusfdstr[10];
    if (statusfd != -1)


@@ -76,7 +92,6 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG,
         Args.push_back(Opts->Value.c_str());
       }
    }
         Args.push_back(Opts->Value.c_str());
       }
    }

-   Args.push_back("--verify");

 
    enum  { DETACHED, CLEARSIGNED } releaseSignature = (FileGPG != File) ? DETACHED : CLEARSIGNED;
    std::vector<std::string> dataHeader;
 
    enum  { DETACHED, CLEARSIGNED } releaseSignature = (FileGPG != File) ? DETACHED : CLEARSIGNED;
    std::vector<std::string> dataHeader;


@@ -296,6 +311,8 @@ bool SplitClearSignedFile(std::string const &InFile, FileFd * const ContentFile,
       // all the rest is whitespace, unsigned garbage or additional message blocks we ignore
    }
    fclose(in);
       // all the rest is whitespace, unsigned garbage or additional message blocks we ignore
    }
    fclose(in);

+   if (buf != NULL)
+      free(buf);

 
    if (found_signature == true)
       return _error->Error("Signature in file %s wasn't closed", InFile.c_str());
 
    if (found_signature == true)
       return _error->Error("Signature in file %s wasn't closed", InFile.c_str());