Temporarely add PaX markings for x86

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

4 files changed, 26 insertions, 8 deletions

diff --git a/dev-java/icedtea-bin/ChangeLog b/dev-java/icedtea-bin/ChangeLog
index c634f279a58e..f3d55162957d 100644
--- a/dev-java/icedtea-bin/ChangeLog
+++ b/dev-java/icedtea-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/icedtea-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.6 2011/11/18 20:27:58 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.7 2011/11/18 21:32:23 sera Exp $
+
+  18 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-bin-6.1.10.4.ebuild,
+  icedtea-bin-7.2.0-r1.ebuild:
+  Temporarely add PaX markings for x86
 
   18 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-bin-7.2.0-r1.ebuild:
   Update deps to match scanelf results more closely, fix #390945.
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index ca95717c7332..11ecd81c2ac7 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -37,7 +37,7 @@ DIST icedtea6-bin-src-1.10.3-r1.tar.bz2 40821581 RMD160 3419b80c28bc001fce7c6fac
 DIST icedtea6-bin-src-1.10.4.tar.bz2 40827387 RMD160 d6a610b3dc5ef5dd5e9e33e0e38f93e225c37394 SHA1 54f3ad33bfc1e512165e8de7e954c77c22ff0714 SHA256 d85de113997f4b8978d3b9312dfcd88d50debbf673118615e5a72244b56e8eab
 EBUILD icedtea-bin-1.10.3-r2.ebuild 3593 RMD160 5b23781328ccaf973c53d48c78e6249b6eba8e58 SHA1 dc40596a5cd27c44a73841fee13f8a17c2bbd18c SHA256 a43cc23efcc22e55d31522b4ade9f77839f2bc7a879cee31e3457e552778ad9b
 EBUILD icedtea-bin-1.10.4.ebuild 3039 RMD160 e4ef9734c53528cf712979c729f77c36f93fb075 SHA1 dde30b51ca3fda962528512adcfea6446d09ca6f SHA256 fc8f37899ca2f5e14d3049a91d2fe78f8cf848bd1b23b09fa9d813ae512d9fa7
-EBUILD icedtea-bin-6.1.10.4.ebuild 3368 RMD160 acc798ba0953a2b4d70e0a98e27159f74b790066 SHA1 3f64a761ce05e3436968c4052c98eb02ae23f728 SHA256 7dd01f54b45c94fc6a44538fa1e5dfe970f6b347997ea3e6c824345d53f5badb
-EBUILD icedtea-bin-7.2.0-r1.ebuild 2836 RMD160 aebb8d337cf25176358dcbfa945f2daa63200aa7 SHA1 46e86e2ab640b64733ad19549b3fcc2ec9c5a102 SHA256 900a8387e511f674347c7efeb5e64e848abf4072a16df6f957151696370c892c
-MISC ChangeLog 13508 RMD160 d6eba8d9d3fe4fcdfa127661e05d8f901bdbe901 SHA1 a1916804e49149981e0a18a420c5c695437cb0a4 SHA256 213a64570d3e4d9bd2e2fc3889eafd6c723fb7b472fff41dc24a81f6597d63d6
+EBUILD icedtea-bin-6.1.10.4.ebuild 3661 RMD160 16d06793522c2183c91503c2be4a844f68631d90 SHA1 584c93dff232b67a0b168848a1490e2cff0348d5 SHA256 19abb5e8038c4063457764069a633cc48420c1abe7caf76aeefdd15d2c3a0cf3
+EBUILD icedtea-bin-7.2.0-r1.ebuild 3132 RMD160 690a0a0dee874ce9c88f7904afd3d3cb7fd10671 SHA1 9c9f445c81932b6342a4d4b5e9238ff419fa7bf7 SHA256 435dfdf3866b842c1b2e23099a30d19ada69e12aeaf80f45cc2b5a2c098ddee7
+MISC ChangeLog 13656 RMD160 7010c90db530fc12c2a68e4bde5899c3da74cbed SHA1 a7e9aed323e4be5577ec0e837e082b2a63fc4665 SHA256 9dd83f70f11602c24417c610fd71a5ca320a24cb5dda774e0be8c75f425fd163
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.10.4.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.10.4.ebuild
index 29265e78b56d..aa8f86dcecc0 100644
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.10.4.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.10.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.10.4.ebuild,v 1.2 2011/11/08 23:47:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.10.4.ebuild,v 1.3 2011/11/18 21:32:23 sera Exp $
 
 EAPI="4"
 
-inherit java-vm-2
+inherit java-vm-2 pax-utils
 
 dist="http://dev.gentoo.org/~caster/distfiles/"
 DESCRIPTION="A Gentoo-made binary build of the Icedtea6 JDK"
@@ -68,6 +68,13 @@ src_install() {
 	# doins can't handle symlinks.
 	cp -pRP bin include jre lib man "${ddest}" || die "failed to copy"
 
+	# Remove on next bump as the needed marks are already set by icedtea ebuild.
+	# Set PaX markings on all JDK/JRE executables to allow code-generation on
+	# the heap by the JIT compiler.
+	local marks="m"
+	use x86 && marks="msp"
+	pax-mark ${marks} $(list-paxables "${ddest}"{,/jre}/bin/*)
+
 	dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
 	if use doc ; then
 		dohtml -r ../doc/html/*
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.0-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.0-r1.ebuild
index 51d549b8057c..7b0cd900ea77 100644
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.0-r1.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.0-r1.ebuild,v 1.2 2011/11/18 20:27:58 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.0-r1.ebuild,v 1.3 2011/11/18 21:32:23 sera Exp $
 
 EAPI="4"
 
-inherit java-vm-2
+inherit java-vm-2 pax-utils
 
 dist="http://dev.gentoo.org/~caster/distfiles/"
 DESCRIPTION="A Gentoo-made binary build of the Icedtea6 JDK"
@@ -68,6 +68,13 @@ src_install() {
 	# doins can't handle symlinks.
 	cp -pRP bin include jre lib man "${ddest}" || die "failed to copy"
 
+	# Remove on next bump as the needed marks are already set by icedtea ebuild.
+	# Set PaX markings on all JDK/JRE executables to allow code-generation on
+	# the heap by the JIT compiler.
+	local marks="m"
+	use x86 && marks="msp"
+	pax-mark ${marks} $(list-paxables "${ddest}"{,/jre}/bin/*)
+
 	dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
 	if use doc ; then
 		dohtml -r ../doc/html/*