fix partial (206 and 416) support in https

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

diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 3b2c08e3428184d8717756da0ba777a36477e3d3..7ce7aba7bc742cd7a56f10d16d6c0b8b82b2e97a 100644 (file)
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -35,12 +35,14 @@
 
 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/

-typedef vector<pkgIndexFile *>::iterator FileIterator;
+typedef std::vector<pkgIndexFile *>::iterator FileIterator;

 template <typename Iter> std::vector<Iter*> pkgCacheGenerator::Dynamic<Iter>::toReMap;
 
 template <typename Iter> std::vector<Iter*> pkgCacheGenerator::Dynamic<Iter>::toReMap;
 

-bool IsDuplicateDescription(pkgCache::DescIterator Desc,
+static bool IsDuplicateDescription(pkgCache::DescIterator Desc,

                            MD5SumValue const &CurMd5, std::string const &CurLang);
 
                            MD5SumValue const &CurMd5, std::string const &CurLang);
 

+using std::string;
+

 // CacheGenerator::pkgCacheGenerator - Constructor                     /*{{{*/
 // ---------------------------------------------------------------------
 /* We set the dirty flag and make sure that is written to the disk */
 // CacheGenerator::pkgCacheGenerator - Constructor                     /*{{{*/
 // ---------------------------------------------------------------------
 /* We set the dirty flag and make sure that is written to the disk */


@@ -67,7 +69,9 @@ pkgCacheGenerator::pkgCacheGenerator(DynamicMMap *pMap,OpProgress *Prog) :
       *Cache.HeaderP = pkgCache::Header();
       map_ptrloc const idxVerSysName = WriteStringInMap(_system->VS->Label);
       Cache.HeaderP->VerSysName = idxVerSysName;
       *Cache.HeaderP = pkgCache::Header();
       map_ptrloc const idxVerSysName = WriteStringInMap(_system->VS->Label);
       Cache.HeaderP->VerSysName = idxVerSysName;

-      map_ptrloc const idxArchitecture = WriteStringInMap(_config->Find("APT::Architecture"));
+      // this pointer is set in ReMap, but we need it now for WriteUniqString
+      Cache.StringItemP = (pkgCache::StringItem *)Map.Data();
+      map_ptrloc const idxArchitecture = WriteUniqString(_config->Find("APT::Architecture"));

       Cache.HeaderP->Architecture = idxArchitecture;
       if (unlikely(idxVerSysName == 0 || idxArchitecture == 0))
         return;
       Cache.HeaderP->Architecture = idxArchitecture;
       if (unlikely(idxVerSysName == 0 || idxArchitecture == 0))
         return;


@@ -193,18 +197,36 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
       string const Version = List.Version();
       if (Version.empty() == true && Arch.empty() == true)
       {
       string const Version = List.Version();
       if (Version.empty() == true && Arch.empty() == true)
       {

+        // package descriptions

         if (MergeListGroup(List, PackageName) == false)
            return false;
         if (MergeListGroup(List, PackageName) == false)
            return false;

+        continue;

       }
 
       if (Arch.empty() == true)
       }
 
       if (Arch.empty() == true)

-        Arch = _config->Find("APT::Architecture");
+      {
+        // use the pseudo arch 'none' for arch-less packages
+        Arch = "none";
+        /* We might built a SingleArchCache here, which we don't want to blow up
+           just for these :none packages to a proper MultiArchCache, so just ensure
+           that we have always a native package structure first for SingleArch */
+        pkgCache::PkgIterator NP;
+        Dynamic<pkgCache::PkgIterator> DynPkg(NP);
+        if (NewPackage(NP, PackageName, _config->Find("APT::Architecture")) == false)
+        // TRANSLATOR: The first placeholder is a package name,
+        // the other two should be copied verbatim as they include debug info
+        return _error->Error(_("Error occurred while processing %s (%s%d)"),
+                             PackageName.c_str(), "NewPackage", 0);
+      }

 
       // Get a pointer to the package structure
       pkgCache::PkgIterator Pkg;
       Dynamic<pkgCache::PkgIterator> DynPkg(Pkg);
       if (NewPackage(Pkg, PackageName, Arch) == false)
 
       // Get a pointer to the package structure
       pkgCache::PkgIterator Pkg;
       Dynamic<pkgCache::PkgIterator> DynPkg(Pkg);
       if (NewPackage(Pkg, PackageName, Arch) == false)

-        return _error->Error(_("Error occurred while processing %s (NewPackage)"),PackageName.c_str());
+        // TRANSLATOR: The first placeholder is a package name,
+        // the other two should be copied verbatim as they include debug info
+        return _error->Error(_("Error occurred while processing %s (%s%d)"),
+                             PackageName.c_str(), "NewPackage", 1);

 
 
       if (Version.empty() == true)
 
 
       if (Version.empty() == true)


