debian/gbp.conf: point debian-branch to master

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

diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 9615b4c22303347cf6095f659c76a195103b28bb..e1958f45ace8b4b3162128e638dbc02800514ed6 100644 (file)
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -18,8 +18,6 @@
 #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/strutl.h>
-#include <apt-pkg/sptr.h>

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


@@ -36,11 +34,14 @@
 #include <iostream>
 #include <string>
 #include <vector>
 #include <iostream>
 #include <string>
 #include <vector>

+#include <memory>
+#include <algorithm>

 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <apti18n.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <apti18n.h>

-                                                                       /*}}}*/
+
+template<class T> using Dynamic = pkgCacheGenerator::Dynamic<T>;                                                       /*}}}*/

 typedef std::vector<pkgIndexFile *>::iterator FileIterator;
 template <typename Iter> std::vector<Iter*> pkgCacheGenerator::Dynamic<Iter>::toReMap;
 
 typedef std::vector<pkgIndexFile *>::iterator FileIterator;
 template <typename Iter> std::vector<Iter*> pkgCacheGenerator::Dynamic<Iter>::toReMap;
 


@@ -54,32 +55,33 @@ using std::string;
 /* 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),
 /* 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 (Map.Size() == 0)
    {
       // Setup the map interface..
       Cache.HeaderP = (pkgCache::Header *)Map.Data();
    if (Map.Size() == 0)
    {
       // Setup the map interface..
       Cache.HeaderP = (pkgCache::Header *)Map.Data();

-      if (Map.RawAllocate(sizeof(pkgCache::Header)) == 0 && _error->PendingError() == true)
+      _error->PushToStack();
+      Map.RawAllocate(sizeof(pkgCache::Header));
+      bool const newError = _error->PendingError();
+      _error->MergeWithStack();
+      if (newError)

         return;
 
       Map.UsePools(*Cache.HeaderP->Pools,sizeof(Cache.HeaderP->Pools)/sizeof(Cache.HeaderP->Pools[0]));
 
       // Starting header
       *Cache.HeaderP = pkgCache::Header();
         return;
 
       Map.UsePools(*Cache.HeaderP->Pools,sizeof(Cache.HeaderP->Pools)/sizeof(Cache.HeaderP->Pools[0]));
 
       // Starting header
       *Cache.HeaderP = pkgCache::Header();

-      map_ptrloc const idxVerSysName = WriteStringInMap(_system->VS->Label);
+
+      // 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;
       if (unlikely(idxVerSysName == 0))
         return;
       Cache.HeaderP->VerSysName = idxVerSysName;

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

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


@@ -91,13 +93,13 @@ pkgCacheGenerator::pkgCacheGenerator(DynamicMMap *pMap,OpProgress *Prog) :
         std::string list = *a;
         for (++a; a != archs.end(); ++a)
            list.append(",").append(*a);
         std::string list = *a;
         for (++a; a != archs.end(); ++a)
            list.append(",").append(*a);

-        map_ptrloc const idxArchitectures = WriteStringInMap(list);
+        map_stringitem_t const idxArchitectures = WriteStringInMap(list);

         if (unlikely(idxArchitectures == 0))
            return;
         if (unlikely(idxArchitectures == 0))
            return;

-        Cache.HeaderP->Architectures = idxArchitectures;
+        Cache.HeaderP->SetArchitectures(idxArchitectures);

       }
       else
       }
       else

-        Cache.HeaderP->Architectures = idxArchitecture;
+        Cache.HeaderP->SetArchitectures(idxArchitecture);

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


@@ -110,9 +112,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));
 }


@@ -123,7 +125,7 @@ pkgCacheGenerator::pkgCacheGenerator(DynamicMMap *pMap,OpProgress *Prog) :
    advoid a problem during a crash */
 pkgCacheGenerator::~pkgCacheGenerator()
 {
    advoid a problem during a crash */
 pkgCacheGenerator::~pkgCacheGenerator()
 {

-   if (_error->PendingError() == true)
+   if (_error->PendingError() == true || Map.validData() == false)

       return;
    if (Map.Sync() == false)
       return;
       return;
    if (Map.Sync() == false)
       return;


@@ -143,10 +145,7 @@ void pkgCacheGenerator::ReMap(void const * const oldMap, void const * const newM
    Cache.ReMap(false);
 
    CurrentFile += (pkgCache::PackageFile const * const) newMap - (pkgCache::PackageFile const * const) oldMap;
    Cache.ReMap(false);
 
    CurrentFile += (pkgCache::PackageFile const * const) newMap - (pkgCache::PackageFile const * const) oldMap;

-
-   for (size_t i = 0; i < _count(UniqHash); ++i)
-      if (UniqHash[i] != 0)
-        UniqHash[i] += (pkgCache::StringItem const * const) newMap - (pkgCache::StringItem 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)
 
    for (std::vector<pkgCache::GrpIterator*>::const_iterator i = Dynamic<pkgCache::GrpIterator>::toReMap.begin();
        i != Dynamic<pkgCache::GrpIterator>::toReMap.end(); ++i)


@@ -169,29 +168,32 @@ void pkgCacheGenerator::ReMap(void const * const oldMap, void const * const newM
    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::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                                    /*{{{*/
 }                                                                      /*}}}*/
 // CacheGenerator::WriteStringInMap                                    /*{{{*/

-map_ptrloc pkgCacheGenerator::WriteStringInMap(const char *String,
+map_stringitem_t pkgCacheGenerator::WriteStringInMap(const char *String,

                                        const unsigned long &Len) {
    void const * const oldMap = Map.Data();
                                        const unsigned long &Len) {
    void const * const oldMap = Map.Data();

-   map_ptrloc const index = Map.WriteString(String, Len);
+   map_stringitem_t const index = Map.WriteString(String, Len);

    if (index != 0)
       ReMap(oldMap, Map.Data());
    return index;
 }
                                                                        /*}}}*/
 // CacheGenerator::WriteStringInMap                                    /*{{{*/
    if (index != 0)
       ReMap(oldMap, Map.Data());
    return index;
 }
                                                                        /*}}}*/
 // CacheGenerator::WriteStringInMap                                    /*{{{*/

-map_ptrloc pkgCacheGenerator::WriteStringInMap(const char *String) {
+map_stringitem_t pkgCacheGenerator::WriteStringInMap(const char *String) {

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

-   map_ptrloc const index = Map.WriteString(String);
+   map_stringitem_t const index = Map.WriteString(String);

    if (index != 0)
       ReMap(oldMap, Map.Data());
    return index;
 }
                                                                        /*}}}*/
    if (index != 0)
       ReMap(oldMap, Map.Data());
    return index;
 }
                                                                        /*}}}*/

-map_ptrloc pkgCacheGenerator::AllocateInMap(const unsigned long &size) {/*{{{*/
+map_pointer_t pkgCacheGenerator::AllocateInMap(const unsigned long &size) {/*{{{*/

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

-   map_ptrloc const index = Map.Allocate(size);
+   map_pointer_t const index = Map.Allocate(size);

    if (index != 0)
       ReMap(oldMap, Map.Data());
    return index;
    if (index != 0)
       ReMap(oldMap, Map.Data());
    return index;


@@ -227,22 +229,6 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
         continue;
       }
 
         continue;
       }
 

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

       // Get a pointer to the package structure
       pkgCache::PkgIterator Pkg;
       Dynamic<pkgCache::PkgIterator> DynPkg(Pkg);
       // Get a pointer to the package structure
       pkgCache::PkgIterator Pkg;
       Dynamic<pkgCache::PkgIterator> DynPkg(Pkg);


@@ -265,26 +251,22 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
       }
 
       if (OutVer != 0)
       }
 
       if (OutVer != 0)

-      {
-        FoundFileDeps |= List.HasFileDeps();

         return true;
         return true;

-      }

    }
 
    }
 

