Added PAX Grscurity warning.

5 files changed, 89 insertions, 14 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 5432677dd05e..c16819f8f263 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-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.60 2003/12/09 04:22:22 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.61 2003/12/13 17:00:01 strider Exp $
+
+  13 Dec 2003; Adrian Almenar <strider@gentoo.org> sun-jdk-1.3.1.09.ebuild,
+  sun-jdk-1.4.2.02.ebuild, sun-jdk-1.4.2.03.ebuild:
+  Added Grsecurity and PAX warning taken from blackdown-jdk 1.4.1.
 
   09 Dec 2003; Adrian Almenar <strider@gentoo.org> sun-jdk-1.4.1.06.ebuild,
   sun-jdk-1.4.2.03.ebuild, files/sun-jdk-1.4.2.03, files/sun-jdk-1.4.1.06:
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 38e2131cd839..4cdd3f4f2a8f 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,8 +1,8 @@
-MD5 760e21df2610a2e687b00ac28b55d1dd sun-jdk-1.3.1.09.ebuild 3481
-MD5 439c0159a4ea3ffa2b744f101dda9e46 sun-jdk-1.4.2.03.ebuild 5008
+MD5 388e1bcdea8f739a80b423fe2e1d4ef1 sun-jdk-1.3.1.09.ebuild 4462
+MD5 c54f9febdddc6d12117eab39895a473a sun-jdk-1.4.2.03.ebuild 5971
 MD5 ed71c42804ea3d749865b113a7f5db75 sun-jdk-1.4.1.06.ebuild 3330
-MD5 6a9a5137160b64f4fa40f6c364e17c1d ChangeLog 13598
-MD5 9f23bb95d5f9f94ad16dbc336f4adf8e sun-jdk-1.4.2.02.ebuild 5010
+MD5 6fcd103537aa0892ed362d5cf628c484 ChangeLog 13794
+MD5 eb1a6de6cc2fc7848a9ab6558a7be22b sun-jdk-1.4.2.02.ebuild 5973
 MD5 3624458aaf058b4b4b2cf00e096c5c84 metadata.xml 382
 MD5 f88d1ccfcc8bbfecc893cda23faf0e10 sun-jdk-1.4.1.05.ebuild 3332
 MD5 cd97114b20d221cee190400af253f8a3 files/sun-jdk-1.3.1.09 488
diff --git a/dev-java/sun-jdk/sun-jdk-1.3.1.09.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.09.ebuild
index 85db9b82c73a..13d957b86dc4 100644
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.09.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.3.1.09.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.09.ebuild,v 1.4 2003/12/09 00:21:30 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.09.ebuild,v 1.5 2003/12/13 17:00:01 strider Exp $
 
 IUSE="doc"
 
@@ -23,6 +23,9 @@ SLOT="1.3"
 KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa -arm"
 RESTRICT="fetch"
 