@@ -269,43 +291,48 @@ bool pkgCacheGenerator::MergeListPackage(ListParser &List, pkgCache::PkgIterator
    pkgCache::VerIterator Ver(Cache);
    Dynamic<pkgCache::VerIterator> DynVer(Ver);
    if (List.UsePackage(Pkg, Ver) == false)
    pkgCache::VerIterator Ver(Cache);
    Dynamic<pkgCache::VerIterator> DynVer(Ver);
    if (List.UsePackage(Pkg, Ver) == false)

-      return _error->Error(_("Error occurred while processing %s (UsePackage1)"),
-                          Pkg.Name());
+      return _error->Error(_("Error occurred while processing %s (%s%d)"),
+                          Pkg.Name(), "UsePackage", 1);

 
    // Find the right version to write the description
    MD5SumValue CurMd5 = List.Description_md5();
 
    // Find the right version to write the description
    MD5SumValue CurMd5 = List.Description_md5();

+   if (CurMd5.Value().empty() == true || List.Description().empty() == true)
+      return true;

    std::string CurLang = List.DescriptionLanguage();
 
    for (Ver = Pkg.VersionList(); Ver.end() == false; ++Ver)
    {
    std::string CurLang = List.DescriptionLanguage();
 
    for (Ver = Pkg.VersionList(); Ver.end() == false; ++Ver)
    {

-      pkgCache::DescIterator Desc = Ver.DescriptionList();
+      pkgCache::DescIterator VerDesc = Ver.DescriptionList();

 
       // a version can only have one md5 describing it
 
       // a version can only have one md5 describing it

-      if (MD5SumValue(Desc.md5()) != CurMd5)
+      if (VerDesc.end() == true || MD5SumValue(VerDesc.md5()) != CurMd5)

         continue;
 
       // don't add a new description if we have one for the given
       // md5 && language
         continue;
 
       // don't add a new description if we have one for the given
       // md5 && language

-      if (IsDuplicateDescription(Desc, CurMd5, CurLang) == true)
+      if (IsDuplicateDescription(VerDesc, CurMd5, CurLang) == true)

         continue;
 
         continue;
 

+      pkgCache::DescIterator Desc;

       Dynamic<pkgCache::DescIterator> DynDesc(Desc);
       Dynamic<pkgCache::DescIterator> DynDesc(Desc);

+
+      map_ptrloc const descindex = NewDescription(Desc, CurLang, CurMd5, VerDesc->md5sum);
+      if (unlikely(descindex == 0 && _error->PendingError()))
+        return _error->Error(_("Error occurred while processing %s (%s%d)"),
+                             Pkg.Name(), "NewDescription", 1);
+
+      Desc->ParentPkg = Pkg.Index();
+

       // we add at the end, so that the start is constant as we need
       // that to be able to efficiently share these lists
       // we add at the end, so that the start is constant as we need
       // that to be able to efficiently share these lists

-      map_ptrloc *LastDesc = &Ver->DescriptionList;
-      for (;Desc.end() == false && Desc->NextDesc != 0; ++Desc);
-      if (Desc.end() == false)
-        LastDesc = &Desc->NextDesc;
-
-      void const * const oldMap = Map.Data();
-      map_ptrloc const descindex = NewDescription(Desc, CurLang, CurMd5, *LastDesc);
-      if (oldMap != Map.Data())
-        LastDesc += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap;
-      *LastDesc = descindex;
-      Desc->ParentPkg = Pkg.Index();
+      VerDesc = Ver.DescriptionList(); // old value might be invalid after ReMap
+      for (;VerDesc.end() == false && VerDesc->NextDesc != 0; ++VerDesc);
+      map_ptrloc * const LastNextDesc = (VerDesc.end() == true) ? &Ver->DescriptionList : &VerDesc->NextDesc;
+      *LastNextDesc = descindex;

 
 

-      if ((*LastDesc == 0 && _error->PendingError()) || NewFileDesc(Desc,List) == false)
-        return _error->Error(_("Error occurred while processing %s (NewFileDesc1)"), Pkg.Name());
+      if (NewFileDesc(Desc,List) == false)
+        return _error->Error(_("Error occurred while processing %s (%s%d)"),
+                             Pkg.Name(), "NewFileDesc", 1);

 
       // we can stop here as all "same" versions will share the description
       break;
 
       // we can stop here as all "same" versions will share the description
       break;


@@ -346,12 +373,12 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator
       if (Res == 0 && Ver.end() == false && Ver->Hash == Hash)
       {
         if (List.UsePackage(Pkg,Ver) == false)
       if (Res == 0 && Ver.end() == false && Ver->Hash == Hash)
       {
         if (List.UsePackage(Pkg,Ver) == false)

-           return _error->Error(_("Error occurred while processing %s (UsePackage2)"),
-                                Pkg.Name());
+           return _error->Error(_("Error occurred while processing %s (%s%d)"),
+                                Pkg.Name(), "UsePackage", 2);

 
         if (NewFileVer(Ver,List) == false)
 
         if (NewFileVer(Ver,List) == false)

-           return _error->Error(_("Error occurred while processing %s (NewFileVer1)"),
-                                Pkg.Name());
+           return _error->Error(_("Error occurred while processing %s (%s%d)"),
+                                Pkg.Name(), "NewFileVer", 1);

 
         // Read only a single record and return
         if (OutVer != 0)
 
         // Read only a single record and return
         if (OutVer != 0)


@@ -365,28 +392,86 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator
    }
 
    // Add a new version
    }
 
    // Add a new version

-   map_ptrloc const verindex = NewVersion(Ver,Version,*LastVer);
+   map_ptrloc const verindex = NewVersion(Ver, Version, Pkg.Index(), Hash, *LastVer);

    if (verindex == 0 && _error->PendingError())
    if (verindex == 0 && _error->PendingError())

-      return _error->Error(_("Error occurred while processing %s (NewVersion%d)"),
-                          Pkg.Name(), 1);
+      return _error->Error(_("Error occurred while processing %s (%s%d)"),
+                          Pkg.Name(), "NewVersion", 1);

 
    if (oldMap != Map.Data())
         LastVer += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap;
    *LastVer = verindex;
 
    if (oldMap != Map.Data())
         LastVer += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap;
    *LastVer = verindex;

-   Ver->ParentPkg = Pkg.Index();
-   Ver->Hash = Hash;

 
 

-   if (List.NewVersion(Ver) == false)
-      return _error->Error(_("Error occurred while processing %s (NewVersion%d)"),
-                          Pkg.Name(), 2);
+   if (unlikely(List.NewVersion(Ver) == false))
+      return _error->Error(_("Error occurred while processing %s (%s%d)"),
+                          Pkg.Name(), "NewVersion", 2);
+
+   if (unlikely(List.UsePackage(Pkg,Ver) == false))
+      return _error->Error(_("Error occurred while processing %s (%s%d)"),
+                          Pkg.Name(), "UsePackage", 3);
+
+   if (unlikely(NewFileVer(Ver,List) == false))
+      return _error->Error(_("Error occurred while processing %s (%s%d)"),
+                          Pkg.Name(), "NewFileVer", 2);
+
+   pkgCache::GrpIterator Grp = Pkg.Group();
+   Dynamic<pkgCache::GrpIterator> DynGrp(Grp);

 
 

-   if (List.UsePackage(Pkg,Ver) == false)
-      return _error->Error(_("Error occurred while processing %s (UsePackage3)"),
-                          Pkg.Name());
+   /* If it is the first version of this package we need to add implicit
+      Multi-Arch dependencies to all other package versions in the group now -
+      otherwise we just add them for this new version */
+   if (Pkg.VersionList()->NextVer == 0)
+   {
+      pkgCache::PkgIterator P = Grp.PackageList();
+      Dynamic<pkgCache::PkgIterator> DynP(P);
+      for (; P.end() != true; P = Grp.NextPkg(P))
+      {
+        if (P->ID == Pkg->ID)
+           continue;
+        pkgCache::VerIterator V = P.VersionList();
+        Dynamic<pkgCache::VerIterator> DynV(V);
+        for (; V.end() != true; ++V)
+           if (unlikely(AddImplicitDepends(V, Pkg) == false))
+              return _error->Error(_("Error occurred while processing %s (%s%d)"),
+                                   Pkg.Name(), "AddImplicitDepends", 1);
+      }
+      /* :none packages are packages without an architecture. They are forbidden by
+        debian-policy, so usually they will only be in (old) dpkg status files -
+        and dpkg will complain about them - and are pretty rare. We therefore do
+        usually not create conflicts while the parent is created, but only if a :none
+        package (= the target) appears. This creates incorrect dependencies on :none
+        for architecture-specific dependencies on the package we copy from, but we
+        will ignore this bug as architecture-specific dependencies are only allowed
+        in jessie and until then the :none packages should be extinct (hopefully).
+        In other words: This should work long enough to allow graceful removal of
+        these packages, it is not supposed to allow users to keep using them … */
+      if (strcmp(Pkg.Arch(), "none") == 0)
+      {
+        pkgCache::PkgIterator M = Grp.FindPreferredPkg();
+        if (M.end() == false && Pkg != M)
+        {
+           pkgCache::DepIterator D = M.RevDependsList();
+           Dynamic<pkgCache::DepIterator> DynD(D);
+           for (; D.end() == false; ++D)
+           {
+              if ((D->Type != pkgCache::Dep::Conflicts &&
+                   D->Type != pkgCache::Dep::DpkgBreaks &&
+                   D->Type != pkgCache::Dep::Replaces) ||
+                  D.ParentPkg().Group() == Grp)
+                 continue;

 
 

-   if (NewFileVer(Ver,List) == false)
-      return _error->Error(_("Error occurred while processing %s (NewVersion%d)"),
-                          Pkg.Name(), 3);
+              map_ptrloc *OldDepLast = NULL;
+              pkgCache::VerIterator ConVersion = D.ParentVer();
+              Dynamic<pkgCache::VerIterator> DynV(ConVersion);
+              // duplicate the Conflicts/Breaks/Replaces for :none arch
+              NewDepends(Pkg, ConVersion, D->Version,
+                    D->CompareOp, D->Type, OldDepLast);
+           }
+        }
+      }
+   }
+   if (unlikely(AddImplicitDepends(Grp, Pkg, Ver) == false))
+      return _error->Error(_("Error occurred while processing %s (%s%d)"),
+                          Pkg.Name(), "AddImplicitDepends", 2);

 
    // Read only a single record and return
    if (OutVer != 0)
 
    // Read only a single record and return
    if (OutVer != 0)


@@ -397,14 +482,13 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator
 
    /* Record the Description (it is not translated) */
    MD5SumValue CurMd5 = List.Description_md5();
 
    /* Record the Description (it is not translated) */
    MD5SumValue CurMd5 = List.Description_md5();

-   if (CurMd5.Value().empty() == true)
+   if (CurMd5.Value().empty() == true || List.Description().empty() == true)

       return true;
    std::string CurLang = List.DescriptionLanguage();
 
    /* Before we add a new description we first search in the group for
       a version with a description of the same MD5 - if so we reuse this
       description group instead of creating our own for this version */
       return true;
    std::string CurLang = List.DescriptionLanguage();
 
    /* Before we add a new description we first search in the group for
       a version with a description of the same MD5 - if so we reuse this
       description group instead of creating our own for this version */

-   pkgCache::GrpIterator Grp = Pkg.Group();

    for (pkgCache::PkgIterator P = Grp.PackageList();
        P.end() == false; P = Grp.NextPkg(P))
    {
    for (pkgCache::PkgIterator P = Grp.PackageList();
        P.end() == false; P = Grp.NextPkg(P))
    {


@@ -421,17 +505,18 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator
    // We haven't found reusable descriptions, so add the first description
    pkgCache::DescIterator Desc = Ver.DescriptionList();
    Dynamic<pkgCache::DescIterator> DynDesc(Desc);
    // We haven't found reusable descriptions, so add the first description
    pkgCache::DescIterator Desc = Ver.DescriptionList();
    Dynamic<pkgCache::DescIterator> DynDesc(Desc);

-   map_ptrloc *LastDesc = &Ver->DescriptionList;

 
 

-   oldMap = Map.Data();
-   map_ptrloc const descindex = NewDescription(Desc, CurLang, CurMd5, *LastDesc);
-   if (oldMap != Map.Data())
-       LastDesc += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap;
-   *LastDesc = descindex;
+   map_ptrloc const descindex = NewDescription(Desc, CurLang, CurMd5, 0);
+   if (unlikely(descindex == 0 && _error->PendingError()))
+      return _error->Error(_("Error occurred while processing %s (%s%d)"),
+                          Pkg.Name(), "NewDescription", 2);
+

    Desc->ParentPkg = Pkg.Index();
    Desc->ParentPkg = Pkg.Index();

+   Ver->DescriptionList = descindex;

 
 

-   if ((*LastDesc == 0 && _error->PendingError()) || NewFileDesc(Desc,List) == false)
-      return _error->Error(_("Error occurred while processing %s (NewFileDesc2)"),Pkg.Name());
+   if (NewFileDesc(Desc,List) == false)
+      return _error->Error(_("Error occurred while processing %s (%s%d)"),
+                          Pkg.Name(), "NewFileDesc", 2);

 
    return true;
 }
 
    return true;
 }


@@ -461,8 +546,8 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List)
       pkgCache::PkgIterator Pkg = Cache.FindPkg(PackageName);
       Dynamic<pkgCache::PkgIterator> DynPkg(Pkg);
       if (Pkg.end() == true)
       pkgCache::PkgIterator Pkg = Cache.FindPkg(PackageName);
       Dynamic<pkgCache::PkgIterator> DynPkg(Pkg);
       if (Pkg.end() == true)

-        return _error->Error(_("Error occurred while processing %s (FindPkg)"),
-                               PackageName.c_str());
+        return _error->Error(_("Error occurred while processing %s (%s%d)"),
+                               PackageName.c_str(), "FindPkg", 1);

       Counter++;
       if (Counter % 100 == 0 && Progress != 0)
         Progress->Progress(List.Offset());
       Counter++;
       if (Counter % 100 == 0 && Progress != 0)
         Progress->Progress(List.Offset());


@@ -472,10 +557,11 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List)
       Dynamic<pkgCache::VerIterator> DynVer(Ver);
       for (; Ver.end() == false; ++Ver)
       {
       Dynamic<pkgCache::VerIterator> DynVer(Ver);
       for (; Ver.end() == false; ++Ver)
       {

-        if (Ver->Hash == Hash && Version.c_str() == Ver.VerStr())
+        if (Ver->Hash == Hash && Version == Ver.VerStr())

         {
            if (List.CollectFileProvides(Cache,Ver) == false)
         {
            if (List.CollectFileProvides(Cache,Ver) == false)

-              return _error->Error(_("Error occurred while processing %s (CollectFileProvides)"),PackageName.c_str());
+              return _error->Error(_("Error occurred while processing %s (%s%d)"),
+                                   PackageName.c_str(), "CollectFileProvides", 1);

            break;
         }
       }
            break;
         }
       }


@@ -509,8 +595,11 @@ bool pkgCacheGenerator::NewGroup(pkgCache::GrpIterator &Grp, const string &Name)
 
    // Insert it into the hash table
    unsigned long const Hash = Cache.Hash(Name);
 
    // Insert it into the hash table
    unsigned long const Hash = Cache.Hash(Name);

-   Grp->Next = Cache.HeaderP->GrpHashTable[Hash];
-   Cache.HeaderP->GrpHashTable[Hash] = Group;
+   map_ptrloc *insertAt = &Cache.HeaderP->GrpHashTable[Hash];
+   while (*insertAt != 0 && strcasecmp(Name.c_str(), Cache.StrP + (Cache.GrpP + *insertAt)->Name) > 0)
+      insertAt = &(Cache.GrpP + *insertAt)->Next;
+   Grp->Next = *insertAt;
+   *insertAt = Group;

 
    Grp->ID = Cache.HeaderP->GroupCount++;
    return true;
 
    Grp->ID = Cache.HeaderP->GroupCount++;
    return true;


@@ -539,11 +628,14 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name
    // Insert the package into our package list
    if (Grp->FirstPackage == 0) // the group is new
    {
    // Insert the package into our package list
    if (Grp->FirstPackage == 0) // the group is new
    {

+      Grp->FirstPackage = Package;

       // Insert it into the hash table
       unsigned long const Hash = Cache.Hash(Name);
       // Insert it into the hash table
       unsigned long const Hash = Cache.Hash(Name);

-      Pkg->NextPackage = Cache.HeaderP->PkgHashTable[Hash];
-      Cache.HeaderP->PkgHashTable[Hash] = Package;
-      Grp->FirstPackage = Package;
+      map_ptrloc *insertAt = &Cache.HeaderP->PkgHashTable[Hash];
+      while (*insertAt != 0 && strcasecmp(Name.c_str(), Cache.StrP + (Cache.PkgP + *insertAt)->Name) > 0)
+        insertAt = &(Cache.PkgP + *insertAt)->NextPackage;
+      Pkg->NextPackage = *insertAt;
+      *insertAt = Package;

    }
    else // Group the Packages together
    {
    }
    else // Group the Packages together
    {


@@ -566,6 +658,77 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name
 
    return true;
 }
 
    return true;
 }

+                                                                       /*}}}*/
+// CacheGenerator::AddImplicitDepends                                  /*{{{*/
+bool pkgCacheGenerator::AddImplicitDepends(pkgCache::GrpIterator &G,
+                                          pkgCache::PkgIterator &P,
+                                          pkgCache::VerIterator &V)
+{
+   // copy P.Arch() into a string here as a cache remap
+   // in NewDepends() later may alter the pointer location
+   string Arch = P.Arch() == NULL ? "" : P.Arch();
+   map_ptrloc *OldDepLast = NULL;
+   /* MultiArch handling introduces a lot of implicit Dependencies:
+      - MultiArch: same → Co-Installable if they have the same version
+      - All others conflict with all other group members */
+   bool const coInstall = ((V->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same);
+   pkgCache::PkgIterator D = G.PackageList();
+   Dynamic<pkgCache::PkgIterator> DynD(D);
+   map_ptrloc const VerStrIdx = V->VerStr;
+   for (; D.end() != true; D = G.NextPkg(D))
+   {
+      if (Arch == D.Arch() || D->VersionList == 0)
+        continue;
+      /* We allow only one installed arch at the time
+        per group, therefore each group member conflicts
+        with all other group members */
+      if (coInstall == true)
+      {
+        // Replaces: ${self}:other ( << ${binary:Version})
+        NewDepends(D, V, VerStrIdx,
+                   pkgCache::Dep::Less, pkgCache::Dep::Replaces,
+                   OldDepLast);
+        // Breaks: ${self}:other (!= ${binary:Version})
+        NewDepends(D, V, VerStrIdx,
+                   pkgCache::Dep::NotEquals, pkgCache::Dep::DpkgBreaks,
+                   OldDepLast);
+      } else {
+        // Conflicts: ${self}:other
+        NewDepends(D, V, 0,
+                   pkgCache::Dep::NoOp, pkgCache::Dep::Conflicts,
+                   OldDepLast);
+      }
+   }
+   return true;
+}
+bool pkgCacheGenerator::AddImplicitDepends(pkgCache::VerIterator &V,
+                                          pkgCache::PkgIterator &D)
+{
+   /* MultiArch handling introduces a lot of implicit Dependencies:
+      - MultiArch: same → Co-Installable if they have the same version
+      - All others conflict with all other group members */
+   map_ptrloc *OldDepLast = NULL;
+   bool const coInstall = ((V->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same);
+   if (coInstall == true)
+   {
+      map_ptrloc const VerStrIdx = V->VerStr;
+      // Replaces: ${self}:other ( << ${binary:Version})
+      NewDepends(D, V, VerStrIdx,
+                pkgCache::Dep::Less, pkgCache::Dep::Replaces,
+                OldDepLast);
+      // Breaks: ${self}:other (!= ${binary:Version})
+      NewDepends(D, V, VerStrIdx,
+                pkgCache::Dep::NotEquals, pkgCache::Dep::DpkgBreaks,
+                OldDepLast);
+   } else {
+      // Conflicts: ${self}:other
+      NewDepends(D, V, 0,
+                pkgCache::Dep::NoOp, pkgCache::Dep::Conflicts,
+                OldDepLast);
+   }
+   return true;
+}
+

                                                                        /*}}}*/
 // CacheGenerator::NewFileVer - Create a new File<->Version association        /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // CacheGenerator::NewFileVer - Create a new File<->Version association        /*{{{*/
 // ---------------------------------------------------------------------


@@ -605,6 +768,8 @@ bool pkgCacheGenerator::NewFileVer(pkgCache::VerIterator &Ver,
 /* This puts a version structure in the linked list */
 unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver,
                                            const string &VerStr,
 /* This puts a version structure in the linked list */
 unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver,
                                            const string &VerStr,

+                                           map_ptrloc const ParentPkg,
+                                           unsigned long const Hash,

                                            unsigned long Next)
 {
    // Get a structure
                                            unsigned long Next)
 {
    // Get a structure


@@ -614,13 +779,39 @@ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver,
    
    // Fill it in
    Ver = pkgCache::VerIterator(Cache,Cache.VerP + Version);
    
    // Fill it in
    Ver = pkgCache::VerIterator(Cache,Cache.VerP + Version);

+   //Dynamic<pkgCache::VerIterator> DynV(Ver); // caller MergeListVersion already takes care of it

    Ver->NextVer = Next;
    Ver->NextVer = Next;

+   Ver->ParentPkg = ParentPkg;
+   Ver->Hash = Hash;

    Ver->ID = Cache.HeaderP->VersionCount++;
    Ver->ID = Cache.HeaderP->VersionCount++;

+
+   // try to find the version string in the group for reuse
+   pkgCache::PkgIterator Pkg = Ver.ParentPkg();
+   pkgCache::GrpIterator Grp = Pkg.Group();
+   if (Pkg.end() == false && Grp.end() == false)
+   {
+      for (pkgCache::PkgIterator P = Grp.PackageList(); P.end() == false; P = Grp.NextPkg(P))
+      {
+        if (Pkg == P)
+           continue;
+        for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; ++V)
+        {
+           int const cmp = strcmp(V.VerStr(), VerStr.c_str());
+           if (cmp == 0)
+           {
+              Ver->VerStr = V->VerStr;
+              return Version;
+           }
+           else if (cmp < 0)
+              break;
+        }
+      }
+   }
+   // haven't found the version string, so create

    map_ptrloc const idxVerStr = WriteStringInMap(VerStr);
    if (unlikely(idxVerStr == 0))
       return 0;
    Ver->VerStr = idxVerStr;
    map_ptrloc const idxVerStr = WriteStringInMap(VerStr);
    if (unlikely(idxVerStr == 0))
       return 0;
    Ver->VerStr = idxVerStr;

-   

    return Version;
 }
                                                                        /*}}}*/
    return Version;
 }
                                                                        /*}}}*/


@@ -662,9 +853,9 @@ bool pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator &Desc,
 // ---------------------------------------------------------------------
 /* This puts a description structure in the linked list */
 map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc,
 // ---------------------------------------------------------------------
 /* This puts a description structure in the linked list */
 map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc,

-                                           const string &Lang, 
-                                            const MD5SumValue &md5sum,
-                                           map_ptrloc Next)
+                                           const string &Lang,
+                                           const MD5SumValue &md5sum,
+                                           map_ptrloc idxmd5str)

 {
    // Get a structure
    map_ptrloc const Description = AllocateInMap(sizeof(pkgCache::Description));
 {
    // Get a structure
    map_ptrloc const Description = AllocateInMap(sizeof(pkgCache::Description));


@@ -673,95 +864,59 @@ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc,
 
    // Fill it in
    Desc = pkgCache::DescIterator(Cache,Cache.DescP + Description);
 
    // Fill it in
    Desc = pkgCache::DescIterator(Cache,Cache.DescP + Description);

-   Desc->NextDesc = Next;

    Desc->ID = Cache.HeaderP->DescriptionCount++;
    Desc->ID = Cache.HeaderP->DescriptionCount++;

-   map_ptrloc const idxlanguage_code = WriteStringInMap(Lang);
-   map_ptrloc const idxmd5sum = WriteStringInMap(md5sum.Value());
-   if (unlikely(idxlanguage_code == 0 || idxmd5sum == 0))
+   map_ptrloc const idxlanguage_code = WriteUniqString(Lang);
+   if (unlikely(idxlanguage_code == 0))

       return 0;
    Desc->language_code = idxlanguage_code;
       return 0;
    Desc->language_code = idxlanguage_code;

-   Desc->md5sum = idxmd5sum;
+
+   if (idxmd5str != 0)
+      Desc->md5sum = idxmd5str;
+   else
+   {
+      map_ptrloc const idxmd5sum = WriteStringInMap(md5sum.Value());
+      if (unlikely(idxmd5sum == 0))
+        return 0;
+      Desc->md5sum = idxmd5sum;
+   }

 
    return Description;
 }
                                                                        /*}}}*/
 
    return Description;
 }
                                                                        /*}}}*/

