From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 5 May 2010 08:01:41 +0000 (+0200)
Subject: * apt-pkg/deb/debrecords.cc:
X-Git-Tag: 0.8.0~14
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/cda675393c357aeeb7617652f5fe3c77d803229a?hp=-c

* apt-pkg/deb/debrecords.cc:
  - fix max tag buffer size (LP: #545336, closes: #578959)
---

cda675393c357aeeb7617652f5fe3c77d803229a
diff --combined apt-pkg/deb/debrecords.cc
index 5b8538a46,57d30dc62..34ef0d8f2
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@@ -11,7 -11,6 +11,7 @@@
  #include <apt-pkg/debrecords.h>
  #include <apt-pkg/strutl.h>
  #include <apt-pkg/error.h>
 +#include <apt-pkg/aptconfiguration.h>
  #include <langinfo.h>
  									/*}}}*/
  
@@@ -20,7 -19,8 +20,8 @@@
  /* */
  debRecordParser::debRecordParser(string FileName,pkgCache &Cache) : 
                    File(FileName,FileFd::ReadOnly), 
-                   Tags(&File,Cache.Head().MaxVerFileSize + 200)
+                   Tags(&File, std::max(Cache.Head().MaxVerFileSize, 
+ 				       Cache.Head().MaxDescFileSize) + 200)
  {
  }
  									/*}}}*/
@@@ -110,18 -110,13 +111,18 @@@ string debRecordParser::ShortDesc(
  string debRecordParser::LongDesc()
  {
    string orig, dest;
 -  char *codeset = nl_langinfo(CODESET);
  
    if (!Section.FindS("Description").empty())
       orig = Section.FindS("Description").c_str();
 -  else 
 -     orig = Section.FindS(("Description-" + pkgIndexFile::LanguageCode()).c_str()).c_str();
 +  else
 +  {
 +     vector<string> const lang = APT::Configuration::getLanguages();
 +     for (vector<string>::const_iterator l = lang.begin();
 +	  orig.empty() && l != lang.end(); l++)
 +	orig = Section.FindS(string("Description-").append(*l).c_str());
 +  }
  
 +  char const * const codeset = nl_langinfo(CODESET);
    if (strcmp(codeset,"UTF-8") != 0) {
       UTF8ToCodeset(codeset, orig, &dest);
       orig = dest;
diff --combined debian/changelog
index eb618118d,786fbb1db..3421b8b6f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,110 -1,14 +1,112 @@@
 -apt (0.7.25.4) UNRELEASED; urgency=low
 +apt (0.7.26~exp4) unstable; urgency=low
 +
 +  * [ Abi break ] apt-pkg/acquire-item.{cc,h}:
 +    - add "IsIndexFile" to constructor of pkgAcqFile so that it sends
 +      the right cache control headers
 +  * apt-pkg/depcache.cc:
 +    - fix incorrect std::cout usage for debug output
 +  * test/libapt/getlanguages_test.cc:
 +    - Add test for Esperanto that has nocounty associated with them
 +      (LP: #560956)
++  * apt-pkg/deb/debrecords.cc:
++    - fix max tag buffer size (LP: #545336, closes: #578959)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 04 May 2010 09:55:08 +0200
 +
 +apt (0.7.26~exp3) UNRELEASED; urgency=low
 +
 +  [ Christian Perrier ]
 +  * German translation update. Closes: #571037
 +  * Spanish manpages translation update. Closes: #573293
 +  * Dutch translation update. Closes: #573946
 +  * Polish manpages translation update. Closes: #574558
 +  * Add "manpages-pl (<< 20060617-3~)" to avoid file conflicts with
 +    that package that was providing some manpages for APT utilities.
 +
 +  [ Julian Andres Klode ]
 +  * cmdline/apt-cache.cc:
 +    - Change behavior of showsrc to match the one of show (Closes: #512046).
 +  * cmdline/apt-key:
 +    - Honor Apt::GPGV::TrustedKeyring (Closes: #316390)
 +  * cmdline/apt-mark:
 +    - Use the new python-apt API (and conflict with python-apt << 0.7.93.2).
 +  * apt-inst/contrib/arfile.h:
 +    - Add public ARArchive::Members() which returns the list of members.
 +  * apt-pkg/policy.cc:
 +    - Always return a candidate if there is at least one version pinned > 0
 +      (Closes: #512318)
 +  * ftparchive/apt-ftparchive.cc:
 +    - Read default configuration (Closes: #383257)
 +  * debian/rules:
 +    - Fix the libraries name to be e.g. libapt-pkg4.9 instead of
 +      libapt-pkg-4.9.
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix backgrounding when dpkg runs (closes: #486222)
 +  * cmdline/apt-mark:
 +    - show error on incorrect aguments (LP: #517917), thanks to
 +      Torsten Spindler
 +  * cmdline/apt-get.cc:
 +    - if apt-get source foo=version or foo/distro can not be found,
 +      error out (LP: #502641)
 +  * apt-pkg/packagemanager.cc:
 +    - better debug output 
 +  * doc/examples/configure-index:
 +    - add missing Debug::pkgPackageManager option
 +
 + -- Christian Perrier <bubulle@debian.org>  Wed, 24 Feb 2010 22:13:50 +0100
 +
 +apt (0.7.26~exp2) experimental; urgency=low
 +
 +  * fix crash when LANGUAGE is not set
 +
 + -- Michael Vogt <mvo@debian.org>  Thu, 18 Feb 2010 22:07:23 +0100
 +
 +apt (0.7.26~exp1) experimental; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * [BREAK] add possibility to download and use multiply
 +    Translation files, configurable with Acquire::Translation
 +    (Closes: #444222, #448216, #550564)
 +  * Ignore :qualifiers after package name in build dependencies
 +    for now as long we don't understand them (Closes: #558103)
 +  * apt-pkg/contrib/mmap.{cc,h}:
 +    - extend it to have a growable flag - unused now but maybe...
 +  * apt-pkg/pkgcache.h:
 +    - use long instead of short for {Ver,Desc}File size,
 +      patch from Víctor Manuel Jáquez Leal, thanks! (Closes: #538917)
 +  * apt-pkg/acquire-item.cc:
 +    - allow also to skip the last patch if target is reached,
 +      thanks Bernhard R. Link! (Closes: #545699)
 +  * ftparchive/writer.{cc,h}:
 +    - add --arch option for packages and contents commands
 +    - if an arch is given accept only *_all.deb and *_arch.deb instead
 +      of *.deb. Thanks Stephan Bosch for the patch! (Closes: #319710)
 +    - add APT::FTPArchive::AlwaysStat to disable the too aggressive
 +      caching if versions are build multiply times (not recommend)
 +      Patch by Christoph Goehre, thanks! (Closes: #463260)
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - stdin redirected to /dev/null takes all CPU (Closes: #569488)
 +      Thanks to Aurelien Jarno for providing (again) a patch!
 +  * buildlib/apti18n.h.in, po/makefile:
 +    - add ngettext support with P_()
 +  * aptconfiguration.cc:
 +    - include all existing Translation files in the Cache (Closes: 564137)
 +  * debian/control:
 +    - update with no changes to debian policy 3.8.4
 +  * doc/apt_preferences.5.xml:
 +    - explicitly warn against careless use (Closes: #567669)
 +  * debian/rules:
 +    - remove creation of empty dir /usr/share/apt
 +  * doc/apt-cdrom.8.xml:
 +    - fix typo spotted by lintian: proc(c)eed
  
 -  [ Evan Dandrea ]
 -  * Remember hosts with general failures for
 -    https://wiki.ubuntu.com/NetworklessInstallationFixes (LP: #556831).
 -  
    [ Ivan Masár ]
    * Slovak translation update. Closes: #568294
    
    [ Michael Vogt ]
 -  * merged lp:~mvo/apt/history
 +  * [BREAK] merged lp:~mvo/apt/history
      - this writes a /var/log/apt/history tagfile that contains details
        from the transaction (complements term.log)
    * methods/http.cc:
@@@ -117,13 -21,35 +119,13 @@@
    * abicheck/
      - add new abitest tester using the ABI Compliance Checker from
        http://ispras.linuxfoundation.org/index.php/ABI_compliance_checker
 -  * apt-pkg/deb/dpkgpm.cc:
 -    - fix backgrounding when dpkg runs (closes: #486222)
 -  * cmdline/apt-mark:
 -    - show error on incorrect aguments (LP: #517917), thanks to
 -      Torsten Spindler
 -  * cmdline/apt-get.cc:
 -    - if apt-get source foo=version or foo/distro can not be found,
 -      error out (LP: #502641)
 -  * apt-pkg/indexfile.cc:
 -    - deal correctly with three letter langcodes (LP: #391409)
 -  * [ Abi break ] apt-pkg/acquire-item.{cc,h}:
 -    - add "IsIndexFile" to constructor of pkgAcqFile so that it sends
 -      the right cache control headers
 -  * apt-pkg/depcache.cc:
 -    - fix incorrect std::cout usage for debug output
 -  * apt-pkg/indexfile.cc:
 -    - If no "_" is found in the language code, try to find a "."
 -      This is required for languages like Esperanto that have no
 -      county associated with them (LP: #560956)
 -      Thanks to "Aisano" for the fix
 -  * apt-pkg/deb/debrecords.cc:
 -    - fix max tag buffer size (LP: #545336, closes: #578959)
  
    [ Robert Collins ]
    * Change the package index Info methods to allow apt-cache policy to be
      useful when using several different archives on the same host.
      (Closes: #329814, LP: #22354)
  
 - -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 18 Dec 2009 16:54:18 +0100
 + -- Michael Vogt <mvo@debian.org>  Thu, 18 Feb 2010 16:11:39 +0100
  
  apt (0.7.25.3) unstable; urgency=low