we now call chpax also for the javadoc binary, see #90553. new upstream version, fixes #91116

(Portage version: 2.0.51.20-r5)

9 files changed, 264 insertions, 24 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index b30c1b93d7a4..dec8f011cf8e 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.110 2005/04/22 13:43:06 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.111 2005/05/04 12:23:33 luckyduck Exp $
+
+*sun-jdk-1.5.0.03 (04 May 2005)
+
+  04 May 2005; Jan Brinkmann <luckyduck@gentoo.org> +files/sun-jdk-1.5.0.03,
+  sun-jdk-1.3.1.13.ebuild, sun-jdk-1.4.2.07-r1.ebuild,
+  sun-jdk-1.4.2.08.ebuild, sun-jdk-1.5.0.02-r1.ebuild,
+  +sun-jdk-1.5.0.03.ebuild:
+  we now call chpax also for the javadoc binary, see #90553. new upstream
+  version, fixes #91116
 
   22 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> sun-jdk-1.3.1.13.ebuild,
   sun-jdk-1.4.2.07-r1.ebuild, sun-jdk-1.4.2.08.ebuild,
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 67660a0d67b0..06ba93f44ed1 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,27 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7a3ac272fb767e8307420bbbda1f6590 sun-jdk-1.3.1.13.ebuild 3815
-MD5 db37863e9b970b9aceabba1562ef0884 sun-jdk-1.4.2.07-r1.ebuild 6236
+MD5 f04e606b57c7dcc093e1eaa97aca58d9 sun-jdk-1.3.1.13.ebuild 3825
+MD5 6fc8e26169096fa8f8fb84d2015340a2 sun-jdk-1.5.0.03.ebuild 6985
+MD5 a8acc6664bc24f04b68361d404af2fdf sun-jdk-1.4.2.07-r1.ebuild 6246
 MD5 183d3481b4e5d7b6367616cff588b875 sun-jdk-1.2.2.017.ebuild 3149
-MD5 49d8fa205a621e1efb90858b8520cfbb sun-jdk-1.4.2.08.ebuild 6233
-MD5 33ce32e29c26eae105b5b1200ecd6bdb ChangeLog 22762
-MD5 578052d0cb85fc553e730def740f6b79 sun-jdk-1.5.0.02-r1.ebuild 6975
+MD5 b1504aaa03412ef2b8f5dc2691d32e31 sun-jdk-1.4.2.08.ebuild 6243
+MD5 acdc1079287bea3be9513352747eaf95 ChangeLog 23109
+MD5 6fc8e26169096fa8f8fb84d2015340a2 sun-jdk-1.5.0.02-r1.ebuild 6985
 MD5 16c9e337522b7e477aece60ff98dde54 metadata.xml 239
 MD5 0f94a657aa38fbca24dd767967474bc4 files/sun-jdk-1.3.1.13 475
 MD5 ca753d6c6afc7ee2df1192978846d0d4 files/sun-jdk-1.4.2.07 499
 MD5 a9fa8b3f17e5639d26a53ab0c163e25c files/sun-jdk-1.4.2.08 495
 MD5 7e47512a18f9af78546d9b528b3bfd47 files/sun-jdk-1.5.0.02 471
+MD5 7e47512a18f9af78546d9b528b3bfd47 files/sun-jdk-1.5.0.03 471
 MD5 ac1c6e8860b4cb03e284664cacf7a977 files/sun-jdk-1.2.2.017 328
 MD5 92fc551c12c9a260dd9ced69d15cf0f3 files/digest-sun-jdk-1.2.2.017 78
 MD5 087d481a89540a1b830bbb4559d74663 files/digest-sun-jdk-1.4.2.07-r1 140
 MD5 d1e29e8acce3cfec9912e23aa366478a files/digest-sun-jdk-1.3.1.13 76
 MD5 49cf0d15bb5d59149d1828735355d139 files/digest-sun-jdk-1.4.2.08 140