-   if (Cache.HeaderP->PackageCount >= (1ULL<<sizeof(Cache.PkgP->ID)*8)-1)
+   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."));
       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)
+   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."));
       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)
+   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."));
       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)
+   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 _error->Error(_("Wow, you exceeded the number of dependencies "
                             "this APT is capable of."));
 

-   FoundFileDeps |= List.HasFileDeps();

    return true;
 }
 // CacheGenerator::MergeListGroup                                      /*{{{*/
    return true;
 }
 // CacheGenerator::MergeListGroup                                      /*{{{*/


@@ -331,7 +313,7 @@ bool pkgCacheGenerator::MergeListPackage(ListParser &List, pkgCache::PkgIterator
       if (VerDesc.end() == true || MD5SumValue(VerDesc.md5()) != CurMd5)
         continue;
 
       if (VerDesc.end() == true || MD5SumValue(VerDesc.md5()) != CurMd5)
         continue;
 

-      map_ptrloc md5idx = VerDesc->md5sum;
+      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
       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


@@ -355,7 +337,7 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator
 {
    pkgCache::VerIterator Ver = Pkg.VersionList();
    Dynamic<pkgCache::VerIterator> DynVer(Ver);
 {
    pkgCache::VerIterator Ver = Pkg.VersionList();
    Dynamic<pkgCache::VerIterator> DynVer(Ver);

-   map_ptrloc *LastVer = &Pkg->VersionList;
+   map_pointer_t *LastVer = &Pkg->VersionList;

    void const * oldMap = Map.Data();
 
    unsigned short const Hash = List.VersionHash();
    void const * oldMap = Map.Data();
 
    unsigned short const Hash = List.VersionHash();


@@ -364,7 +346,7 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator
       /* 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;
       /* 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;

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

       {
         Res = Cache.VS->CmpVersion(Version,Ver.VerStr());
         // Version is higher as current version - insert here
       {
         Res = Cache.VS->CmpVersion(Version,Ver.VerStr());
         // Version is higher as current version - insert here


@@ -400,13 +382,13 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator
    }
 
    // Add a new version
    }
 
    // Add a new version

-   map_ptrloc const verindex = NewVersion(Ver, Version, Pkg.Index(), Hash, *LastVer);
-   if (verindex == 0 && _error->PendingError())
+   map_pointer_t const verindex = NewVersion(Ver, Version, Pkg.Index(), Hash, *LastVer);
+   if (unlikely(verindex == 0))

       return _error->Error(_("Error occurred while processing %s (%s%d)"),
                           Pkg.Name(), "NewVersion", 1);
 
    if (oldMap != Map.Data())
       return _error->Error(_("Error occurred while processing %s (%s%d)"),
                           Pkg.Name(), "NewVersion", 1);
 
    if (oldMap != Map.Data())

-        LastVer += (map_ptrloc const * const) Map.Data() - (map_ptrloc const * const) oldMap;
+        LastVer += (map_pointer_t const * const) Map.Data() - (map_pointer_t const * const) oldMap;

    *LastVer = verindex;
 
    if (unlikely(List.NewVersion(Ver) == false))
    *LastVer = verindex;
 
    if (unlikely(List.NewVersion(Ver) == false))


@@ -442,40 +424,6 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator
               return _error->Error(_("Error occurred while processing %s (%s%d)"),
                                    Pkg.Name(), "AddImplicitDepends", 1);
       }
               return _error->Error(_("Error occurred while processing %s (%s%d)"),
                                    Pkg.Name(), "AddImplicitDepends", 1);
       }

-      /* :none packages are packages without an architecture. They are forbidden by
-        debian-policy, so usually they will only be in (old) dpkg status files -
-        and dpkg will complain about them - and are pretty rare. We therefore do
-        usually not create conflicts while the parent is created, but only if a :none
-        package (= the target) appears. This creates incorrect dependencies on :none
-        for architecture-specific dependencies on the package we copy from, but we
-        will ignore this bug as architecture-specific dependencies are only allowed
-        in jessie and until then the :none packages should be extinct (hopefully).
-        In other words: This should work long enough to allow graceful removal of
-        these packages, it is not supposed to allow users to keep using them … */
-      if (strcmp(Pkg.Arch(), "none") == 0)
-      {
-        pkgCache::PkgIterator M = Grp.FindPreferredPkg();
-        if (M.end() == false && Pkg != M)
-        {
-           pkgCache::DepIterator D = M.RevDependsList();
-           Dynamic<pkgCache::DepIterator> DynD(D);
-           for (; D.end() == false; ++D)
-           {
-              if ((D->Type != pkgCache::Dep::Conflicts &&
-                   D->Type != pkgCache::Dep::DpkgBreaks &&
-                   D->Type != pkgCache::Dep::Replaces) ||
-                  D.ParentPkg().Group() == Grp)
-                 continue;
-
-              map_ptrloc *OldDepLast = NULL;
-              pkgCache::VerIterator ConVersion = D.ParentVer();
-              Dynamic<pkgCache::VerIterator> DynV(ConVersion);
-              // duplicate the Conflicts/Breaks/Replaces for :none arch
-              NewDepends(Pkg, ConVersion, D->Version,
-                    D->CompareOp, D->Type, OldDepLast);
-           }
-        }
-      }

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


@@ -509,7 +457,7 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator
    }
 
    // We haven't found reusable descriptions, so add the first description(s)
    }
 
    // We haven't found reusable descriptions, so add the first description(s)

-   map_ptrloc md5idx = Ver->DescriptionList == 0 ? 0 : Ver.DescriptionList()->md5sum;
+   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)
    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)


