- provide a {Package,Version}List similar to {Package,Version}Set

[apt.git] / apt-pkg / indexcopy.cc

diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index f88d51fc54d31efcdb380763fc9386bfe9e1b83a..4df018ef45512c26244a16bbf175db24be81ffa6 100644 (file)
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -10,7 +10,7 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#include "indexcopy.h"
+#include<config.h>

 
 #include <apt-pkg/error.h>
 #include <apt-pkg/progress.h>
 
 #include <apt-pkg/error.h>
 #include <apt-pkg/progress.h>


@@ -21,7 +21,6 @@
 #include <apt-pkg/indexrecords.h>
 #include <apt-pkg/md5.h>
 #include <apt-pkg/cdrom.h>
 #include <apt-pkg/indexrecords.h>
 #include <apt-pkg/md5.h>
 #include <apt-pkg/cdrom.h>

-#include <apti18n.h>

 
 #include <iostream>
 #include <sstream>
 
 #include <iostream>
 #include <sstream>


@@ -30,6 +29,10 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <stdio.h>

+#include <stdlib.h>
+
+#include "indexcopy.h"
+#include <apti18n.h>

                                                                        /*}}}*/
 
 using namespace std;
                                                                        /*}}}*/
 
 using namespace std;


@@ -43,7 +46,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
                             pkgCdromStatus *log)
 {
    OpProgress *Progress = NULL;
                             pkgCdromStatus *log)
 {
    OpProgress *Progress = NULL;

-   if (List.size() == 0)
+   if (List.empty() == true)

       return true;
    
    if(log) 
       return true;
    
    if(log) 


@@ -53,8 +56,8 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
    bool Debug = _config->FindB("Debug::aptcdrom",false);
    
    // Prepare the progress indicator
    bool Debug = _config->FindB("Debug::aptcdrom",false);
    
    // Prepare the progress indicator

-   unsigned long TotalSize = 0;
-   for (vector<string>::iterator I = List.begin(); I != List.end(); I++)
+   off_t TotalSize = 0;
+   for (vector<string>::iterator I = List.begin(); I != List.end(); ++I)

    {
       struct stat Buf;
       if (stat(string(*I + GetFileName()).c_str(),&Buf) != 0 &&
    {
       struct stat Buf;
       if (stat(string(*I + GetFileName()).c_str(),&Buf) != 0 &&


@@ -64,18 +67,18 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
       TotalSize += Buf.st_size;
    }   
 
       TotalSize += Buf.st_size;
    }   
 

-   unsigned long CurrentSize = 0;
+   off_t CurrentSize = 0;

    unsigned int NotFound = 0;
    unsigned int WrongSize = 0;
    unsigned int Packages = 0;
    unsigned int NotFound = 0;
    unsigned int WrongSize = 0;
    unsigned int Packages = 0;

-   for (vector<string>::iterator I = List.begin(); I != List.end(); I++)
+   for (vector<string>::iterator I = List.begin(); I != List.end(); ++I)

    {      
       string OrigPath = string(*I,CDROM.length());
    {      
       string OrigPath = string(*I,CDROM.length());

-      unsigned long FileSize = 0;
+      off_t FileSize = 0;

       
       // Open the package file
       FileFd Pkg;
       
       // Open the package file
       FileFd Pkg;

-      if (FileExists(*I + GetFileName()) == true)
+      if (RealFileExists(*I + GetFileName()) == true)

       {
         Pkg.Open(*I + GetFileName(),FileFd::ReadOnly);
         FileSize = Pkg.Size();
       {
         Pkg.Open(*I + GetFileName(),FileFd::ReadOnly);
         FileSize = Pkg.Size();


@@ -164,7 +167,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
         if(Progress)
            Progress->Progress(Parser.Offset());
         string File;
         if(Progress)
            Progress->Progress(Parser.Offset());
         string File;

-        unsigned long Size;
+        unsigned long long Size;

         if (GetFile(File,Size) == false)
         {
            fclose(TargetFl);
         if (GetFile(File,Size) == false)
         {
            fclose(TargetFl);


@@ -219,7 +222,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
            }       
                                            
            // Size match
            }       
                                            
            // Size match

-           if ((unsigned)Buf.st_size != Size)
+           if ((unsigned long long)Buf.st_size != Size)

            {
               if (Debug == true)
                  clog << "Wrong Size: " << File << endl;
            {
               if (Debug == true)
                  clog << "Wrong Size: " << File << endl;


@@ -453,7 +456,7 @@ bool IndexCopy::GrabFirst(string Path,string &To,unsigned int Depth)
 // PackageCopy::GetFile - Get the file information from the section    /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // PackageCopy::GetFile - Get the file information from the section    /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool PackageCopy::GetFile(string &File,unsigned long &Size)
+bool PackageCopy::GetFile(string &File,unsigned long long &Size)

 {
    File = Section->FindS("Filename");
    Size = Section->FindI("Size");
 {
    File = Section->FindS("Filename");
    Size = Section->FindI("Size");


@@ -479,7 +482,7 @@ bool PackageCopy::RewriteEntry(FILE *Target,string File)
 // SourceCopy::GetFile - Get the file information from the section     /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // SourceCopy::GetFile - Get the file information from the section     /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool SourceCopy::GetFile(string &File,unsigned long &Size)
+bool SourceCopy::GetFile(string &File,unsigned long long &Size)

 {
    string Files = Section->FindS("Files");
    if (Files.empty() == true)
 {
    string Files = Section->FindS("Files");
    if (Files.empty() == true)


@@ -502,7 +505,7 @@ bool SourceCopy::GetFile(string &File,unsigned long &Size)
       return _error->Error("Error parsing file record");
    
    // Parse the size and append the directory
       return _error->Error("Error parsing file record");
    
    // Parse the size and append the directory

-   Size = atoi(sSize.c_str());
+   Size = strtoull(sSize.c_str(), NULL, 10);

    File = Base + File;
    return true;
 }
    File = Base + File;
    return true;
 }


@@ -532,7 +535,7 @@ bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex)
    // we skip non-existing files in the verifcation to support a cdrom
    // with no Packages file (just a Package.gz), see LP: #255545
    // (non-existing files are not considered a error)
    // we skip non-existing files in the verifcation to support a cdrom
    // with no Packages file (just a Package.gz), see LP: #255545
    // (non-existing files are not considered a error)

-   if(!FileExists(prefix+file))
+   if(!RealFileExists(prefix+file))

    {
       _error->Warning(_("Skipping nonexistent file %s"), string(prefix+file).c_str());
       return true;
    {
       _error->Warning(_("Skipping nonexistent file %s"), string(prefix+file).c_str());
       return true;


@@ -583,13 +586,13 @@ bool SigVerify::CopyMetaIndex(string CDROM, string CDName,                /*{{{*/
 bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,        /*{{{*/
                              vector<string> PkgList,vector<string> SrcList)
 {
 bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,        /*{{{*/
                              vector<string> PkgList,vector<string> SrcList)
 {

-   if (SigList.size() == 0)
+   if (SigList.empty() == true)

       return true;
 
    bool Debug = _config->FindB("Debug::aptcdrom",false);
 
    // Read all Release files
       return true;
 
    bool Debug = _config->FindB("Debug::aptcdrom",false);
 
    // Read all Release files

-   for (vector<string>::iterator I = SigList.begin(); I != SigList.end(); I++)
+   for (vector<string>::iterator I = SigList.begin(); I != SigList.end(); ++I)

    { 
       if(Debug)
         cout << "Signature verify for: " << *I << endl;
    { 
       if(Debug)
         cout << "Signature verify for: " << *I << endl;


@@ -601,7 +604,7 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
       string const release = *I+"Release";
 
       // a Release.gpg without a Release should never happen
       string const release = *I+"Release";
 
       // a Release.gpg without a Release should never happen

-      if(FileExists(release) == false)
+      if(RealFileExists(release) == false)

       {
         delete MetaIndex;
         continue;
       {
         delete MetaIndex;
         continue;


@@ -633,7 +636,7 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
       // go over the Indexfiles and see if they verify
       // if so, remove them from our copy of the lists
       vector<string> keys = MetaIndex->MetaKeys();
       // go over the Indexfiles and see if they verify
       // if so, remove them from our copy of the lists
       vector<string> keys = MetaIndex->MetaKeys();

-      for (vector<string>::iterator I = keys.begin(); I != keys.end(); I++)
+      for (vector<string>::iterator I = keys.begin(); I != keys.end(); ++I)

       { 
         if(!Verify(prefix,*I, MetaIndex)) {
            // something went wrong, don't copy the Release.gpg
       { 
         if(!Verify(prefix,*I, MetaIndex)) {
            // something went wrong, don't copy the Release.gpg


@@ -664,6 +667,21 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
 bool SigVerify::RunGPGV(std::string const &File, std::string const &FileGPG,
                        int const &statusfd, int fd[2])
 {
 bool SigVerify::RunGPGV(std::string const &File, std::string const &FileGPG,
                        int const &statusfd, int fd[2])
 {

+   if (File == FileGPG)
+   {
+      #define SIGMSG "-----BEGIN PGP SIGNED MESSAGE-----\n"
+      char buffer[sizeof(SIGMSG)];
+      FILE* gpg = fopen(File.c_str(), "r");
+      if (gpg == NULL)
+        return _error->Errno("RunGPGV", _("Could not open file %s"), File.c_str());
+      char const * const test = fgets(buffer, sizeof(buffer), gpg);
+      fclose(gpg);
+      if (test == NULL || strcmp(buffer, SIGMSG) != 0)
+        return _error->Error(_("File %s doesn't start with a clearsigned message"), File.c_str());
+      #undef SIGMSG
+   }
+
+

    string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv");
    // FIXME: remove support for deprecated APT::GPGV setting
    string const trustedFile = _config->Find("APT::GPGV::TrustedKeyring", _config->FindFile("Dir::Etc::Trusted"));
    string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv");
    // FIXME: remove support for deprecated APT::GPGV setting
    string const trustedFile = _config->Find("APT::GPGV::TrustedKeyring", _config->FindFile("Dir::Etc::Trusted"));


@@ -681,14 +699,18 @@ bool SigVerify::RunGPGV(std::string const &File, std::string const &FileGPG,
    std::vector<string> keyrings;
    if (DirectoryExists(trustedPath))
      keyrings = GetListOfFilesInDir(trustedPath, "gpg", false, true);
    std::vector<string> keyrings;
    if (DirectoryExists(trustedPath))
      keyrings = GetListOfFilesInDir(trustedPath, "gpg", false, true);

-   if (FileExists(trustedFile) == true)
+   if (RealFileExists(trustedFile) == true)

      keyrings.push_back(trustedFile);
 
    std::vector<const char *> Args;
    Args.reserve(30);
 
    if (keyrings.empty() == true)
      keyrings.push_back(trustedFile);
 
    std::vector<const char *> Args;
    Args.reserve(30);
 
    if (keyrings.empty() == true)

-      return false;
+   {
+      // TRANSLATOR: %s is the trusted keyring parts directory
+      return _error->Error(_("No keyring installed in %s."),
+                          _config->FindDir("Dir::Etc::TrustedParts").c_str());
+   }

 
    Args.push_back(gpgvpath.c_str());
    Args.push_back("--ignore-time-conflict");
 
    Args.push_back(gpgvpath.c_str());
    Args.push_back("--ignore-time-conflict");


@@ -722,7 +744,8 @@ bool SigVerify::RunGPGV(std::string const &File, std::string const &FileGPG,
    }
 
    Args.push_back(FileGPG.c_str());
    }
 
    Args.push_back(FileGPG.c_str());

-   Args.push_back(File.c_str());
+   if (FileGPG != File)
+      Args.push_back(File.c_str());

    Args.push_back(NULL);
 
    if (Debug == true)
    Args.push_back(NULL);
 
    if (Debug == true)


@@ -756,7 +779,7 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name,   /*{{{*/
                                vector<string> &List, pkgCdromStatus *log)
 {
    OpProgress *Progress = NULL;
                                vector<string> &List, pkgCdromStatus *log)
 {
    OpProgress *Progress = NULL;

-   if (List.size() == 0)
+   if (List.empty() == true)

       return true;
    
    if(log) 
       return true;
    
    if(log) 


@@ -765,8 +788,8 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name,   /*{{{*/
    bool Debug = _config->FindB("Debug::aptcdrom",false);
    
    // Prepare the progress indicator
    bool Debug = _config->FindB("Debug::aptcdrom",false);
    
    // Prepare the progress indicator

-   unsigned long TotalSize = 0;
-   for (vector<string>::iterator I = List.begin(); I != List.end(); I++)
+   off_t TotalSize = 0;
+   for (vector<string>::iterator I = List.begin(); I != List.end(); ++I)

    {
       struct stat Buf;
       if (stat(string(*I).c_str(),&Buf) != 0 &&
    {
       struct stat Buf;
       if (stat(string(*I).c_str(),&Buf) != 0 &&


@@ -776,18 +799,18 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/
       TotalSize += Buf.st_size;
    }   
 
       TotalSize += Buf.st_size;
    }   
 

-   unsigned long CurrentSize = 0;
+   off_t CurrentSize = 0;

    unsigned int NotFound = 0;
    unsigned int WrongSize = 0;
    unsigned int Packages = 0;
    unsigned int NotFound = 0;
    unsigned int WrongSize = 0;
    unsigned int Packages = 0;

-   for (vector<string>::iterator I = List.begin(); I != List.end(); I++)
+   for (vector<string>::iterator I = List.begin(); I != List.end(); ++I)

    {      
       string OrigPath = string(*I,CDROM.length());
    {      
       string OrigPath = string(*I,CDROM.length());

-      unsigned long FileSize = 0;
+      off_t FileSize = 0;

       
       // Open the package file
       FileFd Pkg;
       
       // Open the package file
       FileFd Pkg;

-      if (FileExists(*I) == true)
+      if (RealFileExists(*I) == true)

       {
         Pkg.Open(*I,FileFd::ReadOnly);
         FileSize = Pkg.Size();
       {
         Pkg.Open(*I,FileFd::ReadOnly);
         FileSize = Pkg.Size();


@@ -865,7 +888,6 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name,   /*{{{*/
       this->Section = &Section;
       string Prefix;
       unsigned long Hits = 0;
       this->Section = &Section;
       string Prefix;
       unsigned long Hits = 0;

-      unsigned long Chop = 0;

       while (Parser.Step(Section) == true)
       {
         if(Progress)
       while (Parser.Step(Section) == true)
       {
         if(Progress)


@@ -883,7 +905,7 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name,   /*{{{*/
       fclose(TargetFl);
 
       if (Debug == true)
       fclose(TargetFl);
 
       if (Debug == true)

-        cout << " Processed by using Prefix '" << Prefix << "' and chop " << Chop << endl;
+        cout << " Processed by using Prefix '" << Prefix << "' and chop " << endl;

         
       if (_config->FindB("APT::CDROM::NoAct",false) == false)
       {
         
       if (_config->FindB("APT::CDROM::NoAct",false) == false)
       {