Version bump to 0.9.9. See Bugs #322413 and #331599

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 168 insertions, 20 deletions

diff --git a/app-admin/paxtest/ChangeLog b/app-admin/paxtest/ChangeLog
index 5a052b0f80ff..979eb148aacf 100644
--- a/app-admin/paxtest/ChangeLog
+++ b/app-admin/paxtest/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/paxtest
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/paxtest/ChangeLog,v 1.36 2010/07/27 02:11:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/paxtest/ChangeLog,v 1.37 2010/08/09 12:31:06 blueness Exp $
+
+*paxtest-0.9.9 (09 Aug 2010)
+
+  09 Aug 2010; Anthony G. Basile <blueness@gentoo.org>
+  +paxtest-0.9.9.ebuild, +files/paxtest-0.9.9-Makefile.patch, metadata.xml:
+  Version bump to 0.9.9. See Bugs #322413 and #331599
 
   27 Jul 2010; Jeroen Roovers <jer@gentoo.org> paxtest-0.9.6.ebuild:
   Stable for HPPA too.
diff --git a/app-admin/paxtest/Manifest b/app-admin/paxtest/Manifest
index 8cf65fa33a8c..58f7c7f92de2 100644
--- a/app-admin/paxtest/Manifest
+++ b/app-admin/paxtest/Manifest
@@ -4,13 +4,16 @@ AUX paxtest-0.9.5-use-fPIE.patch 813 RMD160 86f9d9456dbedde81853302f28bbe212aa84
 AUX paxtest-0.9.5.1.diff 2369 RMD160 7601b098ae29afb27de7d3460d777fb13c6d4824 SHA1 872b9c3e9a162bb3347bf07d6d447d74ddd98da3 SHA256 9b9ccde9603017be034d6ee3b63daa2ff7b2af5ba3b789429a58948bedf20a95
 AUX paxtest-0.9.7_pre5-Makefile.patch 1850 RMD160 5c34ff0c50fab36f1d450740601bdb1bbb6b4887 SHA1 9bd1eb5bcc14e867ab21d3b3546c155d459ace14 SHA256 2bceb20a825885cd2c127bfeff74f90abace0802e4f4e10e53976b16b2afaca8
 AUX paxtest-0.9.7_pre5-missing-includes.patch 1139 RMD160 498d140cfe8dfae64bcc1c4f61efe550536b7656 SHA1 d547e9f7eba9faa7130f471175b018c1ad929216 SHA256 335107b93d3c76e4dc0321a030797e56436c5c99d3d4014172ae56f3c4670747
+AUX paxtest-0.9.9-Makefile.patch 1941 RMD160 61e59e7d1e4d88c8d0ca5ebdc5c7d3a67339646d SHA1 607596f177d8727b5ecbf009abd34b21fb62232f SHA256 fe341623957a582b33a25469c0c56721bfeae8e18f18ad65355d06381856368b
 DIST paxtest-0.9.5.tar.gz 26961 RMD160 28576260c17d887bbbc975948060805ca6b1345c SHA1 b053108597bbb339a0a89d1ce9b2d0cc5a5a5850 SHA256 2f055e14c794cddbe9cb32387e829f69a97c605aca9821cca5010068340002be
 DIST paxtest-0.9.6.tar.gz 35747 RMD160 a19ef178bf11d2e3a007e6958f4e371ce941b97c SHA1 591065b15431d5b34a98a2e8946ff3cd09bbd0ff SHA256 d79bed06edbb28e3c69bba653a216cea3ed3f1704aeefe1565eddcbae8cd49b5
 DIST paxtest-0.9.7-pre4.tar.gz 34552 RMD160 dab85b408f0efc7c3de39563fda852be23771427 SHA1 edd55c07fbdbff862e531caa003fe8661425d0c9 SHA256 033c60eeed8e7ddf877b60e239f5b79c76874f53c3b656c16ed0e02893d014b5
 DIST paxtest-0.9.7-pre5.tar.gz 34957 RMD160 f462d64a264d11b3b6024e1d09d2e48d58f2f731 SHA1 01fedc84b3c90ab0775dd0a2e41ac958f09f577e SHA256 32281809faf163857ca228b22d66c789370ff4464ccaeb195e330085024df3c9