@@ -517,13 +465,13 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-bool pkgCacheGenerator::AddNewDescription(ListParser &List, pkgCache::VerIterator &Ver, std::string const &lang, MD5SumValue const &CurMd5, map_ptrloc &md5idx) /*{{{*/
+bool pkgCacheGenerator::AddNewDescription(ListParser &List, pkgCache::VerIterator &Ver, std::string const &lang, MD5SumValue const &CurMd5, map_stringitem_t &md5idx) /*{{{*/

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

-   map_ptrloc const descindex = NewDescription(Desc, lang, CurMd5, md5idx);
-   if (unlikely(descindex == 0 && _error->PendingError()))
+   map_pointer_t const descindex = NewDescription(Desc, lang, CurMd5, md5idx);
+   if (unlikely(descindex == 0))

       return _error->Error(_("Error occurred while processing %s (%s%d)"),
            Ver.ParentPkg().Name(), "NewDescription", 1);
 
       return _error->Error(_("Error occurred while processing %s (%s%d)"),
            Ver.ParentPkg().Name(), "NewDescription", 1);
 


@@ -534,7 +482,7 @@ bool pkgCacheGenerator::AddNewDescription(ListParser &List, pkgCache::VerIterato
    // 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);
    // 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_ptrloc * const LastNextDesc = (VerDesc.end() == true) ? &Ver->DescriptionList : &VerDesc->NextDesc;
+   map_pointer_t * const LastNextDesc = (VerDesc.end() == true) ? &Ver->DescriptionList : &VerDesc->NextDesc;

    *LastNextDesc = descindex;
 
    if (NewFileDesc(Desc,List) == false)
    *LastNextDesc = descindex;
 
    if (NewFileDesc(Desc,List) == false)


@@ -545,57 +493,6 @@ bool pkgCacheGenerator::AddNewDescription(ListParser &List, pkgCache::VerIterato
 }
                                                                        /*}}}*/
                                                                        /*}}}*/
 }
                                                                        /*}}}*/
                                                                        /*}}}*/

-// 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)
-{
-   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);
-      Dynamic<pkgCache::PkgIterator> DynPkg(Pkg);
-      if (Pkg.end() == true)
-        return _error->Error(_("Error occurred while processing %s (%s%d)"),
-                               PackageName.c_str(), "FindPkg", 1);
-      Counter++;
-      if (Counter % 100 == 0 && Progress != 0)
-        Progress->Progress(List.Offset());
-
-      unsigned short Hash = List.VersionHash();
-      pkgCache::VerIterator Ver = Pkg.VersionList();
-      Dynamic<pkgCache::VerIterator> DynVer(Ver);
-      for (; Ver.end() == false; ++Ver)
-      {
-        if (List.SameVersion(Hash, Ver) == true && Version == Ver.VerStr())
-        {
-           if (List.CollectFileProvides(Cache,Ver) == false)
-              return _error->Error(_("Error occurred while processing %s (%s%d)"),
-                                   PackageName.c_str(), "CollectFileProvides", 1);
-           break;
-        }
-      }
-      
-      if (Ver.end() == true)
-        _error->Warning(_("Package %s %s was not found while processing file dependencies"),PackageName.c_str(),Version.c_str());
-   }
-
-   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 */


@@ -606,19 +503,19 @@ bool pkgCacheGenerator::NewGroup(pkgCache::GrpIterator &Grp, const string &Name)
       return true;
 
    // Get a structure
       return true;
 
    // Get a structure

-   map_ptrloc const Group = AllocateInMap(sizeof(pkgCache::Group));
+   map_pointer_t const Group = AllocateInMap(sizeof(pkgCache::Group));

    if (unlikely(Group == 0))
       return false;
 
    Grp = pkgCache::GrpIterator(Cache, Cache.GrpP + Group);
    if (unlikely(Group == 0))
       return false;
 
    Grp = pkgCache::GrpIterator(Cache, Cache.GrpP + Group);

-   map_ptrloc const idxName = WriteStringInMap(Name);
+   map_stringitem_t const idxName = StoreString(PKGNAME, Name);

    if (unlikely(idxName == 0))
       return false;
    Grp->Name = idxName;
 
    // Insert it into the hash table
    unsigned long const Hash = Cache.Hash(Name);
    if (unlikely(idxName == 0))
       return false;
    Grp->Name = idxName;
 
    // Insert it into the hash table
    unsigned long const Hash = Cache.Hash(Name);

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


@@ -643,42 +540,127 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name
         return true;
 
    // Get a structure
         return true;
 
    // Get a structure

-   map_ptrloc const Package = AllocateInMap(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);
 

+   // Set the name, arch and the ID
+   APT_IGNORE_DEPRECATED(Pkg->Name = Grp->Name;)
+   Pkg->Group = Grp.Index();
+   // 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;
+   Pkg->Arch = idxArch;
+   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
    // Insert the package into our package list
    if (Grp->FirstPackage == 0) // the group is new
    {
       Grp->FirstPackage = Package;
       // Insert it into the hash table

-      unsigned long const Hash = Cache.Hash(Name);
-      map_ptrloc *insertAt = &Cache.HeaderP->PkgHashTable[Hash];
-      while (*insertAt != 0 && strcasecmp(Name.c_str(), Cache.StrP + (Cache.PkgP + *insertAt)->Name) > 0)
-        insertAt = &(Cache.PkgP + *insertAt)->Next;
-      Pkg->Next = *insertAt;
+      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
    {
       *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);
       // this package is the new last package
       pkgCache::PkgIterator LastPkg(Cache, Cache.PkgP + Grp->LastPackage);

-      Pkg->Next = LastPkg->Next;
-      LastPkg->Next = Package;
+      Pkg->NextPackage = LastPkg->NextPackage;
+      LastPkg->NextPackage = Package;

    }
    Grp->LastPackage = Package;
 
    }
    Grp->LastPackage = Package;
 