-// CacheGenerator::FinishCache - do various finish operations          /*{{{*/
+// CacheGenerator::NewDepends - Create a dependency element            /*{{{*/

 // ---------------------------------------------------------------------
 // ---------------------------------------------------------------------

-/* This prepares the Cache for delivery */
-bool pkgCacheGenerator::FinishCache(OpProgress *Progress)
+/* This creates a dependency element in the tree. It is linked to the
+   version and to the package that it is pointing to. */
+bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg,
+                                  pkgCache::VerIterator &Ver,
+                                  string const &Version,
+                                  unsigned int const &Op,
+                                  unsigned int const &Type,
+                                  map_ptrloc* &OldDepLast)

 {
 {

-   // FIXME: add progress reporting for this operation
-   // Do we have different architectures in your groups ?
-   vector<string> archs = APT::Configuration::getArchitectures();
-   if (archs.size() > 1)
+   map_ptrloc index = 0;
+   if (Version.empty() == false)

    {
    {

-      // Create Conflicts in between the group
-      pkgCache::GrpIterator G = GetCache().GrpBegin();
-      Dynamic<pkgCache::GrpIterator> DynG(G);
-      for (; G.end() != true; ++G)
+      int const CmpOp = Op & 0x0F;
+      // =-deps are used (79:1) for lockstep on same-source packages (e.g. data-packages)
+      if (CmpOp == pkgCache::Dep::Equals && strcmp(Version.c_str(), Ver.VerStr()) == 0)
+        index = Ver->VerStr;
+
+      if (index == 0)

       {
       {

-        string const PkgName = G.Name();
-        pkgCache::PkgIterator P = G.PackageList();
-        Dynamic<pkgCache::PkgIterator> DynP(P);
-        for (; P.end() != true; P = G.NextPkg(P))
-        {
-           pkgCache::PkgIterator allPkg;
-           Dynamic<pkgCache::PkgIterator> DynallPkg(allPkg);
-           pkgCache::VerIterator V = P.VersionList();
-           Dynamic<pkgCache::VerIterator> DynV(V);
-           for (; V.end() != true; ++V)
-           {
-               // copy P.Arch() into a string here as a cache remap
-               // in NewDepends() later may alter the pointer location
-              string Arch = P.Arch() == NULL ? "" : P.Arch();
-              map_ptrloc *OldDepLast = NULL;
-              /* MultiArch handling introduces a lot of implicit Dependencies:
-               - MultiArch: same → Co-Installable if they have the same version
-               - Architecture: all → Need to be Co-Installable for internal reasons
-               - All others conflict with all other group members */
-              bool const coInstall = ((V->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same);
-              for (vector<string>::const_iterator A = archs.begin(); A != archs.end(); ++A)
-              {
-                 if (*A == Arch)
-                    continue;
-                 /* We allow only one installed arch at the time
-                    per group, therefore each group member conflicts
-                    with all other group members */
-                 pkgCache::PkgIterator D = G.FindPkg(*A);
-                 Dynamic<pkgCache::PkgIterator> DynD(D);
-                 if (D.end() == true)
-                    continue;
-                 if (coInstall == true)
-                 {
-                    // Replaces: ${self}:other ( << ${binary:Version})
-                    NewDepends(D, V, V.VerStr(),
-                               pkgCache::Dep::Less, pkgCache::Dep::Replaces,
-                               OldDepLast);
-                    // Breaks: ${self}:other (!= ${binary:Version})
-                    NewDepends(D, V, V.VerStr(),
-                               pkgCache::Dep::NotEquals, pkgCache::Dep::DpkgBreaks,
-                               OldDepLast);
-                 } else {
-                       // Conflicts: ${self}:other
-                       NewDepends(D, V, "",
-                                  pkgCache::Dep::NoOp, pkgCache::Dep::Conflicts,
-                                  OldDepLast);
-                 }
-              }
-           }
-        }
+        void const * const oldMap = Map.Data();
+        index = WriteStringInMap(Version);
+        if (unlikely(index == 0))
+           return false;
+        if (OldDepLast != 0 && oldMap != Map.Data())
+           OldDepLast += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap;

       }
    }
       }
    }

-   return true;
+   return NewDepends(Pkg, Ver, index, Op, Type, OldDepLast);

 }
 }

-                                                                       /*}}}*/
-// CacheGenerator::NewDepends - Create a dependency element            /*{{{*/
-// ---------------------------------------------------------------------
-/* This creates a dependency element in the tree. It is linked to the
-   version and to the package that it is pointing to. */

 bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg,
                                   pkgCache::VerIterator &Ver,
 bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg,
                                   pkgCache::VerIterator &Ver,

-                                  string const &Version,
+                                  map_ptrloc const Version,

                                   unsigned int const &Op,
                                   unsigned int const &Type,
                                   map_ptrloc* &OldDepLast)
                                   unsigned int const &Op,
                                   unsigned int const &Type,
                                   map_ptrloc* &OldDepLast)