+DIST paxtest-0.9.9.tgz 33379 RMD160 88a698797206cf6fe11bc3e6d21231318efe286a SHA1 38f1b0bc4199c9cc08e847a9e56844dd02de238d SHA256 2ebb51e9a72e381cd74d9095d444aff4f06ca20124ef770c81b618d43d7f08df
 EBUILD paxtest-0.9.5-r1.ebuild 1081 RMD160 0ae06d595accb486e8f1897911f24b6ae8140924 SHA1 7fd68c951e040d131e79a3a360f660c53110e966 SHA256 776aa7608e5f105c238b8cc6558bb71734ea83407649391f62b1f0f96810f2ba
 EBUILD paxtest-0.9.6.ebuild 937 RMD160 7066e41daf9b769d181252b18a67284028e645cc SHA1 e73af8ef0ad84f7934bd95d7c716ee744871ee0a SHA256 3b6d5bc05f5bb6f983fc0e0335af00058e565088d89b97deeacc72f8f6e72138
 EBUILD paxtest-0.9.7_pre4.ebuild 1134 RMD160 075c0c738647a6ac2acc4dff6777aab711c40ed7 SHA1 39b157f8699b88ba0369be979f95bb667696e56f SHA256 9a4c81a916da64386b4d35cdd9c60b15cd8f8639e33182471d5fa5acd69ceb65
 EBUILD paxtest-0.9.7_pre5.ebuild 1745 RMD160 c7b25f22e15e3f27302d171c3e11fef8e056fdc0 SHA1 31f4bbfc567035e632269edf799f8eab49c7f8dd SHA256 c431fdd351f48b80cbd61349cba85623a01211531553bcae42b3e3be5e731309
