merge with current debian apt/experimental

diff --cc apt-pkg/acquire-item.h
Simple merge

diff --cc apt-pkg/deb/deblistparser.cc
Simple merge

diff --cc apt-pkg/deb/debmetaindex.cc
Simple merge

diff --cc debian/changelog
index 0e7ffb80ff337d0b7ae8aab628c17bed62ec6d4c,a06abbbc08dfcb8864107da9584b8d562354b5b2..f32f7a282e41a93990dfebe3d7a586f134744be8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,24 +1,39 @@@
- apt (0.8.16~exp7) experimental; urgency=low
+ apt (0.8.16~exp7) UNRELEASEDexperimental; urgency=low
  
-  -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 21 Sep 2011 19:29:55 +0200
 +  [ David Kalnischkies ]
 +  * do not pollute namespace in the headers with using (Closes: #500198)
 +  * use forward declaration in headers if possible instead of includes
 +  * remove old APT_COMPATIBILITY ifdef's
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - use std::vector instead of fixed size arrays to store args and
 +      multiarch-packagename strings
 +    - load the dpkg base arguments only one time and reuse them later
 +  * cmdline/apt-get.cc:
 +    - follow Provides in the evaluation of saving candidates, too, for
 +      statisfying garbage package dependencies (Closes: #640590)
 +  * apt-pkg/algorithms.cc:
 +    - if a package is garbage, don't try to save it with FixByInstall
 +  * apt-pkg/deb/debsrcrecords.cc:
 +    - remove the limit of 400 Binaries for a source package (Closes: #622110)
++  * apt-pkg/deb/deblistparser.cc:
++    - fix crash when the dynamic mmap needs to be grown in
++      LoadReleaseInfo (LP: #854090)
 +
 -  
+   [ Michael Vogt ]
+   * apt-pkg/contrib/configuration.cc:
+     - fix double delete (LP: #848907)
+     - ignore only the invalid regexp instead of all options
+   * apt-pkg/acquire-item.h, apt-pkg/deb/debmetaindex.cc:
+     - fix fetching language information by adding OptionalSubIndexTarget
+   * methods/https.cc:
+     - cleanup broken downloads properly
 -  [ David Kalnischkies ]  
 -  * apt-pkg/deb/deblistparser.cc:
 -    - fix crash when the dynamic mmap needs to be grown in
 -      LoadReleaseInfo (LP: #854090)
++
+   [ Colin Watson ]
+   * ftparchive/cachedb.cc:
+     - fix buffersize in bytes2hex
+ 
 - -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 05 Oct 2011 18:14:11 +0200
+ 
++ -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 05 Oct 2011 18:40:57 +0200
  
  apt (0.8.16~exp6) experimental; urgency=low
  

diff --cc ftparchive/cachedb.cc
index c4db88811d1b29195e2ed55aa8300dcea419fa08,6eccb8d4ae6f8f046e49bc5f30c85a99f230e0a9..f0bfa2a6d613cc4ae54c47a5c0e7ba80c79c54a3
--- 1/ftparchive/cachedb.cc
--- 2/ftparchive/cachedb.cc
+++ b/ftparchive/cachedb.cc
@@@ -299,12 -298,16 +299,16 @@@ bool CacheDB::LoadContents(bool const &
  }
                                                                        /*}}}*/
  
 -static string bytes2hex(uint8_t *bytes, size_t length) {
 +static std::string bytes2hex(uint8_t *bytes, size_t length) {
-    char space[65];
-    if (length * 2 > sizeof(space) - 1) length = (sizeof(space) - 1) / 2;
-    for (size_t i = 0; i < length; i++)
-       snprintf(&space[i*2], 3, "%02x", bytes[i]);
-    return std::string(space);
+    char buf[3];
 -   string space;
++   std::string space;
+ 
+    space.reserve(length*2 + 1);
+    for (size_t i = 0; i < length; i++) {
+       snprintf(buf, sizeof(buf), "%02x", bytes[i]);
+       space.append(buf);
+    }
+    return space;
  }
  
  static inline unsigned char xdig2num(char const &dig) {

diff --cc methods/https.cc
Simple merge