Fix a segfault in the version merger introduced in the previous patch:

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

diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 5fbb43a9f357e06c6e2ba2d91b7a368d34438882..66108d8220e96be3c0c76d9bc16baf217135b1bf 100644 (file)
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: deblistparser.cc,v 1.4 1998/07/07 04:17:16 jgg Exp $
+// $Id: deblistparser.cc,v 1.29.2.5 2004/01/06 01:43:44 mdz Exp $

 /* ######################################################################
    
    Package Cache Generator - Generator for the cache structure.
 /* ######################################################################
    
    Package Cache Generator - Generator for the cache structure.


@@ -10,52 +10,31 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#include <pkglib/deblistparser.h>
-#include <pkglib/error.h>
-#include <system.h>
+#include <apt-pkg/deblistparser.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/crc-16.h>
+#include <apt-pkg/md5.h>
+#include <apt-pkg/macros.h>
+
+#include <ctype.h>

                                                                        /*}}}*/
 
                                                                        /*}}}*/
 

+static debListParser::WordList PrioList[] = {{"important",pkgCache::State::Important},
+                       {"required",pkgCache::State::Required},
+                       {"standard",pkgCache::State::Standard},
+                       {"optional",pkgCache::State::Optional},
+                      {"extra",pkgCache::State::Extra},
+                       {}};
+

 // ListParser::debListParser - Constructor                             /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // ListParser::debListParser - Constructor                             /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-debListParser::debListParser(File &File) : Tags(File)
-{
-}
-                                                                       /*}}}*/
-// ListParser::FindTag - Find the tag and return a string              /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debListParser::FindTag(const char *Tag)
+debListParser::debListParser(FileFd *File) : Tags(File)

 {
 {

-   const char *Start;
-   const char *Stop;
-   if (Section.Find(Tag,Start,Stop) == false)
-      return string();
-   return string(Start,Stop - Start);
-}
-                                                                       /*}}}*/
-// ListParser::FindTagI - Find the tag and return an int               /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-signed long debListParser::FindTagI(const char *Tag,signed long Default)
-{
-   const char *Start;
-   const char *Stop;
-   if (Section.Find(Tag,Start,Stop) == false)
-      return Default;
-   
-   // Copy it into a temp buffer so we can use strtol
-   char S[300];
-   if ((unsigned)(Stop - Start) >= sizeof(S))
-      return Default;
-   strncpy(S,Start,Stop-Start);
-   S[Stop - Start] = 0;
-   
-   char *End;
-   signed long Result = strtol(S,&End,10);
-   if (S == End)
-      return Default;
-   return Result;
+   Arch = _config->Find("APT::architecture");

 }
                                                                        /*}}}*/
 // ListParser::UniqFindTagWrite - Find the tag and write a unq string  /*{{{*/
 }
                                                                        /*}}}*/
 // ListParser::UniqFindTagWrite - Find the tag and write a unq string  /*{{{*/


@@ -70,47 +49,14 @@ unsigned long debListParser::UniqFindTagWrite(const char *Tag)
    return WriteUniqString(Start,Stop - Start);
 }
                                                                        /*}}}*/
    return WriteUniqString(Start,Stop - Start);
 }
                                                                        /*}}}*/

-// ListParser::HandleFlag - Sets a flag variable based on a tag                /*{{{*/
-// ---------------------------------------------------------------------
-/* This checks the tag for true/false yes/no etc */
-bool debListParser::HandleFlag(const char *Tag,unsigned long &Flags,
-                              unsigned long Flag)
-{
-   const char *Start;
-   const char *Stop;
-   if (Section.Find(Tag,Start,Stop) == false)
-      return true;
-   
-   int Set = 2;
-   if (strncasecmp(Start,"yes",Stop - Start) == 0)
-      Set = 1;
-   if (strncasecmp(Start,"true",Stop - Start) == 0)
-      Set = 1;
-   if (strncasecmp(Start,"no",Stop - Start) == 0)
-      Set = 0;
-   if (strncasecmp(Start,"false",Stop - Start) == 0)
-      Set = 0;
-   if (Set == 2)
-   {
-      _error->Warning("Unknown flag value");
-      return true;
-   }
-   
-   if (Set == 0)
-      Flags &= ~Flag;
-   if (Set == 1)
-      Flags |= Flag;
-   return true;
-}
-                                                                       /*}}}*/

 // ListParser::Package - Return the package name                       /*{{{*/
 // ---------------------------------------------------------------------
 /* This is to return the name of the package this section describes */
 string debListParser::Package()
 {
 // ListParser::Package - Return the package name                       /*{{{*/
 // ---------------------------------------------------------------------
 /* This is to return the name of the package this section describes */
 string debListParser::Package()
 {

-   string Result = FindTag("Package");
+   string Result = Section.FindS("Package");

    if (Result.empty() == true)
    if (Result.empty() == true)

-      _error->Error("Encoutered a section with no Package: header");
+      _error->Error("Encountered a section with no Package: header");

    return Result;
 }
                                                                        /*}}}*/
    return Result;
 }
                                                                        /*}}}*/


