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

4 files changed, 93 insertions, 2 deletions

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