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

Package-Manager: portage-2.1.2_rc2-r3

diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog
index c0e68e56712190dd36d2d507b4f66ae7812ec935..1a827f60c5ae3d2bd86ed5a4a9f0f797e61da1ec 100644 (file)
--- 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/Manifest b/dev-java/blackdown-jdk/Manifest
index 80943146e59412c74c2cf34ff7bb0f12768624e2..0ac21974a39ccfa1aa40a4dcd41ac2f4f16a9c14 100644 (file)
--- a/dev-java/blackdown-jdk/Manifest
+++ b/dev-java/blackdown-jdk/Manifest
@@ -1,17 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX blackdown-jdk-1.4.2.env 916 RMD160 499ca9b989c5276713248d4f23482bff9d9f63bd SHA1 ce2e5954895047c74e634d547aea3383b72ed1e6 SHA256 f81ba9d5b8f5e03d68426241a578337223d8e309f2625bd2cddce20349733f5d
 MD5 88a91f74fc3f38762ec8a9ca9eac66c1 files/blackdown-jdk-1.4.2.env 916
 RMD160 499ca9b989c5276713248d4f23482bff9d9f63bd files/blackdown-jdk-1.4.2.env 916
 SHA256 f81ba9d5b8f5e03d68426241a578337223d8e309f2625bd2cddce20349733f5d files/blackdown-jdk-1.4.2.env 916
 DIST j2sdk-1.4.2-03-linux-amd64.bin 33997205 RMD160 de0e4ad5201315f99e9d1f26e5b2827ced37b9f5 SHA1 e3be6bc1c31691123a396351478b58e1b09e9489 SHA256 1810ffc356d7a10d773de003d074050de3c7322ca480ec0344e2b8798498f1dd
 DIST j2sdk-1.4.2-03-linux-i586.bin 34375872 RMD160 47e06e37867237106caf8e5a2c635055a5203d90 SHA1 1d7dd1b91ece6f9a9895bb03986eb865934716ea SHA256 728f661fdf9510de3c01a79259d492a98d9b636034d14e1c930118280dba9df9
-EBUILD blackdown-jdk-1.4.2.03-r12.ebuild 4339 RMD160 31faf1198d7cef63bcc9ac4660313c17137bb40a SHA1 877e69f4f74b38c29dab8f62ba6d7c9e96e1026b SHA256 e507859bb647db75a90e68dd0ce30fae6bbf874267da3248bda07f61183164ff
-MD5 c48bd192a85768bca5a45cf3123e4428 blackdown-jdk-1.4.2.03-r12.ebuild 4339
-RMD160 31faf1198d7cef63bcc9ac4660313c17137bb40a blackdown-jdk-1.4.2.03-r12.ebuild 4339
-SHA256 e507859bb647db75a90e68dd0ce30fae6bbf874267da3248bda07f61183164ff blackdown-jdk-1.4.2.03-r12.ebuild 4339
-MISC ChangeLog 20048 RMD160 2b1b2f5072f46ac747523de01f37b8a046feda46 SHA1 1869183751a8e27544ebf7e50c6c0df6473455d4 SHA256 5d1701886416e10e72fe08bbb7e91d021b62982754ec3d0bdac89b341432f56a
-MD5 84d3833bd4f16a9ceeb8b0d0b652422a ChangeLog 20048
-RMD160 2b1b2f5072f46ac747523de01f37b8a046feda46 ChangeLog 20048
-SHA256 5d1701886416e10e72fe08bbb7e91d021b62982754ec3d0bdac89b341432f56a ChangeLog 20048
+EBUILD blackdown-jdk-1.4.2.03-r12.ebuild 3602 RMD160 0eaa3e5e1a9b9627fe7e36389516987407ed8de8 SHA1 5710d2e46fd8d1d8c09be332fccc72f7b01f58c0 SHA256 174a7d90dacef0aaadb7230c9c878d9cac576c9e2c017a3430540afa7f024c55
+MD5 8a3da21790760f00c6369a4830d3984a blackdown-jdk-1.4.2.03-r12.ebuild 3602
+RMD160 0eaa3e5e1a9b9627fe7e36389516987407ed8de8 blackdown-jdk-1.4.2.03-r12.ebuild 3602
+SHA256 174a7d90dacef0aaadb7230c9c878d9cac576c9e2c017a3430540afa7f024c55 blackdown-jdk-1.4.2.03-r12.ebuild 3602
+MISC ChangeLog 20188 RMD160 e4dc132fc2d1f58672f70bbe452c73596c0dead2 SHA1 aac7f6c79189b5220cf997b45677cb44c4207250 SHA256 490ce1c38aea07d82d21b0e53395d7a52848aac32a8618e583588b5b7587f442
+MD5 35d9d81fc10bb38a8c6e29ec0c883656 ChangeLog 20188
+RMD160 e4dc132fc2d1f58672f70bbe452c73596c0dead2 ChangeLog 20188
+SHA256 490ce1c38aea07d82d21b0e53395d7a52848aac32a8618e583588b5b7587f442 ChangeLog 20188
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -19,3 +22,10 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 ae61c188f91254c44a84db78bec9bd92 files/digest-blackdown-jdk-1.4.2.03-r12 551
 RMD160 1445c9fe67ddfd01bbaf5f90811dc19d90cb52fd files/digest-blackdown-jdk-1.4.2.03-r12 551
 SHA256 c8d2e3d696ae765965e2ac3b6e03d7483d01075b1293e4b8a25981a1de8fd73a files/digest-blackdown-jdk-1.4.2.03-r12 551
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFfBOOZfNLSOUrp0sRAjXZAKCxAxW2No+8hEwpuCy98e8oVjgX+QCgwWC9
+Zau3LAdTG8i4KJKHQtLB9Uo=
+=n52d
+-----END PGP SIGNATURE-----

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 8fd0406744d2e5e89e9e3d94d6d03e60b921f40e..281f497e459c0e155ad3848725a7c039476a6ef3 100644 (file)
--- 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
 }