force fancy progressbar redraw on window size change

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

diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index a2a1d59347ecbbda5bb9a5f5a4d85eaac63dfbf8..854ba1bd7d871f272f581358281398d504faa544 100644 (file)
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -10,32 +10,34 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

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

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

+#include <apt-pkg/aptconfiguration.h>

 #include <apt-pkg/configuration.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/indexrecords.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/indexrecords.h>

-#include <apt-pkg/md5.h>

 #include <apt-pkg/cdrom.h>
 #include <apt-pkg/cdrom.h>

-#include <apti18n.h>
+#include <apt-pkg/gpgv.h>
+#include <apt-pkg/hashes.h>

 
 #include <iostream>
 #include <sstream>
 #include <unistd.h>
 #include <sys/stat.h>
 
 #include <iostream>
 #include <sstream>
 #include <unistd.h>
 #include <sys/stat.h>

-#include <sys/types.h>
-#include <fcntl.h>

 #include <stdio.h>
 #include <stdio.h>

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

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

-
-

 // IndexCopy::CopyPackages - Copy the package files from the CD                /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // IndexCopy::CopyPackages - Copy the package files from the CD                /*{{{*/
 // ---------------------------------------------------------------------
 /* */


@@ -43,7 +45,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,75 +55,39 @@ 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;
+   std::vector<APT::Configuration::Compressor> const compressor = APT::Configuration::getCompressors();
+   for (vector<string>::iterator I = List.begin(); I != List.end(); ++I)

    {
       struct stat Buf;
    {
       struct stat Buf;

-      if (stat(string(*I + GetFileName()).c_str(),&Buf) != 0 &&
-         stat(string(*I + GetFileName() + ".gz").c_str(),&Buf) != 0)
-        return _error->Errno("stat","Stat failed for %s",
-                             string(*I + GetFileName()).c_str());
+      bool found = false;
+      std::string file = std::string(*I).append(GetFileName());
+      for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
+          c != compressor.end(); ++c)
+      {
+        if (stat((file + c->Extension).c_str(), &Buf) != 0)
+           continue;
+        found = true;
+        break;
+      }
+
+      if (found == false)
+        return _error->Errno("stat", "Stat failed for %s", file.c_str());

       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;

       
       // Open the package file
       
       // Open the package file

-      FileFd Pkg;
-      if (FileExists(*I + GetFileName()) == true)
-      {
-        Pkg.Open(*I + GetFileName(),FileFd::ReadOnly);
-        FileSize = Pkg.Size();
-      }      
-      else
-      {
-        FileFd From(*I + GetFileName() + ".gz",FileFd::ReadOnly);
-        if (_error->PendingError() == true)
-           return false;
-        FileSize = From.Size();
-        
-        // Get a temp file
-        FILE *tmp = tmpfile();
-        if (tmp == 0)
-           return _error->Errno("tmpfile","Unable to create a tmp file");
-        Pkg.Fd(dup(fileno(tmp)));
-        fclose(tmp);
-        
-        // Fork gzip
-        pid_t Process = fork();
-        if (Process < 0)
-           return _error->Errno("fork","Couldn't fork gzip");
-        
-        // The child
-        if (Process == 0)
-        {          
-           dup2(From.Fd(),STDIN_FILENO);
-           dup2(Pkg.Fd(),STDOUT_FILENO);
-           SetCloseExec(STDIN_FILENO,false);
-           SetCloseExec(STDOUT_FILENO,false);
-           
-           const char *Args[3];
-           string Tmp =  _config->Find("Dir::bin::gzip","gzip");
-           Args[0] = Tmp.c_str();
-           Args[1] = "-d";
-           Args[2] = 0;
-           execvp(Args[0],(char **)Args);
-           exit(100);
-        }
-        
-        // Wait for gzip to finish
-        if (ExecWait(Process,_config->Find("Dir::bin::gzip","gzip").c_str(),false) == false)
-           return _error->Error("gzip failed, perhaps the disk is full.");
-        
-        Pkg.Seek(0);
-      }
+      FileFd Pkg(*I + GetFileName(), FileFd::ReadOnly, FileFd::Auto);
+      off_t const FileSize = Pkg.Size();
+

       pkgTagFile Parser(&Pkg);
       if (_error->PendingError() == true)
         return false;
       pkgTagFile Parser(&Pkg);
       if (_error->PendingError() == true)
         return false;


@@ -132,12 +98,17 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
               (*I).c_str() + CDROM.length(),GetFileName());
       string TargetF = _config->FindDir("Dir::State::lists") + "partial/";
       TargetF += URItoFileName(S);
               (*I).c_str() + CDROM.length(),GetFileName());
       string TargetF = _config->FindDir("Dir::State::lists") + "partial/";
       TargetF += URItoFileName(S);

