Fix CDS generation on hardened, bug #215225.

Package-Manager: portage-2.1.4.4

4 files changed, 22 insertions, 13 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 7148a8787549..ba282888d55b 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.231 2008/03/27 20:18:28 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.232 2008/03/28 23:11:01 caster Exp $
+
+  28 Mar 2008; Vlastimil Babka <caster@gentoo.org>
+  sun-jdk-1.5.0.15-r1.ebuild, sun-jdk-1.6.0.05-r1.ebuild:
+  Fix CDS generation on hardened, bug #215225.
 
 *sun-jdk-1.6.0.05-r1 (27 Mar 2008)
 *sun-jdk-1.5.0.15-r1 (27 Mar 2008)
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 60bc3cf8817a..da04c4db56b7 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -9,9 +9,9 @@ DIST jdk-5.0u15-dlj-linux-i586.bin 49670009 RMD160 b7fcb7e92c91cf4ef428a434c35c4
 DIST jdk-6u5-dlj-linux-amd64.bin 63756779 RMD160 ed4d9d72845fb15e7731582996b078b4449da1f6 SHA1 c0eac2aa33a0ad05fdeb960708cc270b2d330af5 SHA256 9a9b97ce5ac821f9a92541eb5e2353ddefd485eaa1b4f4de6b41fce8281831d4
 DIST jdk-6u5-dlj-linux-i586.bin 70537386 RMD160 bd1bd2a6601b7e972c9c5f3e1cce4ce7d408b055 SHA1 ba7f5e5c0567db73cf8a9f3b41bcff32e2aed542 SHA256 b0f78f2e6baf88c1d7dc9334c6b86e621b2c9d629f5617f3f57a3bd7cbad0c99
 EBUILD sun-jdk-1.4.2.17.ebuild 5328 RMD160 37c048c6d1fe397370259cc3b88d5548ae68e451 SHA1 65c5b3e5b040e88c94c7a1b85ae3a833110febf4 SHA256 f543744a6965561eee230bada1334735f656a313981194e92ac2e3fb04ce6e2a
-EBUILD sun-jdk-1.5.0.15-r1.ebuild 4410 RMD160 7b322fd1411b9808d456f6dec0e3173f5e9c9252 SHA1 0fe80f8755f0e014c67b66299220a9cfb92bf70a SHA256 395a1f0585b0d95735e630ae1db2c3107aa23a1f5ca8c80998934903ce63c961
+EBUILD sun-jdk-1.5.0.15-r1.ebuild 4471 RMD160 c7268656bf1adccafde5dd9c1104c5a12905b1dc SHA1 ef750484cbcc4ad36768bbf7058094a73078135a SHA256 9049093525b826626b0f7eb99a252785afe329c17a0abb46805f18e0450a24c5
 EBUILD sun-jdk-1.5.0.15.ebuild 4266 RMD160 18b3f5f3ba7bde42af3521489d567b0063ce3dd7 SHA1 416b0bd6f2cb5896c04a11a0ee304454fe115a3e SHA256 d5d9dd93d3c121ee71642542bb4ee84f16b01d08cdbd27d265b5eeea62649476
-EBUILD sun-jdk-1.6.0.05-r1.ebuild 4758 RMD160 e6e43359f1eb1ea8bd8be43f0b3b25e826418a01 SHA1 e64fab5251b4196a17edb20ad33a28d67d59ca43 SHA256 7df37fa4bcef6755c1671a9b9956363361e02661aa5a253afa3108ff49a83e4f
+EBUILD sun-jdk-1.6.0.05-r1.ebuild 4820 RMD160 7f96132f60bef6373416077854eb5127517820ac SHA1 7a38f9109ed2a58158ec443ed2d52f3cefc23e35 SHA256 b51f5b2ba702d05d5eca8dd4e0773617fcd902d9624750ef55e2d2e868044350
 EBUILD sun-jdk-1.6.0.05.ebuild 4568 RMD160 ccab3316dc2dc2ab71d6db2836ecf5e6decea575 SHA1 db84a0fa9797237f676a58b1a8de811085ac2b65 SHA256 7793bee9d5fdadf262632a5142153141435d3402990aa7398e567c5c5e117956
-MISC ChangeLog 44326 RMD160 0082c4f08a80c02dc9a75b28b2f6b9c5f48a9a3f SHA1 02f3fd8cd154995593eef8054217c2cce8a4870c SHA256 a0762f4614f3963d8e121e0a1761c3a158423d21aa6da28089735aae9e361696
+MISC ChangeLog 44483 RMD160 45bfa341d5c1ea460fcb76d2ebe5518442ef6164 SHA1 01a3b1f863fb7f9077e07c2d6b59b5ec6ce4bf0e SHA256 9fd62bf31824832c852b2a8f6b6774d91aa52c82e7580bd18a3114d7303ef03d
 MISC metadata.xml 237 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 SHA1 47fb9d11272aa2245df406c2156c2482e166a1c3 SHA256 3e53f0c8fb262a6751adb4c188e045e0be6de8739c02ec1af079cba5512e696d
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.15-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.15-r1.ebuild
index 6bac327f52a3..763d5865847c 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.15-r1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.15-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/dev-java/sun-jdk/sun-jdk-1.5.0.15-r1.ebuild,v 1.1 2008/03/27 20:18:28 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.15-r1.ebuild,v 1.2 2008/03/28 23:11:01 caster Exp $
 
 inherit versionator java-vm-2 eutils pax-utils
 
@@ -43,6 +43,12 @@ JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
 
 src_unpack() {
 	sh "${DISTDIR}/${A}" --accept-license --unpack || die "Failed to unpack"
+}
+
+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/*)
 
 	# see bug #207282
 	if use x86; then
@@ -54,10 +60,6 @@ src_unpack() {
 src_install() {
 	local dirs="bin include jre lib man"
 
-	# 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}"{,/jre}/bin/*)
-
 	dodir /opt/${P}
 
 	cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy"
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.05-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.05-r1.ebuild
index 06cfa6e121d4..f747398e8abe 100644
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.05-r1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-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/dev-java/sun-jdk/sun-jdk-1.6.0.05-r1.ebuild,v 1.1 2008/03/27 20:18:28 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.05-r1.ebuild,v 1.2 2008/03/28 23:11:01 caster Exp $
 
 inherit versionator java-vm-2 eutils pax-utils
 
@@ -47,6 +47,12 @@ S="${WORKDIR}/jdk$(replace_version_separator 3 _)"
 
 src_unpack() {
 	sh "${DISTDIR}"/${A} --accept-license --unpack || die "Failed to unpack"
+}
+
+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/*)
 
 	# see bug #207282
 	if use x86; then
@@ -59,9 +65,6 @@ src_unpack() {
 src_install() {
 	local dirs="bin include jre lib man"
 
-	# 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}"{,/jre}/bin/*)
 
 	dodir /opt/${P}