+# this is needed for proper operating under a PaX kernel without activated grsecurity acl
+CHPAX_CONSERVATIVE_FLAGS="pemsv"
+
 pkg_nofetch() {
 	einfo "Please download ${At} from:"
 	einfo ${HOMEPAGE}
@@ -93,6 +96,28 @@ pkg_postinst () {
 	java_pkg_postinst
 	inst_plugin /opt/${P}/jre/plugin/i386/mozilla/libjavaplugin_oji.so
 
+	# 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
+		einfo "setting up conservative PaX flags for jar, javac and java"
+
+		for paxkills in "jar" "javac" "java"
+		do
+			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/$paxkills
+		done
+
+		# /opt/sun-jdk-1.3.1.09/jre/bin/java_vm
+		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/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 + pappy@gentoo.org"
+	fi
+
 	#Thanks to Douglas Pollock <douglas.pollock@magma.ca> for this
 	#comment found on the sun-jdk 1.2.2 ebuild that he sent.
 	einfo "********************************************************"
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.02.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.02.ebuild
index b0bf5a21eab1..4a4c2621a25d 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.02.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.02.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.02.ebuild,v 1.4 2003/12/09 04:22:22 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.02.ebuild,v 1.5 2003/12/13 17:00:01 strider Exp $
 
 IUSE="doc gnome kde mozilla"
 
@@ -11,10 +11,10 @@ S="${WORKDIR}/j2sdk1.4.2_02"
 DESCRIPTION="Sun's J2SE Development Kit, version 1.4.2_02"
 HOMEPAGE="http://java.sun.com/products/archive/index.html"
 SRC_URI=${At}
-RESTRICT="fetch"
 SLOT="1.4"
 LICENSE="sun-bcla-java-vm"
 KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa -arm"
+RESTRICT="fetch"
 
 DEPEND=">=dev-java/java-config-0.2.7
 	sys-apps/sed
@@ -26,11 +26,12 @@ PROVIDE="virtual/jre-1.4.2
 	virtual/jdk-1.4.2
 	virtual/java-scheme-2"
 
-RESTRICT="fetch"
-
 PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar
 jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/javaws/javaws.jar"
 
+# this is needed for proper operating under a PaX kernel without activated grsecurity acl
+CHPAX_CONSERVATIVE_FLAGS="pemsv"
+
 pkg_nofetch() {
 	einfo "Please download ${At} from:"
 	einfo ${HOMEPAGE}
@@ -136,6 +137,28 @@ pkg_postinst () {
 		echo
 	fi
 
+	# 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
+		einfo "setting up conservative PaX flags for jar, javac and java"
+
+		for paxkills in "jar" "javac" "java"
+		do
+			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/$paxkills
+		done
+
+		# /opt/sun-jdk-1.4.2.02/jre/bin/java_vm
+		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/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 + pappy@gentoo.org"
+	fi
+
 	#Thanks to Douglas Pollock <douglas.pollock@magma.ca> for this
 	#comment found on the sun-jdk 1.2.2 ebuild that he sent.
 	einfo "*********************************************************"
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.03.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.03.ebuild
index 4f714aa25362..50a2ab3a4c43 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.03.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.03.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.03.ebuild,v 1.1 2003/12/09 04:22:22 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.03.ebuild,v 1.2 2003/12/13 17:00:01 strider Exp $
 
 IUSE="doc gnome kde mozilla"
 
@@ -11,10 +11,10 @@ S="${WORKDIR}/j2sdk1.4.2_03"
 DESCRIPTION="Sun's J2SE Development Kit, version 1.4.2_03"
 HOMEPAGE="http://java.sun.com/j2se/1.4.2/download.html"
 SRC_URI=${At}
-RESTRICT="fetch"
 SLOT="1.4"
 LICENSE="sun-bcla-java-vm"
 KEYWORDS="~x86 -ppc -sparc -alpha -mips -hppa -arm"
+RESTRICT="fetch"
 
 DEPEND=">=dev-java/java-config-1.1.5
 	sys-apps/sed
@@ -26,11 +26,12 @@ PROVIDE="virtual/jre-1.4.2
 	virtual/jdk-1.4.2
 	virtual/java-scheme-2"
 
-RESTRICT="fetch"
-
 PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar
 jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/javaws/javaws.jar"
 
+# this is needed for proper operating under a PaX kernel without activated grsecurity acl
+CHPAX_CONSERVATIVE_FLAGS="pemsv"
+
 pkg_nofetch() {
 	einfo "Please download ${At} from:"
 	einfo ${HOMEPAGE}
@@ -136,6 +137,28 @@ pkg_postinst () {
 		echo
 	fi
 
+	# 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
+		einfo "setting up conservative PaX flags for jar, javac and java"
+
+		for paxkills in "jar" "javac" "java"
+		do
+			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/$paxkills
+		done
+
+		# /opt/sun-jdk-1.4.2.03/jre/bin/java_vm
+		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/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 + pappy@gentoo.org"
+	fi
+
 	#Thanks to Douglas Pollock <douglas.pollock@magma.ca> for this
 	#comment found on the sun-jdk 1.2.2 ebuild that he sent.
 	einfo "*********************************************************"