Fixes #52375.

6 files changed, 313 insertions, 6 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 74da97cabd15..164360d1246b 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.74 2004/06/21 19:20:37 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.75 2004/06/21 19:45:06 karltk Exp $
+
+*sun-jdk-1.5.0_beta2-r1 (21 Jun 2004)
+
+  21 Jun 2004; Karl Trygve Kalleberg <karltk@gentoo.org> 
+  Added 'jce' flag, fixes #52375, thanks to Thomas Matthijs <axxo@keanu.be>.
 
 *sun-jdk-1.4.2.04-r2 (21 Jun 2004)
 
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 01b012d58fb0..085add2e5060 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,4 +1,4 @@
-MD5 49323c0e2af2f38727484f0c1f969d74 ChangeLog 16339
+MD5 9334c22a5e9d9ab71d9566c06b895a17 ChangeLog 16514
 MD5 16c9e337522b7e477aece60ff98dde54 metadata.xml 239
 MD5 e734c04c6cf7088eaaa49c06458d5003 sun-jdk-1.3.1.09.ebuild 4468
 MD5 e92a1878e47f9099dfc228ef92ef69c6 sun-jdk-1.3.1.10.ebuild 4499
@@ -6,9 +6,10 @@ MD5 6805cfc5fb809c9750b9bf38e0c1df88 sun-jdk-1.4.1.06.ebuild 3316
 MD5 36de40d801341eb376ba7558464f3a05 sun-jdk-1.4.2.03.ebuild 6000
 MD5 7eeb8ce3796d592aec9ad2381c748f6e sun-jdk-1.4.2.04.ebuild 5988
 MD5 085254c760c1b70e2ec5ee7831abd546 sun-jdk-1.5.0_beta1-r1.ebuild 6684
-MD5 2d7259e699db81d9aed4f28fa1ed226d sun-jdk-1.5.0_beta2.ebuild 7123
+MD5 7d2aa63e69cc2cafd3d0cebd001cc867 sun-jdk-1.5.0_beta2.ebuild 8106
 MD5 9e7b085ba617855392cb3d3de46db13f sun-jdk-1.4.2.04-r1.ebuild 7166
 MD5 cb32f59ce8ef97449639d30ded183600 sun-jdk-1.4.2.04-r2.ebuild 7170
+MD5 b5e5e0a4d6a4aec61d4240ece4e83de9 sun-jdk-1.5.0_beta2-r1.ebuild 8109
 MD5 951b3321a6c971e8af7c5b12816f3db0 files/digest-sun-jdk-1.3.1.09 76
 MD5 7b0d2e578d7bc3c00ab9b67590b7b3ca files/digest-sun-jdk-1.3.1.10 76
 MD5 758406756bec272a9edfb8f09979c1f9 files/digest-sun-jdk-1.4.1.06 76
@@ -25,3 +26,5 @@ MD5 41998d0664732a0724913e8fcbb99116 files/sun-jdk-1.5.0_beta1 511
 MD5 094dd610ffa5d7f03b8174b76a5db6ae files/digest-sun-jdk-1.5.0_beta2 155
 MD5 a46e6de4e40dfdca9cb4e20c0e81faf8 files/sun-jdk-1.5.0_beta2 480
 MD5 e88f84fa4a8c251de5ca40b04b094f06 files/digest-sun-jdk-1.4.2.04-r2 140
