Version bump, security bug #212425.

Package-Manager: portage-2.1.4.4

4 files changed, 302 insertions, 2 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 99156c4ffe36..a42239e71906 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.224 2008/01/23 21:07:38 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.225 2008/03/05 21:28:04 caster Exp $
+
+*sun-jdk-1.4.2.17 (05 Mar 2008)
+
+  05 Mar 2008; Vlastimil Babka <caster@gentoo.org> +sun-jdk-1.4.2.17.ebuild:
+  Version bump, security bug #212425.
 
   23 Jan 2008; Vlastimil Babka <caster@gentoo.org> sun-jdk-1.6.0.04.ebuild:
   Put back dependency on java-sdk-docs with USE=doc - bug #207181.
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.17.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.17.ebuild
new file mode 100644
index 000000000000..5e34bdfd4b28
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.17.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2008 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.17.ebuild,v 1.1 2008/03/05 21:28:04 caster Exp $
+
+JAVA_SUPPORTS_GENERATION_1="true"
+inherit pax-utils 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="x86? ( ${At} )
+		jce? ( ${jce_policy} )"
+SLOT="1.4"
+LICENSE="sun-bcla-java-vm"
+KEYWORDS="~x86"
+# files are prestripped
+RESTRICT="fetch strip"
+IUSE="X alsa doc examples jce nsplugin odbc"
+
+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/libXext
+		x11-libs/libXi
+		x11-libs/libXp
+		x11-libs/libXtst
+		x11-libs/libXt
+		x11-libs/libX11
+	)
+	odbc? ( dev-db/unixODBC )"
+
+JAVA_PROVIDE="jdbc-stdext"
+
+DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=8&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}. 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=$(echo -e '\0177\0105\0114\0106\0001\0001\0001')
+	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
+		local 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"
+		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}
+
+	cp -dPR ${dirs} "${D}/opt/${P}/"
+
+	# Set PaX markings on all JDK/JRE executables to allow code-generation on
+	# the heap by the JIT compiler.
+	pax-mark srpm $(list-paxables "${D}"/opt/${P}/{,/jre}/bin/*)
+
+	dodoc COPYRIGHT README THIRDPARTYLICENSEREADME.txt || die
+	dohtml README.html || die
+	if use examples; then
+		cp -pPR demo "${D}/opt/${P}/" || die
+	fi
+
+	cp -pPR src.zip "${D}/opt/${P}/" || die
+
+	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" || die
+		mv "${D}/opt/${P}/jre/lib/security/local_policy.jar" \
+			"${D}/opt/${P}/jre/lib/security/strong-jce" || die
+		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
+	java-vm_revdep-mask
+}
diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 6cb31338378a..20abfb88940d 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/sun-jre-bin
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.117 2008/01/18 15:05:13 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.118 2008/03/05 21:31:01 caster Exp $
+
+*sun-jre-bin-1.4.2.17 (05 Mar 2008)
+
+  05 Mar 2008; Vlastimil Babka <caster@gentoo.org>
+  +sun-jre-bin-1.4.2.17.ebuild:
+  Version bump, security bug #212425.
 
 *sun-jre-bin-1.6.0.04 (18 Jan 2008)
 *sun-jre-bin-1.5.0.14 (18 Jan 2008)
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.17.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.17.ebuild
new file mode 100644
index 000000000000..0dcfea1c2821
--- /dev/null
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.17.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.17.ebuild,v 1.1 2008/03/05 21:31:01 caster Exp $
+
+inherit eutils pax-utils java-vm-2
+
+MY_PV=${PV%.*}_${PV##*.}
+MY_PV2=${PV//./_}
+At="j2re-${MY_PV2}-linux-i586.bin"
+S="${WORKDIR}/j2re${MY_PV}"
+DESCRIPTION="Sun's J2SE Platform"
+HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
+SRC_URI=${At}
+SLOT="1.4"
+LICENSE="sun-bcla-java-vm-1.4.2"
+KEYWORDS="-* ~x86"
+# pre stripped
+RESTRICT="fetch strip"
+IUSE="X alsa nsplugin odbc"
+
+DEPEND=""
+
+RDEPEND="
+	alsa? ( media-libs/alsa-lib )
+	X? (
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXp
+		x11-libs/libXtst
+		x11-libs/libXt
+		x11-libs/libX11
+	)
+	odbc? ( dev-db/unixODBC )"
+
+DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=8&PartDetailId=j2re-${MY_PV}-oth-JPR&SiteId=JSC&TransactionId=noreg"
+
+QA_TEXTRELS_x86="opt/${P}/lib/i386/libawt.so
+	opt/${P}/plugin/i386/ns4/libjavaplugin.so
+	opt/${P}/plugin/i386/ns610/libjavaplugin_oji.so
+	opt/${P}/plugin/i386/ns610-gcc32/libjavaplugin_oji.so"
+
+pkg_nofetch() {
+	einfo "Please download ${At} from:"
+	einfo ${DOWNLOAD_URL}
+	einfo "(accept the license, then click on 'self-extracting file' under 'Linux Platform')"
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_unpack() {
+	if [ ! -r "${DISTDIR}"/${At} ]; then
+		eerror "cannot read ${At}. Please check the permission and try again."
+		die
+	fi
+	#Search for the ELF Header
+	testExp=$(echo -e '\0177\0105\0114\0106\0001\0001\0001')
+	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
+		local PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar \
+			lib/ext/localedata.jar lib/plugin.jar javaws/javaws.jar"
+		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 lib man javaws plugin"
+	dodir /opt/${P}
+
+	cp -pPR ${dirs} "${D}/opt/${P}/"
+
+	pax-mark srpm $(list-paxables "${D}"/opt/${P}/bin/*)
+
+	dodoc CHANGES COPYRIGHT README THIRDPARTYLICENSEREADME.txt || die
+	dohtml Welcome.html ControlPanel.html || die
+
+	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}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+	fi
+
+	# bug #147259
+	dosym ../javaws/javaws /opt/${P}/bin/javaws
+
+	# create dir for system preferences
+	dodir /opt/${P}/.systemPrefs
+
+	# 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}/" \
+		-e "s/\(Name=Java\)/\1 Control Panel/" \
+		"${D}/opt/${P}/plugin/desktop/sun_java.desktop" > \
+		"${T}/sun_java-jre.desktop"
+	domenu "${T}/sun_java-jre.desktop"
+
+	set_java_env
+	java-vm_revdep-mask
+}