summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Jones <cretin@gentoo.org>2004-11-06 00:39:54 +0000
committerStefan Jones <cretin@gentoo.org>2004-11-06 00:39:54 +0000
commitb20187791eca4a4669bf77ad511aa13d71a902db (patch)
tree167c15be504a71a8bc10aa0e0a4066c85bee08cd /app-arch
parentStable on alpha, bug 70138. (diff)
downloadhistorical-b20187791eca4a4669bf77ad511aa13d71a902db.tar.gz
historical-b20187791eca4a4669bf77ad511aa13d71a902db.tar.bz2
historical-b20187791eca4a4669bf77ad511aa13d71a902db.zip
Added patch to fix bug #69811
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/rpm/ChangeLog5
-rw-r--r--app-arch/rpm/Manifest5
-rw-r--r--app-arch/rpm/files/rpm-4.2-pic.patch47
-rw-r--r--app-arch/rpm/rpm-4.2.ebuild3
4 files changed, 56 insertions, 4 deletions
diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index c961648e73c9..44200da0fa53 100644
--- 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 f5f9b316b1c9..357c77de2d77 100644
--- 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
index 000000000000..801775e8624c
--- /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 abe12fd9f8aa..022f372e25c9 100644
--- 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() {