ebuild bump trying to increase QA level of this package as per bug #162447. Added a workaround trying to fix bug #153292. Thanks to Marti Raudsepp <marti@juffo.org> for reporting. Thanks to Jeff Johnson <n3npq.jbj@gmail.com> and Ken Gilmer <ken@buglabs.net> for their help.

Package-Manager: portage-2.1.2-r9

6 files changed, 77 insertions, 3 deletions

diff --git a/app-arch/rpm/files/digest-rpm-4.4.6-r4 b/app-arch/rpm/files/digest-rpm-4.4.6-r4
new file mode 100644
index 000000000000..8dae251f56e0
--- /dev/null
+++ b/app-arch/rpm/files/digest-rpm-4.4.6-r4
@@ -0,0 +1,3 @@
+MD5 baa6f371446c65b4080d1cd1f194a7ae rpm-4.4.6.tar.gz 17157249
+RMD160 6b433d20a63fb2542244ae62eff0a8b5fe290439 rpm-4.4.6.tar.gz 17157249
+SHA256 1e1da50af2b9dfe34c79315eae7520e7e57087671e17ce26107d779ae2b0b595 rpm-4.4.6.tar.gz 17157249
diff --git a/app-arch/rpm/files/digest-rpm-4.4.7-r2 b/app-arch/rpm/files/digest-rpm-4.4.7-r2
index 2739a8ed4c19..8ad784707d6f 100644
--- a/app-arch/rpm/files/digest-rpm-4.4.7-r2
+++ b/app-arch/rpm/files/digest-rpm-4.4.7-r2
@@ -1,6 +1,3 @@
-MD5 3df07424eb50a8dc9f174acd649746af rpm-4.4.7-patches-1.tar.gz 48537
-RMD160 9baaf952fa105bc2a51241eac89ff28ffd2378a0 rpm-4.4.7-patches-1.tar.gz 48537
-SHA256 1444dc2eb7c07953bd5e0857d6d9db3817a692308729288d3acd84910abdb4a4 rpm-4.4.7-patches-1.tar.gz 48537
 MD5 d012c81b5169f7377ea4a36607e1445e rpm-4.4.7.tar.gz 14125623
 RMD160 9002eb0fe1d680d8bff447d6918f9726c9a4e34c rpm-4.4.7.tar.gz 14125623
 SHA256 18fde4195e4ac21a4290327336948f8c4fc58a680395edbb5f2f31bae67b18b5 rpm-4.4.7.tar.gz 14125623
