From 0762dc5e1f389303e250e0f20705044e3f4ba072 Mon Sep 17 00:00:00 2001 From: Ralph Sennhauser Date: Mon, 21 Nov 2011 10:45:21 +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/oracle-jre-bin/ChangeLog | 6 +++++- dev-java/oracle-jre-bin/Manifest | 6 +++--- dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.1-r1.ebuild | 9 ++++----- dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.1.ebuild | 9 ++++----- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dev-java/oracle-jre-bin/ChangeLog b/dev-java/oracle-jre-bin/ChangeLog index 96abef622e9f..511e1ea79f93 100644 --- a/dev-java/oracle-jre-bin/ChangeLog +++ b/dev-java/oracle-jre-bin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/oracle-jre-bin # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.5 2011/11/04 09:27:24 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.6 2011/11/21 10:45:21 sera Exp $ + + 21 Nov 2011; Ralph Sennhauser + oracle-jre-bin-1.7.0.1.ebuild, oracle-jre-bin-1.7.0.1-r1.ebuild: + Use java-vm-2.eclass to set PaX markings *oracle-jre-bin-1.7.0.1-r1 (04 Nov 2011) diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest index 2a0e3a83a947..57b6c60282c0 100644 --- a/dev-java/oracle-jre-bin/Manifest +++ b/dev-java/oracle-jre-bin/Manifest @@ -6,7 +6,7 @@ DIST jre-7-linux-x64.tar.gz 32344881 RMD160 cd543988ca038d74e103a7e2998d717800c3 DIST jre-7u1-linux-i586.tar.gz 33753969 RMD160 653313221a0dc0c7b69e158b003c8658eee8f529 SHA1 04f58ab69b479d475933d2270876fd6c9e97a3b6 SHA256 76bfa6d7b80e077a399bf69fbc8e031ee8f4094be0b6d1e30e247e7341ae2d40 DIST jre-7u1-linux-x64.tar.gz 32352700 RMD160 5e032865ffd75961decf959fe4f166833a4f7593 SHA1 fcbd35065ac6040b4160ca93ecd5cf6521885303 SHA256 41d9e1c3f51f7c5041ae9f1c3f200a716903d8d010d5a771e6672766ae95ee92 EBUILD oracle-jre-bin-1.7.0-r1.ebuild 4389 RMD160 58c9b1654f0935dbbb87d27eaf79b65b84af3d26 SHA1 a83a6972874951a22f1f98fdd268271541314c18 SHA256 d4833229175e06cdd0738e2458a18ee5a478902566e13daed8e73b866bd2765e -EBUILD oracle-jre-bin-1.7.0.1-r1.ebuild 4579 RMD160 fca80189d4b809554111f58a858b0e60c648809c SHA1 c0da4c5d25c5ee3d4ec786193d2df145b4029ece SHA256 721b096891240ea304a8a6c27a896c8a80f7398f6bb2f144902ffb1204d8e6ce -EBUILD oracle-jre-bin-1.7.0.1.ebuild 4436 RMD160 58c1e59a9a5f2fb4621360441cbdcc259778fa0b SHA1 c272d88e0c835162bbee95f7389165686245de54 SHA256 e955c2767c7d5c09e8fd28e6324cb8c2890064529413d7a309091cc7ae35cea8 -MISC ChangeLog 1170 RMD160 86c3119c7464f301489db94ff14b80b129f4e0de SHA1 d587f48f715b41bd1e4e2ea6d7e6d8d6283fc3a6 SHA256 af6212faa8fb1b396a9deb879d8162fba26a5b72910ae7ec35f4ad67e71ab7ab +EBUILD oracle-jre-bin-1.7.0.1-r1.ebuild 4446 RMD160 08485d7ab43561a1eed839869ecf002767746c4a SHA1 5ab39f0fac4d55cf0ec440ec20594aafcbddb444 SHA256 ee916842f5cba99285e4f1cb9073749f67eaf5082e89ca58fcec38f8114ffeec +EBUILD oracle-jre-bin-1.7.0.1.ebuild 4303 RMD160 2eda125fdd34448b0da6c54f0e17b8798ed7ecd9 SHA1 7c051f1c0616178ef320c8400fe9003e1c1ff098 SHA256 25740905c8aa76edfd2be7d60f92986bc532b0ee4e5175b9771a1e43eb732029 +MISC ChangeLog 1329 RMD160 928d33980595190f1f1d53a6ac59d4926dbce09b SHA1 0c2c04d504f8e74b53a421f8db237a54c664366d SHA256 16df13d17622b9b5e8e0a5bd65eb357796ba53880924381a3ed17348b8480ccf MISC metadata.xml 374 RMD160 4e6b6826d9ee188e0fa0b5a9a5e5d23b722e10f8 SHA1 0c90ab71e19ea1e34710e7944f268bd46943f57d SHA256 32decb0503e4843bf9157625a4c494955b4c93ccd079bec72da1c374c03b7fa8 diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.1-r1.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.1-r1.ebuild index b03bb42038c9..33921c1a6301 100644 --- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.1-r1.ebuild +++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.1-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/oracle-jre-bin/oracle-jre-bin-1.7.0.1-r1.ebuild,v 1.1 2011/11/04 09:27:24 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.1-r1.ebuild,v 1.2 2011/11/21 10:45:21 sera Exp $ EAPI="4" -inherit java-vm-2 eutils pax-utils prefix versionator +inherit java-vm-2 eutils prefix versionator UPDATE="$(get_version_component_range 4)" UPDATE="${UPDATE#0}" @@ -75,9 +75,8 @@ src_prepare() { } src_compile() { - # Set PaX markings on all JDK/JRE executables to allow code-generation on - # the heap by the JIT compiler. This needs to be done before CDS - #215225 - pax-mark m $(list-paxables "${S}"{,/jre}/bin/*) + # This needs to be done before CDS - #215225 + java-vm_set-pax-markings "${S}" # see bug #207282 einfo "Creating the Class Data Sharing archives" diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.1.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.1.ebuild index 8444711f7ecd..8d6bbcfc5c3b 100644 --- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.1.ebuild +++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.1.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/oracle-jre-bin/oracle-jre-bin-1.7.0.1.ebuild,v 1.1 2011/10/21 23:05:19 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.1.ebuild,v 1.2 2011/11/21 10:45:21 sera Exp $ EAPI="4" -inherit java-vm-2 eutils pax-utils prefix versionator +inherit java-vm-2 eutils prefix versionator UPDATE="$(get_version_component_range 4)" UPDATE="${UPDATE#0}" @@ -75,9 +75,8 @@ src_prepare() { } src_compile() { - # Set PaX markings on all JDK/JRE executables to allow code-generation on - # the heap by the JIT compiler. This needs to be done before CDS - #215225 - pax-mark m $(list-paxables "${S}"{,/jre}/bin/*) + # This needs to be done before CDS - #215225 + java-vm_set-pax-markings "${S}" # see bug #207282 einfo "Creating the Class Data Sharing archives" -- 2.26.2