Fix CDS generation on hardened, bug #215225.

(Portage version: 2.1.4.4)

3 files changed, 20 insertions, 17 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index f092f683da3c..0553402b0aa2 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/emul-linux-x86-java
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.50 2008/03/27 20:13:30 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.51 2008/03/28 23:21:35 caster Exp $
+
+  28 Mar 2008; Vlastimil Babka <caster@gentoo.org>
+  emul-linux-x86-java-1.5.0.15.ebuild,
+  emul-linux-x86-java-1.6.0.05-r1.ebuild:
+  Fix CDS generation on hardened, bug #215225.
 
 *emul-linux-x86-java-1.6.0.05-r1 (27 Mar 2008)
 
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild
index 9b4f3c1d1477..46357942fb84 100644
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild,v 1.4 2008/03/27 20:16:58 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.15.ebuild,v 1.5 2008/03/28 23:21:35 caster Exp $
 
 inherit versionator pax-utils eutils java-vm-2
 
@@ -30,16 +30,18 @@ QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so
 	opt/${P}/lib/i386/libdeploy.so"
 
 src_unpack() {
-	if [[ ! -r ${DISTDIR}/${At} ]]; then
-		die "cannot read ${At}. Please check the permission and try again."
-	fi
-
 	mkdir bundled-jdk
 	cd bundled-jdk
 	sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack"
 
 	cd ..
 	bash "${FILESDIR}"/construct.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
+}
+
+src_compile() {
+	# Set PaX markings on all JDK/JRE executables to allow code-generation on
+	# the heap by the JIT compiler. This has to be done before CDS - #215225
+	pax-mark m $(list-paxables "${S}"/bin/*)
 
 	# see bug #207282
 	einfo "Creating the Class Data Sharing archives"
@@ -47,10 +49,6 @@ src_unpack() {
 }
 
 src_install() {
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler.
-	pax-mark m $(list-paxables "${S}"/bin/*)
-
 	dodir /opt/${P}
 	cp -pPR bin lib man javaws plugin "${D}/opt/${P}/" || die "failed to copy"
 
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.05-r1.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.05-r1.ebuild
index 25279baf9e66..cdea2f5fa816 100644
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.05-r1.ebuild
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.05-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.05-r1.ebuild,v 1.2 2008/03/27 20:16:58 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.05-r1.ebuild,v 1.3 2008/03/28 23:21:35 caster Exp $
 
 inherit versionator pax-utils java-vm-2 eutils
 
@@ -34,16 +34,18 @@ QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so
 	opt/${P}/lib/i386/server/libjvm.so"
 
 src_unpack() {
-	if [[ ! -r "${DISTDIR}"/${A} ]]; then
-		die "cannot read ${DISTDIR}/${A}. Please check the permission and try again."
-	fi
-
 	mkdir bundled-jdk
 	cd bundled-jdk
 	sh "${DISTDIR}"/${At} --accept-license --unpack || die "Failed to unpack"
 
 	cd ..
 	bash "${FILESDIR}"/construct-${SLOT}.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct-${SLOT}.sh failed"
+}
+
+src_compile() {
+	# Set PaX markings on all JDK/JRE executables to allow code-generation on
+	# the heap by the JIT compiler. This has to be done before CDS - #215225
+	pax-mark m $(list-paxables "${S}"/bin/*)
 
 	# see bug #207282
 	einfo "Creating the Class Data Sharing archives"
@@ -57,8 +59,6 @@ src_install() {
 
 	cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy"
 
-	pax-mark m $(list-paxables "${D}"/opt/${P}/bin/*)
-
 	dodoc README THIRDPARTYLICENSEREADME.txt || die
 	dohtml Welcome.html || die
 	dodir /opt/${P}/share/