fixed up getheap2 and getmain2 tests for non-x86 archs

4 files changed, 47 insertions, 14 deletions

diff --git a/app-admin/paxtest/ChangeLog b/app-admin/paxtest/ChangeLog
index 826d6d714e6a..d964c442d790 100644
--- a/app-admin/paxtest/ChangeLog
+++ b/app-admin/paxtest/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/paxtest
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/paxtest/ChangeLog,v 1.12 2004/07/29 09:47:21 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/paxtest/ChangeLog,v 1.13 2004/07/29 19:09:08 lv Exp $
+
+  29 Jul 2004; Travis Tilley <lv@gentoo.org>
+  +files/paxtest-0.9.5-use-fPIE.patch, paxtest-0.9.5-r1.ebuild:
+  fixed up getheap2 and getmain2 tests for non-x86 archs
 
   29 Jul 2004; Travis Tilley <lv@gentoo.org> paxtest-0.9.5-r1.ebuild:
   added very preliminary support for non-x86 archs and added ~amd64 keyword
diff --git a/app-admin/paxtest/Manifest b/app-admin/paxtest/Manifest
index 59ba258bd208..1a1329a865d8 100644
--- a/app-admin/paxtest/Manifest
+++ b/app-admin/paxtest/Manifest
@@ -1,5 +1,6 @@
-MD5 1be6b9869e1c6f39692f6b35284cd949 ChangeLog 1894
+MD5 bfbb7a1b39c2ea22d112a97168c6dd21 ChangeLog 2061
 MD5 9c3ac1379620120fbd744ce753b30ab5 metadata.xml 1075
-MD5 50b704fafee0bee0c95f8d1568f32ec1 paxtest-0.9.5-r1.ebuild 1355
+MD5 173037a661828931cd7aa0df7f2336f5 paxtest-0.9.5-r1.ebuild 1099
 MD5 d2c0f3f930cc073ecca57b22266fc4af files/digest-paxtest-0.9.5-r1 64
 MD5 424438ef95656aae91eb2f6c53c663d9 files/paxtest-0.9.5.1.diff 2369
+MD5 30e5dbdc3446194bf75504fe4c83d5d9 files/paxtest-0.9.5-use-fPIE.patch 813
diff --git a/app-admin/paxtest/files/paxtest-0.9.5-use-fPIE.patch b/app-admin/paxtest/files/paxtest-0.9.5-use-fPIE.patch
new file mode 100644
index 000000000000..76c41406d806
--- /dev/null
+++ b/app-admin/paxtest/files/paxtest-0.9.5-use-fPIE.patch
@@ -0,0 +1,33 @@
+--- paxtest-0.9.5.old/Makefile.Gentoo-hardened	2004-07-29 14:56:20.261505592 -0400
++++ paxtest-0.9.5/Makefile.Gentoo-hardened	2004-07-29 14:57:04.160831880 -0400
+@@ -77,8 +77,6 @@
+ paxtest: $(TESTS) genpaxtest
+ 	sh genpaxtest $(TESTS)
+ 
+-crt1S.o: crt1S.S
+-
+ anonmap: body.o anonmap.o
+ 
+ execbss: body.o execbss.o
+@@ -92,8 +90,8 @@
+ getheap1: getheap.o
+ 	$(CC) $(LDFLAGS) -o $@ $+
+ 
+-getheap2: crt1S.o interp.o getheap.o
+-	$(CC) -shared -o $@ $+
++getheap2: interp.o getheap.o
++	$(CC) -fPIE -o $@ $+
+ 
+ getheap.o: getheap.c
+ 	$(CC) $(CFLAGS) -fPIC -DPIC -o $@ -c $<
+@@ -104,8 +102,8 @@
+ 	$(CC) $(LDFLAGS) -o $@ $+
+ 	chpax -X $@
+ 
+-getmain2: crt1S.o interp.o getmain2.o
+-	$(CC) -shared -o $@ $+
++getmain2: interp.o getmain2.o
++	$(CC) -fPIE -o $@ $+
+ 
+ getmain2.o: getmain.c
+ 	$(CC) $(CFLAGS) -fPIC -DPIC -o $@ -c $<
diff --git a/app-admin/paxtest/paxtest-0.9.5-r1.ebuild b/app-admin/paxtest/paxtest-0.9.5-r1.ebuild
index b2d5a23fd226..39b50d6f52e4 100644
--- a/app-admin/paxtest/paxtest-0.9.5-r1.ebuild
+++ b/app-admin/paxtest/paxtest-0.9.5-r1.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-admin/paxtest/paxtest-0.9.5-r1.ebuild,v 1.8 2004/07/29 09:47:21 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/paxtest/paxtest-0.9.5-r1.ebuild,v 1.9 2004/07/29 19:09:08 lv Exp $
 
 inherit eutils
 
@@ -24,12 +24,13 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/paxtest-0.9.5.1.diff
-	cp Makefile{,.orig}
-	cp Makefile{.Gentoo-hardened,}
 
 	# paxtest includes crt1S.S, which is great if you're on x86, but not so
-	# much if you're not... lets use the system Scrt1.o
-	use !x86 && cp ${ROOT}/usr/lib/Scrt1.o ${S}/crt1S.o
+	# much if you're not...
+	use !x86 && epatch ${FILESDIR}/paxtest-0.9.5-use-fPIE.patch
+
+	cp Makefile{,.orig}
+	cp Makefile{.Gentoo-hardened,}
 }
 
 src_compile() {
@@ -43,9 +44,3 @@ src_install() {
 	done
 }
 
-pkg_postinst() {
-	use !x86 && (
-	ewarn "WARNING: support for non-x86 archs is currently a hack."
-	ewarn "since you're not on x86, you may get \"Accessing a corrupted shared library\""
-	ewarn "during the getmain2 and getheap2 tests." )
-}