diff options
| author |   Ralph Sennhauser <sera@gentoo.org> | 2011-11-21 11:40:06 +0000 |
|---|---|---|
| committer | Ralph Sennhauser <sera@gentoo.org> | 2011-11-21 11:40:06 +0000 |
| commit | 3a614ea1882056cfd628583e80c1081a6546a17a (patch) | |
| tree | 0dcd685f4820b1143b4ddd4392d98f43e5fbe344 /dev-java/icedtea | |
| parent | drop old (diff) | |
| download | gentoo-2-3a614ea1882056cfd628583e80c1081a6546a17a.tar.gz gentoo-2-3a614ea1882056cfd628583e80c1081a6546a17a.tar.bz2 gentoo-2-3a614ea1882056cfd628583e80c1081a6546a17a.zip | |
Use java-vm-2.eclass to set PaX markings
(Portage version: 2.1.10.35/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/icedtea')
| -rw-r--r-- | dev-java/icedtea/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild | 11 | ||||
| -rw-r--r-- | dev-java/icedtea/icedtea-7.2.0-r1.ebuild | 13 |
3 files changed, 14 insertions, 16 deletions
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog index 12a2bd3f1966..151d1c2152c5 100644 --- a/dev-java/icedtea/ChangeLog +++ b/dev-java/icedtea/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/icedtea # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.53 2011/11/18 22:00:15 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.54 2011/11/21 11:40:06 sera Exp $ + + 21 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild, + icedtea-7.2.0-r1.ebuild: + Use java-vm-2.eclass to set PaX markings 18 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild, icedtea-7.2.0-r1.ebuild: diff --git a/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild b/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild index 82c9e3caf1db..453d091d9204 100644 --- a/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild +++ b/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.10 2011/11/18 22:00:16 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.11 2011/11/21 11:40:06 sera Exp $ # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) # ********************************************************* @@ -236,12 +236,6 @@ src_install() { # doins can't handle symlinks. cp -vRP bin include jre lib man "${ddest}" || die "failed to copy" - # 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 ASSEMBLY_EXCEPTION THIRD_PARTY_README if use examples; then @@ -254,6 +248,9 @@ src_install() { # Fix the permissions. find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die + # Needs to be done before generating cacerts + java-vm_set-pax-markings "${ddest}" + # We need to generate keystore - bug #273306 einfo "Generating cacerts file from certificates in /usr/share/ca-certificates/" mkdir "${T}/certgen" && cd "${T}/certgen" || die diff --git a/dev-java/icedtea/icedtea-7.2.0-r1.ebuild b/dev-java/icedtea/icedtea-7.2.0-r1.ebuild index f06f42131a24..c887a0a6e001 100644 --- a/dev-java/icedtea/icedtea-7.2.0-r1.ebuild +++ b/dev-java/icedtea/icedtea-7.2.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.17 2011/11/18 22:00:15 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.18 2011/11/21 11:40:06 sera Exp $ # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) # ********************************************************* @@ -9,7 +9,7 @@ EAPI="4" -inherit flag-o-matic java-pkg-2 java-vm-2 pax-utils versionator +inherit flag-o-matic java-pkg-2 java-vm-2 versionator LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C" SLOT="7" @@ -262,12 +262,6 @@ src_install() { # doins can't handle symlinks. cp -vRP bin include jre lib man "${ddest}" || die "failed to copy" - # 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 ASSEMBLY_EXCEPTION THIRD_PARTY_README if use examples; then @@ -280,6 +274,9 @@ src_install() { # Fix the permissions. find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die + # Needs to be done before generating cacerts + java-vm_set-pax-markings "${ddest}" + # We need to generate keystore - bug #273306 einfo "Generating cacerts file from certificates in /usr/share/ca-certificates/" mkdir "${T}/certgen" && cd "${T}/certgen" || die |