* apt-pkg/tagfile.cc:

  - applied patch from jvw to make the tag key stuff case-insensitive

diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index 8fcbeb23b6fb39ee1ab3deab4f268fece42029f5..0bc6ce6fd8021a5d4fc1096d1a29eb456611eb8b 100644 (file)
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -192,12 +192,12 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long Offset)
 // ---------------------------------------------------------------------
 /* 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
-   first 3 letters gives very good performance on the debian package files */
+   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) ^ (Res << 2);
+      Res = ((unsigned long)(*Text) & 0xDF) ^ (Res << 1);
    return Res & 0xFF;
 }
 

diff --git a/configure.in b/configure.in
index fc4eff203d5fead71051b9cbdf75c1c8976e6574..f0b0d6703af0f057455389e7258eefc6230852fd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.6.45")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.45.1")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index b55e0c5822ac898ebd8e11cf20ea795e5c2753dd..5f54213558c164d51913c4a8eddce0cac2679542 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,9 @@ apt (0.6.45.1) unstable; urgency=low
     * fi.po: Updated to 512t. Closes: #382702
   * share/archive-archive.gpg:
     - removed the outdated amd64 and debian-2004 keys
+  * apt-pkg/tagfile.cc:
+    - applied patch from Jeroen van Wolffelaar to make the tags
+      caseinsensitive (closes: #384182)
   
  --