Version bump wrt bug #155822.

Package-Manager: portage-2.1.2_rc2-r1

4 files changed, 225 insertions, 5 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 26301229e09c..975c980a2e3b 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.167 2006/11/22 23:25:15 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.168 2006/11/23 00:01:27 caster Exp $
+
+*sun-jdk-1.4.2.13 (23 Nov 2006)
+
+  23 Nov 2006; Vlastimil Babka <caster@gentoo.org> +sun-jdk-1.4.2.13.ebuild:
+  Version bump wrt bug #155822.
 
 *sun-jdk-1.5.0.09-r1 (22 Nov 2006)
 
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 2fc7fbec665d..98c84a653f13 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -11,6 +11,7 @@ MD5 9b9e4337c1fb2f73b1adad1db1e01325 files/sun-jdk-1.5.env 925
 RMD160 6042c2849330d0a7b7ef87f2680209a27707a370 files/sun-jdk-1.5.env 925
 SHA256 9faf2bfbdec7fd92e6fc3509a22ae8ec9a3527d850f9763cef42575e0dec13fe files/sun-jdk-1.5.env 925
 DIST j2sdk-1_4_2_12-linux-i586.bin 36337163 RMD160 6b1499cf3bd46158293506b8a0d701ec52b78ef3 SHA1 74f88c386985ba01b7c574e441f3f479b4a3b549 SHA256 ab7f5285993d71dc692625bed4d11557048ef3a4be6c51941c507cef26025531
+DIST j2sdk-1_4_2_13-linux-i586.bin 36361814 RMD160 cefb731ae6740f36a17242aa79b36d79dda2e102 SHA1 12c679cfa2e212bfa90ae6ef6ad6c477e427bbba SHA256 f5dd8045fe791bd5c52bddf33a1cf65968ee03981e0663f75cd97a942daa24e2
 DIST jce_policy-1_4_2.zip 12195 RMD160 323340fa8a96f315a35b0ebc918731e6fe56c370 SHA1 ea17b649ebcaaf4246e9dd28dbc77926176c64ee SHA256 7bf6d683602686321affc0071ad2fc3890c19cf5bb5cc16a963052e17588c097
 DIST jdk-1_5_0_08-dlj-linux-amd64.bin 43854617 RMD160 c6669cba980b9097c6921041ee3af8753587ea37 SHA1 f43776629e50834be1f25060bcbe7f8ee0483173 SHA256 a4a4baa5488c7be8b109ed6c1f460a8b30861ae546c050c319de41e987bc857f
 DIST jdk-1_5_0_08-dlj-linux-i586.bin 49498712 RMD160 11c01f6391cec0476a3d96306a7bee7ec82d8425 SHA1 e7bc2da45219c54f9ac0dcbe6b3b8bf7ead3cc4e SHA256 e96ebeefb5116182c01f6e3fb306d24f1b81ba6849b76b0d4705051b01647ce8
@@ -20,6 +21,10 @@ EBUILD sun-jdk-1.4.2.12-r2.ebuild 6295 RMD160 169f60bb6d88164d5f4c867766a9651a93
 MD5 47e6303ad612a0b25879b412e5f7bc32 sun-jdk-1.4.2.12-r2.ebuild 6295
 RMD160 169f60bb6d88164d5f4c867766a9651a93bb7457 sun-jdk-1.4.2.12-r2.ebuild 6295
 SHA256 d2ca54862998c72351c6fa09f2c87c71b705c42df41468a2cb8e51cf394be058 sun-jdk-1.4.2.12-r2.ebuild 6295
+EBUILD sun-jdk-1.4.2.13.ebuild 6311 RMD160 401273f18e1bbb21df2d438c1a89f0e0a770602a SHA1 b0dbb22b1199fcd54c9bd20f5695addd1625ae72 SHA256 cd5bbc85ddb97a326c623f55339d7e38806988e53cc9da57fbc454c6cd885ce7
+MD5 ef5eaf43ad27e6bbc6ed630d8bf4a15a sun-jdk-1.4.2.13.ebuild 6311
+RMD160 401273f18e1bbb21df2d438c1a89f0e0a770602a sun-jdk-1.4.2.13.ebuild 6311
+SHA256 cd5bbc85ddb97a326c623f55339d7e38806988e53cc9da57fbc454c6cd885ce7 sun-jdk-1.4.2.13.ebuild 6311
 EBUILD sun-jdk-1.5.0.08.ebuild 5585 RMD160 9a17e1ef27724f417ab53fc6bf3983784575ef93 SHA1 a3fd6db0d666dbe73a8a1d681267496f448bde0a SHA256 ca37bfd50f6fd2f2abb62b59735f4a7c743f9f5b0de8627f593b2871260f95bf
 MD5 ac5ac2cd6724e7ba0c1f887ff3e57c77 sun-jdk-1.5.0.08.ebuild 5585
 RMD160 9a17e1ef27724f417ab53fc6bf3983784575ef93 sun-jdk-1.5.0.08.ebuild 5585
