fix crash in order writing in pkgDPkgPM::WriteApportReport()

[apt.git] / cmdline / apt-get.cc

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 566103f8c7a1c3907ae3fdbf62b21dd9df556eae..a2853771227f9924ae36bcfdd334b101c982b475 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -665,7 +665,7 @@ static bool DoDownload(CommandLine &CmdL)
    {
       pkgAcquire::UriIterator I = Fetcher.UriBegin();
       for (; I != Fetcher.UriEnd(); ++I)
    {
       pkgAcquire::UriIterator I = Fetcher.UriBegin();
       for (; I != Fetcher.UriEnd(); ++I)

-        cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' <<
+        cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile)  << ' ' <<

               I->Owner->FileSize << ' ' << I->Owner->HashSum() << endl;
       return true;
    }
               I->Owner->FileSize << ' ' << I->Owner->HashSum() << endl;
       return true;
    }


@@ -756,6 +756,7 @@ static bool DoSource(CommandLine &CmdL)
 
    // Load the requestd sources into the fetcher
    unsigned J = 0;
 
    // Load the requestd sources into the fetcher
    unsigned J = 0;

+   std::string UntrustedList;

    for (const char **I = CmdL.FileList + 1; *I != 0; I++, J++)
    {
       string Src;
    for (const char **I = CmdL.FileList + 1; *I != 0; I++, J++)
    {
       string Src;


@@ -764,6 +765,9 @@ static bool DoSource(CommandLine &CmdL)
       if (Last == 0) {
         return _error->Error(_("Unable to find a source package for %s"),Src.c_str());
       }
       if (Last == 0) {
         return _error->Error(_("Unable to find a source package for %s"),Src.c_str());
       }

+
+      if (Last->Index().IsTrusted() == false)
+         UntrustedList += Src + " ";

       
       string srec = Last->AsStr();
       string::size_type pos = srec.find("\nVcs-");
       
       string srec = Last->AsStr();
       string::size_type pos = srec.find("\nVcs-");


@@ -793,13 +797,13 @@ static bool DoSource(CommandLine &CmdL)
       }
 
       // Back track
       }
 
       // Back track

-      vector<pkgSrcRecords::File> Lst;
-      if (Last->Files(Lst) == false) {
+      vector<pkgSrcRecords::File2> Lst;
+      if (Last->Files2(Lst) == false) {

         return false;
       }
 
       // Load them into the fetcher
         return false;
       }
 
       // Load them into the fetcher

-      for (vector<pkgSrcRecords::File>::const_iterator I = Lst.begin();
+      for (vector<pkgSrcRecords::File2>::const_iterator I = Lst.begin();

           I != Lst.end(); ++I)
       {
         // Try to guess what sort of file it is we are getting.
           I != Lst.end(); ++I)
       {
         // Try to guess what sort of file it is we are getting.


@@ -828,25 +832,33 @@ static bool DoSource(CommandLine &CmdL)
         queued.insert(Last->Index().ArchiveURI(I->Path));
 
         // check if we have a file with that md5 sum already localy
         queued.insert(Last->Index().ArchiveURI(I->Path));
 
         // check if we have a file with that md5 sum already localy

-        if(!I->MD5Hash.empty() && FileExists(flNotDir(I->Path)))  
-        {
-           FileFd Fd(flNotDir(I->Path), FileFd::ReadOnly);
-           MD5Summation sum;
-           sum.AddFD(Fd.Fd(), Fd.Size());
-           Fd.Close();
-           if((string)sum.Result() == I->MD5Hash) 
+        std::string localFile = flNotDir(I->Path);
+        if (FileExists(localFile) == true)
+           if(I->Hashes.VerifyFile(localFile) == true)

            {
               ioprintf(c1out,_("Skipping already downloaded file '%s'\n"),
            {
               ioprintf(c1out,_("Skipping already downloaded file '%s'\n"),

-                       flNotDir(I->Path).c_str());
+                       localFile.c_str());

               continue;
            }
               continue;
            }

+
+        // see if we have a hash (Acquire::ForceHash is the only way to have none)
+        HashString const * const hs = I->Hashes.find(NULL);
+        if (hs == NULL && _config->FindB("APT::Get::AllowUnauthenticated",false) == false)
+        {
+           ioprintf(c1out, "Skipping download of file '%s' as requested hashsum is not available for authentication\n",
+                    localFile.c_str());
+           continue;

         }
 
         new pkgAcqFile(&Fetcher,Last->Index().ArchiveURI(I->Path),
         }
 
         new pkgAcqFile(&Fetcher,Last->Index().ArchiveURI(I->Path),

-                       I->MD5Hash,I->Size,
+                       hs != NULL ? hs->toStr() : "", I->FileSize,

                        Last->Index().SourceInfo(*Last,*I),Src);
       }
    }
                        Last->Index().SourceInfo(*Last,*I),Src);
       }
    }

