Merge branch 'feature/extractar-filefd' into debian/experimental

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

diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 037c0cb63849b51708aca353068c227ef4e8e6bb..802af172cc8143c75fc01f21050418dff8e574d8 100644 (file)
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -10,7 +10,7 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#define APT_COMPATIBILITY 986
+#include <config.h>

 
 #include <apt-pkg/pkgcachegen.h>
 #include <apt-pkg/error.h>
 
 #include <apt-pkg/pkgcachegen.h>
 #include <apt-pkg/error.h>


@@ -18,35 +18,45 @@
 #include <apt-pkg/progress.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/progress.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/configuration.h>

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

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

-
-#include <apt-pkg/tagfile.h>
+#include <apt-pkg/macros.h>
+#include <apt-pkg/metaindex.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/hashsum_template.h>
+#include <apt-pkg/indexfile.h>
+#include <apt-pkg/md5.h>
+#include <apt-pkg/mmap.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+
+#include <stddef.h>
+#include <string.h>
+#include <iostream>
+#include <string>
+#include <vector>
+#include <memory>
+#include <algorithm>
+#include <sys/stat.h>
+#include <unistd.h>

 
 #include <apti18n.h>
 
 
 #include <apti18n.h>
 

-#include <vector>
+template<class T> using Dynamic = pkgCacheGenerator::Dynamic<T>;                                                       /*}}}*/
+typedef std::vector<pkgIndexFile *>::iterator FileIterator;
+template <typename Iter> std::vector<Iter*> pkgCacheGenerator::Dynamic<Iter>::toReMap;

 
 

-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-#include <stdio.h>
-#include <system.h>
-                                                                       /*}}}*/
-typedef vector<pkgIndexFile *>::iterator FileIterator;
+static bool IsDuplicateDescription(pkgCache::DescIterator Desc,
+                           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 */
 pkgCacheGenerator::pkgCacheGenerator(DynamicMMap *pMap,OpProgress *Prog) :
                    Map(*pMap), Cache(pMap,false), Progress(Prog),
 
 // CacheGenerator::pkgCacheGenerator - Constructor                     /*{{{*/
 // ---------------------------------------------------------------------
 /* We set the dirty flag and make sure that is written to the disk */
 pkgCacheGenerator::pkgCacheGenerator(DynamicMMap *pMap,OpProgress *Prog) :
                    Map(*pMap), Cache(pMap,false), Progress(Prog),

-                   FoundFileDeps(0)
+                    CurrentRlsFile(NULL), CurrentFile(NULL), d(NULL)

 {
 {

-   CurrentFile = 0;
-   memset(UniqHash,0,sizeof(UniqHash));
-   

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


@@ -61,8 +71,35 @@ pkgCacheGenerator::pkgCacheGenerator(DynamicMMap *pMap,OpProgress *Prog) :
 
       // Starting header
       *Cache.HeaderP = pkgCache::Header();
 
       // Starting header
       *Cache.HeaderP = pkgCache::Header();

-      Cache.HeaderP->VerSysName = Map.WriteString(_system->VS->Label);
-      Cache.HeaderP->Architecture = Map.WriteString(_config->Find("APT::Architecture"));
+
+      // make room for the hashtables for packages and groups
+      if (Map.RawAllocate(2 * (Cache.HeaderP->GetHashTableSize() * sizeof(map_pointer_t))) == 0)
+        return;
+
+      map_stringitem_t const idxVerSysName = WriteStringInMap(_system->VS->Label);
+      if (unlikely(idxVerSysName == 0))
+        return;
+      Cache.HeaderP->VerSysName = idxVerSysName;
+      map_stringitem_t const idxArchitecture = StoreString(MIXED, _config->Find("APT::Architecture"));
+      if (unlikely(idxArchitecture == 0))
+        return;
+      Cache.HeaderP->Architecture = idxArchitecture;
+
+      std::vector<std::string> archs = APT::Configuration::getArchitectures();
+      if (archs.size() > 1)
+      {
+        std::vector<std::string>::const_iterator a = archs.begin();
+        std::string list = *a;
+        for (++a; a != archs.end(); ++a)
+           list.append(",").append(*a);
+        map_stringitem_t const idxArchitectures = WriteStringInMap(list);
+        if (unlikely(idxArchitectures == 0))
+           return;
+        Cache.HeaderP->SetArchitectures(idxArchitectures);
+      }
+      else
+        Cache.HeaderP->SetArchitectures(idxArchitecture);
+

       Cache.ReMap();
    }
    else
       Cache.ReMap();
    }
    else


@@ -74,9 +111,9 @@ pkgCacheGenerator::pkgCacheGenerator(DynamicMMap *pMap,OpProgress *Prog) :
       {
         _error->Error(_("Cache has an incompatible versioning system"));
         return;
       {
         _error->Error(_("Cache has an incompatible versioning system"));
         return;

-      }      
+      }

    }
    }

-   
+

    Cache.HeaderP->Dirty = true;
    Map.Sync(0,sizeof(pkgCache::Header));
 }
    Cache.HeaderP->Dirty = true;
    Map.Sync(0,sizeof(pkgCache::Header));
 }


@@ -93,9 +130,74 @@ pkgCacheGenerator::~pkgCacheGenerator()
       return;
    
    Cache.HeaderP->Dirty = false;
       return;
    
    Cache.HeaderP->Dirty = false;

+   Cache.HeaderP->CacheFileSize = Map.Size();

    Map.Sync(0,sizeof(pkgCache::Header));
 }
                                                                        /*}}}*/
    Map.Sync(0,sizeof(pkgCache::Header));
 }
                                                                        /*}}}*/

+void pkgCacheGenerator::ReMap(void const * const oldMap, void const * const newMap) {/*{{{*/
+   if (oldMap == newMap)
+      return;
+
+   if (_config->FindB("Debug::pkgCacheGen", false))
+      std::clog << "Remaping from " << oldMap << " to " << newMap << std::endl;
+
+   Cache.ReMap(false);
+
+   CurrentFile += (pkgCache::PackageFile const * const) newMap - (pkgCache::PackageFile const * const) oldMap;
+   CurrentRlsFile += (pkgCache::ReleaseFile const * const) newMap - (pkgCache::ReleaseFile const * const) oldMap;
+
+   for (std::vector<pkgCache::GrpIterator*>::const_iterator i = Dynamic<pkgCache::GrpIterator>::toReMap.begin();
+       i != Dynamic<pkgCache::GrpIterator>::toReMap.end(); ++i)
+      (*i)->ReMap(oldMap, newMap);
+   for (std::vector<pkgCache::PkgIterator*>::const_iterator i = Dynamic<pkgCache::PkgIterator>::toReMap.begin();
+       i != Dynamic<pkgCache::PkgIterator>::toReMap.end(); ++i)
+      (*i)->ReMap(oldMap, newMap);
+   for (std::vector<pkgCache::VerIterator*>::const_iterator i = Dynamic<pkgCache::VerIterator>::toReMap.begin();
+       i != Dynamic<pkgCache::VerIterator>::toReMap.end(); ++i)
+      (*i)->ReMap(oldMap, newMap);
+   for (std::vector<pkgCache::DepIterator*>::const_iterator i = Dynamic<pkgCache::DepIterator>::toReMap.begin();
+       i != Dynamic<pkgCache::DepIterator>::toReMap.end(); ++i)
+      (*i)->ReMap(oldMap, newMap);
+   for (std::vector<pkgCache::DescIterator*>::const_iterator i = Dynamic<pkgCache::DescIterator>::toReMap.begin();
+       i != Dynamic<pkgCache::DescIterator>::toReMap.end(); ++i)
+      (*i)->ReMap(oldMap, newMap);
+   for (std::vector<pkgCache::PrvIterator*>::const_iterator i = Dynamic<pkgCache::PrvIterator>::toReMap.begin();
+       i != Dynamic<pkgCache::PrvIterator>::toReMap.end(); ++i)
+      (*i)->ReMap(oldMap, newMap);
+   for (std::vector<pkgCache::PkgFileIterator*>::const_iterator i = Dynamic<pkgCache::PkgFileIterator>::toReMap.begin();
+       i != Dynamic<pkgCache::PkgFileIterator>::toReMap.end(); ++i)
+      (*i)->ReMap(oldMap, newMap);
+   for (std::vector<pkgCache::RlsFileIterator*>::const_iterator i = Dynamic<pkgCache::RlsFileIterator>::toReMap.begin();
+       i != Dynamic<pkgCache::RlsFileIterator>::toReMap.end(); ++i)
+      (*i)->ReMap(oldMap, newMap);
+}                                                                      /*}}}*/
+// CacheGenerator::WriteStringInMap                                    /*{{{*/
+map_stringitem_t pkgCacheGenerator::WriteStringInMap(const char *String,
+                                       const unsigned long &Len) {
+   void const * const oldMap = Map.Data();
+   map_stringitem_t const index = Map.WriteString(String, Len);
+   if (index != 0)
+      ReMap(oldMap, Map.Data());
+   return index;
+}
+                                                                       /*}}}*/
+// CacheGenerator::WriteStringInMap                                    /*{{{*/
+map_stringitem_t pkgCacheGenerator::WriteStringInMap(const char *String) {
+   void const * const oldMap = Map.Data();
+   map_stringitem_t const index = Map.WriteString(String);
+   if (index != 0)
+      ReMap(oldMap, Map.Data());
+   return index;
+}
+                                                                       /*}}}*/
+map_pointer_t pkgCacheGenerator::AllocateInMap(const unsigned long &size) {/*{{{*/
+   void const * const oldMap = Map.Data();
+   map_pointer_t const index = Map.Allocate(size);
+   if (index != 0)
+      ReMap(oldMap, Map.Data());
+   return index;
+}
+                                                                       /*}}}*/

 // CacheGenerator::MergeList - Merge the package list                  /*{{{*/
 // ---------------------------------------------------------------------
 /* This provides the generation of the entries in the cache. Each loop
 // CacheGenerator::MergeList - Merge the package list                  /*{{{*/
 // ---------------------------------------------------------------------
 /* This provides the generation of the entries in the cache. Each loop


@@ -112,256 +214,314 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
       if (PackageName.empty() == true)
         return false;
 
       if (PackageName.empty() == true)
         return false;
 

-      /* As we handle Arch all packages as architecture bounded
-         we add all information to every (simulated) arch package */
-      std::vector<string> genArch;
-      if (List.ArchitectureAll() == true)
-        genArch = APT::Configuration::getArchitectures();
-      else
-        genArch.push_back(List.Architecture());
+      Counter++;
+      if (Counter % 100 == 0 && Progress != 0)
+        Progress->Progress(List.Offset());

 
 

