merge from lp:~donkult/apt/sid

[apt.git] / apt-pkg / deb / deblistparser.cc

diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index bdb50f6bff809ba9b7ebf22e8660dc243b244ae0..b84bd6fddb8fa974c9fdf5ba7323ce87d00ea82f 100644 (file)
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -15,6 +15,7 @@
 #include <apt-pkg/deblistparser.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/deblistparser.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>

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

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


@@ -22,7 +23,6 @@
 #include <apt-pkg/md5.h>
 #include <apt-pkg/macros.h>
 
 #include <apt-pkg/md5.h>
 #include <apt-pkg/macros.h>
 

-#include <fnmatch.h>

 #include <ctype.h>
                                                                        /*}}}*/
 
 #include <ctype.h>
                                                                        /*}}}*/
 


@@ -215,15 +215,22 @@ string debListParser::DescriptionLanguage()
  */
 MD5SumValue debListParser::Description_md5()
 {
  */
 MD5SumValue debListParser::Description_md5()
 {

-   string value = Section.FindS("Description-md5");
-
-   if (value.empty()) 
+   string const value = Section.FindS("Description-md5");
+   if (value.empty() == true)

    {
       MD5Summation md5;
       md5.Add((Description() + "\n").c_str());
       return md5.Result();
    {
       MD5Summation md5;
       md5.Add((Description() + "\n").c_str());
       return md5.Result();

-   } else
-      return MD5SumValue(value);
+   }
+   else if (likely(value.size() == 32))
+   {
+      if (likely(value.find_first_not_of("0123456789abcdefABCDEF") == string::npos))
+        return MD5SumValue(value);
+      _error->Error("Malformed Description-md5 line; includes invalid character '%s'", value.c_str());
+      return MD5SumValue();
+   }
+   _error->Error("Malformed Description-md5 line; doesn't have the required length (32 != %d) '%s'", (int)value.size(), value.c_str());
+   return MD5SumValue();

 }
                                                                         /*}}}*/
 // ListParser::UsePackage - Update a package structure                 /*{{{*/
 }
                                                                         /*}}}*/
 // ListParser::UsePackage - Update a package structure                 /*{{{*/


@@ -236,21 +243,26 @@ bool debListParser::UsePackage(pkgCache::PkgIterator &Pkg,
    if (Pkg->Section == 0)
       Pkg->Section = UniqFindTagWrite("Section");
 
    if (Pkg->Section == 0)
       Pkg->Section = UniqFindTagWrite("Section");
 

-   // Packages which are not from the "native" arch doesn't get the essential flag
-   // in the default "native" mode - it is also possible to mark "all" or "none".
-   // The "installed" mode is handled by ParseStatus(), See #544481 and friends.

    string const static myArch = _config->Find("APT::Architecture");
    string const static myArch = _config->Find("APT::Architecture");

-   string const static essential = _config->Find("pkgCacheGen::Essential", "native");
-   if ((essential == "native" && Pkg->Arch != 0 && myArch == Pkg.Arch()) ||
-       essential == "all")
+   // Possible values are: "all", "native", "installed" and "none"
+   // The "installed" mode is handled by ParseStatus(), See #544481 and friends.
+   string const static essential = _config->Find("pkgCacheGen::Essential", "all");
+   if (essential == "all" ||
+       (essential == "native" && Pkg->Arch != 0 && myArch == Pkg.Arch()))

       if (Section.FindFlag("Essential",Pkg->Flags,pkgCache::Flag::Essential) == false)
         return false;
    if (Section.FindFlag("Important",Pkg->Flags,pkgCache::Flag::Important) == false)
       return false;
 
    if (strcmp(Pkg.Name(),"apt") == 0)
       if (Section.FindFlag("Essential",Pkg->Flags,pkgCache::Flag::Essential) == false)
         return false;
    if (Section.FindFlag("Important",Pkg->Flags,pkgCache::Flag::Important) == false)
       return false;
 
    if (strcmp(Pkg.Name(),"apt") == 0)

-      Pkg->Flags |= pkgCache::Flag::Important;
-   
+   {
+      if ((essential == "native" && Pkg->Arch != 0 && myArch == Pkg.Arch()) ||
+         essential == "all")
+        Pkg->Flags |= pkgCache::Flag::Essential | pkgCache::Flag::Important;
+      else
+        Pkg->Flags |= pkgCache::Flag::Important;
+   }
+

    if (ParseStatus(Pkg,Ver) == false)
       return false;
    return true;
    if (ParseStatus(Pkg,Ver) == false)
       return false;
    return true;


@@ -452,22 +464,6 @@ const char *debListParser::ConvertRelation(const char *I,unsigned int &Op)
    }
    return I;
 }
    }
    return I;
 }