+MD5 3fa9afb39fe6c07d974d1e22061000df files/digest-sun-jdk-1.5.0_beta2-r1 224
+MD5 ced122a769da8f4bfd205c28cb599356 files/sun-jdk-1.5.0_beta2-r1 487
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0_beta2-r1 b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0_beta2-r1
new file mode 100644
index 000000000000..13e58d95d915
--- /dev/null
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0_beta2-r1
@@ -0,0 +1,3 @@
+MD5 93556887af8910d709de028ddb07f27d jdk-1_5_0-beta2-linux-i586.bin 45618522
+MD5 04e7a35af0fd655e516f5ba3435cf632 jdk-1_5_0-beta2-linux-amd64.bin 41564226
+MD5 68555bfaeaee2fbbb78630699f792d14 jce_policy-1_5_0-beta2.zip 8834
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.5.0_beta2-r1 b/dev-java/sun-jdk/files/sun-jdk-1.5.0_beta2-r1
new file mode 100644
index 000000000000..18507edbd04c
--- /dev/null
+++ b/dev-java/sun-jdk/files/sun-jdk-1.5.0_beta2-r1
@@ -0,0 +1,12 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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_beta2-r1,v 1.1 2004/06/21 19:45:07 karltk 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.5.0_beta2-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0_beta2-r1.ebuild
new file mode 100644
index 000000000000..2e4c05a1943d
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0_beta2-r1.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2004 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.5.0_beta2-r1.ebuild,v 1.1 2004/06/21 19:45:06 karltk Exp $
+
+IUSE="doc gnome kde mozilla jce"
+
+inherit java
+
+amd64file="jdk-1_5_0-beta2-linux-amd64.bin"
+x86file="jdk-1_5_0-beta2-linux-i586.bin"
+
+jcefile="jce_policy-1_5_0-beta2.zip"
+
+if use x86; then
+	At=${x86file}
+elif use amd64; then
+	At=${amd64file}
+fi
+
+S="${WORKDIR}/jdk1.5.0"
+DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
+HOMEPAGE="http://java.sun.com/j2se/1.5.0/download.jsp"
+SRC_URI="x86? ( $x86file ) amd64? ( $amd64file )
+		jce? ( $jcefile )"
+SLOT="1.5"
+LICENSE="sun-bcla-java-vm"
+KEYWORDS="~x86 ~amd64"
+RESTRICT="fetch"
+
+#
+DEPEND=">=dev-java/java-config-1.2
+	sys-apps/sed
+	doc? ( =dev-java/java-sdk-docs-1.5.0* )
+	virtual/lpr"
+
+RDEPEND="x86? ( sys-libs/lib-compat )
+	doc? ( =dev-java/java-sdk-docs-1.5.0* )
+	virtual/lpr"
+
+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"
+
+pkg_nofetch() {
+	einfo "Please download ${At} from:"
+	einfo ${HOMEPAGE}
+	einfo "(SDK 32-bit/64-bit for Windows/Linux/Solaris SPARC 32-bit for Solaris x86, then select download Linux Self-extracting or Linux AMD64 self-extracting, depending on your arch.)"
+	einfo "and move it to ${DISTDIR}"
+
+	if use jce; then
+		einfo "Also download ${jcefile} from:"
+		einfo ${HOMEPAGE}
+		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
+		eerror "cannot read ${At}. Please check the permission and try again."
+		die
+	fi
+	if use jce; then
+		if [ ! -r ${DISTDIR}/${jcefile} ]; then
+			eerror "cannot read ${jcefile}. Please check the permission and try again."
+			die
+		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
+		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}/
+	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}
+		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
+
+
+	local plugin_dir="ns7-gcc29"
+	if has_version '>=gcc-3*' ; then
+		plugin_dir="ns7"
+	fi
+
+	if use mozilla ; then
+		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
+
+	if use x86; then
+		if use gnome ; then
+			#TODO check this on Gnome
+			dodir /usr/share/gnome/apps/Internet
+			insinto /usr/share/gnome/apps/Internet
+			doins ${T}/sun_java.desktop
+		fi
+
+		if use kde ; then
+			dodir /usr/share/applnk/Internet
+			insinto /usr/share/applnk/Internet
+			doins ${T}/sun_java.desktop
+		fi
+	else
+		eerror "Sorry no kde, gnome support for your arch now."
+	fi
+
+	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
+		einfo "********************************************************"
+		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"
+		einfo "********************************************************"
+		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/$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
+
+	#Thanks to Douglas Pollock <douglas.pollock@magma.ca> for this
+	#comment found on the sun-jdk 1.2.2 ebuild that he sent.
+	einfo "*********************************************************"
+	eerror "Some parts of Sun's JDK require XFree86 to be installed."
+	eerror "Be careful which Java libraries you attempt to use."
+	einfo "*********************************************************"
+	echo
+
+	einfo "*********************************************************"
+	einfo " After installing ${P} this"
+	einfo " was set as the default JVM to run."
+	einfo " When finished please run the following so your"
+	einfo " enviroment gets updated."
+	eerror "    /usr/sbin/env-update && source /etc/profile"
+	einfo " Or use java-config program to set your preferred VM"
+	einfo "*********************************************************"
+
+	# warn about a default setting in Java 1.5.0 beta2
+	einfo "*********************************************************"
+	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."
+	einfo "*********************************************************"
+
+	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+	echo -ne "\a" ; sleep 1
+	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+	echo -ne "\a" ; sleep 1
+	sleep 8
+
+}
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0_beta2.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0_beta2.ebuild
index 30d6c068b8db..a8cea73ed1d6 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0_beta2.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0_beta2.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2004 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.5.0_beta2.ebuild,v 1.1 2004/06/11 22:28:53 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0_beta2.ebuild,v 1.2 2004/06/21 19:45:06 karltk Exp $
 