+
+   // check authentication status of the source as well
+   if (UntrustedList != "" && !AuthPrompt(UntrustedList, false))
+      return false;

    
    // Display statistics
    unsigned long long FetchBytes = Fetcher.FetchNeeded();
    
    // Display statistics
    unsigned long long FetchBytes = Fetcher.FetchNeeded();


@@ -945,18 +957,19 @@ static bool DoSource(CommandLine &CmdL)
         else
         {
            // Call dpkg-source
         else
         {
            // Call dpkg-source

-           char S[500];
-           snprintf(S,sizeof(S),"%s -x %s",
+           std::string const sourceopts = _config->Find("DPkg::Source-Options", "-x");
+           std::string S;
+           strprintf(S, "%s %s %s",

                     _config->Find("Dir::Bin::dpkg-source","dpkg-source").c_str(),
                     _config->Find("Dir::Bin::dpkg-source","dpkg-source").c_str(),

-                    Dsc[I].Dsc.c_str());
-           if (system(S) != 0)
+                    sourceopts.c_str(), Dsc[I].Dsc.c_str());
+           if (system(S.c_str()) != 0)

            {
            {

-              fprintf(stderr,_("Unpack command '%s' failed.\n"),S);
-              fprintf(stderr,_("Check if the 'dpkg-dev' package is installed.\n"));
+              fprintf(stderr, _("Unpack command '%s' failed.\n"), S.c_str());
+              fprintf(stderr, _("Check if the 'dpkg-dev' package is installed.\n"));

               _exit(1);
               _exit(1);

-           }       
+           }

         }
         }

-        
+

         // Try to compile it with dpkg-buildpackage
         if (_config->FindB("APT::Get::Compile",false) == true)
         {
         // Try to compile it with dpkg-buildpackage
         if (_config->FindB("APT::Get::Compile",false) == true)
         {


@@ -972,20 +985,20 @@ static bool DoSource(CommandLine &CmdL)
            buildopts.append(_config->Find("DPkg::Build-Options","-b -uc"));
 
            // Call dpkg-buildpackage
            buildopts.append(_config->Find("DPkg::Build-Options","-b -uc"));
 
            // Call dpkg-buildpackage

-           char S[500];
-           snprintf(S,sizeof(S),"cd %s && %s %s",
+           std::string S;
+           strprintf(S, "cd %s && %s %s",

                     Dir.c_str(),
                     _config->Find("Dir::Bin::dpkg-buildpackage","dpkg-buildpackage").c_str(),
                     buildopts.c_str());
                     Dir.c_str(),
                     _config->Find("Dir::Bin::dpkg-buildpackage","dpkg-buildpackage").c_str(),
                     buildopts.c_str());

-           
-           if (system(S) != 0)
+
+           if (system(S.c_str()) != 0)

            {
            {

-              fprintf(stderr,_("Build command '%s' failed.\n"),S);
+              fprintf(stderr, _("Build command '%s' failed.\n"), S.c_str());

               _exit(1);
               _exit(1);

-           }       
-        }      
+           }
+        }

       }
       }

-      
+

       _exit(0);
    }
 
       _exit(0);
    }
 


@@ -1554,7 +1567,7 @@ static bool DoChangelog(CommandLine &CmdL)
    {
       string changelogfile;
       if (downOnly == false)
    {
       string changelogfile;
       if (downOnly == false)

-        changelogfile.append(tmpname).append("changelog");
+        changelogfile.append(tmpname).append("/changelog");

       else
         changelogfile.append(Ver.ParentPkg().Name()).append(".changelog");
       if (DownloadChangelog(Cache, Fetcher, Ver, changelogfile) && downOnly == false)
       else
         changelogfile.append(Ver.ParentPkg().Name()).append(".changelog");
       if (DownloadChangelog(Cache, Fetcher, Ver, changelogfile) && downOnly == false)