@@ -121,7 +67,7 @@ string debListParser::Package()
    entry is assumed to only describe package properties */
 string debListParser::Version()
 {
    entry is assumed to only describe package properties */
 string debListParser::Version()
 {

-   return FindTag("Version");
+   return Section.FindS("Version");

 }
                                                                        /*}}}*/
 // ListParser::NewVersion - Fill in the version structure              /*{{{*/
 }
                                                                        /*}}}*/
 // ListParser::NewVersion - Fill in the version structure              /*{{{*/


@@ -130,36 +76,28 @@ string debListParser::Version()
 bool debListParser::NewVersion(pkgCache::VerIterator Ver)
 {
    // Parse the section
 bool debListParser::NewVersion(pkgCache::VerIterator Ver)
 {
    // Parse the section

-   if ((Ver->Section = UniqFindTagWrite("Section")) == 0)
-      return _error->Warning("Missing Section tag");
+   Ver->Section = UniqFindTagWrite("Section");
+   Ver->Arch = UniqFindTagWrite("Architecture");

    
    // Archive Size
    
    // Archive Size

-   if ((Ver->Size = (unsigned)FindTagI("Size")) == 0)
-      return _error->Error("Unparsable Size field");
+   Ver->Size = (unsigned)Section.FindI("Size");

    
    // Unpacked Size (in K)
    
    // Unpacked Size (in K)

-   if ((Ver->InstalledSize = (unsigned)FindTagI("Installed-Size")) == 0)
-      return _error->Error("Unparsable Installed-Size field");
+   Ver->InstalledSize = (unsigned)Section.FindI("Installed-Size");

    Ver->InstalledSize *= 1024;
 
    // Priority
    const char *Start;
    const char *Stop;
    if (Section.Find("Priority",Start,Stop) == true)
    Ver->InstalledSize *= 1024;
 
    // Priority
    const char *Start;
    const char *Stop;
    if (Section.Find("Priority",Start,Stop) == true)

-   {
-      WordList PrioList[] = {{"important",pkgCache::State::Important},
-                            {"required",pkgCache::State::Required},
-                            {"standard",pkgCache::State::Standard},
-                            {"optional",pkgCache::State::Optional},
-                            {"extra",pkgCache::State::Extra}};
-      if (GrabWord(string(Start,Stop-Start),PrioList,
-                  _count(PrioList),Ver->Priority) == false)
-        return _error->Error("Malformed Priority line");
+   {      
+      if (GrabWord(string(Start,Stop-Start),PrioList,Ver->Priority) == false)
+        Ver->Priority = pkgCache::State::Extra;

    }
 
    if (ParseDepends(Ver,"Depends",pkgCache::Dep::Depends) == false)
       return false;
    }
 
    if (ParseDepends(Ver,"Depends",pkgCache::Dep::Depends) == false)
       return false;

-   if (ParseDepends(Ver,"PreDepends",pkgCache::Dep::PreDepends) == false)
+   if (ParseDepends(Ver,"Pre-Depends",pkgCache::Dep::PreDepends) == false)

       return false;
    if (ParseDepends(Ver,"Suggests",pkgCache::Dep::Suggests) == false)
       return false;
       return false;
    if (ParseDepends(Ver,"Suggests",pkgCache::Dep::Suggests) == false)
       return false;


@@ -167,15 +105,75 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver)
       return false;
    if (ParseDepends(Ver,"Conflicts",pkgCache::Dep::Conflicts) == false)
       return false;
       return false;
    if (ParseDepends(Ver,"Conflicts",pkgCache::Dep::Conflicts) == false)
       return false;

-   if (ParseDepends(Ver,"Replaces",pkgCache::Dep::Depends) == false)
+   if (ParseDepends(Ver,"Breaks",pkgCache::Dep::DpkgBreaks) == false)
+      return false;
+   if (ParseDepends(Ver,"Replaces",pkgCache::Dep::Replaces) == false)
+      return false;
+   if (ParseDepends(Ver,"Enhances",pkgCache::Dep::Enhances) == false)

       return false;
 
       return false;
 

+   // Obsolete.
+   if (ParseDepends(Ver,"Optional",pkgCache::Dep::Suggests) == false)
+      return false;
+   

    if (ParseProvides(Ver) == false)
       return false;
    
    return true;
 }
                                                                        /*}}}*/
    if (ParseProvides(Ver) == false)
       return false;
    
    return true;
 }
                                                                        /*}}}*/