@@ -771,29 +926,16 @@ bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg,
    map_ptrloc const Dependency = AllocateInMap(sizeof(pkgCache::Dependency));
    if (unlikely(Dependency == 0))
       return false;
    map_ptrloc const Dependency = AllocateInMap(sizeof(pkgCache::Dependency));
    if (unlikely(Dependency == 0))
       return false;

-   
+

    // Fill it in
    pkgCache::DepIterator Dep(Cache,Cache.DepP + Dependency);
    Dynamic<pkgCache::DepIterator> DynDep(Dep);
    Dep->ParentVer = Ver.Index();
    Dep->Type = Type;
    Dep->CompareOp = Op;
    // Fill it in
    pkgCache::DepIterator Dep(Cache,Cache.DepP + Dependency);
    Dynamic<pkgCache::DepIterator> DynDep(Dep);
    Dep->ParentVer = Ver.Index();
    Dep->Type = Type;
    Dep->CompareOp = Op;

+   Dep->Version = Version;

    Dep->ID = Cache.HeaderP->DependsCount++;
 
    Dep->ID = Cache.HeaderP->DependsCount++;
 

-   // Probe the reverse dependency list for a version string that matches
-   if (Version.empty() == false)
-   {
-/*      for (pkgCache::DepIterator I = Pkg.RevDependsList(); I.end() == false; I++)
-        if (I->Version != 0 && I.TargetVer() == Version)
-           Dep->Version = I->Version;*/
-      if (Dep->Version == 0) {
-        map_ptrloc const index = WriteStringInMap(Version);
-        if (unlikely(index == 0))
-           return false;
-        Dep->Version = index;
-      }
-   }
-

    // Link it to the package
    Dep->Package = Pkg.Index();
    Dep->NextRevDepends = Pkg->RevDepends;
    // Link it to the package
    Dep->Package = Pkg.Index();
    Dep->NextRevDepends = Pkg->RevDepends;