-   // Set the name, arch and the ID
-   Pkg->Name = Grp->Name;
-   Pkg->Group = Grp.Index();
-   // all is mapped to the native architecture
-   map_ptrloc const idxArch = (Arch == "all") ? Cache.HeaderP->Architecture : WriteUniqString(Arch.c_str());
-   if (unlikely(idxArch == 0))
-      return false;
-   Pkg->Arch = idxArch;
-   Pkg->ID = Cache.HeaderP->PackageCount++;
-
+   // lazy-create foo (of amd64) provides foo:amd64 at the time we first need it
+   if (Arch == "any")
+   {
+      size_t const found = Name.find(':');
+      std::string const NameA = Name.substr(0, found);
+      std::string const ArchA = Name.substr(found + 1);
+      pkgCache::PkgIterator PkgA = Cache.FindPkg(NameA, ArchA);
+      if (PkgA.end() == false)
+      {
+        Dynamic<pkgCache::PkgIterator> DynPkgA(PkgA);
+        pkgCache::PrvIterator Prv = PkgA.ProvidesList();
+        for (; Prv.end() == false; ++Prv)
+        {
+           if (Prv.IsMultiArchImplicit())
+              continue;
+           pkgCache::VerIterator V = Prv.OwnerVer();
+           if (ArchA != V.ParentPkg().Arch())
+              continue;
+           if (NewProvides(V, Pkg, V->VerStr, pkgCache::Flag::MultiArchImplicit | pkgCache::Flag::ArchSpecific) == false)
+              return false;
+        }
+        pkgCache::VerIterator V = PkgA.VersionList();
+        Dynamic<pkgCache::VerIterator> DynV(V);
+        for (; V.end() == false; ++V)
+        {
+           if (NewProvides(V, Pkg, V->VerStr, pkgCache::Flag::MultiArchImplicit | pkgCache::Flag::ArchSpecific) == false)
+              return false;
+        }
+      }
+   }

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


@@ -690,14 +672,14 @@ bool pkgCacheGenerator::AddImplicitDepends(pkgCache::GrpIterator &G,
    // 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();
    // copy P.Arch() into a string here as a cache remap
    // in NewDepends() later may alter the pointer location
    string Arch = P.Arch() == NULL ? "" : P.Arch();

-   map_ptrloc *OldDepLast = NULL;
+   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);
    /* MultiArch handling introduces a lot of implicit Dependencies:
       - MultiArch: same → Co-Installable if they have the same version
       - All others conflict with all other group members */
    bool const coInstall = ((V->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same);
    pkgCache::PkgIterator D = G.PackageList();
    Dynamic<pkgCache::PkgIterator> DynD(D);

-   map_ptrloc const VerStrIdx = V->VerStr;
+   map_stringitem_t const VerStrIdx = V->VerStr;

    for (; D.end() != true; D = G.NextPkg(D))
    {
       if (Arch == D.Arch() || D->VersionList == 0)
    for (; D.end() != true; D = G.NextPkg(D))
    {
       if (Arch == D.Arch() || D->VersionList == 0)


@@ -709,16 +691,16 @@ bool pkgCacheGenerator::AddImplicitDepends(pkgCache::GrpIterator &G,
       {
         // Replaces: ${self}:other ( << ${binary:Version})
         NewDepends(D, V, VerStrIdx,
       {
         // Replaces: ${self}:other ( << ${binary:Version})
         NewDepends(D, V, VerStrIdx,

-                   pkgCache::Dep::Less, pkgCache::Dep::Replaces,
+                   pkgCache::Dep::Less | pkgCache::Dep::MultiArchImplicit, pkgCache::Dep::Replaces,

                    OldDepLast);
         // Breaks: ${self}:other (!= ${binary:Version})
         NewDepends(D, V, VerStrIdx,
                    OldDepLast);
         // Breaks: ${self}:other (!= ${binary:Version})
         NewDepends(D, V, VerStrIdx,

-                   pkgCache::Dep::NotEquals, pkgCache::Dep::DpkgBreaks,
+                   pkgCache::Dep::NotEquals | pkgCache::Dep::MultiArchImplicit, pkgCache::Dep::DpkgBreaks,

                    OldDepLast);
       } else {
         // Conflicts: ${self}:other
         NewDepends(D, V, 0,
                    OldDepLast);
       } else {
         // Conflicts: ${self}:other
         NewDepends(D, V, 0,

-                   pkgCache::Dep::NoOp, pkgCache::Dep::Conflicts,
+                   pkgCache::Dep::NoOp | pkgCache::Dep::MultiArchImplicit, pkgCache::Dep::Conflicts,

                    OldDepLast);
       }
    }
                    OldDepLast);
       }
    }


@@ -730,23 +712,23 @@ bool pkgCacheGenerator::AddImplicitDepends(pkgCache::VerIterator &V,
    /* 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 */
    /* MultiArch handling introduces a lot of implicit Dependencies:
       - MultiArch: same → Co-Installable if they have the same version
       - All others conflict with all other group members */

-   map_ptrloc *OldDepLast = NULL;
+   map_pointer_t *OldDepLast = NULL;

    bool const coInstall = ((V->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same);
    if (coInstall == true)
    {
    bool const coInstall = ((V->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same);
    if (coInstall == true)
    {

-      map_ptrloc const VerStrIdx = V->VerStr;
+      map_stringitem_t const VerStrIdx = V->VerStr;

       // Replaces: ${self}:other ( << ${binary:Version})
       NewDepends(D, V, VerStrIdx,
       // Replaces: ${self}:other ( << ${binary:Version})
       NewDepends(D, V, VerStrIdx,

-                pkgCache::Dep::Less, pkgCache::Dep::Replaces,
+                pkgCache::Dep::Less | pkgCache::Dep::MultiArchImplicit, pkgCache::Dep::Replaces,

                 OldDepLast);
       // Breaks: ${self}:other (!= ${binary:Version})
       NewDepends(D, V, VerStrIdx,
                 OldDepLast);
       // Breaks: ${self}:other (!= ${binary:Version})
       NewDepends(D, V, VerStrIdx,

-                pkgCache::Dep::NotEquals, pkgCache::Dep::DpkgBreaks,
+                pkgCache::Dep::NotEquals | pkgCache::Dep::MultiArchImplicit, pkgCache::Dep::DpkgBreaks,

                 OldDepLast);
    } else {
       // Conflicts: ${self}:other
       NewDepends(D, V, 0,
                 OldDepLast);
    } else {
       // Conflicts: ${self}:other
       NewDepends(D, V, 0,

-                pkgCache::Dep::NoOp, pkgCache::Dep::Conflicts,
+                pkgCache::Dep::NoOp | pkgCache::Dep::MultiArchImplicit, pkgCache::Dep::Conflicts,

                 OldDepLast);
    }
    return true;
                 OldDepLast);
    }
    return true;


@@ -763,15 +745,15 @@ bool pkgCacheGenerator::NewFileVer(pkgCache::VerIterator &Ver,
       return true;
    
    // Get a structure
       return true;
    
    // Get a structure

-   map_ptrloc const VerFile = AllocateInMap(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;
+   map_pointer_t *Last = &Ver->FileList;

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


@@ -789,14 +771,14 @@ 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,

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

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

-   map_ptrloc const Version = AllocateInMap(sizeof(pkgCache::Version));
+   map_pointer_t const Version = AllocateInMap(sizeof(pkgCache::Version));

    if (Version == 0)
       return 0;
    
    if (Version == 0)
       return 0;
    


@@ -831,7 +813,7 @@ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver,
       }
    }
    // haven't found the version string, so create
       }
    }
    // haven't found the version string, so create

-   map_ptrloc const idxVerStr = WriteStringInMap(VerStr);
+   map_stringitem_t const idxVerStr = StoreString(VERSIONNUMBER, VerStr);

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


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

-   map_ptrloc const DescFile = AllocateInMap(sizeof(pkgCache::DescFile));
+   map_pointer_t const DescFile = AllocateInMap(sizeof(pkgCache::DescFile));

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


@@ -856,7 +838,7 @@ 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;
+   map_pointer_t *Last = &Desc->FileList;

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


@@ -875,20 +857,20 @@ 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,
+map_pointer_t pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc,

                                            const string &Lang,
                                            const MD5SumValue &md5sum,
                                            const string &Lang,
                                            const MD5SumValue &md5sum,

-                                           map_ptrloc idxmd5str)
+                                           map_stringitem_t const idxmd5str)

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

-   map_ptrloc const Description = AllocateInMap(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);
    Desc->ID = Cache.HeaderP->DescriptionCount++;
    if (Description == 0)
       return 0;
 
    // Fill it in
    Desc = pkgCache::DescIterator(Cache,Cache.DescP + Description);
    Desc->ID = Cache.HeaderP->DescriptionCount++;

-   map_ptrloc const idxlanguage_code = WriteUniqString(Lang);
+   map_stringitem_t const idxlanguage_code = StoreString(MIXED, Lang);

    if (unlikely(idxlanguage_code == 0))
       return 0;
    Desc->language_code = idxlanguage_code;
    if (unlikely(idxlanguage_code == 0))
       return 0;
    Desc->language_code = idxlanguage_code;


@@ -897,7 +879,7 @@ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc,
       Desc->md5sum = idxmd5str;
    else
    {
       Desc->md5sum = idxmd5str;
    else
    {

-      map_ptrloc const idxmd5sum = WriteStringInMap(md5sum.Value());
+      map_stringitem_t const idxmd5sum = WriteStringInMap(md5sum.Value());

       if (unlikely(idxmd5sum == 0))
         return 0;
       Desc->md5sum = idxmd5sum;
       if (unlikely(idxmd5sum == 0))
         return 0;
       Desc->md5sum = idxmd5sum;


@@ -912,57 +894,83 @@ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc,
    version and to the package that it is pointing to. */
 bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg,
                                   pkgCache::VerIterator &Ver,
    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)

 {
 {

-   map_ptrloc index = 0;
-   if (Version.empty() == false)
+   void const * const oldMap = Map.Data();
+   // Get a structure
+   map_pointer_t const Dependency = AllocateInMap(sizeof(pkgCache::Dependency));
+   if (unlikely(Dependency == 0))
+      return false;
+
+   bool isDuplicate = false;
+   map_pointer_t DependencyData = 0;
+   map_pointer_t PreviousData = 0;
+   if (Pkg->RevDepends != 0)

    {
    {

-      int const CmpOp = Op & 0x0F;
-      // =-deps are used (79:1) for lockstep on same-source packages (e.g. data-packages)
-      if (CmpOp == pkgCache::Dep::Equals && strcmp(Version.c_str(), Ver.VerStr()) == 0)
-        index = Ver->VerStr;
+      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 (index == 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)

       {
       {

-        void const * const oldMap = Map.Data();
-        index = WriteStringInMap(Version);
-        if (unlikely(index == 0))
-           return false;
-        if (OldDepLast != 0 && oldMap != Map.Data())
-           OldDepLast += (map_ptrloc const * const) Map.Data() - (map_ptrloc const * const) oldMap;
+        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;

       }
    }
       }
    }

-   return NewDepends(Pkg, Ver, index, Op, Type, OldDepLast);
-}
-bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg,
-                                  pkgCache::VerIterator &Ver,
-                                  map_ptrloc const Version,
-                                  unsigned int const &Op,
-                                  unsigned int const &Type,
-                                  map_ptrloc* &OldDepLast)
-{
-   void const * const oldMap = Map.Data();
-   // Get a structure
-   map_ptrloc const Dependency = AllocateInMap(sizeof(pkgCache::Dependency));
-   if (unlikely(Dependency == 0))
-      return false;

 
 

-   // Fill it in
-   pkgCache::DepIterator Dep(Cache,Cache.DepP + Dependency);
-   Dynamic<pkgCache::DepIterator> DynDep(Dep);
-   Dep->ParentVer = Ver.Index();
-   Dep->Type = Type;
-   Dep->CompareOp = Op;
-   Dep->Version = Version;
-   Dep->ID = Cache.HeaderP->DependsCount++;
+   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)
 
    // Do we know where to link the Dependency to?
    if (OldDepLast == NULL)


@@ -971,12 +979,11 @@ bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg,
       for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; ++D)
         OldDepLast = &D->NextDepends;
    } else if (oldMap != Map.Data())
       for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; ++D)
         OldDepLast = &D->NextDepends;
    } else if (oldMap != Map.Data())