-      for (std::vector<string>::const_iterator arch = genArch.begin();
-          arch != genArch.end(); ++arch)
+      string Arch = List.Architecture();
+      string const Version = List.Version();
+      if (Version.empty() == true && Arch.empty() == true)

       {
       {

+        // package descriptions
+        if (MergeListGroup(List, PackageName) == false)
+           return false;
+        continue;
+      }
+

       // Get a pointer to the package structure
       pkgCache::PkgIterator Pkg;
       // Get a pointer to the package structure
       pkgCache::PkgIterator Pkg;

-      if (NewPackage(Pkg, PackageName, *arch) == false)
-        return _error->Error(_("Error occurred while processing %s (NewPackage)"),PackageName.c_str());
-      Counter++;
-      if (Counter % 100 == 0 && Progress != 0)
-        Progress->Progress(List.Offset());
+      Dynamic<pkgCache::PkgIterator> DynPkg(Pkg);
+      if (NewPackage(Pkg, PackageName, Arch) == 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", 1);
+

 
 

-      /* Get a pointer to the version structure. We know the list is sorted
-         so we use that fact in the search. Insertion of new versions is
-        done with correct sorting */
-      string Version = List.Version();

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

-        // we first process the package, then the descriptions
-        // (this has the bonus that we get MMap error when we run out
-        //  of MMap space)
-        if (List.UsePackage(Pkg,pkgCache::VerIterator(Cache)) == false)
-           return _error->Error(_("Error occurred while processing %s (UsePackage1)"),
-                                PackageName.c_str());
-
-        // Find the right version to write the description
-        MD5SumValue CurMd5 = List.Description_md5();
-        pkgCache::VerIterator Ver = Pkg.VersionList();
-        map_ptrloc *LastVer = &Pkg->VersionList;
-
-        for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++)
-        {
-           pkgCache::DescIterator Desc = Ver.DescriptionList();
-           map_ptrloc *LastDesc = &Ver->DescriptionList;
-           bool duplicate=false;
-
-           // don't add a new description if we have one for the given
-           // md5 && language
-           for ( ; Desc.end() == false; Desc++)
-              if (MD5SumValue(Desc.md5()) == CurMd5 && 
-                  Desc.LanguageCode() == List.DescriptionLanguage())
-                 duplicate=true;
-           if(duplicate)
-              continue;
-           
-           for (Desc = Ver.DescriptionList();
-                Desc.end() == false;
-                LastDesc = &Desc->NextDesc, Desc++)
-           {
-              if (MD5SumValue(Desc.md5()) == CurMd5) 
-               {
-                 // Add new description
-                 *LastDesc = NewDescription(Desc, List.DescriptionLanguage(), CurMd5, *LastDesc);
-                 Desc->ParentPkg = Pkg.Index();
-                 
-                 if ((*LastDesc == 0 && _error->PendingError()) || NewFileDesc(Desc,List) == false)
-                    return _error->Error(_("Error occurred while processing %s (NewFileDesc1)"),PackageName.c_str());
-                 break;
-              }
-           }
-        }
+        if (MergeListPackage(List, Pkg) == false)
+           return false;
+      }
+      else
+      {
+        if (MergeListVersion(List, Pkg, Version, OutVer) == false)
+           return false;
+      }
+
+      if (OutVer != 0)
+        return true;
+   }
+
+   if (Cache.HeaderP->PackageCount >= std::numeric_limits<map_id_t>::max())
+      return _error->Error(_("Wow, you exceeded the number of package "
+                            "names this APT is capable of."));
+   if (Cache.HeaderP->VersionCount >= std::numeric_limits<map_id_t>::max())
+      return _error->Error(_("Wow, you exceeded the number of versions "
+                            "this APT is capable of."));
+   if (Cache.HeaderP->DescriptionCount >= std::numeric_limits<map_id_t>::max())
+      return _error->Error(_("Wow, you exceeded the number of descriptions "
+                            "this APT is capable of."));
+   if (Cache.HeaderP->DependsCount >= std::numeric_limits<map_id_t>::max())
+      return _error->Error(_("Wow, you exceeded the number of dependencies "
+                            "this APT is capable of."));
+
+   return true;
+}
+// CacheGenerator::MergeListGroup                                      /*{{{*/
+bool pkgCacheGenerator::MergeListGroup(ListParser &List, std::string const &GrpName)
+{
+   pkgCache::GrpIterator Grp = Cache.FindGrp(GrpName);
+   // a group has no data on it's own, only packages have it but these
+   // stanzas like this come from Translation- files to add descriptions,
+   // but without a version we don't need a description for it…
+   if (Grp.end() == true)
+      return true;
+   Dynamic<pkgCache::GrpIterator> DynGrp(Grp);
+
+   pkgCache::PkgIterator Pkg;
+   Dynamic<pkgCache::PkgIterator> DynPkg(Pkg);
+   for (Pkg = Grp.PackageList(); Pkg.end() == false; Pkg = Grp.NextPkg(Pkg))
+      if (MergeListPackage(List, Pkg) == false)
+        return false;

 
 

+   return true;
+}
+                                                                       /*}}}*/
+// CacheGenerator::MergeListPackage                                    /*{{{*/
+bool pkgCacheGenerator::MergeListPackage(ListParser &List, pkgCache::PkgIterator &Pkg)
+{
+   // we first process the package, then the descriptions
+   // (for deb this package processing is in fact a no-op)
+   pkgCache::VerIterator Ver(Cache);
+   Dynamic<pkgCache::VerIterator> DynVer(Ver);
+   if (List.UsePackage(Pkg, Ver) == false)
+      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();
+   if (CurMd5.Value().empty() == true && List.Description("").empty() == true)
+      return true;
+   std::vector<std::string> availDesc = List.AvailableDescriptionLanguages();
+   for (Ver = Pkg.VersionList(); Ver.end() == false; ++Ver)
+   {
+      pkgCache::DescIterator VerDesc = Ver.DescriptionList();
+
+      // a version can only have one md5 describing it
+      if (VerDesc.end() == true || MD5SumValue(VerDesc.md5()) != CurMd5)

         continue;
         continue;

+
+      map_stringitem_t md5idx = VerDesc->md5sum;
+      for (std::vector<std::string>::const_iterator CurLang = availDesc.begin(); CurLang != availDesc.end(); ++CurLang)
+      {
+        // don't add a new description if we have one for the given
+        // md5 && language
+        if (IsDuplicateDescription(VerDesc, CurMd5, *CurLang) == true)
+           continue;
+
+        AddNewDescription(List, Ver, *CurLang, CurMd5, md5idx);

       }
 
       }
 

-      pkgCache::VerIterator Ver = Pkg.VersionList();
-      map_ptrloc *LastVer = &Pkg->VersionList;
+      // we can stop here as all "same" versions will share the description
+      break;
+   }
+
+   return true;
+}
+                                                                       /*}}}*/
+// CacheGenerator::MergeListVersion                                    /*{{{*/
+bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator &Pkg,
+                                        std::string const &Version, pkgCache::VerIterator* &OutVer)
+{
+   pkgCache::VerIterator Ver = Pkg.VersionList();
+   Dynamic<pkgCache::VerIterator> DynVer(Ver);
+   map_pointer_t *LastVer = &Pkg->VersionList;
+   void const * oldMap = Map.Data();
+
+   unsigned short const Hash = List.VersionHash();
+   if (Ver.end() == false)
+   {
+      /* We know the list is sorted so we use that fact in the search.
+         Insertion of new versions is done with correct sorting */

       int Res = 1;
       int Res = 1;

-      for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++)
+      for (; Ver.end() == false; LastVer = &Ver->NextVer, ++Ver)

       {
         Res = Cache.VS->CmpVersion(Version,Ver.VerStr());
       {
         Res = Cache.VS->CmpVersion(Version,Ver.VerStr());

-        if (Res >= 0)
+        // Version is higher as current version - insert here
+        if (Res > 0)

            break;
            break;

+        // Versionstrings are equal - is hash also equal?
+        if (Res == 0 && List.SameVersion(Hash, Ver) == true)
+           break;
+        // proceed with the next till we have either the right
+        // or we found another version (which will be lower)

       }
       }

-      
-      /* We already have a version for this item, record that we
-         saw it */
-      unsigned long Hash = List.VersionHash();
-      if (Res == 0 && Ver->Hash == Hash)
+
+      /* We already have a version for this item, record that we saw it */
+      if (Res == 0 && Ver.end() == false && Ver->Hash == Hash)

       {
         if (List.UsePackage(Pkg,Ver) == false)
       {
         if (List.UsePackage(Pkg,Ver) == false)

-           return _error->Error(_("Error occurred while processing %s (UsePackage2)"),
-                                PackageName.c_str());
+           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)"),
-                                PackageName.c_str());
-        
+           return _error->Error(_("Error occurred while processing %s (%s%d)"),
+                                Pkg.Name(), "NewFileVer", 1);
+

         // Read only a single record and return
         if (OutVer != 0)
         {
            *OutVer = Ver;
         // Read only a single record and return
         if (OutVer != 0)
         {
            *OutVer = Ver;

-           FoundFileDeps |= List.HasFileDeps();

            return true;
         }
            return true;
         }

-        
-        continue;
-      }      

 
 

-      // Skip to the end of the same version set.
-      if (Res == 0)
-      {
-        for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++)
-        {
-           Res = Cache.VS->CmpVersion(Version,Ver.VerStr());
-           if (Res != 0)
-              break;
-        }
+        return true;

       }
       }

+   }

 
 

-      // Add a new version
-      *LastVer = NewVersion(Ver,Version,*LastVer);
-      Ver->ParentPkg = Pkg.Index();
-      Ver->Hash = Hash;
+   // Add a new version
+   map_pointer_t const verindex = NewVersion(Ver, Version, Pkg.Index(), Hash, *LastVer);
+   if (verindex == 0 && _error->PendingError())
+      return _error->Error(_("Error occurred while processing %s (%s%d)"),
+                          Pkg.Name(), "NewVersion", 1);

 
 

-      if ((*LastVer == 0 && _error->PendingError()) || List.NewVersion(Ver) == false)
-        return _error->Error(_("Error occurred while processing %s (NewVersion1)"),
-                             PackageName.c_str());
+   if (oldMap != Map.Data())
+        LastVer += (map_pointer_t const * const) Map.Data() - (map_pointer_t const * const) oldMap;
+   *LastVer = verindex;

 
 

-      if (List.UsePackage(Pkg,Ver) == false)
-        return _error->Error(_("Error occurred while processing %s (UsePackage3)"),
-                             PackageName.c_str());
-      
-      if (NewFileVer(Ver,List) == false)
-        return _error->Error(_("Error occurred while processing %s (NewVersion2)"),
-                             PackageName.c_str());
+   if (unlikely(List.NewVersion(Ver) == false))
+      return _error->Error(_("Error occurred while processing %s (%s%d)"),
+                          Pkg.Name(), "NewVersion", 2);

 
 

-      // Read only a single record and return
-      if (OutVer != 0)
+   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 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))

       {
       {

-        *OutVer = Ver;
-        FoundFileDeps |= List.HasFileDeps();
-        return true;
-      }      
-
-      /* Record the Description data. Description data always exist in
-        Packages and Translation-* files. */
-      pkgCache::DescIterator Desc = Ver.DescriptionList();
-      map_ptrloc *LastDesc = &Ver->DescriptionList;
-      
-      // Skip to the end of description set
-      for (; Desc.end() == false; LastDesc = &Desc->NextDesc, Desc++);
-
-      // Add new description
-      *LastDesc = NewDescription(Desc, List.DescriptionLanguage(), List.Description_md5(), *LastDesc);
-      Desc->ParentPkg = Pkg.Index();
-
-      if ((*LastDesc == 0 && _error->PendingError()) || NewFileDesc(Desc,List) == false)
-        return _error->Error(_("Error occurred while processing %s (NewFileDesc2)"),PackageName.c_str());
+        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);

       }
    }
       }
    }

+   if (unlikely(AddImplicitDepends(Grp, Pkg, Ver) == false))
+      return _error->Error(_("Error occurred while processing %s (%s%d)"),
+                          Pkg.Name(), "AddImplicitDepends", 2);

 
 

-   FoundFileDeps |= List.HasFileDeps();
+   // Read only a single record and return
+   if (OutVer != 0)
+   {
+      *OutVer = Ver;
+      return true;
+   }

 
 

-   if (Cache.HeaderP->PackageCount >= (1ULL<<sizeof(Cache.PkgP->ID)*8)-1)
-      return _error->Error(_("Wow, you exceeded the number of package "
-                            "names this APT is capable of."));
-   if (Cache.HeaderP->VersionCount >= (1ULL<<(sizeof(Cache.VerP->ID)*8))-1)
-      return _error->Error(_("Wow, you exceeded the number of versions "
-                            "this APT is capable of."));
-   if (Cache.HeaderP->DescriptionCount >= (1ULL<<(sizeof(Cache.DescP->ID)*8))-1)
-      return _error->Error(_("Wow, you exceeded the number of descriptions "
-                            "this APT is capable of."));
-   if (Cache.HeaderP->DependsCount >= (1ULL<<(sizeof(Cache.DepP->ID)*8))-1ULL)
-      return _error->Error(_("Wow, you exceeded the number of dependencies "
-                            "this APT is capable of."));
+   /* Record the Description(s) based on their master md5sum */
+   MD5SumValue CurMd5 = List.Description_md5();
+   if (CurMd5.Value().empty() == true && List.Description("").empty() == true)
+      return true;
+
+   /* 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 */
+   for (pkgCache::PkgIterator P = Grp.PackageList();
+       P.end() == false; P = Grp.NextPkg(P))
+   {
+      for (pkgCache::VerIterator V = P.VersionList();
+          V.end() == false; ++V)
+      {
+        if (V->DescriptionList == 0 || MD5SumValue(V.DescriptionList().md5()) != CurMd5)
+           continue;
+        Ver->DescriptionList = V->DescriptionList;
+      }
+   }
+
+   // We haven't found reusable descriptions, so add the first description(s)
+   map_stringitem_t md5idx = Ver->DescriptionList == 0 ? 0 : Ver.DescriptionList()->md5sum;
+   std::vector<std::string> availDesc = List.AvailableDescriptionLanguages();
+   for (std::vector<std::string>::const_iterator CurLang = availDesc.begin(); CurLang != availDesc.end(); ++CurLang)
+      if (AddNewDescription(List, Ver, *CurLang, CurMd5, md5idx) == false)
+        return false;

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