@@ -32,10 +37,10 @@ EBUILD sun-jdk-1.5.0.09.ebuild 5116 RMD160 ff9350a4624070304b5e09190c53280b0c3f3
 MD5 9b72c60b6d428ee54ecdd02140bb90d9 sun-jdk-1.5.0.09.ebuild 5116
 RMD160 ff9350a4624070304b5e09190c53280b0c3f322b sun-jdk-1.5.0.09.ebuild 5116
 SHA256 9d36d435e63f93cf5f5a28e633359409f6d06567ed875e9ebca3ff49c00d6f42 sun-jdk-1.5.0.09.ebuild 5116
-MISC ChangeLog 33855 RMD160 6ebfa64bc8529be5a569abe6b59e503b1371f945 SHA1 0cd9ca727a055531569b1e0514fbe7451c80e62b SHA256 a83e364af7aea23a779b7f1d952618d6e4bd78b002db47c8ced920cdeaa0374f
-MD5 69a3705b19cd5cb27abdd2d1563cd197 ChangeLog 33855
-RMD160 6ebfa64bc8529be5a569abe6b59e503b1371f945 ChangeLog 33855
-SHA256 a83e364af7aea23a779b7f1d952618d6e4bd78b002db47c8ced920cdeaa0374f ChangeLog 33855
+MISC ChangeLog 33998 RMD160 95bb8cbf6118be88b30f85440fde6e6cae53da2a SHA1 e11c425a1290c123cab1852c8f8d478dd8d2f19d SHA256 1c7324ff72fdcde8ce2636a7bf3f599a2a68ab1eb4f03cd2b764abb652739fad
+MD5 6fba0e544f2565e0961df4ec9d42a1a5 ChangeLog 33998
+RMD160 95bb8cbf6118be88b30f85440fde6e6cae53da2a ChangeLog 33998
+SHA256 1c7324ff72fdcde8ce2636a7bf3f599a2a68ab1eb4f03cd2b764abb652739fad ChangeLog 33998
 MISC metadata.xml 239 RMD160 98d688f78b8fae2a2d23e610af86e822832a8402 SHA1 6d20154bac8f6c9bdde74156e48932cd8cc52f06 SHA256 b21519a40c89110e6d2ce7d214e849e2e808ebbb3a338e833b622b9f150f97a3
 MD5 16c9e337522b7e477aece60ff98dde54 metadata.xml 239
 RMD160 98d688f78b8fae2a2d23e610af86e822832a8402 metadata.xml 239
@@ -43,6 +48,9 @@ SHA256 b21519a40c89110e6d2ce7d214e849e2e808ebbb3a338e833b622b9f150f97a3 metadata
 MD5 5bec2db22a35d2dab4b65c6c5ac4a5ad files/digest-sun-jdk-1.4.2.12-r2 512
 RMD160 84b4872443740be6f65e43bd92830b1a2f72eedd files/digest-sun-jdk-1.4.2.12-r2 512
 SHA256 80412544ff068c961ad5d3022215e34877cfa22118e1f68768e8d768ebe8687b files/digest-sun-jdk-1.4.2.12-r2 512