-      OldDepLast += (map_ptrloc const * const) Map.Data() - (map_ptrloc const * const) oldMap;
+      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;
 }
                                                                        /*}}}*/


@@ -984,124 +991,250 @@ 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;
    Dynamic<pkgCache::GrpIterator> DynGrp(Grp);
    if (unlikely(Owner->NewGroup(Grp, PackageName) == false))
       return false;
 
 {
    pkgCache::GrpIterator Grp;
    Dynamic<pkgCache::GrpIterator> DynGrp(Grp);
    if (unlikely(Owner->NewGroup(Grp, PackageName) == false))
       return false;
 

-   // Locate the target package
-   pkgCache::PkgIterator Pkg = Grp.FindPkg(Arch);
-   // we don't create 'none' packages and their dependencies if we can avoid it …
-   if (Pkg.end() == true && Arch == "none" && strcmp(Ver.ParentPkg().Arch(), "none") != 0)
-      return true;
-   Dynamic<pkgCache::PkgIterator> DynPkg(Pkg);
-   if (Pkg.end() == true) {
-      if (unlikely(Owner->NewPackage(Pkg, PackageName, Arch) == false))
-        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 &PkgName,
+bool pkgCacheListParser::NewProvides(pkgCache::VerIterator &Ver,
+                                               const string &PkgName,

                                                const string &PkgArch,
                                                const string &PkgArch,

-                                               const string &Version)
+                                               const string &Version,
+                                               uint8_t const Flags)

 {
 {

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

 
    // We do not add self referencing provides
    if (Ver.ParentPkg().Name() == PkgName && (PkgArch == Ver.ParentPkg().Arch() ||
 
    // We do not add self referencing provides
    if (Ver.ParentPkg().Name() == PkgName && (PkgArch == Ver.ParentPkg().Arch() ||

-       (PkgArch == "all" && strcmp((Cache.StrP + Cache.HeaderP->Architecture), Ver.ParentPkg().Arch()) == 0)))
+       (PkgArch == "all" && strcmp((Cache.StrP + Cache.HeaderP->Architecture), Ver.ParentPkg().Arch()) == 0)) &&
+        (Version.empty() || Version == Ver.VerStr()))

       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

-   map_ptrloc const Provides = Owner->AllocateInMap(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);
    // Fill it in
    pkgCache::PrvIterator Prv(Cache,Cache.ProvideP + Provides,Cache.PkgP);

-   Dynamic<pkgCache::PrvIterator> DynPrv(Prv);

    Prv->Version = Ver.Index();
    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) {
-      map_ptrloc const idxProvideVersion = WriteString(Version);
-      Prv->ProvideVersion = idxProvideVersion;
-      if (unlikely(idxProvideVersion == 0))
-        return false;
-   }
-   
-   // Locate the target package
-   pkgCache::PkgIterator Pkg;
-   Dynamic<pkgCache::PkgIterator> DynPkg(Pkg);
-   if (unlikely(Owner->NewPackage(Pkg,PkgName, PkgArch) == 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;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-bool pkgCacheGenerator::ListParser::SameVersion(unsigned short const Hash,/*{{{*/
+// 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;
 }
                                                                        /*}}}*/
       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;
+}
+                                                                       /*}}}*/

 // CacheGenerator::SelectFile - Select the current file being parsed   /*{{{*/
 // ---------------------------------------------------------------------
 /* 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. */
 // CacheGenerator::SelectFile - Select the current file being parsed   /*{{{*/
 // ---------------------------------------------------------------------
 /* 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

-   map_ptrloc const idxFile = AllocateInMap(sizeof(*CurrentFile));
+   map_pointer_t const idxFile = AllocateInMap(sizeof(*CurrentFile));

    if (unlikely(idxFile == 0))
       return false;
    CurrentFile = Cache.PkgFileP + idxFile;
 
    // Fill it in
    if (unlikely(idxFile == 0))
       return false;
    CurrentFile = Cache.PkgFileP + idxFile;
 
    // Fill it in

-   map_ptrloc const idxFileName = WriteStringInMap(File);
-   map_ptrloc const idxSite = WriteUniqString(Site);
-   if (unlikely(idxFileName == 0 || idxSite == 0))
+   map_stringitem_t const idxFileName = WriteStringInMap(File);
+   if (unlikely(idxFileName == 0))

       return false;
    CurrentFile->FileName = idxFileName;
       return false;
    CurrentFile->FileName = idxFileName;

-   CurrentFile->Site = idxSite;

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

-   CurrentFile->Flags = Flags;

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

-   map_ptrloc const idxIndexType = WriteUniqString(Index.GetType()->Label);
+   map_stringitem_t const idxIndexType = StoreString(MIXED, Index.GetType()->Label);

    if (unlikely(idxIndexType == 0))
       return false;
    CurrentFile->IndexType = idxIndexType;
    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++;


@@ -1115,57 +1248,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
-   void const * const oldMap = Map.Data();
-   map_ptrloc const Item = AllocateInMap(sizeof(pkgCache::StringItem));
-   if (Item == 0)
-      return 0;

 
 

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

 
 

-   Bucket = ItemP;
-   return ItemP->String;
+   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                    /*{{{*/


@@ -1173,18 +1276,24 @@ 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, 
+class APT_HIDDEN ScopedErrorRevert {
+public:
+   ScopedErrorRevert() { _error->PushToStack(); }
+   ~ScopedErrorRevert() { _error->RevertToStack(); }
+};
+static bool CheckValidity(const string &CacheFile,

                           pkgSourceList &List,
                           pkgSourceList &List,

-                          FileIterator Start, 
-                          FileIterator End,
+                          FileIterator const Start,
+                          FileIterator const End,

                           MMap **OutMap = 0)
 {
                           MMap **OutMap = 0)
 {

+   ScopedErrorRevert ser;

    bool const Debug = _config->FindB("Debug::pkgCacheGen", false);
    // No file, certainly invalid
    if (CacheFile.empty() == true || FileExists(CacheFile) == false)
    {
       if (Debug == true)
    bool const Debug = _config->FindB("Debug::pkgCacheGen", false);
    // No file, certainly invalid
    if (CacheFile.empty() == true || FileExists(CacheFile) == false)
    {
       if (Debug == true)

-        std::clog << "CacheFile doesn't exist" << std::endl;
+        std::clog << "CacheFile " << CacheFile << " doesn't exist" << std::endl;

       return false;
    }
 
       return false;
    }
 


@@ -1197,44 +1306,67 @@ static bool CheckValidity(const string &CacheFile,
 
    // Map it
    FileFd CacheF(CacheFile,FileFd::ReadOnly);
 
    // Map it
    FileFd CacheF(CacheFile,FileFd::ReadOnly);

-   SPtr<MMap> Map = new MMap(CacheF,0);
-   pkgCache Cache(Map);
-   if (_error->PendingError() == true || Map->Size() == 0)
+   std::unique_ptr<MMap> Map(new MMap(CacheF,0));
+   if (unlikely(Map->validData()) == false)
+      return false;
+   pkgCache Cache(Map.get());
+   if (_error->PendingError() || Map->Size() == 0)

    {
       if (Debug == true)
    {
       if (Debug == true)

-        std::clog << "Errors are pending or Map is empty()" << std::endl;
-      _error->Discard();
+        std::clog << "Errors are pending or Map is empty() for " << CacheFile << std::endl;

       return false;
    }
       return false;
    }

-   
-   /* 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)
+
+   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)
    {
       if (Debug == true)

-        std::clog << "Checking PkgFile " << (*Start)->Describe() << ": ";
-      if ((*Start)->HasPackages() == false)
+        std::clog << "Checking RlsFile " << (*i)->Describe() << ": ";
+      pkgCache::RlsFileIterator const RlsFile = (*i)->FindInCache(Cache, true);
+      if (RlsFile.end() == true)

       {
       {

-         if (Debug == true)
-           std::clog << "Has NO packages" << std::endl;
-        continue;
+        if (Debug == true)
+           std::clog << "FindInCache returned end-Pointer" << std::endl;
+        return false;

       }
       }

-    
-      if ((*Start)->Exists() == 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.. */
+   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.
          if (Debug == true)
            std::clog << "file doesn't exist" << std::endl;
         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 (Debug == true)
       if (File.end() == true)
       {
         if (Debug == true)


@@ -1246,28 +1378,27 @@ static bool CheckValidity(const string &CacheFile,
       if (Debug == true)
         std::clog << "with ID " << File->ID << " is valid" << std::endl;
    }
       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)
       {
         if (Debug == true)
    for (unsigned I = 0; I != Cache.HeaderP->PackageFileCount; I++)
       if (Visited[I] == false)
       {
         if (Debug == true)

-           std::clog << "File with ID" << I << " wasn't visited" << std::endl;
+           std::clog << "PkgFile with ID" << I << " wasn't visited" << std::endl;

         return false;
       }
         return false;
       }

-   
+

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

-        _error->DumpErrors();
+        _error->DumpErrors(std::clog, GlobalError::DEBUG, false);

       }
       }

-      _error->Discard();

       return false;
    }
       return false;
    }

-   
+

    if (OutMap != 0)
    if (OutMap != 0)

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

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


@@ -1275,9 +1406,20 @@ static bool CheckValidity(const string &CacheFile,
 // ---------------------------------------------------------------------
 /* 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;
+   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)
    for (; Start < End; ++Start)
    {
       if ((*Start)->HasPackages() == false)


@@ -1288,72 +1430,69 @@ static unsigned long ComputeSize(FileIterator Start,FileIterator End)
 }
                                                                        /*}}}*/
 // BuildCache - Merge the list of index files into the cache           /*{{{*/
 }
                                                                        /*}}}*/
 // 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;
+   bool mergeFailure = false;
+
+   auto const indexFileMerge = [&](pkgIndexFile * const I) {
+      if (I->HasPackages() == false || mergeFailure)
+        return;
+
+      if (I->Exists() == false)
+        return;

 
 

-      if ((*I)->FindInCache(Gen.GetCache()).end() == false)
+      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();
+
+      map_filesize_t const Size = I->Size();

       if (Progress != NULL)
       if (Progress != NULL)

-        Progress->OverallProgress(CurrentSize,TotalSize,Size,_("Reading package lists"));
+        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)

    {
    {

-      if (Progress != 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();
-        if (Progress != NULL)
-           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;
 }
                                                                        /*}}}*/

-// CacheGenerator::CreateDynamicMMap - load an mmap with configuration options /*{{{*/
-DynamicMMap* pkgCacheGenerator::CreateDynamicMMap(FileFd *CacheF, unsigned long Flags) {
-   unsigned long const MapStart = _config->FindI("APT::Cache-Start", 24*1024*1024);
-   unsigned long const MapGrow = _config->FindI("APT::Cache-Grow", 1*1024*1024);
-   unsigned long 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);
-}
-                                                                       /*}}}*/

 // CacheGenerator::MakeStatusCache - Construct the status cache                /*{{{*/
 // ---------------------------------------------------------------------
 /* This makes sure that the status cache (the cache that has all 
 // CacheGenerator::MakeStatusCache - Construct the status cache                /*{{{*/
 // ---------------------------------------------------------------------
 /* This makes sure that the status cache (the cache that has all 


@@ -1362,27 +1501,72 @@ DynamicMMap* pkgCacheGenerator::CreateDynamicMMap(FileFd *CacheF, unsigned long
    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. */

+static DynamicMMap* CreateDynamicMMap(FileFd * const CacheF, unsigned long Flags)
+{
+   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 (SCacheF.IsOpen() == false || SCacheF.Failed())
+      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));
+   if (unlikely(Map->validData()) == false)
+      return false;
+   FileFd CacheF(FileName, FileFd::ReadOnly);
+   if (CacheF.IsOpen() == false || CacheF.Failed())
+      return false;
+   _error->PushToStack();
+   map_pointer_t const alloc = Map->RawAllocate(CacheF.Size());
+   bool const newError = _error->PendingError();
+   _error->MergeWithStack();
+   if (alloc == 0 && newError)
+      return false;
+   if (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,
 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 AllowMem)
+                       MMap **OutMap,bool)

 {
 {

+   // FIXME: deprecate the ignored AllowMem parameter

    bool const Debug = _config->FindB("Debug::pkgCacheGen", false);
 
    std::vector<pkgIndexFile *> Files;
    bool const Debug = _config->FindB("Debug::pkgCacheGen", false);
 
    std::vector<pkgIndexFile *> Files;

-   for (std::vector<metaIndex *>::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)
-         Files.push_back (*j);
-   }
-   
-   unsigned long const EndOfSource = Files.size();

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


@@ -1403,194 +1587,160 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress
         CreateDirectory(dir, flNotFile(SrcCacheFile));
    }
 
         CreateDirectory(dir, flNotFile(SrcCacheFile));
    }
 