-// CacheGenerator::MergeFileProvides - Merge file provides             /*{{{*/
-// ---------------------------------------------------------------------
-/* If we found any file depends while parsing the main list we need to 
-   resolve them. Since it is undesired to load the entire list of files
-   into the cache as virtual packages we do a two stage effort. MergeList
-   identifies the file depends and this creates Provdies for them by
-   re-parsing all the indexs. */
-bool pkgCacheGenerator::MergeFileProvides(ListParser &List)
+bool pkgCacheGenerator::AddNewDescription(ListParser &List, pkgCache::VerIterator &Ver, std::string const &lang, MD5SumValue const &CurMd5, map_stringitem_t &md5idx) /*{{{*/

 {
 {

-   List.Owner = this;
-   
-   unsigned int Counter = 0;
-   while (List.Step() == true)
-   {
-      string PackageName = List.Package();
-      if (PackageName.empty() == true)
-        return false;
-      string Version = List.Version();
-      if (Version.empty() == true)
-        continue;
-      
-      pkgCache::PkgIterator Pkg = Cache.FindPkg(PackageName);
-      if (Pkg.end() == true)
-        return _error->Error(_("Error occurred while processing %s (FindPkg)"),
-                               PackageName.c_str());
-      Counter++;
-      if (Counter % 100 == 0 && Progress != 0)
-        Progress->Progress(List.Offset());
+   pkgCache::DescIterator Desc;
+   Dynamic<pkgCache::DescIterator> DynDesc(Desc);

 
 

-      unsigned long Hash = List.VersionHash();
-      pkgCache::VerIterator Ver = Pkg.VersionList();
-      for (; Ver.end() == false; Ver++)
-      {
-        if (Ver->Hash == Hash && Version.c_str() == Ver.VerStr())
-        {
-           if (List.CollectFileProvides(Cache,Ver) == false)
-              return _error->Error(_("Error occurred while processing %s (CollectFileProvides)"),PackageName.c_str());
-           break;
-        }
-      }
-      
-      if (Ver.end() == true)
-        _error->Warning(_("Package %s %s was not found while processing file dependencies"),PackageName.c_str(),Version.c_str());
-   }
+   map_pointer_t const descindex = NewDescription(Desc, lang, CurMd5, md5idx);
+   if (unlikely(descindex == 0 && _error->PendingError()))
+      return _error->Error(_("Error occurred while processing %s (%s%d)"),
+           Ver.ParentPkg().Name(), "NewDescription", 1);
+
+   md5idx = Desc->md5sum;
+   Desc->ParentPkg = Ver.ParentPkg().Index();
+
+   // we add at the end, so that the start is constant as we need
+   // that to be able to efficiently share these lists
+   pkgCache::DescIterator VerDesc = Ver.DescriptionList(); // old value might be invalid after ReMap
+   for (;VerDesc.end() == false && VerDesc->NextDesc != 0; ++VerDesc);
+   map_pointer_t * const LastNextDesc = (VerDesc.end() == true) ? &Ver->DescriptionList : &VerDesc->NextDesc;
+   *LastNextDesc = descindex;
+
+   if (NewFileDesc(Desc,List) == false)
+      return _error->Error(_("Error occurred while processing %s (%s%d)"),
+           Ver.ParentPkg().Name(), "NewFileDesc", 1);

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

+                                                                       /*}}}*/

 // CacheGenerator::NewGroup - Add a new group                          /*{{{*/
 // ---------------------------------------------------------------------
 /* This creates a new group structure and adds it to the hash table */
 // CacheGenerator::NewGroup - Add a new group                          /*{{{*/
 // ---------------------------------------------------------------------
 /* This creates a new group structure and adds it to the hash table */

-bool pkgCacheGenerator::NewGroup(pkgCache::GrpIterator &Grp, const string &Name) {
-       Grp = Cache.FindGrp(Name);
-       if (Grp.end() == false)
-               return true;
-
-       // Get a structure
-       unsigned long const Group = Map.Allocate(sizeof(pkgCache::Group));
-       if (unlikely(Group == 0))
-               return false;
+bool pkgCacheGenerator::NewGroup(pkgCache::GrpIterator &Grp, const string &Name)
+{
+   Grp = Cache.FindGrp(Name);
+   if (Grp.end() == false)
+      return true;

 
 

-       Grp = pkgCache::GrpIterator(Cache, Cache.GrpP + Group);
-       Grp->Name = Map.WriteString(Name);
-       if (unlikely(Grp->Name == 0))
-               return false;
+   // Get a structure
+   map_pointer_t const Group = AllocateInMap(sizeof(pkgCache::Group));
+   if (unlikely(Group == 0))
+      return false;

 
 

-       // Insert it into the hash table
-       unsigned long const Hash = Cache.Hash(Name);
-       Grp->Next = Cache.HeaderP->GrpHashTable[Hash];
-       Cache.HeaderP->GrpHashTable[Hash] = Group;
+   Grp = pkgCache::GrpIterator(Cache, Cache.GrpP + Group);
+   map_stringitem_t const idxName = StoreString(PKGNAME, Name);
+   if (unlikely(idxName == 0))
+      return false;
+   Grp->Name = idxName;

 
 

-       Cache.HeaderP->GroupCount++;
+   // Insert it into the hash table
+   unsigned long const Hash = Cache.Hash(Name);
+   map_pointer_t *insertAt = &Cache.HeaderP->GrpHashTableP()[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;

 
 

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

 }
                                                                        /*}}}*/
 // CacheGenerator::NewPackage - Add a new package                      /*{{{*/
 }
                                                                        /*}}}*/
 // CacheGenerator::NewPackage - Add a new package                      /*{{{*/


@@ -370,6 +530,7 @@ bool pkgCacheGenerator::NewGroup(pkgCache::GrpIterator &Grp, const string &Name)
 bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name,
                                        const string &Arch) {
    pkgCache::GrpIterator Grp;
 bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name,
                                        const string &Arch) {
    pkgCache::GrpIterator Grp;

+   Dynamic<pkgCache::GrpIterator> DynGrp(Grp);

    if (unlikely(NewGroup(Grp, Name) == false))
       return false;
 
    if (unlikely(NewGroup(Grp, Name) == false))
       return false;
 


@@ -378,31 +539,169 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name
         return true;
 
    // Get a structure
         return true;
 
    // Get a structure

-   unsigned long const Package = Map.Allocate(sizeof(pkgCache::Package));
+   map_pointer_t const Package = AllocateInMap(sizeof(pkgCache::Package));

    if (unlikely(Package == 0))
       return false;
    Pkg = pkgCache::PkgIterator(Cache,Cache.PkgP + Package);
 
    if (unlikely(Package == 0))
       return false;
    Pkg = pkgCache::PkgIterator(Cache,Cache.PkgP + Package);
 

-   // Insert it into the hash table
-   unsigned long const Hash = Cache.Hash(Name);
-   Pkg->NextPackage = Cache.HeaderP->PkgHashTable[Hash];
-   Cache.HeaderP->PkgHashTable[Hash] = Package;
-
-   // remember the packages in the group
-   Grp->FirstPackage = Package;
-   if (Grp->LastPackage == 0)
-      Grp->LastPackage = Package;
-

    // Set the name, arch and the ID
    // Set the name, arch and the ID

-   Pkg->Name = Grp->Name;
+   APT_IGNORE_DEPRECATED(Pkg->Name = Grp->Name;)

    Pkg->Group = Grp.Index();
    Pkg->Group = Grp.Index();

-   Pkg->Arch = WriteUniqString(Arch.c_str());
-   if (unlikely(Pkg->Arch == 0))
+   // all is mapped to the native architecture
+   map_stringitem_t const idxArch = (Arch == "all") ? Cache.HeaderP->Architecture : StoreString(MIXED, Arch);
+   if (unlikely(idxArch == 0))

       return false;
       return false;

+   Pkg->Arch = idxArch;

    Pkg->ID = Cache.HeaderP->PackageCount++;
 
    Pkg->ID = Cache.HeaderP->PackageCount++;
 

+   // Insert the package into our package list
+   if (Grp->FirstPackage == 0) // the group is new
+   {
+      Grp->FirstPackage = Package;
+      // Insert it into the hash table
+      map_id_t const Hash = Cache.Hash(Name);
+      map_pointer_t *insertAt = &Cache.HeaderP->PkgHashTableP()[Hash];
+      while (*insertAt != 0 && strcasecmp(Name.c_str(), Cache.StrP + (Cache.GrpP + (Cache.PkgP + *insertAt)->Group)->Name) > 0)
+        insertAt = &(Cache.PkgP + *insertAt)->NextPackage;
+      Pkg->NextPackage = *insertAt;
+      *insertAt = Package;
+   }
+   else // Group the Packages together
+   {
+      // but first get implicit provides done
+      if (APT::Configuration::checkArchitecture(Pkg.Arch()) == true)
+      {
+        pkgCache::PkgIterator const M = Grp.FindPreferredPkg(false); // native or any foreign pkg will do
+        if (M.end() == false) {
+           pkgCache::PrvIterator Prv;
+           Dynamic<pkgCache::PrvIterator> DynPrv(Prv);
+           for (Prv = M.ProvidesList(); Prv.end() == false; ++Prv)
+           {
+              if ((Prv->Flags & pkgCache::Flag::ArchSpecific) != 0)
+                 continue;
+              pkgCache::VerIterator Ver = Prv.OwnerVer();
+              Dynamic<pkgCache::VerIterator> DynVer(Ver);
+              if ((Ver->MultiArch & pkgCache::Version::Allowed) == pkgCache::Version::Allowed ||
+                  ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign &&
+                       (Prv->Flags & pkgCache::Flag::MultiArchImplicit) == 0))
+                 if (NewProvides(Ver, Pkg, Prv->ProvideVersion, Prv->Flags) == false)
+                    return false;
+           }
+        }
+
+
+        pkgCache::PkgIterator P;
+        pkgCache::VerIterator Ver;
+        Dynamic<pkgCache::PkgIterator> DynP(P);
+        Dynamic<pkgCache::VerIterator> DynVer(Ver);
+
+        for (P = Grp.PackageList(); P.end() == false;  P = Grp.NextPkg(P))
+           for (Ver = P.VersionList(); Ver.end() == false; ++Ver)
+              if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign)
+                 if (NewProvides(Ver, Pkg, Ver->VerStr, pkgCache::Flag::MultiArchImplicit) == false)
+                    return false;
+      }
+      // and negative dependencies, don't forget negative dependencies
+      {
+        pkgCache::PkgIterator const M = Grp.FindPreferredPkg(false);
+        if (M.end() == false) {
+           pkgCache::DepIterator Dep;
+           Dynamic<pkgCache::DepIterator> DynDep(Dep);
+           for (Dep = M.RevDependsList(); Dep.end() == false; ++Dep)
+           {
+              if ((Dep->CompareOp & (pkgCache::Dep::ArchSpecific | pkgCache::Dep::MultiArchImplicit)) != 0)
+                 continue;
+              if (Dep->Type != pkgCache::Dep::DpkgBreaks && Dep->Type != pkgCache::Dep::Conflicts &&
+                    Dep->Type != pkgCache::Dep::Replaces)
+                 continue;
+              pkgCache::VerIterator Ver = Dep.ParentVer();
+              Dynamic<pkgCache::VerIterator> DynVer(Ver);
+              map_pointer_t * unused = NULL;
+              if (NewDepends(Pkg, Ver, Dep->Version, Dep->CompareOp, Dep->Type, unused) == false)
+                 return false;
+           }
+        }
+      }
+
+      // this package is the new last package
+      pkgCache::PkgIterator LastPkg(Cache, Cache.PkgP + Grp->LastPackage);
+      Pkg->NextPackage = LastPkg->NextPackage;
+      LastPkg->NextPackage = Package;
+   }
+   Grp->LastPackage = Package;

    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_pointer_t *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_stringitem_t 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::MultiArchImplicit, pkgCache::Dep::Replaces,
+                   OldDepLast);
+        // Breaks: ${self}:other (!= ${binary:Version})
+        NewDepends(D, V, VerStrIdx,
+                   pkgCache::Dep::NotEquals | pkgCache::Dep::MultiArchImplicit, pkgCache::Dep::DpkgBreaks,
+                   OldDepLast);
+      } else {
+        // Conflicts: ${self}:other
+        NewDepends(D, V, 0,
+                   pkgCache::Dep::NoOp | pkgCache::Dep::MultiArchImplicit, 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_pointer_t *OldDepLast = NULL;
+   bool const coInstall = ((V->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same);
+   if (coInstall == true)
+   {
+      map_stringitem_t const VerStrIdx = V->VerStr;
+      // Replaces: ${self}:other ( << ${binary:Version})
+      NewDepends(D, V, VerStrIdx,
+                pkgCache::Dep::Less | pkgCache::Dep::MultiArchImplicit, pkgCache::Dep::Replaces,
+                OldDepLast);
+      // Breaks: ${self}:other (!= ${binary:Version})
+      NewDepends(D, V, VerStrIdx,
+                pkgCache::Dep::NotEquals | pkgCache::Dep::MultiArchImplicit, pkgCache::Dep::DpkgBreaks,
+                OldDepLast);
+   } else {
+      // Conflicts: ${self}:other
+      NewDepends(D, V, 0,
+                pkgCache::Dep::NoOp | pkgCache::Dep::MultiArchImplicit, pkgCache::Dep::Conflicts,
+                OldDepLast);
+   }
+   return true;
+}
+

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


@@ -414,16 +713,16 @@ bool pkgCacheGenerator::NewFileVer(pkgCache::VerIterator &Ver,
       return true;
    
    // Get a structure
       return true;
    
    // Get a structure

-   unsigned long VerFile = Map.Allocate(sizeof(pkgCache::VerFile));
+   map_pointer_t const VerFile = AllocateInMap(sizeof(pkgCache::VerFile));

    if (VerFile == 0)
    if (VerFile == 0)

-      return 0;
+      return false;

    
    pkgCache::VerFileIterator VF(Cache,Cache.VerFileP + VerFile);
    VF->File = CurrentFile - Cache.PkgFileP;
    
    // Link it to the end of the list
    
    pkgCache::VerFileIterator VF(Cache,Cache.VerFileP + VerFile);
    VF->File = CurrentFile - Cache.PkgFileP;
    
    // Link it to the end of the list

-   map_ptrloc *Last = &Ver->FileList;
-   for (pkgCache::VerFileIterator V = Ver.FileList(); V.end() == false; V++)
+   map_pointer_t *Last = &Ver->FileList;
+   for (pkgCache::VerFileIterator V = Ver.FileList(); V.end() == false; ++V)

       Last = &V->NextFile;
    VF->NextFile = *Last;
    *Last = VF.Index();
       Last = &V->NextFile;
    VF->NextFile = *Last;
    *Last = VF.Index();


@@ -440,23 +739,52 @@ bool pkgCacheGenerator::NewFileVer(pkgCache::VerIterator &Ver,
 // CacheGenerator::NewVersion - Create a new Version                   /*{{{*/
 // ---------------------------------------------------------------------
 /* This puts a version structure in the linked list */
 // CacheGenerator::NewVersion - Create a new Version                   /*{{{*/
 // ---------------------------------------------------------------------
 /* This puts a version structure in the linked list */

-unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver,
+map_pointer_t pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver,

                                            const string &VerStr,
                                            const string &VerStr,

-                                           unsigned long Next)
+                                           map_pointer_t const ParentPkg,
+                                           unsigned short const Hash,
+                                           map_pointer_t const Next)

 {
    // Get a structure
 {
    // Get a structure

-   unsigned long Version = Map.Allocate(sizeof(pkgCache::Version));
+   map_pointer_t const Version = AllocateInMap(sizeof(pkgCache::Version));

    if (Version == 0)
       return 0;
    
    // Fill it in
    Ver = pkgCache::VerIterator(Cache,Cache.VerP + Version);
    if (Version == 0)
       return 0;
    
    // 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++;

-   Ver->VerStr = Map.WriteString(VerStr);
-   if (Ver->VerStr == 0)
+
+   // 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_stringitem_t const idxVerStr = StoreString(VERSIONNUMBER, VerStr);
+   if (unlikely(idxVerStr == 0))

       return 0;
       return 0;

-   
+   Ver->VerStr = idxVerStr;

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


@@ -470,7 +798,7 @@ bool pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator &Desc,
       return true;
    
    // Get a structure
       return true;
    
    // Get a structure

-   unsigned long DescFile = Map.Allocate(sizeof(pkgCache::DescFile));
+   map_pointer_t const DescFile = AllocateInMap(sizeof(pkgCache::DescFile));

    if (DescFile == 0)
       return false;
 
    if (DescFile == 0)
       return false;
 


@@ -478,8 +806,8 @@ bool pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator &Desc,
    DF->File = CurrentFile - Cache.PkgFileP;
 
    // Link it to the end of the list
    DF->File = CurrentFile - Cache.PkgFileP;
 
    // Link it to the end of the list

-   map_ptrloc *Last = &Desc->FileList;
-   for (pkgCache::DescFileIterator D = Desc.FileList(); D.end() == false; D++)
+   map_pointer_t *Last = &Desc->FileList;
+   for (pkgCache::DescFileIterator D = Desc.FileList(); D.end() == false; ++D)

       Last = &D->NextFile;
 
    DF->NextFile = *Last;
       Last = &D->NextFile;
 
    DF->NextFile = *Last;


@@ -497,135 +825,133 @@ bool pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator &Desc,
 // CacheGenerator::NewDescription - Create a new Description           /*{{{*/
 // ---------------------------------------------------------------------
 /* This puts a description structure in the linked list */
 // CacheGenerator::NewDescription - Create a new Description           /*{{{*/
 // ---------------------------------------------------------------------
 /* 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)
+map_pointer_t pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc,
+                                           const string &Lang,
+                                           const MD5SumValue &md5sum,
+                                           map_stringitem_t const idxmd5str)

 {
    // Get a structure
 {
    // Get a structure

-   map_ptrloc Description = Map.Allocate(sizeof(pkgCache::Description));
+   map_pointer_t const Description = AllocateInMap(sizeof(pkgCache::Description));

    if (Description == 0)
       return 0;
 
    // Fill it in
    Desc = pkgCache::DescIterator(Cache,Cache.DescP + Description);
    if (Description == 0)
       return 0;
 
    // Fill it in
    Desc = pkgCache::DescIterator(Cache,Cache.DescP + Description);

-   Desc->NextDesc = Next;

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

-   Desc->language_code = Map.WriteString(Lang);
-   Desc->md5sum = Map.WriteString(md5sum.Value());
-   if (Desc->language_code == 0 || Desc->md5sum == 0)
+   map_stringitem_t const idxlanguage_code = StoreString(MIXED, Lang);
+   if (unlikely(idxlanguage_code == 0))

       return 0;
       return 0;

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

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

-// CacheGenerator::FinishCache - do various finish operations          /*{{{*/
-// ---------------------------------------------------------------------
-/* This prepares the Cache for delivery */
-bool pkgCacheGenerator::FinishCache(OpProgress &Progress) {
-       // 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) {
-               // Create Conflicts in between the group
-               for (pkgCache::GrpIterator G = GetCache().GrpBegin(); G.end() != true; G++) {
-                       string const PkgName = G.Name();
-                       for (pkgCache::PkgIterator P = G.PackageList(); P.end() != true; P = G.NextPkg(P)) {
-                               for (pkgCache::VerIterator V = P.VersionList(); V.end() != true; V++) {
-                                       string const Arch = V.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::All ||
-                                                               V->MultiArch == 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);
-                                               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::Less, pkgCache::Dep::DpkgBreaks,
-                                                                  OldDepLast);
-                                                       NewDepends(D, V, V.VerStr(),
-                                                                  pkgCache::Dep::Greater, pkgCache::Dep::DpkgBreaks,
-                                                                  OldDepLast);
-                                               } else {
-                                                       // Conflicts: ${self}:other
-                                                       NewDepends(D, V, "",
-                                                                  pkgCache::Dep::NoOp, pkgCache::Dep::Conflicts,
-                                                                  OldDepLast);
-                                               }
-                                       }
-                               }
-                       }
-               }
-       }
-       return true;
-}
-                                                                       /*}}}*/

 // 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,
 // 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,