+MD5 160b416ee657e71dda6bdfb888696231 files/digest-sun-jdk-1.5.0.03 212
 MD5 dc0cdafb5c99594fb0ef9daa13b35fcf files/digest-sun-jdk-1.5.0.02-r1 212
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD4DBQFCaP+A06ebR+OMO78RAvsIAJURa2vwXg+/2IMKqVXzz0B8tKGUAJwLFd0T
-qeabnDDiqaTlgGWJ19CexQ==
-=Q9gl
------END PGP SIGNATURE-----
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.03 b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.03
new file mode 100644
index 000000000000..c90ae1f47427
--- /dev/null
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.03
@@ -0,0 +1,3 @@
+MD5 bc221641fcfdc9268499001326fc8ebb jdk-1_5_0_03-linux-i586.bin 48772357
+MD5 7ee64fb99eee684b849248db4d778eef jdk-1_5_0_03-linux-amd64.bin 43533399
+MD5 169441bba1ca95e84e030e116f258d79 jce_policy-1_5_0.zip 8826
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.5.0.03 b/dev-java/sun-jdk/files/sun-jdk-1.5.0.03
new file mode 100644
index 000000000000..d68b6e56697d
--- /dev/null
+++ b/dev-java/sun-jdk/files/sun-jdk-1.5.0.03
@@ -0,0 +1,12 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.5.0.03,v 1.1 2005/05/04 12:23:33 luckyduck Exp $
+
+VERSION="Sun JDK @PV@"
+JAVA_HOME=/opt/@P@
+JDK_HOME=/opt/@P@
+JAVAC=${JAVA_HOME}/bin/javac
+ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+ADDLDPATH="/opt/@P@/jre/lib"
+MANPATH="/opt/@P@/man"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH MANPATH"
diff --git a/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild
index b2ffe80cd445..24d7592fa405 100644
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.3.1.13.ebuild,v 1.5 2005/04/22 13:43:06 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild,v 1.6 2005/05/04 12:23:33 luckyduck Exp $
 
 inherit java eutils
 
