[abrt] added patch to build with rpm 4.9

Jiří Moskovčák jmoskovc at fedoraproject.org
Wed Jan 19 17:39:39 UTC 2011


commit 4a5a3ac6b44ad1f2c3f93befe22ec5dcd6493680
Author: Jiri Moskovcak <jmoskovc at redhat.com>
Date:   Wed Jan 19 18:38:49 2011 +0100

    added patch to build with rpm 4.9

 abrt-1.1.14-rpm-digestalgo.patch |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)
---
diff --git a/abrt-1.1.14-rpm-digestalgo.patch b/abrt-1.1.14-rpm-digestalgo.patch
new file mode 100644
index 0000000..d8560ff
--- /dev/null
+++ b/abrt-1.1.14-rpm-digestalgo.patch
@@ -0,0 +1,22 @@
+diff -up abrt-1.1.14/src/Daemon/RPM.cpp.rpm49-hashalgo abrt-1.1.14/src/Daemon/RPM.cpp
+--- abrt-1.1.14/src/Daemon/RPM.cpp.rpm49-hashalgo	2010-11-15 14:46:06.000000000 +0200
++++ abrt-1.1.14/src/Daemon/RPM.cpp	2011-01-18 10:57:57.000000000 +0200
+@@ -112,7 +112,6 @@ bool CheckHash(const char* pPackage, con
+     if (header != NULL)
+     {
+         rpmfi fi = rpmfiNew(ts, header, RPMTAG_BASENAMES, RPMFI_NOHEADER);
+-        pgpHashAlgo hashAlgo;
+         std::string headerHash;
+         char computedHash[1024] = "";
+ 
+@@ -120,8 +119,8 @@ bool CheckHash(const char* pPackage, con
+         {
+             if (strcmp(pPath, rpmfiFN(fi)) == 0)
+             {
+-                headerHash = rpmfiFDigestHex(fi, &hashAlgo);
+-                rpmDoDigest(hashAlgo, pPath, 1, (unsigned char*) computedHash, NULL);
++                headerHash = rpmfiFDigestHex(fi, NULL);
++                rpmDoDigest(rpmfiDigestAlgo(fi), pPath, 1, (unsigned char*) computedHash, NULL);
+                 ret = (headerHash != "" && headerHash == computedHash);
+                 break;
+             }


More information about the scm-commits mailing list