diff --git a/app-arch/rpm/files/digest-rpm-4.4.7-r3 b/app-arch/rpm/files/digest-rpm-4.4.7-r3
new file mode 100644
index 000000000000..2739a8ed4c19
--- /dev/null
+++ b/app-arch/rpm/files/digest-rpm-4.4.7-r3
@@ -0,0 +1,6 @@
+MD5 3df07424eb50a8dc9f174acd649746af rpm-4.4.7-patches-1.tar.gz 48537
+RMD160 9baaf952fa105bc2a51241eac89ff28ffd2378a0 rpm-4.4.7-patches-1.tar.gz 48537
+SHA256 1444dc2eb7c07953bd5e0857d6d9db3817a692308729288d3acd84910abdb4a4 rpm-4.4.7-patches-1.tar.gz 48537
+MD5 d012c81b5169f7377ea4a36607e1445e rpm-4.4.7.tar.gz 14125623
+RMD160 9002eb0fe1d680d8bff447d6918f9726c9a4e34c rpm-4.4.7.tar.gz 14125623
+SHA256 18fde4195e4ac21a4290327336948f8c4fc58a680395edbb5f2f31bae67b18b5 rpm-4.4.7.tar.gz 14125623
diff --git a/app-arch/rpm/files/rpm-4.4.6-qa-fix-undefined.patch b/app-arch/rpm/files/rpm-4.4.6-qa-fix-undefined.patch
new file mode 100644
index 000000000000..25537d19b009
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.4.6-qa-fix-undefined.patch
@@ -0,0 +1,21 @@
+--- rpm-4.4.6/rpmio/url.c.orig	2007-01-20 16:29:35.471962977 +0100
++++ rpm-4.4.6/rpmio/url.c	2007-01-20 16:30:34.438967191 +0100
+@@ -28,6 +28,8 @@
+ #define	IPPORT_PGPKEYSERVER	11371
+ #endif
+
++#include <neon/ne_session.h>
++
+ /**
+  */
+ /*@unchecked@*/
+
+--- rpm-4.4.6/lib/rpmfi.c.orig	2007-01-20 18:11:30.186124993 +0100
++++ rpm-4.4.6/lib/rpmfi.c	2007-01-20 18:13:26.938313715 +0100
+@@ -24,6 +24,7 @@
+
+ #include "misc.h"	/* XXX stripTrailingChar */
+ #include "rpmmacro.h"	/* XXX rpmCleanPath */
++#include "legacy.h" /* XXX dodigest */
+
+ #include "debug.h"
diff --git a/app-arch/rpm/files/rpm-4.4.7-qa-fix-undefined.patch b/app-arch/rpm/files/rpm-4.4.7-qa-fix-undefined.patch
new file mode 100644
index 000000000000..a5627ebc0599
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.4.7-qa-fix-undefined.patch
@@ -0,0 +1,33 @@
+--- rpmio/url.c.orig	2007-01-20 16:29:35.471962977 +0100
++++ rpmio/url.c	2007-01-20 16:30:34.438967191 +0100
+@@ -28,6 +28,8 @@
+ #define	IPPORT_PGPKEYSERVER	11371
+ #endif
+
++#include <neon/ne_session.h>
++
+ /**
+  */
+ /*@unchecked@*/
+
+--- lib/rpmrc.c.orig	2007-01-20 16:40:21.922342919 +0100
++++ lib/rpmrc.c	2007-01-20 16:42:11.185674112 +0100
+@@ -13,7 +13,7 @@
+ #else
+ #define __power_pc() 0
+ #endif
+-
++#include <rpmio_internal.h>
+ #include <rpmcli.h>
+ #include <rpmmacro.h>
+ #include <rpmlua.h>
+
+--- lib/rpmfi.c.orig	2007-01-20 18:11:30.186124993 +0100
++++ lib/rpmfi.c	2007-01-20 18:13:26.938313715 +0100
+@@ -24,6 +24,7 @@
+
+ #include "misc.h"	/* XXX stripTrailingChar */
+ #include "rpmmacro.h"	/* XXX rpmCleanPath */
++#include "legacy.h" /* XXX dodigest */
+
+ #include "debug.h"
diff --git a/app-arch/rpm/files/rpm-4.4.7-qa-implicit-function-to-pointer.patch b/app-arch/rpm/files/rpm-4.4.7-qa-implicit-function-to-pointer.patch
new file mode 100644
index 000000000000..96f7afbf1eab
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.4.7-qa-implicit-function-to-pointer.patch
@@ -0,0 +1,14 @@
+Fix QA Notice: Function `dbiFreeIndexSet' implicitly converted to pointer at transaction.c:2086
+that will almost certainly crash on 64bit architectures.
+Patch provided by Jeff Johnson <n3npq.jbj@gmail.com> on Rpm-devel list.
+--- rpm-4.4.7/lib/transaction.c.orig	2007-01-20 15:44:30.275657635 +0100
++++ rpm-4.4.7/lib/transaction.c	2007-01-20 15:45:09.818625107 +0100
+@@ -2083,7 +2083,7 @@
+ 		shared->isRemoved = (knownBad == ro);
+ 		shared++;
+ 	    }
+-	    matches[i] = dbiFreeIndexSet(matches[i]);
++	    (void) dbiFreeIndexSet(matches[i]);
+ 	}
+ 	numShared = shared - sharedList;
+ 	shared->otherPkg = -1;