@@ -107,7 +107,7 @@ pkg_postinst () {
 		echo
 		einfo "setting up conservative PaX flags for jar, javac and java"
 
-		for paxkills in "jar" "javac" "java" "javah"
+		for paxkills in "jar" "javac" "java" "javah" "javadoc"
 		do
 			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/$paxkills
 		done
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.07-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.07-r1.ebuild
index 792f881dc648..f5a0872ed3bd 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.07-r1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.07-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.4.2.07-r1.ebuild,v 1.3 2005/04/22 13:43:06 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.07-r1.ebuild,v 1.4 2005/05/04 12:23:33 luckyduck Exp $
 
 inherit java eutils
 
@@ -169,7 +169,7 @@ pkg_postinst() {
 		echo
 		einfo "setting up conservative PaX flags for jar, javac and java"
 
-		for paxkills in "jar" "javac" "java" "javah"
+		for paxkills in "jar" "javac" "java" "javah" "javadoc"
 		do
 			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/$paxkills
 		done
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.08.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.08.ebuild
index 2153b1e489f6..2fb1805edfdb 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.08.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.08.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.4.2.08.ebuild,v 1.3 2005/04/22 13:43:06 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.08.ebuild,v 1.4 2005/05/04 12:23:33 luckyduck Exp $
 
 inherit java eutils
 
@@ -169,7 +169,7 @@ pkg_postinst() {
 		echo
 		einfo "setting up conservative PaX flags for jar, javac and java"
 
-		for paxkills in "jar" "javac" "java" "javah"
+		for paxkills in "jar" "javac" "java" "javah" "javadoc"
 		do
 			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/$paxkills
 		done
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.02-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.02-r1.ebuild
index d84bd4a19296..5e252a5e4402 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.02-r1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.02-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.02-r1.ebuild,v 1.3 2005/04/22 13:43:06 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.02-r1.ebuild,v 1.4 2005/05/04 12:23:33 luckyduck Exp $
 
 inherit java eutils
 
@@ -193,7 +193,7 @@ pkg_postinst() {
 		echo
 		einfo "setting up conservative PaX flags for jar, javac and java"
 
-		for paxkills in "jar" "javac" "java" "javah"
+		for paxkills in "jar" "javac" "java" "javah" "javadoc"
 		do
 			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/$paxkills
 		done
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.03.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.03.ebuild
new file mode 100644
index 000000000000..a23c455bedd8
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.03.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2005 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.03.ebuild,v 1.1 2005/05/04 12:23:33 luckyduck Exp $
+
+inherit java eutils
+
+MY_PVL=${PV%.*}_${PV##*.}
+MY_PVA=${PV//./_}
+
+amd64file="jdk-${MY_PVA}-linux-amd64.bin"
+x86file="jdk-${MY_PVA}-linux-i586.bin"
+
+jcefile="jce_policy-${MY_PVA%_*}.zip"
+
+if use x86; then
+	At=${x86file}
+elif use amd64; then
+	At=${amd64file}
+fi
+
+S="${WORKDIR}/jdk${MY_PVL}"
+DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
+HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
+SRC_URI="x86? ( $x86file ) amd64? ( $amd64file )
+		jce? ( $jcefile )"
+SLOT="1.5"
+LICENSE="sun-bcla-java-vm"
+KEYWORDS="~x86 ~amd64"
+RESTRICT="fetch nostrip"
+IUSE="doc gnome kde mozilla jce"
+
+#
+DEPEND=">=dev-java/java-config-1.2
+	sys-apps/sed
+	jce? ( app-arch/unzip )
+	doc? ( =dev-java/java-sdk-docs-1.5.0* )"
+
+RDEPEND="x86? ( sys-libs/lib-compat )
+	doc? ( =dev-java/java-sdk-docs-1.5.0* )"
+
+PROVIDE="virtual/jre-1.5
+	virtual/jdk-1.5"
+
+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/lib/javaws.jar jre/lib/deploy.jar"
+
+# this is needed for proper operating under a PaX kernel without activated grsecurity acl
+CHPAX_CONSERVATIVE_FLAGS="pemsv"
+
+FETCH_SDK="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jdk-${MY_PVL}-oth-JPR&SiteId=JSC&TransactionId=noreg"
+FETCH_JCE="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jce_policy-${PV%.*}-oth-JPR&SiteId=JSC&TransactionId=noreg"
+
+
+pkg_nofetch() {
+	einfo "Please download ${At} from:"
+	einfo ${FETCH_SDK}
+	einfo "(Select the Self-extracting (.bin) for Linux or Linux AMD64, depending on your arch)"
+	einfo "and move it to ${DISTDIR}"
+
+	if use jce; then
+		echo
+		einfo "Also download ${jcefile} from:"
+		einfo ${FETCH_JCE}
+		einfo "Java(TM) Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files"
+		einfo "and move it to ${DISTDIR}"
+	fi
+
+}
+
+src_unpack() {
+	if [ ! -r ${DISTDIR}/${At} ]; then
+		die "cannot read ${At}. Please check the permission and try again."
+	fi
+	if use jce; then
+		if [ ! -r ${DISTDIR}/${jcefile} ]; then
+			die "cannot read ${jcefile}. Please check the permission and try again."
+		fi
+	fi
+
+	#Search for the ELF Header
+	testExp=`echo -e "\105\114\106"`
+	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
+	tail -n +${startAt} ${DISTDIR}/${At} > install.sfx
+	chmod +x install.sfx
+	./install.sfx || die
+	rm install.sfx
+
+	if [ -f ${S}/bin/unpack200 ]; then
+		UNPACK_CMD=${S}/bin/unpack200
+		chmod +x $UNPACK_CMD
+		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
+		for i in $PACKED_JARS; do
+			PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack
+			if [ -f ${PACK_FILE} ]; then
+				echo "	unpacking: $i"
+				$UNPACK_CMD ${PACK_FILE} ${S}/$i
+				rm -f ${PACK_FILE}
+			fi
+		done
+		rm -f ${UNPACK_CMD}
+	else
+		die "unpack not found"
+	fi
+	${S}/bin/java -client -Xshare:dump
+}
+
+src_install() {
+	local dirs="bin include jre lib man"
+	dodir /opt/${P}
+
+	for i in $dirs ; do
+		cp -a $i ${D}/opt/${P}/ || die "failed to copy"
+	done
+	dodoc COPYRIGHT LICENSE README.html
+	dohtml README.html
+	dodir /opt/${P}/share/
+	cp -a demo src.zip ${D}/opt/${P}/share/
+	if ( use x86 || use amd64 ); then
+		cp -a sample ${D}/opt/${P}/share/
+	fi
+
+	if use jce ; then
+		cd ${D}/opt/${P}/jre/lib/security
+		unzip ${DISTDIR}/${jcefile} || die "failed to unzip jce"
+		mv jce unlimited-jce
+		dodir /opt/${P}/jre/lib/security/strong-jce
+		mv ${D}/opt/${P}/jre/lib/security/US_export_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce
+		mv ${D}/opt/${P}/jre/lib/security/local_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce
+		dosym /opt/${P}/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
+		dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
+	fi
+
+	if use mozilla; then
+		local plugin_dir="ns7-gcc29"
+		if has_version '>=gcc-3*' ; then
+			plugin_dir="ns7"
+		fi
+
+		if use x86 ; then
+			install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+		else
+			eerror "No plugin available for amd64 arch"
+		fi
+	fi
+
+	# create dir for system preferences
+	dodir /opt/${P}/.systemPrefs
+
+	# install control panel for Gnome/KDE
+	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
+		-e "s/\(Name=Java\)/\1 Control Panel/" \
+		${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
+		${T}/sun_java.desktop
+
+	domenu ${T}/sun_java.desktop
+
+	set_java_env ${FILESDIR}/${VMHANDLE}
+
+	# TODO prepman "fixes" symlink ja -> ja__JP.eucJP in 'man' directory,
+	#      creating ja.gz -> ja_JP.eucJP.gz. This is broken as ja_JP.eucJP
+	#      is a directory and will not be gzipped ;)
+}
+
+pkg_postinst() {
+	# Create files used as storage for system preferences.
+	PREFS_LOCATION=/opt/${P}/jre
+	mkdir -p ${PREFS_LOCATION}/.systemPrefs
+	if [ ! -f ${PREFS_LOCATION}/.systemPrefs/.system.lock ] ; then
+		touch $PREFS_LOCATION/.systemPrefs/.system.lock
+		chmod 644 $PREFS_LOCATION/.systemPrefs/.system.lock
+	fi
+	if [ ! -f $PREFS_LOCATION/.systemPrefs/.systemRootModFile ] ; then
+		touch $PREFS_LOCATION/.systemPrefs/.systemRootModFile
+		chmod 644 $PREFS_LOCATION/.systemPrefs/.systemRootModFile
+	fi
+
+	# Set as default VM if none exists
+	java_pkg_postinst
+
+	#Show info about netscape
+	if has_version '>=netscape-navigator-4.79-r1' || has_version '>=netscape-communicator-4.79-r1' ; then
+		echo
+		einfo "If you want to install the plugin for Netscape 4.x, type"
+		einfo
+		einfo "   cd /usr/lib/nsbrowser/plugins/"
+		einfo "   ln -sf /opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so"
+	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
+		echo
+		einfo "setting up conservative PaX flags for jar, javac and java"
+
+		for paxkills in "jar" "javac" "java" "javah" "javadoc"
+		do
+			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/$paxkills
+		done
+
+		# /opt/$VM/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
+
+	echo
+	eerror "Some parts of Sun's JDK require virtual/x11 and/or virtual/lpr to be installed."
+	eerror "Be careful which Java libraries you attempt to use."
+
+	echo
+	einfo " Be careful: ${P}'s Java compiler uses"
+	einfo " '-source 1.5' as default. Some keywords such as 'enum'"
+	einfo " are not valid identifiers any more in that mode,"
+	einfo " which can cause incompatibility with certain sources."
+
+	ebeep 5
+	epause 8
+}