-
-/*
- * CompleteArch:
- *
- * The complete architecture, consisting of <kernel>-<cpu>.
- */
-static string CompleteArch(std::string const &arch) {
-    if (arch == "armel")              return "linux-arm";
-    if (arch == "armhf")              return "linux-arm";
-    if (arch == "lpia")               return "linux-i386";
-    if (arch == "powerpcspe")         return "linux-powerpc";
-    if (arch == "uclibc-linux-armel") return "linux-arm";
-    if (arch == "uclinux-armel")      return "uclinux-arm";
-
-    return (arch.find("-") != string::npos) ? arch : "linux-" + arch;
-}

                                                                        /*}}}*/
 // ListParser::ParseDepends - Parse a dependency element               /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // ListParser::ParseDepends - Parse a dependency element               /*{{{*/
 // ---------------------------------------------------------------------


@@ -544,58 +540,59 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
 
    if (ParseArchFlags == true)
    {
 
    if (ParseArchFlags == true)
    {

-      string completeArch = CompleteArch(arch);
+      APT::CacheFilter::PackageArchitectureMatchesSpecification matchesArch(arch, false);

 
       // Parse an architecture
       if (I != Stop && *I == '[')
       {
 
       // Parse an architecture
       if (I != Stop && *I == '[')
       {

+        ++I;

         // malformed
         // malformed

-         I++;
-         if (I == Stop)
-           return 0; 
-        
-         const char *End = I;
-         bool Found = false;
-        bool NegArch = false;
-         while (I != Stop) 
+        if (unlikely(I == Stop))
+           return 0;
+
+        const char *End = I;
+        bool Found = false;
+        bool NegArch = false;
+        while (I != Stop)

         {
         {

-            // look for whitespace or ending ']'
-           while (End != Stop && !isspace(*End) && *End != ']') 
-              End++;
-        
-           if (End == Stop) 
+           // look for whitespace or ending ']'
+           for (;End != Stop && !isspace(*End) && *End != ']'; ++End);
+
+           if (unlikely(End == Stop))

               return 0;
 
            if (*I == '!')
               return 0;
 
            if (*I == '!')

-            {
+           {

               NegArch = true;
               NegArch = true;

-              I++;
-            }
+              ++I;
+           }

 
 

-           if (stringcmp(arch,I,End) == 0) {
+           std::string arch(I, End);
+           if (arch.empty() == false && matchesArch(arch.c_str()) == true)
+           {

               Found = true;
               Found = true;

-           } else {
-              std::string wildcard = SubstVar(string(I, End), "any", "*");
-              if (fnmatch(wildcard.c_str(), completeArch.c_str(), 0) == 0)
-                 Found = true;
+              if (I[-1] != '!')
+                 NegArch = false;
+              // we found a match, so fast-forward to the end of the wildcards
+              for (; End != Stop && *End != ']'; ++End);

            }
            }

-           
+

            if (*End++ == ']') {
               I = End;
               break;
            }
            if (*End++ == ']') {
               I = End;
               break;
            }

-           
+

            I = End;
            for (;I != Stop && isspace(*I) != 0; I++);
            I = End;
            for (;I != Stop && isspace(*I) != 0; I++);

-         }
+        }

 
 

-        if (NegArch)
+        if (NegArch == true)

            Found = !Found;
            Found = !Found;

-        
-         if (Found == false)
+
+        if (Found == false)

            Package = ""; /* not for this arch */
       }
            Package = ""; /* not for this arch */
       }

-      
+

       // Skip whitespace
       for (;I != Stop && isspace(*I) != 0; I++);
    }
       // Skip whitespace
       for (;I != Stop && isspace(*I) != 0; I++);
    }