-                                  string const &Version,
-                                  unsigned int const &Op,
-                                  unsigned int const &Type,
-                                  map_ptrloc *OldDepLast)
+                                  map_pointer_t const Version,
+                                  uint8_t const Op,
+                                  uint8_t const Type,
+                                  map_pointer_t* &OldDepLast)

 {
 {

+   void const * const oldMap = Map.Data();

    // Get a structure
    // Get a structure

-   unsigned long const Dependency = Map.Allocate(sizeof(pkgCache::Dependency));
+   map_pointer_t const Dependency = AllocateInMap(sizeof(pkgCache::Dependency));

    if (unlikely(Dependency == 0))
       return false;
    if (unlikely(Dependency == 0))
       return false;

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

 
 

-   // Probe the reverse dependency list for a version string that matches
-   if (Version.empty() == false)
+   bool isDuplicate = false;
+   map_pointer_t DependencyData = 0;
+   map_pointer_t PreviousData = 0;
+   if (Pkg->RevDepends != 0)

    {
    {

-/*      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)
-        if (unlikely((Dep->Version = Map.WriteString(Version)) == 0))
-           return false;
+      pkgCache::Dependency const * const L = Cache.DepP + Pkg->RevDepends;
+      DependencyData = L->DependencyData;
+      do {
+        pkgCache::DependencyData const * const D = Cache.DepDataP + DependencyData;
+        if (Version > D->Version)
+           break;
+        if (D->Version == Version && D->Type == Type && D->CompareOp == Op)
+        {
+           isDuplicate = true;
+           break;
+        }
+        PreviousData = DependencyData;
+        DependencyData = D->NextData;
+      } while (DependencyData != 0);
+   }
+
+   if (isDuplicate == false)
+   {
+      DependencyData = AllocateInMap(sizeof(pkgCache::DependencyData));
+      if (unlikely(DependencyData == 0))
+        return false;
+   }
+
+   pkgCache::Dependency * Link = Cache.DepP + Dependency;
+   Link->ParentVer = Ver.Index();
+   Link->DependencyData = DependencyData;
+   Link->ID = Cache.HeaderP->DependsCount++;
+
+   pkgCache::DepIterator Dep(Cache, Link);
+   if (isDuplicate == false)
+   {
+      Dep->Type = Type;
+      Dep->CompareOp = Op;
+      Dep->Version = Version;
+      Dep->Package = Pkg.Index();
+      ++Cache.HeaderP->DependsDataCount;
+      if (PreviousData != 0)
+      {
+        pkgCache::DependencyData * const D = Cache.DepDataP + PreviousData;
+        Dep->NextData = D->NextData;
+        D->NextData = DependencyData;
+      }
+      else if (Pkg->RevDepends != 0)
+      {
+        pkgCache::Dependency const * const D = Cache.DepP + Pkg->RevDepends;
+        Dep->NextData = D->DependencyData;
+      }
+   }
+
+   if (isDuplicate == true || PreviousData != 0)
+   {
+      pkgCache::Dependency * const L = Cache.DepP + Pkg->RevDepends;
+      Link->NextRevDepends = L->NextRevDepends;
+      L->NextRevDepends = Dependency;
+   }
+   else
+   {
+      Link->NextRevDepends = Pkg->RevDepends;
+      Pkg->RevDepends = Dependency;

    }
 
    }
 

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

 
    // Do we know where to link the Dependency to?
    if (OldDepLast == NULL)
    {
       OldDepLast = &Ver->DependsList;
 
    // Do we know where to link the Dependency to?
    if (OldDepLast == NULL)
    {
       OldDepLast = &Ver->DependsList;

-      for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++)
+      for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; ++D)

         OldDepLast = &D->NextDepends;
         OldDepLast = &D->NextDepends;

-   }
+   } else if (oldMap != Map.Data())
+      OldDepLast += (map_pointer_t const * const) Map.Data() - (map_pointer_t const * const) oldMap;

 
    Dep->NextDepends = *OldDepLast;
 
    Dep->NextDepends = *OldDepLast;

-   *OldDepLast = Dep.Index();
+   *OldDepLast = Dependency;

    OldDepLast = &Dep->NextDepends;
    OldDepLast = &Dep->NextDepends;

-

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


@@ -633,74 +959,201 @@ bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg,
 // ---------------------------------------------------------------------
 /* This creates a Group and the Package to link this dependency to if
    needed and handles also the caching of the old endpoint */
 // ---------------------------------------------------------------------
 /* This creates a Group and the Package to link this dependency to if
    needed and handles also the caching of the old endpoint */

-bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver,
+bool pkgCacheListParser::NewDepends(pkgCache::VerIterator &Ver,

                                               const string &PackageName,
                                               const string &Arch,
                                               const string &Version,
                                               const string &PackageName,
                                               const string &Arch,
                                               const string &Version,

-                                              unsigned int Op,
-                                              unsigned int Type)
+                                              uint8_t const Op,
+                                              uint8_t const Type)

 {
    pkgCache::GrpIterator Grp;
 {
    pkgCache::GrpIterator Grp;

+   Dynamic<pkgCache::GrpIterator> DynGrp(Grp);

    if (unlikely(Owner->NewGroup(Grp, PackageName) == false))
       return false;
 
    if (unlikely(Owner->NewGroup(Grp, PackageName) == false))
       return false;
 

-   // Locate the target package
-   pkgCache::PkgIterator Pkg = Grp.FindPkg(Arch);
-   if (Pkg.end() == true) {
-      if (unlikely(Owner->NewPackage(Pkg, PackageName, Arch) == false))
-        return false;
+   map_stringitem_t idxVersion = 0;
+   if (Version.empty() == false)
+   {
+      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)
+        idxVersion = Ver->VerStr;
+
+      if (idxVersion == 0)
+      {
+        idxVersion = StoreString(pkgCacheGenerator::VERSIONNUMBER, Version);
+        if (unlikely(idxVersion == 0))
+           return false;
+      }

    }
 
    }
 

-   // Is it a file dependency?
-   if (unlikely(PackageName[0] == '/'))
-      FoundFileDeps = true;
+   bool const isNegative = (Type == pkgCache::Dep::DpkgBreaks ||
+        Type == pkgCache::Dep::Conflicts ||
+        Type == pkgCache::Dep::Replaces);
+
+   pkgCache::PkgIterator Pkg;
+   Dynamic<pkgCache::PkgIterator> DynPkg(Pkg);
+   if (isNegative == false || (Op & pkgCache::Dep::ArchSpecific) == pkgCache::Dep::ArchSpecific || Grp->FirstPackage == 0)
+   {
+      // Locate the target package
+      Pkg = Grp.FindPkg(Arch);
+      if (Pkg.end() == true) {
+        if (unlikely(Owner->NewPackage(Pkg, PackageName, Arch) == false))
+           return false;
+      }
+
+      /* Caching the old end point speeds up generation substantially */
+      if (OldDepVer != Ver) {
+        OldDepLast = NULL;
+        OldDepVer = Ver;
+      }

 
 

-   /* Caching the old end point speeds up generation substantially */
-   if (OldDepVer != Ver) {
-      OldDepLast = NULL;
-      OldDepVer = Ver;
+      return Owner->NewDepends(Pkg, Ver, idxVersion, Op, Type, OldDepLast);

    }
    }

+   else
+   {
+      /* Caching the old end point speeds up generation substantially */
+      if (OldDepVer != Ver) {
+        OldDepLast = NULL;
+        OldDepVer = Ver;
+      }

 
 

-   return Owner->NewDepends(Pkg, Ver, Version, Op, Type, OldDepLast);
+      for (Pkg = Grp.PackageList(); Pkg.end() == false; Pkg = Grp.NextPkg(Pkg))
+      {
+        if (Owner->NewDepends(Pkg, Ver, idxVersion, Op, Type, OldDepLast) == false)
+              return false;
+      }
+   }
+   return true;

 }
                                                                        /*}}}*/
 // ListParser::NewProvides - Create a Provides element                 /*{{{*/
 }
                                                                        /*}}}*/
 // ListParser::NewProvides - Create a Provides element                 /*{{{*/

-// ---------------------------------------------------------------------
-/* */
-bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver,
-                                               const string &PackageName,
-                                               const string &Version)
+bool pkgCacheListParser::NewProvides(pkgCache::VerIterator &Ver,
+                                               const string &PkgName,
+                                               const string &PkgArch,
+                                               const string &Version,
+                                               uint8_t const Flags)

 {
 {

-   pkgCache &Cache = Owner->Cache;
+   pkgCache const &Cache = Owner->Cache;

 
    // We do not add self referencing provides
 
    // We do not add self referencing provides

-   if (unlikely(Ver.ParentPkg().Name() == PackageName))
+   if (Ver.ParentPkg().Name() == PkgName && (PkgArch == Ver.ParentPkg().Arch() ||
+       (PkgArch == "all" && strcmp((Cache.StrP + Cache.HeaderP->Architecture), Ver.ParentPkg().Arch()) == 0)))

       return true;
       return true;

-   
+
+   // Locate the target package
+   pkgCache::PkgIterator Pkg;
+   Dynamic<pkgCache::PkgIterator> DynPkg(Pkg);
+   if (unlikely(Owner->NewPackage(Pkg,PkgName, PkgArch) == false))
+      return false;
+
+   map_stringitem_t idxProvideVersion = 0;
+   if (Version.empty() == false) {
+      idxProvideVersion = StoreString(pkgCacheGenerator::VERSIONNUMBER, Version);
+      if (unlikely(idxProvideVersion == 0))
+        return false;
+   }
+   return Owner->NewProvides(Ver, Pkg, idxProvideVersion, Flags);
+}
+bool pkgCacheGenerator::NewProvides(pkgCache::VerIterator &Ver,
+                                   pkgCache::PkgIterator &Pkg,
+                                   map_pointer_t const ProvideVersion,
+                                   uint8_t const Flags)
+{

    // Get a structure
    // Get a structure

-   unsigned long const Provides = Owner->Map.Allocate(sizeof(pkgCache::Provides));
+   map_pointer_t const Provides = AllocateInMap(sizeof(pkgCache::Provides));

    if (unlikely(Provides == 0))
       return false;
    if (unlikely(Provides == 0))
       return false;

-   Cache.HeaderP->ProvidesCount++;
-   
+   ++Cache.HeaderP->ProvidesCount;
+

    // Fill it in
    pkgCache::PrvIterator Prv(Cache,Cache.ProvideP + Provides,Cache.PkgP);
    Prv->Version = Ver.Index();
    // Fill it in
    pkgCache::PrvIterator Prv(Cache,Cache.ProvideP + Provides,Cache.PkgP);
    Prv->Version = Ver.Index();

+   Prv->ProvideVersion = ProvideVersion;
+   Prv->Flags = Flags;

    Prv->NextPkgProv = Ver->ProvidesList;
    Ver->ProvidesList = Prv.Index();
    Prv->NextPkgProv = Ver->ProvidesList;
    Ver->ProvidesList = Prv.Index();

-   if (Version.empty() == false && unlikely((Prv->ProvideVersion = WriteString(Version)) == 0))
-      return false;
-   
-   // Locate the target package
-   pkgCache::PkgIterator Pkg;
-   if (unlikely(Owner->NewPackage(Pkg,PackageName,string(Ver.Arch())) == false))
-      return false;
-   
+

    // Link it to the package
    Prv->ParentPkg = Pkg.Index();
    Prv->NextProvides = Pkg->ProvidesList;
    Pkg->ProvidesList = Prv.Index();
    // Link it to the package
    Prv->ParentPkg = Pkg.Index();
    Prv->NextProvides = Pkg->ProvidesList;
    Pkg->ProvidesList = Prv.Index();

-   
+   return true;
+}
+                                                                       /*}}}*/
+// ListParser::NewProvidesAllArch - add provides for all architectures /*{{{*/
+bool pkgCacheListParser::NewProvidesAllArch(pkgCache::VerIterator &Ver, string const &Package,
+                               string const &Version, uint8_t const Flags) {
+   pkgCache &Cache = Owner->Cache;
+   pkgCache::GrpIterator Grp = Cache.FindGrp(Package);
+   Dynamic<pkgCache::GrpIterator> DynGrp(Grp);
+
+   if (Grp.end() == true)
+      return NewProvides(Ver, Package, Cache.NativeArch(), Version, Flags);
+   else
+   {
+      map_stringitem_t idxProvideVersion = 0;
+      if (Version.empty() == false) {
+        idxProvideVersion = StoreString(pkgCacheGenerator::VERSIONNUMBER, Version);
+        if (unlikely(idxProvideVersion == 0))
+           return false;
+      }
+
+      bool const isImplicit = (Flags & pkgCache::Flag::MultiArchImplicit) == pkgCache::Flag::MultiArchImplicit;
+      bool const isArchSpecific = (Flags & pkgCache::Flag::ArchSpecific) == pkgCache::Flag::ArchSpecific;
+      pkgCache::PkgIterator OwnerPkg = Ver.ParentPkg();
+      Dynamic<pkgCache::PkgIterator> DynOwnerPkg(OwnerPkg);
+      pkgCache::PkgIterator Pkg;
+      Dynamic<pkgCache::PkgIterator> DynPkg(Pkg);
+      for (Pkg = Grp.PackageList(); Pkg.end() == false; Pkg = Grp.NextPkg(Pkg))
+      {
+        if (isImplicit && OwnerPkg == Pkg)
+           continue;
+        if (isArchSpecific == false && APT::Configuration::checkArchitecture(OwnerPkg.Arch()) == false)
+           continue;
+        if (Owner->NewProvides(Ver, Pkg, idxProvideVersion, Flags) == false)
+           return false;
+      }
+   }
+   return true;
+}
+                                                                       /*}}}*/
+bool pkgCacheListParser::SameVersion(unsigned short const Hash,                /*{{{*/
+      pkgCache::VerIterator const &Ver)
+{
+   return Hash == Ver->Hash;
+}
+                                                                       /*}}}*/
+// CacheGenerator::SelectReleaseFile - Select the current release file the indexes belong to   /*{{{*/
+bool pkgCacheGenerator::SelectReleaseFile(const string &File,const string &Site,
+                                  unsigned long Flags)
+{
+   if (File.empty() && Site.empty())
+   {
+      CurrentRlsFile = NULL;
+      return true;
+   }
+
+   // Get some space for the structure
+   map_pointer_t const idxFile = AllocateInMap(sizeof(*CurrentRlsFile));
+   if (unlikely(idxFile == 0))
+      return false;
+   CurrentRlsFile = Cache.RlsFileP + idxFile;
+
+   // Fill it in
+   map_stringitem_t const idxFileName = WriteStringInMap(File);
+   map_stringitem_t const idxSite = StoreString(MIXED, Site);
+   if (unlikely(idxFileName == 0 || idxSite == 0))
+      return false;
+   CurrentRlsFile->FileName = idxFileName;
+   CurrentRlsFile->Site = idxSite;
+   CurrentRlsFile->NextFile = Cache.HeaderP->RlsFileList;
+   CurrentRlsFile->Flags = Flags;
+   CurrentRlsFile->ID = Cache.HeaderP->ReleaseFileCount;
+   RlsFileName = File;
+   Cache.HeaderP->RlsFileList = CurrentRlsFile - Cache.RlsFileP;
+   Cache.HeaderP->ReleaseFileCount++;
+

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


@@ -708,29 +1161,51 @@ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver,
 // ---------------------------------------------------------------------
 /* This is used to select which file is to be associated with all newly
    added versions. The caller is responsible for setting the IMS fields. */
 // ---------------------------------------------------------------------
 /* This is used to select which file is to be associated with all newly
    added versions. The caller is responsible for setting the IMS fields. */

-bool pkgCacheGenerator::SelectFile(const string &File,const string &Site,
-                                  const pkgIndexFile &Index,
-                                  unsigned long Flags)
+bool pkgCacheGenerator::SelectFile(std::string const &File,
+                                  pkgIndexFile const &Index,
+                                  std::string const &Architecture,
+                                  std::string const &Component,
+                                  unsigned long const Flags)

 {
    // Get some space for the structure
 {
    // Get some space for the structure

-   CurrentFile = Cache.PkgFileP + Map.Allocate(sizeof(*CurrentFile));
-   if (CurrentFile == Cache.PkgFileP)
+   map_pointer_t const idxFile = AllocateInMap(sizeof(*CurrentFile));
+   if (unlikely(idxFile == 0))

       return false;
       return false;

-   
+   CurrentFile = Cache.PkgFileP + idxFile;
+

    // Fill it in
    // Fill it in

-   CurrentFile->FileName = Map.WriteString(File);
-   CurrentFile->Site = WriteUniqString(Site);
+   map_stringitem_t const idxFileName = WriteStringInMap(File);
+   if (unlikely(idxFileName == 0))
+      return false;
+   CurrentFile->FileName = idxFileName;

    CurrentFile->NextFile = Cache.HeaderP->FileList;
    CurrentFile->NextFile = Cache.HeaderP->FileList;

-   CurrentFile->Flags = Flags;

    CurrentFile->ID = Cache.HeaderP->PackageFileCount;
    CurrentFile->ID = Cache.HeaderP->PackageFileCount;

-   CurrentFile->IndexType = WriteUniqString(Index.GetType()->Label);
+   map_stringitem_t const idxIndexType = StoreString(MIXED, Index.GetType()->Label);
+   if (unlikely(idxIndexType == 0))
+      return false;
+   CurrentFile->IndexType = idxIndexType;
+   if (Architecture.empty())
+      CurrentFile->Architecture = 0;
+   else
+   {
+      map_stringitem_t const arch = StoreString(pkgCacheGenerator::MIXED, Architecture);
+      if (unlikely(arch == 0))
+        return false;
+      CurrentFile->Architecture = arch;
+   }
+   map_stringitem_t const component = StoreString(pkgCacheGenerator::MIXED, Component);
+   if (unlikely(component == 0))
+      return false;
+   CurrentFile->Component = component;
+   CurrentFile->Flags = Flags;
+   if (CurrentRlsFile != NULL)
+      CurrentFile->Release = CurrentRlsFile - Cache.RlsFileP;
+   else
+      CurrentFile->Release = 0;

    PkgFileName = File;
    Cache.HeaderP->FileList = CurrentFile - Cache.PkgFileP;
    Cache.HeaderP->PackageFileCount++;
 
    PkgFileName = File;
    Cache.HeaderP->FileList = CurrentFile - Cache.PkgFileP;
    Cache.HeaderP->PackageFileCount++;
 

-   if (CurrentFile->FileName == 0)
-      return false;
-   

    if (Progress != 0)
       Progress->SubProgress(Index.Size());
    return true;
    if (Progress != 0)
       Progress->SubProgress(Index.Size());
    return true;


@@ -740,50 +1215,27 @@ bool pkgCacheGenerator::SelectFile(const string &File,const string &Site,
 // ---------------------------------------------------------------------
 /* This is used to create handles to strings. Given the same text it
    always returns the same number */
 // ---------------------------------------------------------------------
 /* This is used to create handles to strings. Given the same text it
    always returns the same number */

-unsigned long pkgCacheGenerator::WriteUniqString(const char *S,
+map_stringitem_t pkgCacheGenerator::StoreString(enum StringType const type, const char *S,

                                                 unsigned int Size)
 {
                                                 unsigned int Size)
 {

-   /* We use a very small transient hash table here, this speeds up generation
-      by a fair amount on slower machines */
-   pkgCache::StringItem *&Bucket = UniqHash[(S[0]*5 + S[1]) % _count(UniqHash)];
-   if (Bucket != 0 && 
-       stringcmp(S,S+Size,Cache.StrP + Bucket->String) == 0)
-      return Bucket->String;
-   
-   // Search for an insertion point
-   pkgCache::StringItem *I = Cache.StringItemP + Cache.HeaderP->StringList;
-   int Res = 1;
-   map_ptrloc *Last = &Cache.HeaderP->StringList;
-   for (; I != Cache.StringItemP; Last = &I->NextItem, 
-        I = Cache.StringItemP + I->NextItem)
-   {
-      Res = stringcmp(S,S+Size,Cache.StrP + I->String);
-      if (Res >= 0)
-        break;
-   }
-   
-   // Match
-   if (Res == 0)
-   {
-      Bucket = I;
-      return I->String;
+   std::string const key(S, Size);
+
+   std::map<std::string,map_stringitem_t> * strings;
+   switch(type) {
+      case MIXED: strings = &strMixed; break;
+      case PKGNAME: strings = &strPkgNames; break;
+      case VERSIONNUMBER: strings = &strVersions; break;
+      case SECTION: strings = &strSections; break;
+      default: _error->Fatal("Unknown enum type used for string storage of '%s'", key.c_str()); return 0;

    }
    }

-   
-   // Get a structure
-   unsigned long Item = Map.Allocate(sizeof(pkgCache::StringItem));
-   if (Item == 0)
-      return 0;

 
 

-   // Fill in the structure
-   pkgCache::StringItem *ItemP = Cache.StringItemP + Item;
-   ItemP->NextItem = I - Cache.StringItemP;
-   *Last = Item;
-   ItemP->String = Map.WriteString(S,Size);
-   if (ItemP->String == 0)
-      return 0;
-   
-   Bucket = ItemP;
-   return ItemP->String;
+   std::map<std::string,map_stringitem_t>::const_iterator const item = strings->find(key);
+   if (item != strings->end())
+      return item->second;
+
+   map_stringitem_t const idxString = WriteStringInMap(S,Size);
+   strings->insert(std::make_pair(key, idxString));
+   return idxString;

 }
                                                                        /*}}}*/
 // CheckValidity - Check that a cache is up-to-date                    /*{{{*/
 }
                                                                        /*}}}*/
 // CheckValidity - Check that a cache is up-to-date                    /*{{{*/


@@ -791,61 +1243,123 @@ unsigned long pkgCacheGenerator::WriteUniqString(const char *S,
 /* This just verifies that each file in the list of index files exists,
    has matching attributes with the cache and the cache does not have
    any extra files. */
 /* This just verifies that each file in the list of index files exists,
    has matching attributes with the cache and the cache does not have
    any extra files. */

-static bool CheckValidity(const string &CacheFile, FileIterator Start, 
-                          FileIterator End,MMap **OutMap = 0)
+static bool CheckValidity(const string &CacheFile,
+                          pkgSourceList &List,
+                          FileIterator const Start,
+                          FileIterator const End,
+                          MMap **OutMap = 0)

 {
 {

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

    // No file, certainly invalid
    if (CacheFile.empty() == true || FileExists(CacheFile) == false)
    // No file, certainly invalid
    if (CacheFile.empty() == true || FileExists(CacheFile) == false)

+   {
+      if (Debug == true)
+        std::clog << "CacheFile " << CacheFile << " doesn't exist" << std::endl;

       return false;
       return false;

-   
+   }
+
+   if (List.GetLastModifiedTime() > GetModificationTime(CacheFile))
+   {
+      if (Debug == true)
+        std::clog << "sources.list is newer than the cache" << std::endl;
+      return false;
+   }
+

    // Map it
    FileFd CacheF(CacheFile,FileFd::ReadOnly);
    // Map it
    FileFd CacheF(CacheFile,FileFd::ReadOnly);

-   SPtr<MMap> Map = new MMap(CacheF,0);
-   pkgCache Cache(Map);
+   std::unique_ptr<MMap> Map(new MMap(CacheF,0));
+   pkgCache Cache(Map.get());

    if (_error->PendingError() == true || Map->Size() == 0)
    {
    if (_error->PendingError() == true || Map->Size() == 0)
    {

+      if (Debug == true)
+        std::clog << "Errors are pending or Map is empty() for " << CacheFile << std::endl;

       _error->Discard();
       return false;
    }
       _error->Discard();
       return false;
    }

-   
+
+   std::unique_ptr<bool[]> RlsVisited(new bool[Cache.HeaderP->ReleaseFileCount]);
+   memset(RlsVisited.get(),0,sizeof(RlsVisited[0])*Cache.HeaderP->ReleaseFileCount);
+   std::vector<pkgIndexFile *> Files;
+   for (pkgSourceList::const_iterator i = List.begin(); i != List.end(); ++i)
+   {
+      if (Debug == true)
+        std::clog << "Checking RlsFile " << (*i)->Describe() << ": ";
+      pkgCache::RlsFileIterator const RlsFile = (*i)->FindInCache(Cache, true);
+      if (RlsFile.end() == true)
+      {
+        if (Debug == true)
+           std::clog << "FindInCache returned end-Pointer" << std::endl;
+        return false;
+      }
+
+      RlsVisited[RlsFile->ID] = true;
+      if (Debug == true)
+        std::clog << "with ID " << RlsFile->ID << " is valid" << std::endl;
+
+      std::vector <pkgIndexFile *> const * const Indexes = (*i)->GetIndexFiles();
+      std::copy_if(Indexes->begin(), Indexes->end(), std::back_inserter(Files),
+           [](pkgIndexFile const * const I) { return I->HasPackages(); });
+   }
+   for (unsigned I = 0; I != Cache.HeaderP->ReleaseFileCount; ++I)
+      if (RlsVisited[I] == false)
+      {
+        if (Debug == true)
+           std::clog << "RlsFile with ID" << I << " wasn't visited" << std::endl;
+        return false;
+      }
+
+   std::copy(Start, End, std::back_inserter(Files));
+

    /* Now we check every index file, see if it is in the cache,
       verify the IMS data and check that it is on the disk too.. */
    /* Now we check every index file, see if it is in the cache,
       verify the IMS data and check that it is on the disk too.. */

-   SPtrArray<bool> Visited = new bool[Cache.HeaderP->PackageFileCount];
-   memset(Visited,0,sizeof(*Visited)*Cache.HeaderP->PackageFileCount);
-   for (; Start != End; Start++)
-   {      
-      if ((*Start)->HasPackages() == false)
-        continue;
-    
-      if ((*Start)->Exists() == false)
+   std::unique_ptr<bool[]> Visited(new bool[Cache.HeaderP->PackageFileCount]);
+   memset(Visited.get(),0,sizeof(Visited[0])*Cache.HeaderP->PackageFileCount);
+   for (std::vector<pkgIndexFile *>::const_reverse_iterator PkgFile = Files.rbegin(); PkgFile != Files.rend(); ++PkgFile)
+   {
+      if (Debug == true)
+        std::clog << "Checking PkgFile " << (*PkgFile)->Describe() << ": ";
+      if ((*PkgFile)->Exists() == false)

       {
       {

-#if 0 // mvo: we no longer give a message here (Default Sources spec)
-        _error->WarningE("stat",_("Couldn't stat source package list %s"),
-                         (*Start)->Describe().c_str());
-#endif
+         if (Debug == true)
+           std::clog << "file doesn't exist" << std::endl;

         continue;
       }
 
       // FindInCache is also expected to do an IMS check.
         continue;
       }
 
       // FindInCache is also expected to do an IMS check.

-      pkgCache::PkgFileIterator File = (*Start)->FindInCache(Cache);
+      pkgCache::PkgFileIterator File = (*PkgFile)->FindInCache(Cache);

       if (File.end() == true)
       if (File.end() == true)

+      {
+        if (Debug == true)
+           std::clog << "FindInCache returned end-Pointer" << std::endl;

         return false;
         return false;

+      }

 
       Visited[File->ID] = true;
 
       Visited[File->ID] = true;

+      if (Debug == true)
+        std::clog << "with ID " << File->ID << " is valid" << std::endl;

    }
    }

-   
+

    for (unsigned I = 0; I != Cache.HeaderP->PackageFileCount; I++)
       if (Visited[I] == false)
    for (unsigned I = 0; I != Cache.HeaderP->PackageFileCount; I++)
       if (Visited[I] == false)

+      {
+        if (Debug == true)
+           std::clog << "PkgFile with ID" << I << " wasn't visited" << std::endl;

         return false;
         return false;

-   
+      }
+

    if (_error->PendingError() == true)
    {
    if (_error->PendingError() == true)
    {

+      if (Debug == true)
+      {
+        std::clog << "Validity failed because of pending errors:" << std::endl;
+        _error->DumpErrors();
+      }

       _error->Discard();
       return false;
    }
    
    if (OutMap != 0)
       _error->Discard();
       return false;
    }
    
    if (OutMap != 0)

-      *OutMap = Map.UnGuard();
+      *OutMap = Map.release();

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


@@ -853,69 +1367,95 @@ static bool CheckValidity(const string &CacheFile, FileIterator Start,
 // ---------------------------------------------------------------------
 /* Size is kind of an abstract notion that is only used for the progress
    meter */
 // ---------------------------------------------------------------------
 /* Size is kind of an abstract notion that is only used for the progress
    meter */

-static unsigned long ComputeSize(FileIterator Start,FileIterator End)
+static map_filesize_t ComputeSize(pkgSourceList const * const List, FileIterator Start,FileIterator End)

 {
 {

-   unsigned long TotalSize = 0;
-   for (; Start != End; Start++)
+   map_filesize_t TotalSize = 0;
+   if (List !=  NULL)
+   {
+      for (pkgSourceList::const_iterator i = List->begin(); i != List->end(); ++i)
+      {
+        std::vector <pkgIndexFile *> *Indexes = (*i)->GetIndexFiles();
+        for (std::vector<pkgIndexFile *>::const_iterator j = Indexes->begin(); j != Indexes->end(); ++j)
+           if ((*j)->HasPackages() == true)
+              TotalSize += (*j)->Size();
+      }
+   }
+
+   for (; Start < End; ++Start)

    {
       if ((*Start)->HasPackages() == false)
    {
       if ((*Start)->HasPackages() == false)

-        continue;      
+        continue;

       TotalSize += (*Start)->Size();
    }
    return TotalSize;
 }
                                                                        /*}}}*/
 // BuildCache - Merge the list of index files into the cache           /*{{{*/
       TotalSize += (*Start)->Size();
    }
    return TotalSize;
 }
                                                                        /*}}}*/
 // BuildCache - Merge the list of index files into the cache           /*{{{*/

-// ---------------------------------------------------------------------
-/* */

 static bool BuildCache(pkgCacheGenerator &Gen,
 static bool BuildCache(pkgCacheGenerator &Gen,

-                      OpProgress &Progress,
-                      unsigned long &CurrentSize,unsigned long TotalSize,
-                      FileIterator Start, FileIterator End)
+                      OpProgress * const Progress,
+                      map_filesize_t &CurrentSize,map_filesize_t TotalSize,
+                      pkgSourceList const * const List,
+                      FileIterator const Start, FileIterator const End)

 {
 {

-   FileIterator I;
-   for (I = Start; I != End; I++)
-   {
-      if ((*I)->HasPackages() == false)
-        continue;
-      
-      if ((*I)->Exists() == false)
-        continue;
+   std::vector<pkgIndexFile *> Files;
+   bool mergeFailure = false;
+
+   auto const indexFileMerge = [&](pkgIndexFile * const I) {
+      if (I->HasPackages() == false || mergeFailure)
+        return;

 
 

-      if ((*I)->FindInCache(Gen.GetCache()).end() == false)
+      if (I->Exists() == false)
+        return;
+
+      if (I->FindInCache(Gen.GetCache()).end() == false)

       {
         _error->Warning("Duplicate sources.list entry %s",
       {
         _error->Warning("Duplicate sources.list entry %s",

-                        (*I)->Describe().c_str());
-        continue;
+              I->Describe().c_str());
+        return;

       }
       }

-      
-      unsigned long Size = (*I)->Size();
-      Progress.OverallProgress(CurrentSize,TotalSize,Size,_("Reading package lists"));
+
+      map_filesize_t const Size = I->Size();
+      if (Progress != NULL)
+        Progress->OverallProgress(CurrentSize, TotalSize, Size, _("Reading package lists"));

       CurrentSize += Size;
       CurrentSize += Size;

-      
-      if ((*I)->Merge(Gen,Progress) == false)
-        return false;
-   }   

 
 

-   if (Gen.HasFileDeps() == true)
+      if (I->Merge(Gen,Progress) == false)
+        mergeFailure = true;
+   };
+
+   if (List !=  NULL)

    {
    {

-      Progress.Done();
-      TotalSize = ComputeSize(Start, End);
-      CurrentSize = 0;
-      for (I = Start; I != End; I++)
+      for (pkgSourceList::const_iterator i = List->begin(); i != List->end(); ++i)

       {
       {

-        unsigned long Size = (*I)->Size();
-        Progress.OverallProgress(CurrentSize,TotalSize,Size,_("Collecting File Provides"));
-        CurrentSize += Size;
-        if ((*I)->MergeFileProvides(Gen,Progress) == false)
+        if ((*i)->FindInCache(Gen.GetCache(), false).end() == false)
+        {
+           _error->Warning("Duplicate sources.list entry %s",
+                 (*i)->Describe().c_str());
+           continue;
+        }
+
+        if ((*i)->Merge(Gen, Progress) == false)
+           return false;
+
+        std::vector <pkgIndexFile *> *Indexes = (*i)->GetIndexFiles();
+        if (Indexes != NULL)
+           std::for_each(Indexes->begin(), Indexes->end(), indexFileMerge);
+        if (mergeFailure)

            return false;
       }
    }
            return false;
       }
    }

-   
+
+   if (Start != End)
+   {
+      Gen.SelectReleaseFile("", "");
+      std::for_each(Start, End, indexFileMerge);
+      if (mergeFailure)
+        return false;
+   }

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

-// MakeStatusCache - Construct the status cache                                /*{{{*/
+// CacheGenerator::MakeStatusCache - Construct the status cache                /*{{{*/

 // ---------------------------------------------------------------------
 /* This makes sure that the status cache (the cache that has all 
    index files from the sources list and all local ones) is ready
 // ---------------------------------------------------------------------
 /* This makes sure that the status cache (the cache that has all 
    index files from the sources list and all local ones) is ready


@@ -923,192 +1463,249 @@ static bool BuildCache(pkgCacheGenerator &Gen,
    the cache will be stored there. This is pretty much mandetory if you
    are using AllowMem. AllowMem lets the function be run as non-root
    where it builds the cache 'fast' into a memory buffer. */
    the cache will be stored there. This is pretty much mandetory if you
    are using AllowMem. AllowMem lets the function be run as non-root
    where it builds the cache 'fast' into a memory buffer. */

-bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
-                       MMap **OutMap,bool AllowMem)
+static DynamicMMap* CreateDynamicMMap(FileFd * const CacheF, unsigned long Flags)

 {
 {

-   unsigned long MapSize = _config->FindI("APT::Cache-Limit",24*1024*1024);
-   
-   vector<pkgIndexFile *> Files;
-   for (vector<metaIndex *>::const_iterator i = List.begin();
-        i != List.end();
-        i++)
-   {
-      vector <pkgIndexFile *> *Indexes = (*i)->GetIndexFiles();
-      for (vector<pkgIndexFile *>::const_iterator j = Indexes->begin();
-          j != Indexes->end();
-          j++)
-         Files.push_back (*j);
-   }
-   
-   unsigned long EndOfSource = Files.size();
+   map_filesize_t const MapStart = _config->FindI("APT::Cache-Start", 24*1024*1024);
+   map_filesize_t const MapGrow = _config->FindI("APT::Cache-Grow", 1*1024*1024);
+   map_filesize_t const MapLimit = _config->FindI("APT::Cache-Limit", 0);
+   Flags |= MMap::Moveable;
+   if (_config->FindB("APT::Cache-Fallback", false) == true)
+      Flags |= MMap::Fallback;
+   if (CacheF != NULL)
+      return new DynamicMMap(*CacheF, Flags, MapStart, MapGrow, MapLimit);
+   else
+      return new DynamicMMap(Flags, MapStart, MapGrow, MapLimit);
+}
+static bool writeBackMMapToFile(pkgCacheGenerator * const Gen, DynamicMMap * const Map,
+      std::string const &FileName)
+{
+   FileFd SCacheF(FileName, FileFd::WriteAtomic);
+   if (_error->PendingError() == true)
+      return false;
+
+   fchmod(SCacheF.Fd(),0644);
+
+   // Write out the main data
+   if (SCacheF.Write(Map->Data(),Map->Size()) == false)
+      return _error->Error(_("IO Error saving source cache"));
+   SCacheF.Sync();
+
+   // Write out the proper header
+   Gen->GetCache().HeaderP->Dirty = false;
+   if (SCacheF.Seek(0) == false ||
+        SCacheF.Write(Map->Data(),sizeof(*Gen->GetCache().HeaderP)) == false)
+      return _error->Error(_("IO Error saving source cache"));
+   Gen->GetCache().HeaderP->Dirty = true;
+   SCacheF.Sync();
+   return true;
+}
+static bool loadBackMMapFromFile(std::unique_ptr<pkgCacheGenerator> &Gen,
+      std::unique_ptr<DynamicMMap> &Map, OpProgress * const Progress, std::string const &FileName)
+{
+   Map.reset(CreateDynamicMMap(NULL, 0));
+   FileFd CacheF(FileName, FileFd::ReadOnly);
+   map_pointer_t const alloc = Map->RawAllocate(CacheF.Size());
+   if ((alloc == 0 && _error->PendingError())
+        || CacheF.Read((unsigned char *)Map->Data() + alloc,
+           CacheF.Size()) == false)
+      return false;
+   Gen.reset(new pkgCacheGenerator(Map.get(),Progress));
+   return true;
+}
+APT_DEPRECATED bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
+                       MMap **OutMap, bool AllowMem)
+   { return pkgCacheGenerator::MakeStatusCache(List, &Progress, OutMap, AllowMem); }
+bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress,
+                       MMap **OutMap,bool)
+{
+   // FIXME: deprecate the ignored AllowMem parameter
+   bool const Debug = _config->FindB("Debug::pkgCacheGen", false);
+
+   std::vector<pkgIndexFile *> Files;

    if (_system->AddStatusFiles(Files) == false)
       return false;
 
    // Decide if we can write to the files..
    if (_system->AddStatusFiles(Files) == false)
       return false;
 
    // Decide if we can write to the files..

-   string CacheFile = _config->FindFile("Dir::Cache::pkgcache");
-   string SrcCacheFile = _config->FindFile("Dir::Cache::srcpkgcache");
-   
-   // Decide if we can write to the cache
-   bool Writeable = false;
-   if (CacheFile.empty() == false)
-      Writeable = access(flNotFile(CacheFile).c_str(),W_OK) == 0;
-   else
-      if (SrcCacheFile.empty() == false)
-        Writeable = access(flNotFile(SrcCacheFile).c_str(),W_OK) == 0;
-   
-   if (Writeable == false && AllowMem == false && CacheFile.empty() == false)
-      return _error->Error(_("Unable to write to %s"),flNotFile(CacheFile).c_str());
-   
-   Progress.OverallProgress(0,1,1,_("Reading package lists"));
-   
-   // Cache is OK, Fin.
-   if (CheckValidity(CacheFile,Files.begin(),Files.end(),OutMap) == true)
+   string const CacheFile = _config->FindFile("Dir::Cache::pkgcache");
+   string const SrcCacheFile = _config->FindFile("Dir::Cache::srcpkgcache");
+
+   // ensure the cache directory exists
+   if (CacheFile.empty() == false || SrcCacheFile.empty() == false)

    {
    {

-      Progress.OverallProgress(1,1,1,_("Reading package lists"));
-      return true;
+      string dir = _config->FindDir("Dir::Cache");
+      size_t const len = dir.size();
+      if (len > 5 && dir.find("/apt/", len - 6, 5) == len - 5)
+        dir = dir.substr(0, len - 5);
+      if (CacheFile.empty() == false)
+        CreateDirectory(dir, flNotFile(CacheFile));
+      if (SrcCacheFile.empty() == false)
+        CreateDirectory(dir, flNotFile(SrcCacheFile));

    }
    }

-   
-   /* At this point we know we need to reconstruct the package cache,
-      begin. */
-   SPtr<FileFd> CacheF;
-   SPtr<DynamicMMap> Map;
-   if (Writeable == true && CacheFile.empty() == false)
+
+   if (Progress != NULL)
+      Progress->OverallProgress(0,1,1,_("Reading package lists"));
+
+   bool pkgcache_fine = false;
+   bool srcpkgcache_fine = false;
+   bool volatile_fine = List.GetVolatileFiles().empty();
+
+   if (CheckValidity(CacheFile, List, Files.begin(), Files.end(), volatile_fine ? OutMap : NULL) == true)

    {
    {

-      unlink(CacheFile.c_str());
-      CacheF = new FileFd(CacheFile,FileFd::WriteEmpty);
-      fchmod(CacheF->Fd(),0644);
-      Map = new DynamicMMap(*CacheF,MMap::Public,MapSize);
-      if (_error->PendingError() == true)
-        return false;
+      if (Debug == true)
+        std::clog << "pkgcache.bin is valid - no need to build any cache" << std::endl;
+      pkgcache_fine = true;
+      srcpkgcache_fine = true;

    }
    }

-   else
+   if (pkgcache_fine == false)

    {
    {

-      // Just build it in memory..
-      Map = new DynamicMMap(0,MapSize);
+      if (CheckValidity(SrcCacheFile, List, Files.end(), Files.end()) == true)
+      {
+        if (Debug == true)
+           std::clog << "srcpkgcache.bin is valid - it can be reused" << std::endl;
+        srcpkgcache_fine = true;
+      }

    }
    }

-   
-   // Lets try the source cache.
-   unsigned long CurrentSize = 0;
-   unsigned long TotalSize = 0;
-   if (CheckValidity(SrcCacheFile,Files.begin(),
-                    Files.begin()+EndOfSource) == true)
+
+   if (volatile_fine == true && srcpkgcache_fine == true && pkgcache_fine == true)

    {
    {

-      // Preload the map with the source cache
-      FileFd SCacheF(SrcCacheFile,FileFd::ReadOnly);
-      unsigned long alloc = Map->RawAllocate(SCacheF.Size());
-      if ((alloc == 0 && _error->PendingError())
-               || SCacheF.Read((unsigned char *)Map->Data() + alloc,
-                               SCacheF.Size()) == false)
-        return false;
+      if (Progress != NULL)
+        Progress->OverallProgress(1,1,1,_("Reading package lists"));
+      return true;
+   }

 
 

-      TotalSize = ComputeSize(Files.begin()+EndOfSource,Files.end());
-      
-      // Build the status cache
-      pkgCacheGenerator Gen(Map.Get(),&Progress);
-      if (_error->PendingError() == true)
-        return false;
-      if (BuildCache(Gen,Progress,CurrentSize,TotalSize,
-                    Files.begin()+EndOfSource,Files.end()) == false)
-        return false;
+   bool Writeable = false;
+   if (srcpkgcache_fine == false || pkgcache_fine == false)
+   {
+      if (CacheFile.empty() == false)
+        Writeable = access(flNotFile(CacheFile).c_str(),W_OK) == 0;
+      else if (SrcCacheFile.empty() == false)
+        Writeable = access(flNotFile(SrcCacheFile).c_str(),W_OK) == 0;

 
 

-      // FIXME: move me to a better place
-      Gen.FinishCache(Progress);
+      if (Debug == true)
+        std::clog << "Do we have write-access to the cache files? " << (Writeable ? "YES" : "NO") << std::endl;

    }
    }

-   else
+
+   // At this point we know we need to construct something, so get storage ready
+   std::unique_ptr<DynamicMMap> Map(CreateDynamicMMap(NULL, 0));
+   if (Debug == true)
+      std::clog << "Open memory Map (not filebased)" << std::endl;
+
+   std::unique_ptr<pkgCacheGenerator> Gen{nullptr};
+   map_filesize_t CurrentSize = 0;
+   std::vector<pkgIndexFile*> VolatileFiles = List.GetVolatileFiles();
+   map_filesize_t TotalSize = ComputeSize(NULL, VolatileFiles.begin(), VolatileFiles.end());
+   if (srcpkgcache_fine == true && pkgcache_fine == false)

    {
    {

-      TotalSize = ComputeSize(Files.begin(),Files.end());
-      
-      // Build the source cache
-      pkgCacheGenerator Gen(Map.Get(),&Progress);
-      if (_error->PendingError() == true)
+      if (Debug == true)
+        std::clog << "srcpkgcache.bin was valid - populate MMap with it" << std::endl;
+      if (loadBackMMapFromFile(Gen, Map, Progress, SrcCacheFile) == false)

         return false;
         return false;

-      if (BuildCache(Gen,Progress,CurrentSize,TotalSize,
-                    Files.begin(),Files.begin()+EndOfSource) == false)
+      srcpkgcache_fine = true;
+      TotalSize += ComputeSize(NULL, Files.begin(), Files.end());
+   }
+   else if (srcpkgcache_fine == false)
+   {
+      if (Debug == true)
+        std::clog << "srcpkgcache.bin is NOT valid - rebuild" << std::endl;
+      Gen.reset(new pkgCacheGenerator(Map.get(),Progress));
+
+      TotalSize += ComputeSize(&List, Files.begin(),Files.end());
+      if (BuildCache(*Gen, Progress, CurrentSize, TotalSize, &List,
+              Files.end(),Files.end()) == false)

         return false;
         return false;

-      
-      // Write it back
+

       if (Writeable == true && SrcCacheFile.empty() == false)
       if (Writeable == true && SrcCacheFile.empty() == false)

-      {
-        FileFd SCacheF(SrcCacheFile,FileFd::WriteEmpty);
-        if (_error->PendingError() == true)
+        if (writeBackMMapToFile(Gen.get(), Map.get(), SrcCacheFile) == false)

            return false;
            return false;

-        
-        fchmod(SCacheF.Fd(),0644);
-        
-        // Write out the main data
-        if (SCacheF.Write(Map->Data(),Map->Size()) == false)
-           return _error->Error(_("IO Error saving source cache"));
-        SCacheF.Sync();
-        
-        // Write out the proper header
-        Gen.GetCache().HeaderP->Dirty = false;
-        if (SCacheF.Seek(0) == false ||
-            SCacheF.Write(Map->Data(),sizeof(*Gen.GetCache().HeaderP)) == false)
-           return _error->Error(_("IO Error saving source cache"));
-        Gen.GetCache().HeaderP->Dirty = true;
-        SCacheF.Sync();
-      }
-      
-      // Build the status cache
-      if (BuildCache(Gen,Progress,CurrentSize,TotalSize,
-                    Files.begin()+EndOfSource,Files.end()) == false)
+   }
+
+   if (pkgcache_fine == false)
+   {
+      if (Debug == true)
+        std::clog << "Building status cache in pkgcache.bin now" << std::endl;
+      if (BuildCache(*Gen, Progress, CurrentSize, TotalSize, NULL,
+              Files.begin(), Files.end()) == false)

         return false;
 
         return false;
 

-      // FIXME: move me to a better place
-      Gen.FinishCache(Progress);
+      if (Writeable == true && CacheFile.empty() == false)
+        if (writeBackMMapToFile(Gen.get(), Map.get(), CacheFile) == false)
+           return false;

    }
 
    }
 

-   if (_error->PendingError() == true)
-      return false;
-   if (OutMap != 0)
+   if (Debug == true)
+      std::clog << "Caches done. Now bring in the volatile files (if any)" << std::endl;
+
+   if (volatile_fine == false)

    {
    {

-      if (CacheF != 0)
+      if (Gen == nullptr)

       {
       {

-        delete Map.UnGuard();
-        *OutMap = new MMap(*CacheF,0);
+        if (Debug == true)
+           std::clog << "Populate new MMap with cachefile contents" << std::endl;
+        if (loadBackMMapFromFile(Gen, Map, Progress, CacheFile) == false)
+           return false;

       }
       }

-      else
-      {
-        *OutMap = Map.UnGuard();
-      }      
+
+      Files = List.GetVolatileFiles();
+      if (BuildCache(*Gen, Progress, CurrentSize, TotalSize, NULL,
+              Files.begin(), Files.end()) == false)
+        return false;

    }
    }

-   
+
+   if (OutMap != nullptr)
+      *OutMap = Map.release();
+
+   if (Debug == true)
+      std::clog << "Everything is ready for shipping" << std::endl;

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

-// MakeOnlyStatusCache - Build a cache with just the status files      /*{{{*/
+// CacheGenerator::MakeOnlyStatusCache - Build only a status files cache/*{{{*/

 // ---------------------------------------------------------------------
 /* */
 // ---------------------------------------------------------------------
 /* */

-bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap)
+APT_DEPRECATED bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap)
+   { return pkgCacheGenerator::MakeOnlyStatusCache(&Progress, OutMap); }
+bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap)

 {
 {

-   unsigned long MapSize = _config->FindI("APT::Cache-Limit",20*1024*1024);
-   vector<pkgIndexFile *> Files;
-   unsigned long EndOfSource = Files.size();
+   std::vector<pkgIndexFile *> Files;

    if (_system->AddStatusFiles(Files) == false)
       return false;
    if (_system->AddStatusFiles(Files) == false)
       return false;

+
+   std::unique_ptr<DynamicMMap> Map(CreateDynamicMMap(NULL, 0));
+   map_filesize_t CurrentSize = 0;
+   map_filesize_t TotalSize = 0;

    
    

-   SPtr<DynamicMMap> Map = new DynamicMMap(0,MapSize);
-   unsigned long CurrentSize = 0;
-   unsigned long TotalSize = 0;
-   
-   TotalSize = ComputeSize(Files.begin()+EndOfSource,Files.end());
+   TotalSize = ComputeSize(NULL, Files.begin(), Files.end());

    
    // Build the status cache
    
    // Build the status cache

-   Progress.OverallProgress(0,1,1,_("Reading package lists"));
-   pkgCacheGenerator Gen(Map.Get(),&Progress);
+   if (Progress != NULL)
+      Progress->OverallProgress(0,1,1,_("Reading package lists"));
+   pkgCacheGenerator Gen(Map.get(),Progress);

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

-   if (BuildCache(Gen,Progress,CurrentSize,TotalSize,
-                 Files.begin()+EndOfSource,Files.end()) == false)
+   if (BuildCache(Gen,Progress,CurrentSize,TotalSize, NULL,
+                 Files.begin(), Files.end()) == false)

       return false;
 
       return false;
 

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

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

-   *OutMap = Map.UnGuard();
+   *OutMap = Map.release();

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

+// IsDuplicateDescription                                              /*{{{*/
+static bool IsDuplicateDescription(pkgCache::DescIterator Desc,
+                           MD5SumValue const &CurMd5, std::string const &CurLang)
+{
+   // Descriptions in the same link-list have all the same md5
+   if (Desc.end() == true || MD5SumValue(Desc.md5()) != CurMd5)
+      return false;
+   for (; Desc.end() == false; ++Desc)
+      if (Desc.LanguageCode() == CurLang)
+        return true;
+   return false;
+}
+                                                                       /*}}}*/
+
+pkgCacheListParser::pkgCacheListParser() : Owner(NULL), OldDepLast(NULL), d(NULL) {}
+pkgCacheListParser::~pkgCacheListParser() {}