Version bump, security bug #212425.

Package-Manager: portage-2.1.4.4

3 files changed, 127 insertions, 3 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index 0f11d97926d6..25e6b63f5574 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-java
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.45 2007/12/08 02:17:23 betelgeuse Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.46 2008/03/05 21:28:08 caster Exp $
+
+*emul-linux-x86-java-1.4.2.17 (05 Mar 2008)
+
+  05 Mar 2008; Vlastimil Babka <caster@gentoo.org>
+  +emul-linux-x86-java-1.4.2.17.ebuild:
+  Version bump, security bug #212425.
 
   08 Dec 2007; Petteri Räty <betelgeuse@gentoo.org>
   emul-linux-x86-java-1.6.0.03.ebuild:
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index 7a8278cca966..ba233e4c6741 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -5,12 +5,14 @@ AUX emul-linux-x86-java-1.5.env 855 RMD160 e9ce4d40ee6a8bd9b0720e00838c399d5f3fd
 AUX emul-linux-x86-java-1.6.env 894 RMD160 86bb5a85c4a7b51a52016376438052673da53636 SHA1 8d62dde36f42a769246235662d6f9b25490cd4c8 SHA256 47fa2c1923a0ee6940cc1deb8a12258d900cacbeabcf3e69b5bbc85ce39dc4df
 AUX javasettings_Linux_x86.xml 1601 RMD160 e87fe605d34fd6060f58f511deea5a935697be9f SHA1 39c5f9693db821b038f47f1f27c995caa9bcac5b SHA256 832b7aa00beb330c655e1503061785e2069fcc1a2ec36830948613f02c4d7585
 DIST j2re-1_4_2_16-linux-i586.bin 14388621 RMD160 46885501b413a73a08f50695c335e11291389376 SHA1 7abc5f9354bc00109766f8f6302e39c4da938bcb SHA256 9293d00a35b31e7f78f6338ead3a811d2732290b90a3711814ee64cea5842045
+DIST j2re-1_4_2_17-linux-i586.bin 14376647 RMD160 62de02a90f67d8965cebc563636d688f6745b7ca SHA1 a4282ea13048c76274222476abfb0954d42c35b8 SHA256 18aa1f5a4b223d3858d1d75913bb036963be4a9bb9b9bdc38ae2b714e1408654
 DIST jdk-1_5_0_13-dlj-linux-i586.bin 49672592 RMD160 cf0ff373451612348ac54c9e78a0a57d7f5efbed SHA1 a025d81df269ed6ce663a34f52e5f0ea2a462bf2 SHA256 6836f531f5dedb94f680d8dd59d349f5f50aa42ca887ae7f4bc664437ac2a9b0
 DIST jdk-6u3-dlj-linux-i586.bin 68613151 RMD160 ba3ea6eb67f72f76f33f091633f8ac049d18b24c SHA1 86ba73cdcc2c22782a04b8191f157a5ac7caa490 SHA256 5c44208fbd5f90b3e6a0692ed9e1e98f5feb0c88aa0cfae5186dddb1f05f731b
 DIST jdk-6u4-dlj-linux-i586.bin 70455896 RMD160 3300edb3fb5e3ac4e32781ee7bc8cc6273b7c76d SHA1 24601838ae7216cbc5d75170b6aebf5e4012dec1 SHA256 955186f497a50106cd1788fcaf032eedc560985826c8a6c3cb7ab43220cad23c
 EBUILD emul-linux-x86-java-1.4.2.16.ebuild 3769 RMD160 7a3507a376ce676b9a5fff849bc2bdebead25caf SHA1 9ba38f1e8b0b755d108597fc2cd159ce81ae8e7c SHA256 6fc5a292379bafb258675280bf776cdec26b2e247681172df38b611577cd540a
+EBUILD emul-linux-x86-java-1.4.2.17.ebuild 3538 RMD160 9b15639c843f463a50003187cb0ef7bfb1885d27 SHA1 15c674301041a5f9f48461a4d5889ba351e497ef SHA256 45d1d19f10b45a066d781eedabf5e0b94109b9ddf8ebe7f39fcab24c048c9b55
 EBUILD emul-linux-x86-java-1.5.0.13.ebuild 2732 RMD160 f63414ff4dcd84c5a30a0a737461fce00110796d SHA1 019735d01ee9a581e5af3d73663f3787672ccccd SHA256 f366ba92df8ce5aaf28f8bd41056a3c6ea7de0f78ec7a10500a23f92f498cd10
 EBUILD emul-linux-x86-java-1.6.0.03.ebuild 2685 RMD160 762b2560025c42c000f238faa88cfbd4d6989a15 SHA1 dc22e96afcd88fdd5f4b655be332c57e316ebe2b SHA256 9cd0604f86dc6502afc35128e548387ba8745bd95f26e9766d67982ce54fcb6f
 EBUILD emul-linux-x86-java-1.6.0.04.ebuild 2686 RMD160 bb7111041a318706635655adefdefd51e1c1aed2 SHA1 108bea8082d06f38af0368feb6a935dd48266534 SHA256 1d03023a645676915c2316fc4ac4705e243e5c5022f7691e0d41acafa4f46c4a
-MISC ChangeLog 9136 RMD160 f90c0ce4b878a75ebbe09db641030b9931411411 SHA1 2f666e16606a659ccb3a7e93354a38a5a49c6719 SHA256 e52e51b81f429ab93ee640e005077bbc5ed9280f15d1c9a3e9896be3f8dadf15
+MISC ChangeLog 9307 RMD160 f1e62b21dedd426fc47ad1cefbd0a44187b2d6c1 SHA1 fbd6c5c695d2f377849b24274c2254b3a328c865 SHA256 12cf1d1619d992b7cd30a699a75568c9de32c3a6dd4d7a2aae019b739e332501
 MISC metadata.xml 179 RMD160 eb23cc92511920eee7575e49cb97e3cc57ec2ffe SHA1 5f572596a2c474e808cdb21b8c2bf80f7cc011b1 SHA256 28110c7811a1bdcba5e23efc7018238140b1e9460b78215f914b7253a8c09ca8
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.17.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.17.ebuild
new file mode 100644
index 000000000000..33aa0635e7ec
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.17.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.17.ebuild,v 1.1 2008/03/05 21:28:08 caster Exp $
+
+inherit multilib 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 JRE (32bit)"
+HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
+SRC_URI=${At}
+SLOT="1.4"
+LICENSE="sun-bcla-java-vm-1.4.2"
+KEYWORDS="-* ~amd64"
+# pre stripped
+RESTRICT="fetch strip"
+IUSE="X alsa nsplugin"
+
+DEPEND=""
+
+RDEPEND="alsa? ( app-emulation/emul-linux-x86-soundlibs )
+	X? ( app-emulation/emul-linux-x86-xlibs )"
+
+DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=8&PartDetailId=j2re-${MY_PV}-oth-JPR&SiteId=JSC&TransactionId=noreg"
+
+QA_TEXTRELS_amd64="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"
+
+	# FIXME figure out how to handle the control pannel conflict with
+	# sun-jdk-bin
+
+	# 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
+}