@@ -625,18 +622,21 @@ bool debListParser::ParseDepends(pkgCache::VerIterator &Ver,
    if (Section.Find(Tag,Start,Stop) == false)
       return true;
 
    if (Section.Find(Tag,Start,Stop) == false)
       return true;
 

-   string Package;

    string const pkgArch = Ver.Arch();
    string const pkgArch = Ver.Arch();

-   string Version;
-   unsigned int Op;

 
    while (1)
    {
 
    while (1)
    {

+      string Package;
+      string Version;
+      unsigned int Op;
+

       Start = ParseDepends(Start,Stop,Package,Version,Op,false,!MultiArchEnabled);
       if (Start == 0)
         return _error->Error("Problem parsing dependency %s",Tag);
       Start = ParseDepends(Start,Stop,Package,Version,Op,false,!MultiArchEnabled);
       if (Start == 0)
         return _error->Error("Problem parsing dependency %s",Tag);

+      size_t const found = Package.rfind(':');

 
 

-      if (MultiArchEnabled == true &&
+      // If negative is unspecific it needs to apply on all architectures
+      if (MultiArchEnabled == true && found == string::npos &&

          (Type == pkgCache::Dep::Conflicts ||
           Type == pkgCache::Dep::DpkgBreaks ||
           Type == pkgCache::Dep::Replaces))
          (Type == pkgCache::Dep::Conflicts ||
           Type == pkgCache::Dep::DpkgBreaks ||
           Type == pkgCache::Dep::Replaces))


@@ -645,9 +645,33 @@ bool debListParser::ParseDepends(pkgCache::VerIterator &Ver,
              a != Architectures.end(); ++a)
            if (NewDepends(Ver,Package,*a,Version,Op,Type) == false)
               return false;
              a != Architectures.end(); ++a)
            if (NewDepends(Ver,Package,*a,Version,Op,Type) == false)
               return false;

+        if (NewDepends(Ver,Package,"none",Version,Op,Type) == false)
+           return false;
+      }
+      else if (MultiArchEnabled == true && found != string::npos &&
+              strcmp(Package.c_str() + found, ":any") != 0)
+      {
+        string Arch = Package.substr(found+1, string::npos);
+        Package = Package.substr(0, found);
+        // Such dependencies are not supposed to be accepted …
+        // … but this is probably the best thing to do.
+        if (Arch == "native")
+           Arch = _config->Find("APT::Architecture");
+        if (NewDepends(Ver,Package,Arch,Version,Op,Type) == false)
+           return false;
+      }
+      else
+      {
+        if (NewDepends(Ver,Package,pkgArch,Version,Op,Type) == false)
+           return false;
+        if ((Type == pkgCache::Dep::Conflicts ||
+             Type == pkgCache::Dep::DpkgBreaks ||
+             Type == pkgCache::Dep::Replaces) &&
+            NewDepends(Ver, Package,
+                       (pkgArch != "none") ? "none" : _config->Find("APT::Architecture"),
+                       Version,Op,Type) == false)
+           return false;

       }
       }

-      else if (NewDepends(Ver,Package,pkgArch,Version,Op,Type) == false)
-        return false;

       if (Start == Stop)
         break;
    }
       if (Start == Stop)
         break;
    }


@@ -741,13 +765,15 @@ bool debListParser::Step()
          drop the whole section. A missing arch tag only happens (in theory)
          inside the Status file, so that is a positive return */
       string const Architecture = Section.FindS("Architecture");
          drop the whole section. A missing arch tag only happens (in theory)
          inside the Status file, so that is a positive return */
       string const Architecture = Section.FindS("Architecture");

-      if (Architecture.empty() == true)
-        return true;

 
       if (Arch.empty() == true || Arch == "any" || MultiArchEnabled == false)
       {
         if (APT::Configuration::checkArchitecture(Architecture) == true)
            return true;
 
       if (Arch.empty() == true || Arch == "any" || MultiArchEnabled == false)
       {
         if (APT::Configuration::checkArchitecture(Architecture) == true)
            return true;

+        /* parse version stanzas without an architecture only in the status file
+           (and as misfortune bycatch flat-archives) */
+        if ((Arch.empty() == true || Arch == "any") && Architecture.empty() == true)
+           return true;

       }
       else
       {
       }
       else
       {


@@ -771,7 +797,8 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,
 {
    // apt-secure does no longer download individual (per-section) Release
    // file. to provide Component pinning we use the section name now
 {
    // apt-secure does no longer download individual (per-section) Release
    // file. to provide Component pinning we use the section name now

-   FileI->Component = WriteUniqString(component);
+   map_ptrloc const storage = WriteUniqString(component);
+   FileI->Component = storage;

 
    // FIXME: Code depends on the fact that Release files aren't compressed
    FILE* release = fdopen(dup(File.Fd()), "r");
 
    // FIXME: Code depends on the fact that Release files aren't compressed
    FILE* release = fdopen(dup(File.Fd()), "r");


@@ -858,13 +885,14 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,
               break;
            *s = '\0';
         }
               break;
            *s = '\0';
         }

+        map_ptrloc const storage = WriteUniqString(data);

         switch (writeTo) {
         switch (writeTo) {

-        case Suite: FileI->Archive = WriteUniqString(data); break;
-        case Component: FileI->Component = WriteUniqString(data); break;
-        case Version: FileI->Version = WriteUniqString(data); break;
-        case Origin: FileI->Origin = WriteUniqString(data); break;
-        case Codename: FileI->Codename = WriteUniqString(data); break;
-        case Label: FileI->Label = WriteUniqString(data); break;
+        case Suite: FileI->Archive = storage; break;
+        case Component: FileI->Component = storage; break;
+        case Version: FileI->Version = storage; break;
+        case Origin: FileI->Origin = storage; break;
+        case Codename: FileI->Codename = storage; break;
+        case Label: FileI->Label = storage; break;

         case None: break;
         }
       }
         case None: break;
         }
       }