write the native architecture as unique string into the cache header

as it is used for arch:all packages as a map to arch:native.
Otherwise arch comparisons later will see differences (Closes: #689323)

diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 4eaf40b51553424b68c0733171c0bcbd5b1e138b..739b538c6ff167c9af572823f911985bdc86be3e 100644 (file)
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -69,7 +69,9 @@ pkgCacheGenerator::pkgCacheGenerator(DynamicMMap *pMap,OpProgress *Prog) :
       *Cache.HeaderP = pkgCache::Header();
       map_ptrloc const idxVerSysName = WriteStringInMap(_system->VS->Label);
       Cache.HeaderP->VerSysName = idxVerSysName;
       *Cache.HeaderP = pkgCache::Header();
       map_ptrloc const idxVerSysName = WriteStringInMap(_system->VS->Label);
       Cache.HeaderP->VerSysName = idxVerSysName;

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

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

diff --git a/debian/changelog b/debian/changelog
index 307bd1eee25ebd280fb5605c1f490116694ec20d..c1936a86500790972e312251d1e0793b1884ec17 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ apt (0.9.7.6) UNRELEASED; urgency=low
     - ensure that dependencies for packages:none are always generated
     - add 2 missing remap registrations causing a segfault in case
       we use the not remapped iterators after a move of the mmap again
     - ensure that dependencies for packages:none are always generated
     - add 2 missing remap registrations causing a segfault in case
       we use the not remapped iterators after a move of the mmap again

+    - write the native architecture as unique string into the cache header
+      as it is used for arch:all packages as a map to arch:native.
+      Otherwise arch comparisons later will see differences (Closes: #689323)

   * apt-pkg/pkgcache.cc:
     - ignore negative dependencies applying in the same group for
       M-A:same packages on the real package name as self-conflicts
   * apt-pkg/pkgcache.cc:
     - ignore negative dependencies applying in the same group for
       M-A:same packages on the real package name as self-conflicts