+      FileFd Target;

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

+      {

         TargetF = "/dev/null";
         TargetF = "/dev/null";

-      FileFd Target(TargetF,FileFd::WriteAtomic);
-      FILE *TargetFl = fdopen(dup(Target.Fd()),"w");
+         Target.Open(TargetF,FileFd::WriteExists);
+      } else {
+         Target.Open(TargetF,FileFd::WriteAtomic);
+      }

       if (_error->PendingError() == true)
         return false;
       if (_error->PendingError() == true)
         return false;

+      FILE *TargetFl = fdopen(dup(Target.Fd()),"w");

       if (TargetFl == 0)
         return _error->Errno("fdopen","Failed to reopen fd");
       
       if (TargetFl == 0)
         return _error->Errno("fdopen","Failed to reopen fd");
       


@@ -159,7 +130,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);


@@ -170,7 +141,6 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
            File = OrigPath + ChopDirs(File,Chop);
         
         // See if the file exists
            File = OrigPath + ChopDirs(File,Chop);
         
         // See if the file exists

-        bool Mangled = false;

         if (NoStat == false || Hits < 10)
         {
            // Attempt to fix broken structure
         if (NoStat == false || Hits < 10)
         {
            // Attempt to fix broken structure


@@ -190,9 +160,10 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
            
            // Get the size
            struct stat Buf;
            
            // Get the size
            struct stat Buf;

-           if (stat(string(CDROM + Prefix + File).c_str(),&Buf) != 0 || 
+           if (stat((CDROM + Prefix + File).c_str(),&Buf) != 0 || 

                Buf.st_size == 0)
            {
                Buf.st_size == 0)
            {

+              bool Mangled = false;

               // Attempt to fix busted symlink support for one instance
               string OrigFile = File;
               string::size_type Start = File.find("binary-");
               // Attempt to fix busted symlink support for one instance
               string OrigFile = File;
               string::size_type Start = File.find("binary-");


@@ -204,7 +175,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
               }
               
               if (Mangled == false ||
               }
               
               if (Mangled == false ||

-                  stat(string(CDROM + Prefix + File).c_str(),&Buf) != 0)
+                  stat((CDROM + Prefix + File).c_str(),&Buf) != 0)

               {
                  if (Debug == true)
                     clog << "Missed(2): " << OrigFile << endl;
               {
                  if (Debug == true)
                     clog << "Missed(2): " << OrigFile << endl;


@@ -214,7 +185,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;


@@ -315,7 +286,7 @@ bool IndexCopy::ReconstructPrefix(string &Prefix,string OrigPath,string CD,
    while (1)
    {
       struct stat Buf;
    while (1)
    {
       struct stat Buf;

-      if (stat(string(CD + MyPrefix + File).c_str(),&Buf) != 0)
+      if (stat((CD + MyPrefix + File).c_str(),&Buf) != 0)

       {
         if (Debug == true)
            cout << "Failed, " << CD + MyPrefix + File << endl;
       {
         if (Debug == true)
            cout << "Failed, " << CD + MyPrefix + File << endl;


@@ -344,7 +315,7 @@ bool IndexCopy::ReconstructChop(unsigned long &Chop,string Dir,string File)
    while (1)
    {
       struct stat Buf;
    while (1)
    {
       struct stat Buf;

-      if (stat(string(Dir + File).c_str(),&Buf) != 0)
+      if (stat((Dir + File).c_str(),&Buf) != 0)

       {
         File = ChopDirs(File,1);
         Depth++;
       {
         File = ChopDirs(File,1);
         Depth++;


@@ -379,9 +350,6 @@ bool IndexCopy::ReconstructChop(unsigned long &Chop,string Dir,string File)
  */
 void IndexCopy::ConvertToSourceList(string CD,string &Path)
 {
  */
 void IndexCopy::ConvertToSourceList(string CD,string &Path)
 {

-   char S[300];
-   snprintf(S,sizeof(S),"binary-%s",_config->Find("Apt::Architecture").c_str());
-   

    // Strip the cdrom base path
    Path = string(Path,CD.length());
    if (Path.empty() == true)
    // Strip the cdrom base path
    Path = string(Path,CD.length());
    if (Path.empty() == true)


@@ -417,7 +385,13 @@ void IndexCopy::ConvertToSourceList(string CD,string &Path)
         return;
       string Binary = string(Path,Slash+1,BinSlash - Slash-1);
       
         return;
       string Binary = string(Path,Slash+1,BinSlash - Slash-1);
       

-      if (Binary != S && Binary != "source")
+      if (strncmp(Binary.c_str(), "binary-", strlen("binary-")) == 0)
+      {
+        Binary.erase(0, strlen("binary-"));
+        if (APT::Configuration::checkArchitecture(Binary) == false)
+           continue;
+      }
+      else if (Binary != "source")

         continue;
 
       Path = Dist + ' ' + Comp;
         continue;
 
       Path = Dist + ' ' + Comp;


@@ -448,7 +422,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");


@@ -462,8 +436,8 @@ bool PackageCopy::GetFile(string &File,unsigned long &Size)
 /* */
 bool PackageCopy::RewriteEntry(FILE *Target,string File)
 {
 /* */
 bool PackageCopy::RewriteEntry(FILE *Target,string File)
 {

-   TFRewriteData Changes[] = {{"Filename",File.c_str()},
-                              {}};
+   TFRewriteData Changes[] = {{ "Filename", File.c_str(), NULL },
+                              { NULL, NULL, NULL }};

    
    if (TFRewrite(Target,*Section,TFRewritePackageOrder,Changes) == false)
       return false;
    
    if (TFRewrite(Target,*Section,TFRewritePackageOrder,Changes) == false)
       return false;


@@ -474,7 +448,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)


@@ -497,7 +471,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;
 }


@@ -508,8 +482,8 @@ bool SourceCopy::GetFile(string &File,unsigned long &Size)
 bool SourceCopy::RewriteEntry(FILE *Target,string File)
 {
    string Dir(File,0,File.rfind('/'));
 bool SourceCopy::RewriteEntry(FILE *Target,string File)
 {
    string Dir(File,0,File.rfind('/'));

-   TFRewriteData Changes[] = {{"Directory",Dir.c_str()},
-                              {}};
+   TFRewriteData Changes[] = {{ "Directory", Dir.c_str(), NULL },
+                              { NULL, NULL, NULL }};

    
    if (TFRewrite(Target,*Section,TFRewriteSourceOrder,Changes) == false)
       return false;
    
    if (TFRewrite(Target,*Section,TFRewriteSourceOrder,Changes) == false)
       return false;


@@ -523,17 +497,20 @@ bool SourceCopy::RewriteEntry(FILE *Target,string File)
 bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex)
 {
    const indexRecords::checkSum *Record = MetaIndex->Lookup(file);
 bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex)
 {
    const indexRecords::checkSum *Record = MetaIndex->Lookup(file);

+   bool const Debug = _config->FindB("Debug::aptcdrom",false);

 
 

-   // 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))
+   // we skip non-existing files in the verifcation of the Release file
+   // as non-existing files do not harm, but a warning scares people and
+   // makes it hard to strip unneeded files from an ISO like uncompressed
+   // indexes as it is done on the mirrors (see also LP: #255545 )
+   if(!RealFileExists(prefix+file))

    {
    {

-      _error->Warning(_("Skipping nonexistent file %s"), string(prefix+file).c_str());
+      if (Debug == true)
+        cout << "Skipping nonexistent in " << prefix << " file " << file << std::endl;

       return true;
    }
 
       return true;
    }
 

-   if (!Record) 
+   if (!Record)

    {
       _error->Warning(_("Can't find authentication record for: %s"), file.c_str());
       return false;
    {
       _error->Warning(_("Can't find authentication record for: %s"), file.c_str());
       return false;


@@ -545,7 +522,7 @@ bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex)
       return false;
    }
 
       return false;
    }
 

-   if(_config->FindB("Debug::aptcdrom",false)) 
+   if(Debug == true)

    {
       cout << "File: " << prefix+file << endl;
       cout << "Expected Hash " << Record->Hash.toStr() << endl;
    {
       cout << "File: " << prefix+file << endl;
       cout << "Expected Hash " << Record->Hash.toStr() << endl;


@@ -567,24 +544,22 @@ bool SigVerify::CopyMetaIndex(string CDROM, string CDName,                /*{{{*/
       FileFd Rel;
       Target.Open(TargetF,FileFd::WriteAtomic);
       Rel.Open(prefix + file,FileFd::ReadOnly);
       FileFd Rel;
       Target.Open(TargetF,FileFd::WriteAtomic);
       Rel.Open(prefix + file,FileFd::ReadOnly);

-      if (_error->PendingError() == true)
-        return false;

       if (CopyFile(Rel,Target) == false)
       if (CopyFile(Rel,Target) == false)

-        return false;
-   
+        return _error->Error("Copying of '%s' for '%s' from '%s' failed", file.c_str(), CDName.c_str(), prefix.c_str());
+

       return true;
 }
                                                                        /*}}}*/
 bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,        /*{{{*/
       return true;
 }
                                                                        /*}}}*/
 bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,        /*{{{*/

-                             vector<string> PkgList,vector<string> SrcList)
+                             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;


@@ -594,13 +569,19 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
 
       string const releasegpg = *I+"Release.gpg";
       string const release = *I+"Release";
 
       string const releasegpg = *I+"Release.gpg";
       string const release = *I+"Release";

+      string const inrelease = *I+"InRelease";
+      bool useInRelease = true;

 
       // a Release.gpg without a Release should never happen
 
       // a Release.gpg without a Release should never happen

-      if(FileExists(release) == false)
+      if (RealFileExists(inrelease) == true)
+        ;
+      else if(RealFileExists(release) == false || RealFileExists(releasegpg) == false)

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

+      else
+        useInRelease = false;

 
       pid_t pid = ExecFork();
       if(pid < 0) {
 
       pid_t pid = ExecFork();
       if(pid < 0) {


@@ -608,13 +589,19 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
         return false;
       }
       if(pid == 0)
         return false;
       }
       if(pid == 0)

-        RunGPGV(release, releasegpg);
+      {
+        if (useInRelease == true)
+           ExecGPGV(inrelease, inrelease);
+        else
+           ExecGPGV(release, releasegpg);
+      }

 
       if(!ExecWait(pid, "gpgv")) {
         _error->Warning("Signature verification failed for: %s",
 
       if(!ExecWait(pid, "gpgv")) {
         _error->Warning("Signature verification failed for: %s",

-                        releasegpg.c_str());
+                        (useInRelease ? inrelease.c_str() : releasegpg.c_str()));

         // something went wrong, don't copy the Release.gpg
         // FIXME: delete any existing gpg file?
         // something went wrong, don't copy the Release.gpg
         // FIXME: delete any existing gpg file?

+        delete MetaIndex;

         continue;
       }
 
         continue;
       }
 


@@ -628,7 +615,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


@@ -642,114 +629,33 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
       delete MetaIndex;
    
       // everything was fine, copy the Release and Release.gpg file
       delete MetaIndex;
    
       // everything was fine, copy the Release and Release.gpg file

-      CopyMetaIndex(CDROM, Name, prefix, "Release");
-      CopyMetaIndex(CDROM, Name, prefix, "Release.gpg");
+      if (useInRelease == true)
+        CopyMetaIndex(CDROM, Name, prefix, "InRelease");
+      else
+      {
+        CopyMetaIndex(CDROM, Name, prefix, "Release");
+        CopyMetaIndex(CDROM, Name, prefix, "Release.gpg");
+      }

    }   
 
    return true;
 }
                                                                        /*}}}*/
    }   
 
    return true;
 }
                                                                        /*}}}*/

-// SigVerify::RunGPGV - returns the command needed for verify          /*{{{*/
-// ---------------------------------------------------------------------
-/* Generating the commandline for calling gpgv is somehow complicated as
-   we need to add multiple keyrings and user supplied options. Also, as
-   the cdrom code currently can not use the gpgv method we have two places
-   these need to be done - so the place for this method is wrong but better
-   than code duplication… */
-bool SigVerify::RunGPGV(std::string const &File, std::string const &FileGPG,
-                       int const &statusfd, int fd[2])
-{
-   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 trustedPath = _config->FindDir("Dir::Etc::TrustedParts");
-
-   bool const Debug = _config->FindB("Debug::Acquire::gpgv", false);
-
-   if (Debug == true)
-   {
-      std::clog << "gpgv path: " << gpgvpath << std::endl;
-      std::clog << "Keyring file: " << trustedFile << std::endl;
-      std::clog << "Keyring path: " << trustedPath << std::endl;
-   }
-
-   std::vector<string> keyrings = GetListOfFilesInDir(trustedPath, "gpg", false);
-   if (FileExists(trustedFile) == true)
-      keyrings.push_back(trustedFile);
-
-   std::vector<const char *> Args;
-   Args.reserve(30);
-
-   if (keyrings.empty() == true)
-      return false;
-
-   Args.push_back(gpgvpath.c_str());
-   Args.push_back("--ignore-time-conflict");
-
-   if (statusfd != -1)
-   {
-      Args.push_back("--status-fd");
-      char fd[10];
-      snprintf(fd, sizeof(fd), "%i", statusfd);
-      Args.push_back(fd);
-   }
-
-   for (vector<string>::const_iterator K = keyrings.begin();
-       K != keyrings.end(); ++K)
-   {
-      Args.push_back("--keyring");
-      Args.push_back(K->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.push_back(Opts->Value.c_str());
-      }
-   }
-
-   Args.push_back(FileGPG.c_str());
-   Args.push_back(File.c_str());
-   Args.push_back(NULL);
-
-   if (Debug == true)
-   {
-      std::clog << "Preparing to exec: " << gpgvpath;
-      for (std::vector<const char *>::const_iterator a = Args.begin(); *a != NULL; ++a)
-        std::clog << " " << *a;
-      std::clog << std::endl;
-   }
-
-   if (statusfd != -1)
-   {
-      int const nullfd = open("/dev/null", O_RDONLY);
-      close(fd[0]);
-      // Redirect output to /dev/null; we read from the status fd
-      dup2(nullfd, STDOUT_FILENO);
-      dup2(nullfd, STDERR_FILENO);
-      // Redirect the pipe to the status fd (3)
-      dup2(fd[1], statusfd);
-
-      putenv((char *)"LANG=");
-      putenv((char *)"LC_ALL=");
-      putenv((char *)"LC_MESSAGES=");
-   }
-
-   execvp(gpgvpath.c_str(), (char **) &Args[0]);
-   return true;
+// SigVerify::RunGPGV - deprecated wrapper calling ExecGPGV            /*{{{*/
+APT_NORETURN bool SigVerify::RunGPGV(std::string const &File, std::string const &FileOut,
+      int const &statusfd, int fd[2]) {
+   ExecGPGV(File, FileOut, statusfd, fd);
+}
+APT_NORETURN bool SigVerify::RunGPGV(std::string const &File, std::string const &FileOut,
+      int const &statusfd) {
+   ExecGPGV(File, FileOut, statusfd);

 }
                                                                        /*}}}*/
 bool TranslationsCopy::CopyTranslations(string CDROM,string Name,      /*{{{*/
                                vector<string> &List, pkgCdromStatus *log)
 {
    OpProgress *Progress = NULL;
 }
                                                                        /*}}}*/
 bool TranslationsCopy::CopyTranslations(string CDROM,string Name,      /*{{{*/
                                vector<string> &List, pkgCdromStatus *log)
 {
    OpProgress *Progress = NULL;

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

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


@@ -758,75 +664,37 @@ 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;
+   std::vector<APT::Configuration::Compressor> const compressor = APT::Configuration::getCompressors();
+   for (vector<string>::iterator I = List.begin(); I != List.end(); ++I)

    {
       struct stat Buf;
    {
       struct stat Buf;

-      if (stat(string(*I).c_str(),&Buf) != 0 &&
-         stat(string(*I + ".gz").c_str(),&Buf) != 0)
-        return _error->Errno("stat","Stat failed for %s",
-                             string(*I).c_str());
+      bool found = false;
+      std::string file = *I;
+      for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
+          c != compressor.end(); ++c)
+      {
+        if (stat((file + c->Extension).c_str(), &Buf) != 0)
+           continue;
+        found = true;
+        break;
+      }
+
+      if (found == false)
+        return _error->Errno("stat", "Stat failed for %s", file.c_str());

       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++)
-   {      
-      string OrigPath = string(*I,CDROM.length());
-      unsigned long FileSize = 0;
-      
+   for (vector<string>::iterator I = List.begin(); I != List.end(); ++I)
+   {

       // Open the package file
       // Open the package file

-      FileFd Pkg;
-      if (FileExists(*I) == true)
-      {
-        Pkg.Open(*I,FileFd::ReadOnly);
-        FileSize = Pkg.Size();
-      }      
-      else
-      {
-        FileFd From(*I + ".gz",FileFd::ReadOnly);
-        if (_error->PendingError() == true)
-           return false;
-        FileSize = From.Size();
-        
-        // Get a temp file
-        FILE *tmp = tmpfile();
-        if (tmp == 0)
-           return _error->Errno("tmpfile","Unable to create a tmp file");
-        Pkg.Fd(dup(fileno(tmp)));
-        fclose(tmp);
-        
-        // Fork gzip
-        pid_t Process = fork();
-        if (Process < 0)
-           return _error->Errno("fork","Couldn't fork gzip");
-        
-        // The child
-        if (Process == 0)
-        {          
-           dup2(From.Fd(),STDIN_FILENO);
-           dup2(Pkg.Fd(),STDOUT_FILENO);
-           SetCloseExec(STDIN_FILENO,false);
-           SetCloseExec(STDOUT_FILENO,false);
-           
-           const char *Args[3];
-           string Tmp =  _config->Find("Dir::bin::gzip","gzip");
-           Args[0] = Tmp.c_str();
-           Args[1] = "-d";
-           Args[2] = 0;
-           execvp(Args[0],(char **)Args);
-           exit(100);
-        }
-        
-        // Wait for gzip to finish
-        if (ExecWait(Process,_config->Find("Dir::bin::gzip","gzip").c_str(),false) == false)
-           return _error->Error("gzip failed, perhaps the disk is full.");
-        
-        Pkg.Seek(0);
-      }
+      FileFd Pkg(*I, FileFd::ReadOnly, FileFd::Auto);
+      off_t const FileSize = Pkg.Size();
+

       pkgTagFile Parser(&Pkg);
       if (_error->PendingError() == true)
         return false;
       pkgTagFile Parser(&Pkg);
       if (_error->PendingError() == true)
         return false;


@@ -837,12 +705,17 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/
               (*I).c_str() + CDROM.length());
       string TargetF = _config->FindDir("Dir::State::lists") + "partial/";
       TargetF += URItoFileName(S);
               (*I).c_str() + CDROM.length());
       string TargetF = _config->FindDir("Dir::State::lists") + "partial/";
       TargetF += URItoFileName(S);

+      FileFd Target;

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

+      {

         TargetF = "/dev/null";
         TargetF = "/dev/null";

-      FileFd Target(TargetF,FileFd::WriteAtomic);
-      FILE *TargetFl = fdopen(dup(Target.Fd()),"w");
+        Target.Open(TargetF,FileFd::WriteExists);
+      } else {
+        Target.Open(TargetF,FileFd::WriteAtomic);
+      }

       if (_error->PendingError() == true)
         return false;
       if (_error->PendingError() == true)
         return false;

+      FILE *TargetFl = fdopen(dup(Target.Fd()),"w");

       if (TargetFl == 0)
         return _error->Errno("fdopen","Failed to reopen fd");
       
       if (TargetFl == 0)
         return _error->Errno("fdopen","Failed to reopen fd");
       


@@ -858,7 +731,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)


@@ -876,7 +748,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)
       {