Use pax-utils.eclass for PaX flag marking - bug #156135

(Portage version: 2.1.2_rc2-r3)

2 files changed, 11 insertions, 28 deletions

diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog
index c0e68e567121..1a827f60c5ae 100644
--- a/dev-java/blackdown-jdk/ChangeLog
+++ b/dev-java/blackdown-jdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/blackdown-jdk
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.111 2006/10/18 00:55:12 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.112 2006/12/10 14:01:15 kevquinn Exp $
+
+  10 Dec 2006; Kevin F. Quinn <kevquinn@gentoo.org>
+  blackdown-jdk-1.4.2.03-r12.ebuild:
+  Use pax-utils to do PaX marking - bug #156135
 
   18 Oct 2006; Joshua Nichols <nichoj@gentoo.org>
   -files/blackdown-jdk-1.4.2.03, -blackdown-jdk-1.4.2.03.ebuild,
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r12.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r12.ebuild
index 8fd0406744d2..281f497e459c 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r12.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r12.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r12.ebuild,v 1.6 2006/10/14 15:41:20 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r12.ebuild,v 1.7 2006/12/10 14:01:15 kevquinn Exp $
 
 JAVA_SUPPORTS_GENERATION_1="true"
-inherit java-vm-2 versionator
+inherit java-vm-2 versionator pax-utils
 
 JREV=$(get_version_component_range 4- )
 JV=$(get_version_component_range 1-3 )
@@ -82,6 +82,10 @@ unpack_jars() {
 src_install() {
 	typeset platform
 
+	# 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 ${S}/{bin,jre,lib,man,include} ${D}/opt/${P} || die "failed to copy"
@@ -123,29 +127,4 @@ src_install() {
 pkg_postinst() {
 	# Set as default system VM if none exists
 	java-vm-2_pkg_postinst
-
-	# if chpax is on the target system, set the appropriate PaX flags
-	# this will not hurt the binary, it modifies only unused ELF bits
-	# but may confuse things like AV scanners and automatic tripwire
-	if has_version "sys-apps/chpax"
-	then
-		echo
-		einfo "setting up conservative PaX flags for jar and javac"
-
-		CHPAX_CONSERVATIVE_FLAGS="pemrxs"
-
-		for paxkills in "jar" "javac" "java" "javah" "javadoc"
-		do
-			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
-		done
-
-		# /opt/blackdown-jdk-1.4.1/jre/bin/java_vm
-		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/jre/bin/java_vm
-
-		einfo "you should have seen lots of chpax output above now"
-		ewarn "make sure the grsec ACL contains those entries also"
-		ewarn "because enabling it will override the chpax setting"
-		ewarn "on the physical files - help for PaX and grsecurity"
-		ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
-	fi
 }