-   // 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 (Debug == true)
-      std::clog << "Do we have write-access to the cache files? " << (Writeable ? "YES" : "NO") << std::endl;
-
-   if (Writeable == false && AllowMem == false && CacheFile.empty() == false)
-      return _error->Error(_("Unable to write to %s"),flNotFile(CacheFile).c_str());
-

    if (Progress != NULL)
       Progress->OverallProgress(0,1,1,_("Reading package lists"));
 
    if (Progress != NULL)
       Progress->OverallProgress(0,1,1,_("Reading package lists"));
 

-   // Cache is OK, Fin.
-   if (CheckValidity(CacheFile, List, Files.begin(),Files.end(),OutMap) == true)
+   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)

    {
    {

-      if (Progress != NULL)
-        Progress->OverallProgress(1,1,1,_("Reading package lists"));

       if (Debug == true)
       if (Debug == true)

-        std::clog << "pkgcache.bin is valid - no need to build anything" << std::endl;
-      return true;
+        std::clog << "pkgcache.bin is valid - no need to build any cache" << std::endl;
+      pkgcache_fine = true;
+      srcpkgcache_fine = true;

    }
    }

-   else if (Debug == true)
-        std::clog << "pkgcache.bin is NOT valid" << std::endl;
-   
-   /* 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 (pkgcache_fine == false)

    {
    {

-      _error->PushToStack();
-      unlink(CacheFile.c_str());
-      CacheF = new FileFd(CacheFile,FileFd::WriteAtomic);
-      fchmod(CacheF->Fd(),0644);
-      Map = CreateDynamicMMap(CacheF, MMap::Public);
-      if (_error->PendingError() == true)
+      if (CheckValidity(SrcCacheFile, List, Files.end(), Files.end()) == true)

       {
       {

-        delete CacheF.UnGuard();
-        delete Map.UnGuard();

         if (Debug == true)
         if (Debug == true)

-           std::clog << "Open filebased MMap FAILED" << std::endl;
-        Writeable = false;
-        if (AllowMem == false)
-        {
-           _error->MergeWithStack();
-           return false;
-        }
-        _error->RevertToStack();
-      }
-      else
-      {
-        _error->MergeWithStack();
-        if (Debug == true)
-           std::clog << "Open filebased MMap" << std::endl;
+           std::clog << "srcpkgcache.bin is valid - it can be reused" << std::endl;
+        srcpkgcache_fine = true;

       }
    }
       }
    }

-   if (Writeable == false || CacheFile.empty() == true)
+
+   if (volatile_fine == true && srcpkgcache_fine == true && pkgcache_fine == true)

    {
    {

-      // Just build it in memory..
-      Map = CreateDynamicMMap(NULL);
-      if (Debug == true)
-        std::clog << "Open memory Map (not filebased)" << std::endl;
+      if (Progress != NULL)
+        Progress->OverallProgress(1,1,1,_("Reading package lists"));
+      return true;

    }
    }

-   
-   // Lets try the source cache.
-   unsigned long CurrentSize = 0;
-   unsigned long TotalSize = 0;
-   if (CheckValidity(SrcCacheFile, List, Files.begin(),
-                    Files.begin()+EndOfSource) == true)
+
+   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;
+

       if (Debug == true)
       if (Debug == true)

-        std::clog << "srcpkgcache.bin is valid - populate MMap with it." << std::endl;
-      // Preload the map with the source cache
-      FileFd SCacheF(SrcCacheFile,FileFd::ReadOnly);
-      unsigned long const alloc = Map->RawAllocate(SCacheF.Size());
-      if ((alloc == 0 && _error->PendingError())
-               || SCacheF.Read((unsigned char *)Map->Data() + alloc,
-                               SCacheF.Size()) == false)
-        return false;
+        std::clog << "Do we have write-access to the cache files? " << (Writeable ? "YES" : "NO") << std::endl;
+   }

 
 

-      TotalSize = ComputeSize(Files.begin()+EndOfSource,Files.end());
+   // At this point we know we need to construct something, so get storage ready
+   std::unique_ptr<DynamicMMap> Map(CreateDynamicMMap(NULL, 0));
+   if (unlikely(Map->validData()) == false)
+      return false;
+   if (Debug == true)
+      std::clog << "Open memory Map (not filebased)" << std::endl;

 
 

-      // 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)
+   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)
+   {
+      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;

+      srcpkgcache_fine = true;
+      TotalSize += ComputeSize(NULL, Files.begin(), Files.end());

    }
    }

-   else
+   else if (srcpkgcache_fine == false)

    {
       if (Debug == true)
         std::clog << "srcpkgcache.bin is NOT valid - rebuild" << std::endl;
    {
       if (Debug == true)
         std::clog << "srcpkgcache.bin is NOT valid - rebuild" << std::endl;

-      TotalSize = ComputeSize(Files.begin(),Files.end());
-      
-      // Build the source cache
-      pkgCacheGenerator Gen(Map.Get(),Progress);
-      if (_error->PendingError() == true)
-        return false;
-      if (BuildCache(Gen,Progress,CurrentSize,TotalSize,
-                    Files.begin(),Files.begin()+EndOfSource) == false)
+      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::WriteAtomic);
-        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;

+
+      if (Writeable == true && CacheFile.empty() == false)
+        if (writeBackMMapToFile(Gen.get(), Map.get(), CacheFile) == false)
+           return false;

    }
    }

+

    if (Debug == true)
    if (Debug == true)

-      std::clog << "Caches are ready for shipping" << std::endl;
+      std::clog << "Caches done. Now bring in the volatile files (if any)" << std::endl;

 
 

-   if (_error->PendingError() == true)
-      return false;
-   if (OutMap != 0)
+   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;
 }
                                                                        /*}}}*/
 // CacheGenerator::MakeOnlyStatusCache - Build only a status files cache/*{{{*/
    return true;
 }
                                                                        /*}}}*/
 // CacheGenerator::MakeOnlyStatusCache - Build only a status files cache/*{{{*/

