Added patch to fix bug #69811

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index c961648e73c9030be77d2d0e77bc15b5b673b87a..44200da0fa539d5450da2e41f8be790d094f8462 100644 (file)
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-arch/rpm
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.39 2004/10/24 01:53:43 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.40 2004/11/06 00:39:54 cretin Exp $
+
+  05 Nov 2004; Stefan Jones <cretin@gentoo.org> +files/rpm-4.2-pic.patch:
+  Patch so -fpie compiles (ie. gentoo hardened gcc)
 
 *rpm-4.2 (23 Oct 2004)
 

diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index f5f9b316b1c9d2aea358d9db5087042d6dbb8359..357c77de2d773349a05fc1e5471cf818b3a72b62 100644 (file)
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,10 +1,11 @@
-MD5 67afead5a9612df5fd9d02006968df01 rpm-4.2.ebuild 2476
+MD5 3a1e1986717783052c8cd9c3b2c18b39 rpm-4.2.ebuild 2514
 MD5 eed8fd534b17058e6bb758fec85f5315 rpm-4.2.1.ebuild 2493
-MD5 668dd6e42ea527d29d4a69c308f8387d ChangeLog 5834
+MD5 fd546d9614328541d100164822a7ceb0 ChangeLog 5961
 MD5 38980820a3828be6eaa1b830419ee070 rpm-4.0.4-r5.ebuild 1626
 MD5 e7ef0e369ef68d513461dd831eb1ef4f files/digest-rpm-4.0.4-r5 62
 MD5 dd838f7f21d8a9eed6fdf9a18e7ba0e4 files/digest-rpm-4.2.1 62
 MD5 806f307798e39d580d5286d99c44b965 files/rpm-4.0.4-glibc2.3.diff 495
+MD5 bf958533b48913899e576ad1808ac868 files/rpm-4.2-pic.patch 1094
 MD5 25a887527d85208a2d3023df4e02a7a4 files/digest-rpm-4.2 60
 MD5 ec4886ca775cb1cb83aebcd42f20f59f files/rpm-4.2.1-python2.3.diff 1479
 MD5 a440edb98e26eae7936e808d084e072b files/rpm-4.2-python2.3.diff 1559

diff --git a/app-arch/rpm/files/rpm-4.2-pic.patch b/app-arch/rpm/files/rpm-4.2-pic.patch
new file mode 100644 (file)
index 0000000..801775e
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.2-pic.patch
@@ -0,0 +1,47 @@
+--- rpm-4.2/lib/rpmrc.c.jj     2004-11-05 12:14:16.961834816 -0800
++++ rpm-4.2/lib/rpmrc.c        2004-11-05 12:17:43.567425992 -0800
+@@ -892,7 +892,7 @@
+ #ifdef        __LCLINT__
+     *eax = *ebx = *ecx = *edx = 0;
+ #endif
+-#ifdef PIC
++#ifdef __PIC__
+       __asm__("pushl %%ebx; cpuid; movl %%ebx,%1; popl %%ebx"
+               : "=a"(*eax), "=g"(*ebx), "=&c"(*ecx), "=&d"(*edx)
+               : "a" (op));
+@@ -912,7 +912,7 @@
+ {
+       unsigned int val;
+ 
+-#ifdef PIC
++#ifdef __PIC__
+       __asm__("pushl %%ebx; cpuid; popl %%ebx"
+               : "=a" (val) : "a" (op) : "ecx", "edx");
+ #else
+@@ -927,7 +927,7 @@
+ {
+       unsigned int tmp, val;
+ 
+-#ifdef PIC
++#ifdef __PIC__
+       __asm__("pushl %%ebx; cpuid; movl %%ebx,%1; popl %%ebx"
+               : "=a" (tmp), "=g" (val) : "a" (op) : "ecx", "edx");
+ #else
+@@ -941,7 +941,7 @@
+       /*@*/
+ {
+       unsigned int tmp, val;
+-#ifdef PIC
++#ifdef __PIC__
+       __asm__("pushl %%ebx; cpuid; popl %%ebx"
+               : "=a" (tmp), "=c" (val) : "a" (op) : "edx");
+ #else
+@@ -956,7 +956,7 @@
+       /*@*/
+ {
+       unsigned int tmp, val;
+-#ifdef PIC
++#ifdef __PIC__
+       __asm__("pushl %%ebx; cpuid; popl %%ebx"
+               : "=a" (tmp), "=d" (val) : "a" (op) : "ecx");
+ #else

diff --git a/app-arch/rpm/rpm-4.2.ebuild b/app-arch/rpm/rpm-4.2.ebuild
index abe12fd9f8aa7f261b762ad8401a4b2e321b92ec..022f372e25c9f03bb37c9277e4110f3147f295e0 100644 (file)
--- a/app-arch/rpm/rpm-4.2.ebuild
+++ b/app-arch/rpm/rpm-4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.2.ebuild,v 1.10 2004/10/26 16:08:01 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.2.ebuild,v 1.11 2004/11/06 00:39:54 cretin Exp $
 
 inherit python flag-o-matic libtool eutils
 
@@ -27,6 +27,7 @@ RDEPEND="=sys-libs/db-3.2*
 src_unpack() {
        unpack ${A}
        epatch ${FILESDIR}/rpm-4.2-python2.3.diff
+       epatch ${FILESDIR}/rpm-4.2-pic.patch
 }
 
 src_compile() {