added a patch to force paxtest to use orig gcc specs regardless if any spec file modifications existed

8 files changed, 120 insertions, 15 deletions

diff --git a/app-admin/paxtest/ChangeLog b/app-admin/paxtest/ChangeLog
index cdc148ea6f3b..5a7eaaf4cd26 100644
--- a/app-admin/paxtest/ChangeLog
+++ b/app-admin/paxtest/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/paxtest
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/paxtest/ChangeLog,v 1.5 2003/11/17 00:04:04 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/paxtest/ChangeLog,v 1.6 2003/11/28 22:14:47 solar Exp $
+
+*paxtest-0.9.5-r1 (28 Nov 2003)
+
+  28 Nov 2003; <solar@gentoo.org> paxtest-0.9.4.ebuild,
+  paxtest-0.9.5-r1.ebuild, paxtest-0.9.5.ebuild, files/paxtest-0.9.5.1.diff:
+  added a patch to force paxtest to use orig gcc specs regardless if any spec
+  file modifications existed
 
   16 Nov 2003; <solar@gentoo.org> paxtest-0.9.4.ebuild, paxtest-0.9.5.ebuild:
   bumping to stable
diff --git a/app-admin/paxtest/Manifest b/app-admin/paxtest/Manifest
index 132ec569b5d9..8756860bd765 100644
--- a/app-admin/paxtest/Manifest
+++ b/app-admin/paxtest/Manifest
@@ -1,7 +1,8 @@
 MD5 9c3ac1379620120fbd744ce753b30ab5 metadata.xml 1075
-MD5 beae7f6bf469f1165dcdd405488d4170 ChangeLog 1368
-MD5 659af3ac6a0fd18172a68a2870aa25ae paxtest-0.9.5.ebuild 847
-MD5 df2e58afeca361bb4edaa4fe1be4f114 paxtest-0.9.5-r1.ebuild 887
+MD5 2223a4b3497029d3c1c8d36c0036ebed ChangeLog 1368
+MD5 0cbbf53abcc433d59ba3d3105bc4a69e paxtest-0.9.1.ebuild 867
+MD5 1959e5b475e75b71d902fbdf69157f79 paxtest-0.9.5.ebuild 847
+MD5 ec64846c6c9d5c828212d065d10bd9e8 paxtest-0.9.5-r1.ebuild 890
 MD5 d2c0f3f930cc073ecca57b22266fc4af files/digest-paxtest-0.9.5 64
 MD5 424438ef95656aae91eb2f6c53c663d9 files/paxtest-0.9.5.1.diff 2369
 MD5 d2c0f3f930cc073ecca57b22266fc4af files/digest-paxtest-0.9.5-r1 64