+// ListParser::Description - Return the description string             /*{{{*/
+// ---------------------------------------------------------------------
+/* This is to return the string describing the package in debian
+   form. If this returns the blank string then the entry is assumed to
+   only describe package properties */
+string debListParser::Description()
+{
+   string const lang = DescriptionLanguage();
+   if (lang.empty())
+      return Section.FindS("Description");
+   else
+      return Section.FindS(string("Description-").append(lang).c_str());
+}
+                                                                        /*}}}*/
+// ListParser::DescriptionLanguage - Return the description lang string        /*{{{*/
+// ---------------------------------------------------------------------
+/* This is to return the string describing the language of
+   description. If this returns the blank string then the entry is
+   assumed to describe original description. */
+string debListParser::DescriptionLanguage()
+{
+   if (Section.FindS("Description").empty() == false)
+      return "";
+
+   std::vector<string> const lang = APT::Configuration::getLanguages();
+   for (std::vector<string>::const_iterator l = lang.begin();
+       l != lang.end(); l++)
+      if (Section.FindS(string("Description-").append(*l).c_str()).empty() == false)
+        return *l;
+
+   return "";
+}
+                                                                        /*}}}*/
+// ListParser::Description - Return the description_md5 MD5SumValue    /*{{{*/
+// ---------------------------------------------------------------------
+/* This is to return the md5 string to allow the check if it is the right
+   description. If no Description-md5 is found in the section it will be
+   calculated.
+ */
+MD5SumValue debListParser::Description_md5()
+{
+   string value = Section.FindS("Description-md5");
+
+   if (value.empty()) 
+   {
+      MD5Summation md5;
+      md5.Add((Description() + "\n").c_str());
+      return md5.Result();
+   } else
+      return MD5SumValue(value);
+}
+                                                                        /*}}}*/

 // ListParser::UsePackage - Update a package structure                 /*{{{*/
 // ---------------------------------------------------------------------
 /* This is called to update the package with any new information 
 // ListParser::UsePackage - Update a package structure                 /*{{{*/
 // ---------------------------------------------------------------------
 /* This is called to update the package with any new information 


@@ -184,24 +182,69 @@ bool debListParser::UsePackage(pkgCache::PkgIterator Pkg,
                               pkgCache::VerIterator Ver)
 {
    if (Pkg->Section == 0)
                               pkgCache::VerIterator Ver)
 {
    if (Pkg->Section == 0)

-      if ((Pkg->Section = UniqFindTagWrite("Section")) == 0)
-        return false;
-   if (HandleFlag("Essential",Pkg->Flags,pkgCache::Flag::Essential) == false)
+      Pkg->Section = UniqFindTagWrite("Section");
+   if (Section.FindFlag("Essential",Pkg->Flags,pkgCache::Flag::Essential) == false)

       return false;
       return false;

-   if (HandleFlag("Immediate-Configure",Pkg->Flags,pkgCache::Flag::ImmediateConf) == false)
+   if (Section.FindFlag("Important",Pkg->Flags,pkgCache::Flag::Important) == false)

       return false;
       return false;

+
+   if (strcmp(Pkg.Name(),"apt") == 0)
+      Pkg->Flags |= pkgCache::Flag::Important;
+   

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

+// ListParser::VersionHash - Compute a unique hash for this version    /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+unsigned short debListParser::VersionHash()
+{
+   const char *Sections[] ={"Installed-Size",
+                            "Depends",
+                            "Pre-Depends",
+//                            "Suggests",
+//                            "Recommends",
+                            "Conflicts",
+                            "Breaks",
+                            "Replaces",0};
+   unsigned long Result = INIT_FCS;
+   char S[1024];
+   for (const char **I = Sections; *I != 0; I++)
+   {
+      const char *Start;
+      const char *End;
+      if (Section.Find(*I,Start,End) == false || End - Start >= (signed)sizeof(S))
+        continue;
+      
+      /* Strip out any spaces from the text, this undoes dpkgs reformatting
+         of certain fields. dpkg also has the rather interesting notion of
+         reformatting depends operators < -> <= */
+      char *I = S;
+      for (; Start != End; Start++)
+      {
+        if (isspace(*Start) == 0)
+           *I++ = tolower_ascii(*Start);
+        if (*Start == '<' && Start[1] != '<' && Start[1] != '=')
+           *I++ = '=';
+        if (*Start == '>' && Start[1] != '>' && Start[1] != '=')
+           *I++ = '=';
+      }
+
+      Result = AddCRC16(Result,S,I - S);
+   }
+   
+   return Result;
+}
+                                                                       /*}}}*/

 // ListParser::ParseStatus - Parse the status field                    /*{{{*/
 // ---------------------------------------------------------------------
 /* Status lines are of the form,
      Status: want flag status
    want = unknown, install, hold, deinstall, purge
    flag = ok, reinstreq, hold, hold-reinstreq
 // ListParser::ParseStatus - Parse the status field                    /*{{{*/
 // ---------------------------------------------------------------------
 /* Status lines are of the form,
      Status: want flag status
    want = unknown, install, hold, deinstall, purge
    flag = ok, reinstreq, hold, hold-reinstreq

-   status = not-installed, unpacked, half-configured, uninstalled,
+   status = not-installed, unpacked, half-configured,

             half-installed, config-files, post-inst-failed, 
             removal-failed, installed
    
             half-installed, config-files, post-inst-failed, 
             removal-failed, installed
    


@@ -227,9 +270,9 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator Pkg,
                           {"install",pkgCache::State::Install},
                           {"hold",pkgCache::State::Hold},
                           {"deinstall",pkgCache::State::DeInstall},
                           {"install",pkgCache::State::Install},
                           {"hold",pkgCache::State::Hold},
                           {"deinstall",pkgCache::State::DeInstall},

-                          {"purge",pkgCache::State::Purge}};
-   if (GrabWord(string(Start,I-Start),WantList,
-               _count(WantList),Pkg->SelectedState) == false)
+                          {"purge",pkgCache::State::Purge},
+                          {}};
+   if (GrabWord(string(Start,I-Start),WantList,Pkg->SelectedState) == false)

       return _error->Error("Malformed 1st word in the Status line");
 
    // Isloate the next word
       return _error->Error("Malformed 1st word in the Status line");
 
    // Isloate the next word


@@ -243,9 +286,9 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator Pkg,
    WordList FlagList[] = {{"ok",pkgCache::State::Ok},
                           {"reinstreq",pkgCache::State::ReInstReq},
                           {"hold",pkgCache::State::HoldInst},
    WordList FlagList[] = {{"ok",pkgCache::State::Ok},
                           {"reinstreq",pkgCache::State::ReInstReq},
                           {"hold",pkgCache::State::HoldInst},

-                          {"hold-reinstreq",pkgCache::State::HoldReInstReq}};
-   if (GrabWord(string(Start,I-Start),FlagList,
-               _count(FlagList),Pkg->InstState) == false)
+                          {"hold-reinstreq",pkgCache::State::HoldReInstReq},
+                          {}};
+   if (GrabWord(string(Start,I-Start),FlagList,Pkg->InstState) == false)

       return _error->Error("Malformed 2nd word in the Status line");
 
    // Isloate the last word
       return _error->Error("Malformed 2nd word in the Status line");
 
    // Isloate the last word


@@ -260,13 +303,14 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator Pkg,
                             {"unpacked",pkgCache::State::UnPacked},
                             {"half-configured",pkgCache::State::HalfConfigured},
                             {"installed",pkgCache::State::Installed},
                             {"unpacked",pkgCache::State::UnPacked},
                             {"half-configured",pkgCache::State::HalfConfigured},
                             {"installed",pkgCache::State::Installed},

-                            {"uninstalled",pkgCache::State::UnInstalled},

                             {"half-installed",pkgCache::State::HalfInstalled},
                             {"config-files",pkgCache::State::ConfigFiles},
                             {"half-installed",pkgCache::State::HalfInstalled},
                             {"config-files",pkgCache::State::ConfigFiles},

+                            {"triggers-awaited",pkgCache::State::TriggersAwaited},
+                            {"triggers-pending",pkgCache::State::TriggersPending},

                             {"post-inst-failed",pkgCache::State::HalfConfigured},
                             {"post-inst-failed",pkgCache::State::HalfConfigured},

-                            {"removal-failed",pkgCache::State::HalfInstalled}};
-   if (GrabWord(string(Start,I-Start),StatusList,
-               _count(StatusList),Pkg->CurrentState) == false)
+                            {"removal-failed",pkgCache::State::HalfInstalled},
+                            {}};
+   if (GrabWord(string(Start,I-Start),StatusList,Pkg->CurrentState) == false)

       return _error->Error("Malformed 3rd word in the Status line");
 
    /* A Status line marks the package as indicating the current
       return _error->Error("Malformed 3rd word in the Status line");
 
    /* A Status line marks the package as indicating the current


@@ -284,6 +328,65 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator Pkg,
    
    return true;
 }
    
    return true;
 }

+
+const char *debListParser::ConvertRelation(const char *I,unsigned int &Op)
+{
+   // Determine the operator
+   switch (*I)
+   {
+      case '<':
+      I++;
+      if (*I == '=')
+      {
+        I++;
+        Op = pkgCache::Dep::LessEq;
+        break;
+      }
+      
+      if (*I == '<')
+      {
+        I++;
+        Op = pkgCache::Dep::Less;
+        break;
+      }
+      
+      // < is the same as <= and << is really Cs < for some reason
+      Op = pkgCache::Dep::LessEq;
+      break;
+      
+      case '>':
+      I++;
+      if (*I == '=')
+      {
+        I++;
+        Op = pkgCache::Dep::GreaterEq;
+        break;
+      }
+      
+      if (*I == '>')
+      {
+        I++;
+        Op = pkgCache::Dep::Greater;
+        break;
+      }
+      
+      // > is the same as >= and >> is really Cs > for some reason
+      Op = pkgCache::Dep::GreaterEq;
+      break;
+      
+      case '=':
+      Op = pkgCache::Dep::Equals;
+      I++;
+      break;
+      
+      // HACK around bad package definitions
+      default:
+      Op = pkgCache::Dep::Equals;
+      break;
+   }
+   return I;
+}
+

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


@@ -291,7 +394,8 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator Pkg,
    bit by bit. */
 const char *debListParser::ParseDepends(const char *Start,const char *Stop,
                                        string &Package,string &Ver,
    bit by bit. */
 const char *debListParser::ParseDepends(const char *Start,const char *Stop,
                                        string &Package,string &Ver,

-                                       unsigned int &Op)
+                                       unsigned int &Op, bool const &ParseArchFlags,
+                                       bool const &StripMultiArch)

 {
    // Strip off leading space
    for (;Start != Stop && isspace(*Start) != 0; Start++);
 {
    // Strip off leading space
    for (;Start != Stop && isspace(*Start) != 0; Start++);


@@ -310,7 +414,14 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
    
    // Stash the package name
    Package.assign(Start,I - Start);
    
    // Stash the package name
    Package.assign(Start,I - Start);

-   
+
+   // We don't want to confuse library users which can't handle MultiArch
+   if (StripMultiArch == true) {
+      size_t const found = Package.rfind(':');
+      if (found != string::npos)
+        Package = Package.substr(0,found);
+   }
+

    // Skip white space to the '('
    for (;I != Stop && isspace(*I) != 0 ; I++);
    
    // Skip white space to the '('
    for (;I != Stop && isspace(*I) != 0 ; I++);
    


@@ -321,60 +432,7 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
       for (I++; I != Stop && isspace(*I) != 0 ; I++);
       if (I + 3 >= Stop)
         return 0;
       for (I++; I != Stop && isspace(*I) != 0 ; I++);
       if (I + 3 >= Stop)
         return 0;

-      
-      // Determine the operator
-      switch (*I)
-      {
-        case '<':
-        I++;
-        if (*I == '=')
-        {
-           I++;
-           Op = pkgCache::Dep::LessEq;
-           break;
-        }
-        
-        if (*I == '<')
-        {
-           I++;
-           Op = pkgCache::Dep::Less;
-           break;
-        }
-        
-        // < is the same as <= and << is really Cs < for some reason
-        Op = pkgCache::Dep::LessEq;
-        break;
-        
-        case '>':
-        I++;
-        if (*I == '=')
-        {
-           I++;
-           Op = pkgCache::Dep::GreaterEq;
-           break;
-        }
-        
-        if (*I == '>')
-        {
-           I++;
-           Op = pkgCache::Dep::Greater;
-           break;
-        }
-        
-        // > is the same as >= and >> is really Cs > for some reason
-        Op = pkgCache::Dep::GreaterEq;
-        break;
-        
-        case '=':
-        Op = pkgCache::Dep::Equals;
-        I++;
-        break;
-        
-        // HACK around bad package definitions
-        default:
-        Op = pkgCache::Dep::Equals;
-        break;
-      }
+      I = ConvertRelation(I,Op);

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


@@ -383,17 +441,75 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
       if (I == Stop || Start == I)
         return 0;     
       
       if (I == Stop || Start == I)
         return 0;     
       

-      Ver = string(Start,I-Start);
+      // Skip trailing whitespace
+      const char *End = I;
+      for (; End > Start && isspace(End[-1]); End--);
+      
+      Ver.assign(Start,End-Start);

       I++;
    }
    else
    {
       I++;
    }
    else
    {

-      Ver = string();
+      Ver.clear();

       Op = pkgCache::Dep::NoOp;
    }
    
    // Skip whitespace
    for (;I != Stop && isspace(*I) != 0; I++);
       Op = pkgCache::Dep::NoOp;
    }
    
    // Skip whitespace
    for (;I != Stop && isspace(*I) != 0; I++);

