From 453a4c56e6e33d6f93507f5e3ec2caa144c3072a Mon Sep 17 00:00:00 2001 From: Ralph Sennhauser Date: Mon, 21 Nov 2011 11:07:41 +0000 Subject: [PATCH] Use java-vm-2.eclass to set PaX markings Package-Manager: portage-2.1.10.35/cvs/Linux x86_64 --- dev-java/icedtea-bin/ChangeLog | 6 +++++- dev-java/icedtea-bin/Manifest | 6 +++--- dev-java/icedtea-bin/icedtea-bin-6.1.10.4.ebuild | 10 +++------- dev-java/icedtea-bin/icedtea-bin-7.2.0-r1.ebuild | 10 +++------- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/dev-java/icedtea-bin/ChangeLog b/dev-java/icedtea-bin/ChangeLog index f3d55162957d..26eb8bdb945e 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.7 2011/11/18 21:32:23 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.8 2011/11/21 11:07:41 sera Exp $ + + 21 Nov 2011; Ralph Sennhauser icedtea-bin-6.1.10.4.ebuild, + icedtea-bin-7.2.0-r1.ebuild: + Use java-vm-2.eclass to set PaX markings 18 Nov 2011; Ralph Sennhauser icedtea-bin-6.1.10.4.ebuild, icedtea-bin-7.2.0-r1.ebuild: diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest index 11ecd81c2ac7..cd14e6cf77f1 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 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 +EBUILD icedtea-bin-6.1.10.4.ebuild 3479 RMD160 0ae4d9e5045492571f8657bb1cfc41f6ca37658f SHA1 88ca7cd60e94aef96a7273fdfec7e00aa2c214b0 SHA256 144845191c932d75d2a2c736278e76ab492984608d77ebb8d6ecbf35a6e468c5 +EBUILD icedtea-bin-7.2.0-r1.ebuild 2950 RMD160 c447e5368c7d4605cbe316272feb021a48cacbf2 SHA1 17edb016a6a141654da8e89ae54fe876805175b8 SHA256 0dd8b747d533b78af571c2b3872f1c81091d6826abd7d43fa6bcc337ae6f216d +MISC ChangeLog 13810 RMD160 7fe0647d18b725df308cd21d44ecbad0c8621b67 SHA1 4bdcd6bdc33297665321b1def04bd079c60f3544 SHA256 a9916988a61b97c98c4c71d3b11d267eed330cb5af1a6313baa10700dd3dc5c8 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 aa8f86dcecc0..a464d98fad9e 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.3 2011/11/18 21:32:23 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.10.4.ebuild,v 1.4 2011/11/21 11:07:41 sera Exp $ EAPI="4" -inherit java-vm-2 pax-utils +inherit java-vm-2 dist="http://dev.gentoo.org/~caster/distfiles/" DESCRIPTION="A Gentoo-made binary build of the Icedtea6 JDK" @@ -69,11 +69,7 @@ src_install() { 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/*) + java-vm_set-pax-markings "${ddest}" dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README} if use doc ; then 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 7b0cd900ea77..dae69a39c8d5 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.3 2011/11/18 21:32:23 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.0-r1.ebuild,v 1.4 2011/11/21 11:07:41 sera Exp $ EAPI="4" -inherit java-vm-2 pax-utils +inherit java-vm-2 dist="http://dev.gentoo.org/~caster/distfiles/" DESCRIPTION="A Gentoo-made binary build of the Icedtea6 JDK" @@ -69,11 +69,7 @@ src_install() { 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/*) + java-vm_set-pax-markings "${ddest}" dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README} if use doc ; then -- 2.26.2