-IUSE="doc gnome kde mozilla"
+IUSE="doc gnome kde mozilla jce"
 
 inherit java
 
 amd64file="jdk-1_5_0-beta2-linux-amd64.bin"
 x86file="jdk-1_5_0-beta2-linux-i586.bin"
 
+jcefile="jce_policy-1_5_0-beta2.zip"
+
 if use x86; then
 	At=${x86file}
 elif use amd64; then
@@ -18,7 +20,8 @@ fi
 S="${WORKDIR}/jdk1.5.0"
 DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
 HOMEPAGE="http://java.sun.com/j2se/1.5.0/download.jsp"
-SRC_URI="x86? ( $x86file ) amd64? ( $amd64file )"
+SRC_URI="x86? ( $x86file ) amd64? ( $amd64file )
+		jce? ( $jcefile )"
 SLOT="1.5"
 LICENSE="sun-bcla-java-vm"
 KEYWORDS="~x86 ~amd64"
@@ -47,6 +50,14 @@ pkg_nofetch() {
 	einfo ${HOMEPAGE}
 	einfo "(SDK 32-bit/64-bit for Windows/Linux/Solaris SPARC 32-bit for Solaris x86, then select download Linux Self-extracting or Linux AMD64 self-extracting, depending on your arch.)"
 	einfo "and move it to ${DISTDIR}"
+
+	if use jce; then
+		einfo "Also download ${jcefile} from:"
+		einfo ${HOMEPAGE}
+		einfo "Java(TM) Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files"
+		einfo "and move it to ${DISTDIR}"
+		fi
+
 }
 
 src_unpack() {
@@ -54,6 +65,13 @@ src_unpack() {
 		eerror "cannot read ${At}. Please check the permission and try again."
 		die
 	fi
+	if use jce; then
+		if [ ! -r ${DISTDIR}/${jcefile} ]; then
+			eerror "cannot read ${jcefile}. Please check the permission and try again."
+			die
+		fi
+	fi
+
 	#Search for the ELF Header
 	testExp=`echo -e "\105\114\106"`
 	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
@@ -95,6 +113,18 @@ src_install () {
 		cp -a sample ${D}/opt/${P}/share/
 	fi
 
+	if use jce ; then
+		cd ${D}/opt/${P}/jre/lib/security
+		unzip ${DISTDIR}/${jcefile}
+		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
+
+
 	local plugin_dir="ns7-gcc29"
 	if has_version '>=gcc-3*' ; then
 		plugin_dir="ns7"