From eea96cc7c1092f96c5929876608d09d9af292954 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 5 May 2010 09:58:23 +0200
Subject: [PATCH] * apt-pkg/deb/debrecords.cc:   - fix max tag buffer size (LP:
 #545336, closes: #578959)

---
 apt-pkg/deb/debrecords.cc | 3 ++-
 debian/changelog          | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index 8ed0bb7eb..57d30dc62 100644
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -19,7 +19,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)
 {
 }
 									/*}}}*/
diff --git a/debian/changelog b/debian/changelog
index 8e8ecca09..7ff516fc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
-apt (0.7.25.3ubuntu8) UNRELEASED; urgency=low
+apt (0.7.25.3ubuntu8) lucid-proposedUNRELEASED; urgency=low
 
+  [ Loïc Minier ]
   * Use https:// in Vcs-Bzr URL.
 
- -- Loïc Minier <loic.minier@ubuntu.com>  Thu, 22 Apr 2010 10:57:24 +0200
+  [ Michael Vogt ]
+  * apt-pkg/deb/debrecords.cc:
+    - fix max tag buffer size (LP: #545336, closes: #578959)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 05 May 2010 09:57:53 +0200
 
 apt (0.7.25.3ubuntu7) lucid; urgency=low
 
-- 
2.45.2