@@ -833,6 +975,9 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator &Ver,
 
    // Locate the target package
    pkgCache::PkgIterator Pkg = Grp.FindPkg(Arch);
 
    // Locate the target package
    pkgCache::PkgIterator Pkg = Grp.FindPkg(Arch);

+   // we don't create 'none' packages and their dependencies if we can avoid it …
+   if (Pkg.end() == true && Arch == "none" && strcmp(Ver.ParentPkg().Arch(), "none") != 0)
+      return true;

    Dynamic<pkgCache::PkgIterator> DynPkg(Pkg);
    if (Pkg.end() == true) {
       if (unlikely(Owner->NewPackage(Pkg, PackageName, Arch) == false))
    Dynamic<pkgCache::PkgIterator> DynPkg(Pkg);
    if (Pkg.end() == true) {
       if (unlikely(Owner->NewPackage(Pkg, PackageName, Arch) == false))


@@ -879,8 +1024,12 @@ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator &Ver,
    Prv->Version = Ver.Index();
    Prv->NextPkgProv = Ver->ProvidesList;
    Ver->ProvidesList = Prv.Index();
    Prv->Version = Ver.Index();
    Prv->NextPkgProv = Ver->ProvidesList;
    Ver->ProvidesList = Prv.Index();

-   if (Version.empty() == false && unlikely((Prv->ProvideVersion = WriteString(Version)) == 0))
-      return false;
+   if (Version.empty() == false) {
+      map_ptrloc const idxProvideVersion = WriteString(Version);
+      Prv->ProvideVersion = idxProvideVersion;
+      if (unlikely(idxProvideVersion == 0))
+        return false;
+   }

    
    // Locate the target package
    pkgCache::PkgIterator Pkg;
    
    // Locate the target package
    pkgCache::PkgIterator Pkg;


@@ -1191,14 +1340,14 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress
                        MMap **OutMap,bool AllowMem)
 {
    bool const Debug = _config->FindB("Debug::pkgCacheGen", false);
                        MMap **OutMap,bool AllowMem)
 {
    bool const Debug = _config->FindB("Debug::pkgCacheGen", false);

-   
-   vector<pkgIndexFile *> Files;
-   for (vector<metaIndex *>::const_iterator i = List.begin();
+
+   std::vector<pkgIndexFile *> Files;
+   for (std::vector<metaIndex *>::const_iterator i = List.begin();

         i != List.end();
         ++i)
    {
         i != List.end();
         ++i)
    {

-      vector <pkgIndexFile *> *Indexes = (*i)->GetIndexFiles();
-      for (vector<pkgIndexFile *>::const_iterator j = Indexes->begin();
+      std::vector <pkgIndexFile *> *Indexes = (*i)->GetIndexFiles();
+      for (std::vector<pkgIndexFile *>::const_iterator j = Indexes->begin();

           j != Indexes->end();
           ++j)
          Files.push_back (*j);
           j != Indexes->end();
           ++j)
          Files.push_back (*j);


@@ -1278,10 +1427,11 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress
         }
         _error->RevertToStack();
       }
         }
         _error->RevertToStack();
       }