diff --git a/app-admin/paxtest/files/digest-paxtest-0.9.1 b/app-admin/paxtest/files/digest-paxtest-0.9.1
deleted file mode 100644
index 9a4152f0b769..000000000000
--- a/app-admin/paxtest/files/digest-paxtest-0.9.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6149508864b8a8aa2e02d73bb15a338b paxtest-0.9.1.tar.gz 20059
diff --git a/app-admin/paxtest/files/digest-paxtest-0.9.4 b/app-admin/paxtest/files/digest-paxtest-0.9.4
deleted file mode 100644
index 395f591a18c2..000000000000
--- a/app-admin/paxtest/files/digest-paxtest-0.9.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4baf0a9ac8e52020db3d576e6c1c0973 paxtest-0.9.4.tar.gz 26515
diff --git a/app-admin/paxtest/files/digest-paxtest-0.9.5-r1 b/app-admin/paxtest/files/digest-paxtest-0.9.5-r1
new file mode 100644
index 000000000000..065c41bb5baf
--- /dev/null
+++ b/app-admin/paxtest/files/digest-paxtest-0.9.5-r1
@@ -0,0 +1 @@
+MD5 34c9f6f48197cc0d81f18a17ec23c719 paxtest-0.9.5.tar.gz 26961
diff --git a/app-admin/paxtest/files/paxtest-0.9.5.1.diff b/app-admin/paxtest/files/paxtest-0.9.5.1.diff
new file mode 100644
index 000000000000..49d75c3192fe
--- /dev/null
+++ b/app-admin/paxtest/files/paxtest-0.9.5.1.diff
@@ -0,0 +1,92 @@
+diff -Nru paxtest-0.9.5/Makefile paxtest-0.9.5.1/Makefile
+--- paxtest-0.9.5/Makefile	2003-11-04 16:39:39.000000000 -0500
++++ paxtest-0.9.5.1/Makefile	2003-11-10 18:19:47.000000000 -0500
+@@ -22,5 +22,5 @@
+ 	make -f Makefile.generic
+ 
+ clean:
+-	make -f Makefile.Adamantix clean
++	make -f Makefile.generic clean
+ 
+diff -Nru paxtest-0.9.5/Makefile.Gentoo-hardened paxtest-0.9.5.1/Makefile.Gentoo-hardened
+--- paxtest-0.9.5/Makefile.Gentoo-hardened	2003-11-04 05:47:37.000000000 -0500
++++ paxtest-0.9.5.1/Makefile.Gentoo-hardened	2003-11-10 18:20:17.000000000 -0500
+@@ -1,19 +1,18 @@
+ #!/usr/bin/make
+ 
+-CC=gcc
+-CFLAGS=-O2
+-LDFLAGS=
++GCC_SPCS:=$(shell gcc -dumpspecs > dumpspecs)
++CC := gcc -specs=dumpspecs
++
++CFLAGS  := -O2
++LDFLAGS :=
+ ifndef RUNDIR
+-RUNDIR=.
++RUNDIR := /usr/lib/paxtest
+ endif
+ 
+ # The Hardened GCC compiler has stack protector on by default, this
+ # could interfere with the results of this test.
+ 
+-CFLAGS	+= -DRUNDIR=\"${RUNDIR}\" -fno-stack-protector
+-CFLAGS	+= $(shell portageq has_version / sys-devel/hardened-gcc && \
+-	echo -yet_exec -yno_propolice)
+-
++CFLAGS	:= -DRUNDIR=\"${RUNDIR}\" -fno-stack-protector
+ 
+ TESTS=	anonmap \
+ 	execbss \
+@@ -60,7 +59,7 @@
+ clean:
+ 	-rm -f *.o *.s *~ core
+ 	-rm -f $(SHLIBS) $(TESTS) $(UTILS)
+-	-rm -f paxtest paxtest.log a.out
++	-rm -f paxtest paxtest.log a.out dumpspecs
+ 
+ ifdef DESTDIR
+ ifdef BINDIR
+@@ -78,10 +77,10 @@
+ paxtest: $(TESTS) genpaxtest
+ 	sh genpaxtest $(TESTS)
+ 
+-anonmap: body.o anonmap.o
+-
+ crt1S.o: crt1S.S
+ 
++anonmap: body.o anonmap.o
++
+ execbss: body.o execbss.o
+ 
+ execdata: body.o execdata.o
+@@ -93,7 +92,7 @@
+ getheap1: getheap.o
+ 	$(CC) $(LDFLAGS) -o $@ $+
+ 
+-getheap2: getheap.o
++getheap2: crt1S.o interp.o getheap.o
+ 	$(CC) -shared -o $@ $+
+ 
+ getheap.o: getheap.c
+@@ -105,7 +104,7 @@
+ 	$(CC) $(LDFLAGS) -o $@ $+
+ 	chpax -X $@
+ 
+-getmain2: getmain2.o
++getmain2: crt1S.o interp.o getmain2.o
+ 	$(CC) -shared -o $@ $+
+ 
+ getmain2.o: getmain.c
+diff -Nru paxtest-0.9.5/Makefile.generic paxtest-0.9.5.1/Makefile.generic
+--- paxtest-0.9.5/Makefile.generic	2003-11-04 08:44:19.000000000 -0500
++++ paxtest-0.9.5.1/Makefile.generic	2003-11-10 18:19:47.000000000 -0500
+@@ -64,7 +64,7 @@
+ clean:
+ 	-rm -f *.o $(CHPAX)/*.o *.s *~ core
+ 	-rm -f $(SHLIBS) $(TESTS) $(UTILS)
+-	-rm -f paxtest chpax paxtest.log a.out
++	-rm -f paxtest chpax paxtest.log a.out dumpspecs
+ 
+ ifdef DESTDIR
+ ifdef BINDIR
diff --git a/app-admin/paxtest/paxtest-0.9.4.ebuild b/app-admin/paxtest/paxtest-0.9.5-r1.ebuild
index 55132cc7981e..6083aee7bf5c 100644
--- a/app-admin/paxtest/paxtest-0.9.4.ebuild
+++ b/app-admin/paxtest/paxtest-0.9.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/paxtest/paxtest-0.9.4.ebuild,v 1.2 2003/11/17 00:04:04 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/paxtest/paxtest-0.9.5-r1.ebuild,v 1.1 2003/11/28 22:14:47 solar Exp $
 
 S=${WORKDIR}/${P}
 
@@ -12,14 +12,20 @@ LICENSE="GPL-2"
 SLOT="0"
 
 IUSE=""
-DEPEND="virtual/glibc"
+DEPEND="virtual/glibc
+	>=sys-apps/chpax-0.5"
+
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/paxtest-0.9.5.1.diff
+	cp Makefile{,.orig}
+	cp Makefile{.Gentoo-hardened,}
+}
 
 src_compile() {
-	# If you really paranoid you can uncomment this umask stuff.
-	# local mask=$(umask)
-	# umask 0077
-	emake DESTDIR=${D} BINDIR=${D}/usr/bin RUNDIR=/usr/lib/paxtest generic || die "Parallel Make Failed"
-	# umask $mask
+	emake DESTDIR=${D} BINDIR=${D}/usr/bin RUNDIR=/usr/lib/paxtest || die
 }
 
 src_install() {
diff --git a/app-admin/paxtest/paxtest-0.9.5.ebuild b/app-admin/paxtest/paxtest-0.9.5.ebuild
index 1a4cb90f8c74..60ea47b1d48c 100644
--- a/app-admin/paxtest/paxtest-0.9.5.ebuild
+++ b/app-admin/paxtest/paxtest-0.9.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/paxtest/paxtest-0.9.5.ebuild,v 1.2 2003/11/17 00:04:04 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/paxtest/paxtest-0.9.5.ebuild,v 1.3 2003/11/28 22:14:47 solar Exp $
 
 S=${WORKDIR}/${P}
 
 DESCRIPTION="PaX regression test suite"
 SRC_URI="http://pageexec.virtualave.net/paxtest-${PV}.tar.gz"
 HOMEPAGE="http://pageexec.virtualave.net"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 LICENSE="GPL-2"
 SLOT="0"