+
+   if (ParseArchFlags == true)
+   {
+      string arch = _config->Find("APT::Architecture");
+
+      // Parse an architecture
+      if (I != Stop && *I == '[')
+      {
+        // malformed
+         I++;
+         if (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) 
+              return 0;
+
+           if (*I == '!')
+            {
+              NegArch = true;
+              I++;
+            }
+
+           if (stringcmp(arch,I,End) == 0)
+              Found = true;
+           
+           if (*End++ == ']') {
+              I = End;
+              break;
+           }
+           
+           I = End;
+           for (;I != Stop && isspace(*I) != 0; I++);
+         }
+
+        if (NegArch)
+           Found = !Found;
+        
+         if (Found == false)
+           Package = ""; /* not for this arch */
+      }
+      
+      // Skip whitespace
+      for (;I != Stop && isspace(*I) != 0; I++);
+   }
+

    if (I != Stop && *I == '|')
       Op |= pkgCache::Dep::Or;
    
    if (I != Stop && *I == '|')
       Op |= pkgCache::Dep::Or;
    


@@ -423,13 +539,16 @@ bool debListParser::ParseDepends(pkgCache::VerIterator Ver,
    string Version;
    unsigned int Op;
 
    string Version;
    unsigned int Op;
 

-   while ((Start = ParseDepends(Start,Stop,Package,Version,Op)) != Stop)
+   while (1)

    {
    {

+      Start = ParseDepends(Start,Stop,Package,Version,Op);

       if (Start == 0)
         return _error->Error("Problem parsing dependency %s",Tag);
       if (Start == 0)
         return _error->Error("Problem parsing dependency %s",Tag);

-
+      

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

+      if (Start == Stop)
+        break;

    }
    return true;
 }
    }
    return true;
 }


