From 47e7ebb340eafcd06a5be6b92ec1b604e1d33f92 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 19 Sep 2006 17:24:46 +0200
Subject: * apt-pkg/tagfile.cc:   - added ubuntu specific Original-Maintainer
 field

---
 apt-pkg/tagfile.cc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'apt-pkg/tagfile.cc')

diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index 72cd08596..029511336 100644
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -378,6 +378,7 @@ static const char *iTFRewritePackageOrder[] = {
                           "Section",
                           "Installed-Size",
                           "Maintainer",
+                          "Original-Maintainer",
                           "Architecture",
                           "Source",
                           "Version",
@@ -407,6 +408,7 @@ static const char *iTFRewriteSourceOrder[] = {"Package",
                                       "Priority",
                                       "Section",
                                       "Maintainer",
+				      "Original-Maintainer",
                                       "Build-Depends",
                                       "Build-Depends-Indep",
                                       "Build-Conflicts",
-- 
cgit v1.2.3


From c176c4d0adad246ac0768f9e2b60aa8e4c56fffb Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sun, 14 Mar 2010 21:48:14 +0100
Subject: * apt-pkg/depcache.cc:   - remove Auto-Installed information from
 extended_states     together with the package itself (Closes: #572364)

---
 apt-pkg/tagfile.cc | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'apt-pkg/tagfile.cc')

diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index 7c5d15a58..0d4999ee7 100644
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -193,17 +193,8 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long Offset)
 									/*}}}*/
 // TagSection::Scan - Scan for the end of the header information	/*{{{*/
 // ---------------------------------------------------------------------
-/* This looks for the first double new line in the data stream. It also
-   indexes the tags in the section. This very simple hash function for the
-   last 8 letters gives very good performance on the debian package files */
-inline static unsigned long AlphaHash(const char *Text, const char *End = 0)
-{
-   unsigned long Res = 0;
-   for (; Text != End && *Text != ':' && *Text != 0; Text++)
-      Res = ((unsigned long)(*Text) & 0xDF) ^ (Res << 1);
-   return Res & 0xFF;
-}
-
+/* This looks for the first double new line in the data stream.
+   It also indexes the tags in the section. */
 bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
 {
    const char *End = Start + MaxLength;
-- 
cgit v1.2.3


From e2c66de5c5e63d8400efb0522c31fbe1ec225f93 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Thu, 3 Jun 2010 09:22:00 +0200
Subject: * apt-pkg/pkgcache.h:   - switch {,Install-}Size to unsigned long
 long * apt-pkg/depcache.cc:   - deal with long long, not with int to remove
 2GB Limit (LP: #250909)

---
 apt-pkg/tagfile.cc | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'apt-pkg/tagfile.cc')

diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index 0d4999ee7..1394d7e24 100644
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -365,6 +365,30 @@ signed int pkgTagSection::FindI(const char *Tag,signed long Default) const
    return Result;
 }
 									/*}}}*/
+// TagSection::FindULL - Find an unsigned long long integer		/*{{{*/
+// ---------------------------------------------------------------------
+/* */
+unsigned long long pkgTagSection::FindULL(const char *Tag, unsigned long long const &Default) const
+{
+   const char *Start;
+   const char *Stop;
+   if (Find(Tag,Start,Stop) == false)
+      return Default;
+
+   // Copy it into a temp buffer so we can use strtoull
+   char S[100];
+   if ((unsigned)(Stop - Start) >= sizeof(S))
+      return Default;
+   strncpy(S,Start,Stop-Start);
+   S[Stop - Start] = 0;
+   
+   char *End;
+   unsigned long long Result = strtoull(S,&End,10);
+   if (S == End)
+      return Default;
+   return Result;
+}
+									/*}}}*/
 // TagSection::FindFlag - Locate a yes/no type flag			/*{{{*/
 // ---------------------------------------------------------------------
 /* The bits marked in Flag are masked on/off in Flags */
-- 
cgit v1.2.3