-MISC ChangeLog 4973 RMD160 0d179d6040299198c98ec4d0fdef7d00d5c9b66d SHA1 dbeebe048af99e2b00db6ff216848a817ade47b2 SHA256 0394d4ab87940a45ec8064dd9eb645aa0b9c280f4d28eec484c9d6cd1dbf3b01
-MISC metadata.xml 1075 RMD160 8e3cfd11e2a8fa1334390dd6503ba82a32a08fb8 SHA1 b12c5c2530c840f69ce3b3a1d267bd195a107b35 SHA256 92a9af0326aa50db1957e3a9088da6c416a26e82f1208ff2c8f94be40ed41f46
+EBUILD paxtest-0.9.9.ebuild 2397 RMD160 eb7a99c441f7a961c589a2039d7f1dd5bf5cd42b SHA1 87ff4d10e1d00c6ea9f1fc001839e32f5cfb1844 SHA256 3d1b335c81b805bd58327953416a97b34a01cc6e686aae04135ae8154bbb1448
+MISC ChangeLog 5194 RMD160 5232afda76e8a93cae0203a28ba856f52e4da8cd SHA1 b51727965391cd6cef2a6c6e8b78f862a4a30cb0 SHA256 70748b36017811891f3d2f69a9cfea2e23ba498ab1dcbe8158b91e2d1690899f
+MISC metadata.xml 1085 RMD160 c54eb71eaf1067ea9716ed08e4cf36de55d1b5fc SHA1 e7055d216ad00e2af1c1d6e7b2739bb594b2e210 SHA256 f6ddd43e5c847f136548ea6037ba1546303885abb7e4fe3d6c60cdc860def948
diff --git a/app-admin/paxtest/files/paxtest-0.9.9-Makefile.patch b/app-admin/paxtest/files/paxtest-0.9.9-Makefile.patch
new file mode 100644
index 000000000000..ebf46999f1e8
--- /dev/null
+++ b/app-admin/paxtest/files/paxtest-0.9.9-Makefile.patch
@@ -0,0 +1,58 @@
+diff -Naur paxtest-0.9.9.orig/Makefile paxtest-0.9.9/Makefile
+--- paxtest-0.9.9.orig/Makefile	2010-02-22 18:47:19.000000000 -0500
++++ paxtest-0.9.9/Makefile	2010-08-09 07:50:53.000000000 -0400
+@@ -52,11 +52,13 @@
+ endif
+ 
+ # for some reason the .c files need it, else GNU_STACK=RWE
+-OPT_FLAGS  := -O2 $(ASFLAGS)
++# Gentoo's CFLAGS should be honored
++OPT_FLAGS  := $(CFLAGS) $(ASFLAGS)
+ PTHREAD := -lpthread
+ # define stripping of binaries/libs here, or set these on make's commandline,
+ # else you'll loose the chpax flags!
+-LDFLAGS :=
++# Gentoo's LDFLAGS should be honored
++LDFLAGS := $(LDFLAGS)
+ SHLDFLAGS :=
+ ifndef RUNDIR
+ RUNDIR := .
+@@ -136,7 +138,7 @@
+ 
+ $(EXEC_TESTS) $(MPROT_TESTS): body.o
+ 	$(CC) $(CFLAGS) -o $@.o -c $@.c
+-	$(CC) $(LDFLAGS) $(PTHREAD) -o $@ $< $@.o
++	$(CC) $(LDFLAGS) -o $@ $< $@.o $(PTHREAD)
+ 	
+ $(RAND_TESTS): randbody.o
+ 	$(CC) $(CFLAGS) -o $@.o -c $@.c
+@@ -185,7 +187,7 @@
+ 	
+ $(MPROTSH_TESTS): body.o shlibtest.so
+ 	$(CC) $(CFLAGS) -o $@.o -c $@.c
+-	$(CC) $(LDFLAGS) $(DL) $(PTHREAD) -o $@ $@.o $^
++	$(CC) $(LDFLAGS) -o $@ $@.o $^ $(DL) $(PTHREAD)
+ 
+ # used for RANDEXEC'd binaries
+ retbody.o: body.c
+@@ -194,12 +196,12 @@
+ # build as ET_EXEC (recommended by PaX Team, not really a requirement)
+ $(RET_TESTS): retbody.o
+ 	$(CC) $(CFLAGS) $(CC_ETEXEC) -o $@.o -c $@.c
+-	$(CC) $(LDFLAGS) $(LD_ETEXEC) $(PTHREAD) -o $@ $< $@.o
++	$(CC) $(LDFLAGS) $(LD_ETEXEC) -o $@ $< $@.o $(PTHREAD)
+ 
+ # build as ET_EXEC (not in Adamantix's Makefile)
+ $(RETX_TESTS): retbody.o
+ 	$(CC) $(CFLAGS) $(CC_ETEXEC) -o $@.o -c $@.c
+-	$(CC) $(LDFLAGS) $(LD_ETEXEC) $(PTHREAD) -o $@ $< $@.o
++	$(CC) $(LDFLAGS) $(LD_ETEXEC) -o $@ $< $@.o $(PTHREAD)
+ 	-$(PAXBIN) -C $@
+ 	$(PAXBIN) -SPXM $@
+ 	
+@@ -212,4 +214,4 @@
+ 	$(CC) $(SHLDFLAGS) -shared -o $@ $<
+ 
+ $(SHLIB_TESTS): body.o $(SHLIBS) shlibbss.o shlibdata.o
+-	$(CC) $(LDFLAGS) $(PTHREAD) -o $@ body.o $@.o $(SHLIBS) $(DL)
++	$(CC) $(LDFLAGS) -o $@ body.o $@.o $(SHLIBS) $(DL) $(PTHREAD)
diff --git a/app-admin/paxtest/metadata.xml b/app-admin/paxtest/metadata.xml
index da080aca94df..04475d3958f3 100644
--- a/app-admin/paxtest/metadata.xml
+++ b/app-admin/paxtest/metadata.xml
@@ -3,23 +3,23 @@
 <pkgmetadata>
 	<herd>hardened</herd>
 	<maintainer>
-		<email>solar@gentoo.org</email>
+		<email>blueness@gentoo.org</email>
 		<description>Primary Maintainer</description>
 	</maintainer>
-<longdescription>Test suite for the PaX kernel patch
- PaX is a Linux kernel patch which adds much stricter control on how memory
- is being used by applications. A normal Linux kernel leaves the control to the
- application and does not implement any enforcement. Especially buffer overflow
- attacks benefit from the absense of kernel enforced memory control. PaX tries
- to do its best to enforce this control of memory used by applications, thereby
- making it harder to succesfully exploit buffer overflows.
- .
- Furthermore, it adds several randomisations, which also make it harder for
- buffer overflows to succeed.
- .
- The test programs test all this functionality, but not all PaX functionality
- is covered.
- .
- For more information about PaX, see http://pageexec.virtualave.net/.
-</longdescription>
+	<longdescription>Test suite for the PaX kernel patch
+		PaX is a Linux kernel patch which adds much stricter control on how memory
+		is being used by applications. A normal Linux kernel leaves the control to the
+		application and does not implement any enforcement. Especially buffer overflow
+		attacks benefit from the absense of kernel enforced memory control. PaX tries
+		to do its best to enforce this control of memory used by applications, thereby
+		making it harder to succesfully exploit buffer overflows.
+
+		Furthermore, it adds several randomisations, which also make it harder for
+		buffer overflows to succeed.
+
+		The test programs test all this functionality, but not all PaX functionality
+		is covered.
+
+		For more information about PaX, see http://pageexec.virtualave.net/.
+	</longdescription>
 </pkgmetadata>