+MD5 4551e92262ffc2bc93ba3941a5f49f30 files/digest-sun-jdk-1.4.2.13 512
+RMD160 6c0a27d829f9b9b868feedd086b0929f015e48a2 files/digest-sun-jdk-1.4.2.13 512
+SHA256 c4db2c43fa08b705c1e9ba316c8cecbcd2d3a7be5d3014cf4bf02e53b214b155 files/digest-sun-jdk-1.4.2.13 512
 MD5 20fa891f2c9e4953c1da7d1c318d3216 files/digest-sun-jdk-1.5.0.08 563
 RMD160 59f63ab1ef5f3a40c10ccd954d1cfa2ca47f4e15 files/digest-sun-jdk-1.5.0.08 563
 SHA256 36ee47fae9d203d6e249bd407da3fd700d2d4f672a258285010f1a44f38ea0b8 files/digest-sun-jdk-1.5.0.08 563
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.13 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.13
new file mode 100644
index 000000000000..d4bcdcafe110
--- /dev/null
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.13
@@ -0,0 +1,6 @@
+MD5 e2e610267fd9ff8fc5f8a807a5606751 j2sdk-1_4_2_13-linux-i586.bin 36361814
+RMD160 cefb731ae6740f36a17242aa79b36d79dda2e102 j2sdk-1_4_2_13-linux-i586.bin 36361814
+SHA256 f5dd8045fe791bd5c52bddf33a1cf65968ee03981e0663f75cd97a942daa24e2 j2sdk-1_4_2_13-linux-i586.bin 36361814
+MD5 ff961c5f5326191c5ac2e4624d756f7e jce_policy-1_4_2.zip 12195
+RMD160 323340fa8a96f315a35b0ebc918731e6fe56c370 jce_policy-1_4_2.zip 12195
+SHA256 7bf6d683602686321affc0071ad2fc3890c19cf5bb5cc16a963052e17588c097 jce_policy-1_4_2.zip 12195
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.13.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.13.ebuild
new file mode 100644
index 000000000000..3599cb81cbd1
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.13.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2006 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.13.ebuild,v 1.1 2006/11/23 00:01:27 caster Exp $
+
+JAVA_SUPPORTS_GENERATION_1="true"
+inherit java-vm-2 eutils
+
+MY_PV=${PV%.*}_${PV##*.}
+MY_P=j2sdk${MY_PV}
+MY_PVB=${PV%.*}
+
+At="j2sdk-${PV//./_}-linux-i586.bin"
+jce_policy="jce_policy-${MY_PVB//./_}.zip"
+
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Sun's J2SE Development Kit"
+HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
+SRC_URI="${At}
+		jce? ( ${jce_policy} )"
+SLOT="1.4"
+LICENSE="sun-bcla-java-vm"
+KEYWORDS="-* ~x86"
+RESTRICT="fetch"
+IUSE="X alsa doc examples nsplugin jce"
+
+DEPEND="sys-apps/sed
+	app-arch/unzip"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	doc? ( =dev-java/java-sdk-docs-1.4.2* )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXp
+		x11-libs/libXt
+		x11-libs/libXtst
+	)"
+
+JAVA_PROVIDE="jdbc-stdext"
+
+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="pemrsv"
+
+DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2sdk-${MY_PV}-oth-JPR&SiteId=JSC&TransactionId=noreg"
+DOWNLOAD_URL_JCE="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=7503-jce-${MY_PVB}-oth-JPR&SiteId=JSC&TransactionId=noreg"
+
+QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/libawt.so
+	opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so
+	opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so
+	opt/${P}/jre/plugin/i386/ns610-gcc32/libjavaplugin_oji.so"
+
+pkg_nofetch() {
+	einfo "Please download ${At} from:"
+	einfo ${DOWNLOAD_URL}
+	einfo "(first select 'Accept License', then click on 'self-extracting file'"
+	einfo "under 'Linux Platform - Java(TM) 2 SDK, Standard Edition')"
+	einfo "and move it to ${DISTDIR}"
+	if use jce; then
+		echo
+		einfo "Also download ${jce_policy} from:"
+		einfo ${DOWNLOAD_URL_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}.bin. Please check the permission and try again."
+	fi
+	if use jce; then
+		if [ ! -r ${DISTDIR}/${jce_policy} ]; then
+			die "cannot read ${jce_policy}. Please check the permission and try again."
+		fi
+	fi
+	#Search for the ELF Header
+	testExp=$'\177\105\114\106\001\001\001'
+	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}/lib/unpack ]; then
+		UNPACK_CMD=${S}/lib/unpack
+		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
+	fi
+}
+
+src_install() {
+	local dirs="bin include jre lib man"
+	dodir /opt/${P}
+
+	for i in $dirs ; do
+		cp -dPR $i ${D}/opt/${P}/
+	done
+
+	dodoc COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt
+	dohtml README.html
+	dodir /opt/${P}/share/
+	if use examples; then
+		cp -pPR demo ${D}/opt/${P}/share/
+	fi
+	cp -pPR src.zip ${D}/opt/${P}/share/
+
+	if use jce ; then
+		# Using unlimited jce while still retaining the strong jce
+		# May have repercussions when you find you cannot symlink libraries
+		# in classpaths.
+		cd ${D}/opt/${P}/jre/lib/security
+		unzip ${DISTDIR}/${jce_policy}
+		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 nsplugin; then
+		local plugin_dir="ns610"
+		if has_version '>=sys-devel/gcc-3.2' ; then
+			plugin_dir="ns610-gcc32"
+		fi
+
+		install_mozilla_plugin /opt/${P}/jre/plugin/i386/${plugin_dir}/libjavaplugin_oji.so
+	fi
+
+	# bug #147259
+	dosym ../jre/javaws/javaws /opt/${P}/bin/javaws
+	dosym ../javaws/javaws /opt/${P}/jre/bin/javaws
+
+	# create dir for system preferences
+	dodir /opt/${P}/.systemPrefs
+	# Create files used as storage for system preferences.
+	touch ${D}/opt/${P}/.systemPrefs/.system.lock
+	chmod 644 ${D}/opt/${P}/.systemPrefs/.system.lock
+	touch ${D}/opt/${P}/.systemPrefs/.systemRootModFile
+	chmod 644 ${D}/opt/${P}/.systemPrefs/.systemRootModFile
+
+	# install control panel for Gnome/KDE
+	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
+		-e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
+		${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
+		${T}/sun_java-${SLOT}.desktop
+
+	domenu ${T}/sun_java-${SLOT}.desktop
+
+	set_java_env
+}
+
+pkg_postinst() {
+	# Set as default 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, javac and java"
+
+		for paxkills in "jar" "javac" "java" "javah" "javadoc"
+		do
+			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
+		done
+
+		# /opt/sun-jdk-1.4.2.03/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
+
+	if ! use X; then
+		echo
+		ewarn "Some parts of Sun's JDK require virtual/x11 to be installed."
+		ewarn "Be careful which Java libraries you attempt to use."
+	fi
+}