-      else if (Debug == true)
+      else

       {
         _error->MergeWithStack();
       {
         _error->MergeWithStack();

-        std::clog << "Open filebased MMap" << std::endl;
+        if (Debug == true)
+           std::clog << "Open filebased MMap" << std::endl;

       }
    }
    if (Writeable == false || CacheFile.empty() == true)
       }
    }
    if (Writeable == false || CacheFile.empty() == true)


@@ -1317,9 +1467,6 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress
       if (BuildCache(Gen,Progress,CurrentSize,TotalSize,
                     Files.begin()+EndOfSource,Files.end()) == false)
         return false;
       if (BuildCache(Gen,Progress,CurrentSize,TotalSize,
                     Files.begin()+EndOfSource,Files.end()) == false)
         return false;

-
-      // FIXME: move me to a better place
-      Gen.FinishCache(Progress);

    }
    else
    {
    }
    else
    {


@@ -1362,9 +1509,6 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress
       if (BuildCache(Gen,Progress,CurrentSize,TotalSize,
                     Files.begin()+EndOfSource,Files.end()) == false)
         return false;
       if (BuildCache(Gen,Progress,CurrentSize,TotalSize,
                     Files.begin()+EndOfSource,Files.end()) == false)
         return false;

-
-      // FIXME: move me to a better place
-      Gen.FinishCache(Progress);

    }
    if (Debug == true)
       std::clog << "Caches are ready for shipping" << std::endl;
    }
    if (Debug == true)
       std::clog << "Caches are ready for shipping" << std::endl;