-// ---------------------------------------------------------------------
-/* */
+class APT_HIDDEN ScopedErrorMerge {
+public:
+   ScopedErrorMerge() { _error->PushToStack(); }
+   ~ScopedErrorMerge() { _error->MergeWithStack(); }
+};

 APT_DEPRECATED bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap)
    { return pkgCacheGenerator::MakeOnlyStatusCache(&Progress, OutMap); }
 bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap)
 {
    std::vector<pkgIndexFile *> Files;
 APT_DEPRECATED bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap)
    { return pkgCacheGenerator::MakeOnlyStatusCache(&Progress, OutMap); }
 bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap)
 {
    std::vector<pkgIndexFile *> Files;

-   unsigned long EndOfSource = Files.size();

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

-   SPtr<DynamicMMap> Map = CreateDynamicMMap(NULL);
-   unsigned long CurrentSize = 0;
-   unsigned long TotalSize = 0;
-   
-   TotalSize = ComputeSize(Files.begin()+EndOfSource,Files.end());
-   
+   ScopedErrorMerge sem;
+   std::unique_ptr<DynamicMMap> Map(CreateDynamicMMap(NULL, 0));
+   if (unlikely(Map->validData()) == false)
+      return false;
+   map_filesize_t CurrentSize = 0;
+   map_filesize_t TotalSize = 0;
+   TotalSize = ComputeSize(NULL, Files.begin(), Files.end());
+

    // Build the status cache
    if (Progress != NULL)
       Progress->OverallProgress(0,1,1,_("Reading package lists"));
    // Build the status cache
    if (Progress != NULL)
       Progress->OverallProgress(0,1,1,_("Reading package lists"));

-   pkgCacheGenerator Gen(Map.Get(),Progress);
+   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;
 
    if (_error->PendingError() == true)
       return false;
       return false;
 
    if (_error->PendingError() == true)
       return false;

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

    
    return true;
 }
    
    return true;
 }


@@ -1608,9 +1758,6 @@ static bool IsDuplicateDescription(pkgCache::DescIterator Desc,
    return false;
 }
                                                                        /*}}}*/
    return false;
 }
                                                                        /*}}}*/

-// CacheGenerator::FinishCache                                         /*{{{*/
-bool pkgCacheGenerator::FinishCache(OpProgress * /*Progress*/)
-{
-   return true;
-}
-                                                                       /*}}}*/
+
+pkgCacheListParser::pkgCacheListParser() : Owner(NULL), OldDepLast(NULL), d(NULL) {}
+pkgCacheListParser::~pkgCacheListParser() {}