diff --git a/app-admin/paxtest/paxtest-0.9.9.ebuild b/app-admin/paxtest/paxtest-0.9.9.ebuild
new file mode 100644
index 000000000000..2788056e52e7
--- /dev/null
+++ b/app-admin/paxtest/paxtest-0.9.9.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/paxtest/paxtest-0.9.9.ebuild,v 1.1 2010/08/09 12:31:06 blueness Exp $
+
+EAPI="2"
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="PaX regression test suite"
+HOMEPAGE="http://pax.grsecurity.net"
+SRC_URI="http://grsecurity.net/~spender/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-apps/chpax-0.7
+	sys-apps/paxctl"
+
+# EI_PAX flags are not strip safe.
+RESTRICT="strip"
+
+QA_EXECSTACK="usr/bin/${PN}
+	usr/$(get_libdir)/${PN}/getamap
+	usr/$(get_libdir)/${PN}/shlibtest2.so
+	usr/$(get_libdir)/${PN}/execheap
+	usr/$(get_libdir)/${PN}/mprotstack
+	usr/$(get_libdir)/${PN}/mprotdata
+	usr/$(get_libdir)/${PN}/mprotheap
+	usr/$(get_libdir)/${PN}/randshlib
+	usr/$(get_libdir)/${PN}/randmain1
+	usr/$(get_libdir)/${PN}/getshlib
+	usr/$(get_libdir)/${PN}/randheap2
+	usr/$(get_libdir)/${PN}/rettofunc2x
+	usr/$(get_libdir)/${PN}/shlibdata
+	usr/$(get_libdir)/${PN}/shlibbss
+	usr/$(get_libdir)/${PN}/getmain1
+	usr/$(get_libdir)/${PN}/execdata
+	usr/$(get_libdir)/${PN}/execstack
+	usr/$(get_libdir)/${PN}/rettofunc2
+	usr/$(get_libdir)/${PN}/mprotshdata
+	usr/$(get_libdir)/${PN}/getstack1
+	usr/$(get_libdir)/${PN}/randamap
+	usr/$(get_libdir)/${PN}/rettofunc1x
+	usr/$(get_libdir)/${PN}/getheap2
+	usr/$(get_libdir)/${PN}/getheap1
+	usr/$(get_libdir)/${PN}/randheap1
+	usr/$(get_libdir)/${PN}/getstack2
+	usr/$(get_libdir)/${PN}/getmain2
+	usr/$(get_libdir)/${PN}/rettofunc1
+	usr/$(get_libdir)/${PN}/randstack2
+	usr/$(get_libdir)/${PN}/mprotshbss
+	usr/$(get_libdir)/${PN}/randstack1
+	usr/$(get_libdir)/${PN}/mprotanon
+	usr/$(get_libdir)/${PN}/randmain2
+	usr/$(get_libdir)/${PN}/writetext
+	usr/$(get_libdir)/${PN}/mprotbss
+	usr/$(get_libdir)/${PN}/anonmap
+	usr/$(get_libdir)/${PN}/execbss
+	usr/$(get_libdir)/${PN}/shlibtest.so"
+
+src_prepare() {
+	mv Makefile.psm Makefile
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+	sed -i "s/^CC := gcc/CC := $(tc-getCC)/" Makefile
+	sed -i "s/^LD := ld/LD := $(tc-getLD)/" Makefile
+}
+
+src_compile() {
+	emake RUNDIR=/usr/$(get_libdir)/paxtest || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" BINDIR=/usr/bin RUNDIR=/usr/$(get_libdir)/paxtest install || die
+
+	newman debian/manpage.1.ex paxtest.1 || die
+	dodoc ChangeLog README || die
+}