@@ -1394,7 +1538,7 @@ __deprecated bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutM
    { return pkgCacheGenerator::MakeOnlyStatusCache(&Progress, OutMap); }
 bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap)
 {
    { return pkgCacheGenerator::MakeOnlyStatusCache(&Progress, OutMap); }
 bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap)
 {

-   vector<pkgIndexFile *> Files;
+   std::vector<pkgIndexFile *> Files;

    unsigned long EndOfSource = Files.size();
    if (_system->AddStatusFiles(Files) == false)
       return false;
    unsigned long EndOfSource = Files.size();
    if (_system->AddStatusFiles(Files) == false)
       return false;


@@ -1415,9 +1559,6 @@ bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **O
                  Files.begin()+EndOfSource,Files.end()) == false)
       return false;
 
                  Files.begin()+EndOfSource,Files.end()) == false)
       return false;
 

-   // FIXME: move me to a better place
-   Gen.FinishCache(Progress);
-

    if (_error->PendingError() == true)
       return false;
    *OutMap = Map.UnGuard();
    if (_error->PendingError() == true)
       return false;
    *OutMap = Map.UnGuard();


@@ -1426,11 +1567,11 @@ bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **O
 }
                                                                        /*}}}*/
 // IsDuplicateDescription                                              /*{{{*/
 }
                                                                        /*}}}*/
 // IsDuplicateDescription                                              /*{{{*/

-bool IsDuplicateDescription(pkgCache::DescIterator Desc,
+static bool IsDuplicateDescription(pkgCache::DescIterator Desc,

                            MD5SumValue const &CurMd5, std::string const &CurLang)
 {
    // Descriptions in the same link-list have all the same md5
                            MD5SumValue const &CurMd5, std::string const &CurLang)
 {
    // Descriptions in the same link-list have all the same md5

-   if (MD5SumValue(Desc.md5()) != CurMd5)
+   if (Desc.end() == true || MD5SumValue(Desc.md5()) != CurMd5)

       return false;
    for (; Desc.end() == false; ++Desc)
       if (Desc.LanguageCode() == CurLang)
       return false;
    for (; Desc.end() == false; ++Desc)
       if (Desc.LanguageCode() == CurLang)


@@ -1438,4 +1579,9 @@ bool IsDuplicateDescription(pkgCache::DescIterator Desc,
    return false;
 }
                                                                        /*}}}*/
    return false;
 }
                                                                        /*}}}*/

-
+// CacheGenerator::FinishCache                                         /*{{{*/
+bool pkgCacheGenerator::FinishCache(OpProgress *Progress)
+{
+   return true;
+}
+                                                                       /*}}}*/