@@ -453,11 +572,12 @@ bool debListParser::ParseProvides(pkgCache::VerIterator Ver)
       Start = ParseDepends(Start,Stop,Package,Version,Op);
       if (Start == 0)
         return _error->Error("Problem parsing Provides line");
       Start = ParseDepends(Start,Stop,Package,Version,Op);
       if (Start == 0)
         return _error->Error("Problem parsing Provides line");

-      if (Op != pkgCache::Dep::NoOp)
-        return _error->Error("Malformed provides line");
-
-      if (NewProvides(Ver,Package,Version) == false)
-        return false;
+      if (Op != pkgCache::Dep::NoOp) {
+        _error->Warning("Ignoring Provides line with DepCompareOp for package %s", Package.c_str());
+      } else {
+        if (NewProvides(Ver,Package,Version) == false)
+           return false;
+      }

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


@@ -469,10 +589,9 @@ bool debListParser::ParseProvides(pkgCache::VerIterator Ver)
 // ListParser::GrabWord - Matches a word and returns                   /*{{{*/
 // ---------------------------------------------------------------------
 /* Looks for a word in a list of words - for ParseStatus */
 // ListParser::GrabWord - Matches a word and returns                   /*{{{*/
 // ---------------------------------------------------------------------
 /* Looks for a word in a list of words - for ParseStatus */

