- properly null-terminate ascii digest string, this fixes upgrade

  problems with packages built with rpm5 on old rpm-4.5
- rel 16

diff --git a/rpm-null-term-ascii-digest.patch b/rpm-null-term-ascii-digest.patch
new file mode 100644 (file)
index 0000000..06102d7
--- /dev/null
+++ b/rpm-null-term-ascii-digest.patch
@@ -0,0 +1,19 @@
+Index: rpmdb/legacy.c
+===================================================================
+RCS file: /v/rpm/cvs/rpm/rpmdb/legacy.c,v
+retrieving revision 1.44.4.3
+diff -p -u -w -r1.44.4.3 legacy.c
+--- rpmdb/legacy.c     16 Apr 2012 23:43:34 -0000      1.44.4.3
++++ rpmdb/legacy.c     2 Oct 2012 20:17:21 -0000
+@@ -282,8 +282,10 @@ int dodigest(int dalgo, const char * fn,
+ exit:
+     if (fsizep)
+       *fsizep = fsize;
+-    if (!rc)
++    if (!rc) {
+       memcpy(digest, dsum, dlen);
++      if (asAscii) digest[dlen] = '\0';
++    }
+     dsum = _free(dsum);
+ 
+     return rc;

diff --git a/rpm.spec b/rpm.spec
index d0395caaefb28cd45cc8a3c11c1ed4b7f33b3bd0..77b19ebd9d0a2f59cd178585c809e91b8c030b2f 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -52,7 +52,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       5.4.10
-Release:       15
+Release:       16
 License:       LGPL
 Group:         Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
@@ -140,6 +140,7 @@ Patch48:    %{name}-verify-ghosts-broken-logic.patch
 Patch49:       %{name}-python-enable-compat-RPMSENSE.patch
 Patch50:       %{name}-dont-treat-gstreamer-modules-as-font.patch
 Patch51:       %{name}-gst-inspect-typo.patch
+Patch52:       %{name}-null-term-ascii-digest.patch
 
 # Patches imported from Mandriva
 
@@ -817,6 +818,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch49 -p1
 %patch50 -p1
 %patch51 -p1
+%patch52 -p0
 
 %patch1000 -p1
 %patch1001 -p1