-bool debListParser::GrabWord(string Word,WordList *List,int Count,
-                            unsigned char &Out)
+bool debListParser::GrabWord(string Word,WordList *List,unsigned char &Out)

 {
 {

-   for (int C = 0; C != Count; C++)
+   for (unsigned int C = 0; List[C].Str != 0; C++)

    {
       if (strcasecmp(Word.c_str(),List[C].Str) == 0)
       {
    {
       if (strcasecmp(Word.c_str(),List[C].Str) == 0)
       {


@@ -490,20 +609,19 @@ bool debListParser::Step()
 {
    iOffset = Tags.Offset();
    while (Tags.Step(Section) == true)
 {
    iOffset = Tags.Offset();
    while (Tags.Step(Section) == true)

-   {
-      /* See if this is the correct Architecture, if it isnt then we
-         drop the whole section */
+   {      
+      /* See if this is the correct Architecture, if it isn't then we
+         drop the whole section. A missing arch tag only happens (in theory)
+         inside the Status file, so that is a positive return */

       const char *Start;
       const char *Stop;
       if (Section.Find("Architecture",Start,Stop) == false)
         return true;
       const char *Start;
       const char *Stop;
       if (Section.Find("Architecture",Start,Stop) == false)
         return true;

-            
-      if (strncmp(Start,"i386",Stop - Start) == 0 &&
-         strlen("i386") == (unsigned)(Stop - Start))
+
+      if (stringcmp(Arch,Start,Stop) == 0)

         return true;
 
         return true;
 

-      if (strncmp(Start,"all",Stop - Start) == 0 &&
-         3 == (unsigned)(Stop - Start))
+      if (stringcmp(Start,Stop,"all") == 0)

         return true;
 
       iOffset = Tags.Offset();
         return true;
 
       iOffset = Tags.Offset();


@@ -511,3 +629,57 @@ bool debListParser::Step()
    return false;
 }
                                                                        /*}}}*/
    return false;
 }
                                                                        /*}}}*/

+// ListParser::LoadReleaseInfo - Load the release information          /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator FileI,
+                                   FileFd &File, string component)
+{
+   pkgTagFile Tags(&File, File.Size() + 256); // XXX
+   pkgTagSection Section;
+   if (Tags.Step(Section) == false)
+      return false;
+
+   //mvo: I don't think we need to fill that in (it's unused since apt-0.6)
+   //FileI->Architecture = WriteUniqString(Arch);
+   
+   // 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);
+
+   const char *Start;
+   const char *Stop;
+   if (Section.Find("Suite",Start,Stop) == true)
+      FileI->Archive = WriteUniqString(Start,Stop - Start);
+   if (Section.Find("Component",Start,Stop) == true)
+      FileI->Component = WriteUniqString(Start,Stop - Start);
+   if (Section.Find("Version",Start,Stop) == true)
+      FileI->Version = WriteUniqString(Start,Stop - Start);
+   if (Section.Find("Origin",Start,Stop) == true)
+      FileI->Origin = WriteUniqString(Start,Stop - Start);
+   if (Section.Find("Codename",Start,Stop) == true)
+      FileI->Codename = WriteUniqString(Start,Stop - Start);
+   if (Section.Find("Label",Start,Stop) == true)
+      FileI->Label = WriteUniqString(Start,Stop - Start);
+   if (Section.Find("Architecture",Start,Stop) == true)
+      FileI->Architecture = WriteUniqString(Start,Stop - Start);
+   
+   if (Section.FindFlag("NotAutomatic",FileI->Flags,
+                       pkgCache::Flag::NotAutomatic) == false)
+      _error->Warning("Bad NotAutomatic flag");
+
+   return !_error->PendingError();
+}
+                                                                       /*}}}*/
+// ListParser::GetPrio - Convert the priority from a string            /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+unsigned char debListParser::GetPrio(string Str)
+{
+   unsigned char Out;
+   if (GrabWord(Str,PrioList,Out) == false)
+      Out = pkgCache::State::Extra;
+   
+   return Out;
+}
+                                                                       /*}}}*/