Version bump - security bug #280409.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 224 insertions, 12 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index d05b5f642315..67f8942a225a 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/emul-linux-x86-java
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.73 2009/08/02 13:12:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.74 2009/08/06 16:14:43 caster Exp $
+
+*emul-linux-x86-java-1.6.0.15 (06 Aug 2009)
+*emul-linux-x86-java-1.5.0.20 (06 Aug 2009)
+
+  06 Aug 2009; Vlastimil Babka <caster@gentoo.org>
+  +emul-linux-x86-java-1.5.0.20.ebuild,
+  +emul-linux-x86-java-1.6.0.15.ebuild:
+  Version bump - security bug #280409.
 
   02 Aug 2009; Markus Meier <maekke@gentoo.org>
   emul-linux-x86-java-1.5.0.19.ebuild:
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index 16e918f0759c..c4f4538fe7c2 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX construct-1.6.sh 6799 RMD160 061317637fbdeeaaa7e7104dbc390bcf1bda763c SHA1 516bf0e3a8868c327c1120fc0bcd840d0c3a5c0b SHA256 4369309ba29da4dcdbda4ea614e2db00ff7e3a801fa58b897de818fe33d78e80
 AUX construct.sh 6964 RMD160 8e3de41f59023cb9bf6040fe5f5a36d1b39552e3 SHA1 bc24071dba36878abf7a2da88bfc063eb3727da1 SHA256 47847c81ee85bd1b7dba6e91c2d7757c15a8930f4748dc926e00553bc89fcbd6
 AUX emul-linux-x86-java-1.4.env 857 RMD160 65dc6da72579122d52475e5fe2c965f7aaea92f2 SHA1 2564ffbdf2bf885a5ba1ce58a6d3643a140c1e0e SHA256 6651a792e2f4f5d582ede77459591d8cdb8e59419b88659720fcf828e60aebf3
@@ -9,19 +6,16 @@ AUX emul-linux-x86-java-1.6.env 894 RMD160 86bb5a85c4a7b51a52016376438052673da53
 DIST j2re-1_4_2_19-linux-i586.bin 14384815 RMD160 54b15f0ea03c7cb7e35b91fe8a6269e21a0d39b2 SHA1 7b230633bf6eaf3581f69d668542431c5833184a SHA256 d1d2f7cd9f0cddee9f65a0d093a0718faceb4b013b0658a92457512f84c8e973
 DIST jdk-5.0u18-dlj-linux-i586.bin 49702576 RMD160 be719b111ce24d5a14b0ed8ad26a9335283866f7 SHA1 2be236e00cf95a7ba1d2a48156eecd6bd367445d SHA256 460dd267a532d9965e65aec8be8288870ff4aadc0cabe331dd4a1d4c058c53be
 DIST jdk-5.0u19-dlj-linux-i586.bin 49754865 RMD160 85531baed424aa400aa75598a8a9d09e22281e03 SHA1 8510b2b2d1c16e2fb3988fe4f94424d19bf179ec SHA256 7e5cd192c7058b6b9b34f34df315451439175ee55a1c8be80428c188345b86dc
+DIST jdk-5.0u20-dlj-linux-i586.bin 49764253 RMD160 22148cb268decb1237e2d74764726ca7c5de3387 SHA1 128aa89d06c3f39bee7866882ff2b4d4d33bfaa4 SHA256 10b1beea2e8d2733255095ba6fe55065e66e9fc2e0116f240eea2ce680195206
 DIST jdk-6u13-dlj-linux-i586.bin 80161911 RMD160 8167ed89d38722577547d4f46f5fa06cf07fedf3 SHA1 ef9177f519ad03669921876fd711c1c02f306abf SHA256 a07d48549bb48becf7a1185b2ce908797a9dcfcc834ff111e8b6d9ad19ce60d7
 DIST jdk-6u14-dlj-linux-i586.bin 81803297 RMD160 db35274bd08422f97f454dbcadb79abdc9e4ab13 SHA1 ce7fcdeb9275820b98a54ecf7a44ed30557b8233 SHA256 08ff9c6a89da117f7e6eabcc21da36900fab56a4fb9b4e8ff5cb3c267b4ec0a0
+DIST jdk-6u15-dlj-linux-i586.bin 81819735 RMD160 593d067c222bd05d640b24fd9cba20915a795de2 SHA1 d09eea7fb48cd662abafbf490b0cb8340936095a SHA256 d0e14d777d2f49da7d98fc27790c766d4d47d19a973c0855b2b9250ab4fdd815
 EBUILD emul-linux-x86-java-1.4.2.19.ebuild 3574 RMD160 388fe86f06cf787092edf09423952728bb0bd90c SHA1 f7e4b280906c26a3d4b313443781ea9d8700ebe5 SHA256 7c1c2cc940a58ce0daafa531a17b8e70c880b9eaf4e8bac5992b43d80436a983
 EBUILD emul-linux-x86-java-1.5.0.18.ebuild 2887 RMD160 368079fcc2bd06fc6ee61a4ec8e4df1da0f9c968 SHA1 a2ba000eaae67fe57e7771c4095c66205ce47c95 SHA256 302cc31d503db45f1f745db582b1ccce5b1a323b75bbe7bd9ad21081f05b829c
 EBUILD emul-linux-x86-java-1.5.0.19.ebuild 2887 RMD160 28c617a51c0f0429a21b4253217a2dafd86fd3cf SHA1 1c897cbb9649df32f60924e8fdbf0a0322191f6c SHA256 a0bb2007fdb59b8fff45563fead3871048421e990b2b641c7dda5318ac48d565
+EBUILD emul-linux-x86-java-1.5.0.20.ebuild 2888 RMD160 0f7ada49d3b6eb3423efcc13d080131ee99a4223 SHA1 04a7aa73d72b6e3ce1452c51d779e1e586da4ca8 SHA256 a5393465f99b91d726ab31fc7dc0ffaf524045512254cde9787508e736af944f
 EBUILD emul-linux-x86-java-1.6.0.13.ebuild 3246 RMD160 3bf47aa3bb202e4d21cab7e5b90a7305daeb7b0e SHA1 4da69cf51cb414a4aedda6791169627a95eb685e SHA256 242c2f6252f129e2918ea90b822ce64fdd5b13a08b1984dae3aaad6d89a32f05
 EBUILD emul-linux-x86-java-1.6.0.14.ebuild 3247 RMD160 fda86bdc97891d18536e6125b9ee354a7d160e73 SHA1 35519b1e7ef93b499df7cd5f947b877fbdc84125 SHA256 dcc16abe98be2473b102f4f0ba5a6d2524de1122f73b42274c7b5aa9c54e479a
-MISC ChangeLog 15245 RMD160 20ea8718ebe3ee89b78ceb838bbebd5f7be843ce SHA1 6ea0b461cd59d01b0ba4b1284ff3795132673ccd SHA256 bd5d9f35b833f17b5f2337f3ad7dde78a94c484120d46c57dafa7bcd1d772ad9
+EBUILD emul-linux-x86-java-1.6.0.15.ebuild 3247 RMD160 85c21f4ade6342bcac8d6b94f442d1c5d5633981 SHA1 f00a19edef97d56d8f9973292c7eb7e90e041db7 SHA256 d397c202055e920e28d84e79d868ad9a9030046a1d195840dda90c88f29f6c5e
+MISC ChangeLog 15505 RMD160 4b176b34ad98a4a50d7b8dd5e336c31d7c94e551 SHA1 5605f3b545e71829905c5b40c4b06d1c400e9a56 SHA256 14e2b5dfbe30eaa8f5463f010f6a9d65542e5e113b7a8a972ae5c5dc9ab57734
 MISC metadata.xml 179 RMD160 eb23cc92511920eee7575e49cb97e3cc57ec2ffe SHA1 5f572596a2c474e808cdb21b8c2bf80f7cc011b1 SHA256 28110c7811a1bdcba5e23efc7018238140b1e9460b78215f914b7253a8c09ca8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkp1kQIACgkQkKaRLQcq0GKo1QCeNRmMiZ1a61qfQuhQ0DBAzRF3
-3lkAn2eV88l5NaogmRvXIm7TzjVT0KfS
-=BDXG
------END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.20.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.20.ebuild
new file mode 100644
index 000000000000..fbffc8b264c3
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.20.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2009 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.5.0.20.ebuild,v 1.1 2009/08/06 16:14:43 caster Exp $
+
+inherit versionator pax-utils eutils java-vm-2
+
+UPDATE="$(get_version_component_range 4)"
+UPDATE="${UPDATE#0}"
+MY_PV="$(get_version_component_range 2-3)u${UPDATE}"
+
+At="jdk-${MY_PV}-dlj-linux-i586.bin"
+DESCRIPTION="Sun's Java SE Runtime Environment (32bit)"
+HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
+SRC_URI="http://download.java.net/dlj/binaries/${At}"
+
+SLOT="1.5"
+LICENSE="dlj-1.1"
+KEYWORDS="-* ~amd64"
+RESTRICT="strip"
+IUSE="X alsa nsplugin"
+
+JAVA_VM_NO_GENERATION1=true
+
+RDEPEND="alsa? ( app-emulation/emul-linux-x86-soundlibs )
+	X? ( app-emulation/emul-linux-x86-xlibs )"
+
+JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
+
+QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so
+	opt/${P}/lib/i386/libdeploy.so"
+QA_DT_HASH="opt/${P}/.*"
+
+src_unpack() {
+	mkdir bundled-jdk
+	cd bundled-jdk
+	sh "${DISTDIR}"/${At} --accept-license --unpack || die "Failed to unpack"
+
+	cd ..
+	bash "${FILESDIR}"/construct.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
+}
+
+src_compile() {
+	# Set PaX markings on all JDK/JRE executables to allow code-generation on
+	# the heap by the JIT compiler. This has to be done before CDS - #215225
+	pax-mark m $(list-paxables "${S}"/bin/*)
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	"${S}"/bin/java -client -Xshare:dump || die
+}
+
+src_install() {
+	dodir /opt/${P}
+	cp -pPR bin lib man javaws plugin "${D}/opt/${P}/" || die "failed to copy"
+
+	dodoc CHANGES README THIRDPARTYLICENSEREADME.txt || die
+	dohtml Welcome.html || die
+
+	if use nsplugin; then
+		local plugin_dir="ns7-gcc29"
+		if has_version '>=sys-devel/gcc-3' ; then
+			plugin_dir="ns7"
+		fi
+
+		install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+	fi
+
+	# 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}\/jre/" \
+#		-e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
+#		${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
+#		${T}/sun_java-${SLOT}.desktop
+
+#	domenu ${T}/sun_java-${SLOT}.desktop
+
+	set_java_env
+	java-vm_revdep-mask
+}
+
+pkg_postinst() {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+
+	if ! use X; then
+		local xwarn="X11 libraries and/or"
+	fi
+
+	echo
+	ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed."
+	ewarn "Be careful which Java libraries you attempt to use."
+
+	echo
+	elog "Beginning with 1.5.0.10 the hotspot vm can use epoll"
+	elog "The epoll-based implementation of SelectorProvider is not selected by"
+	elog "default."
+	elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider"
+}
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.15.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.15.ebuild
new file mode 100644
index 000000000000..bc5be7a8b16a
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.15.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2009 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.6.0.15.ebuild,v 1.1 2009/08/06 16:14:43 caster Exp $
+
+inherit versionator pax-utils java-vm-2 eutils
+
+UPDATE="$(get_version_component_range 4)"
+UPDATE="${UPDATE#0}"
+MY_PV="$(get_version_component_range 2)u${UPDATE}"
+
+At="jdk-${MY_PV}-dlj-linux-i586.bin"
+DESCRIPTION="Sun's Java SE Runtime Environment (32bit)"
+HOMEPAGE="http://java.sun.com/javase/6/"
+#SRC_URI="http://download.java.net/dlj/binaries/${At}"
+SRC_URI="http://dlc.sun.com/dlj/binaries/${At}"
+
+SLOT="1.6"
+LICENSE="dlj-1.1"
+KEYWORDS="-* ~amd64"
+RESTRICT="strip"
+IUSE="X alsa nsplugin"
+
+JAVA_VM_NO_GENERATION1=true
+
+RDEPEND="alsa? ( app-emulation/emul-linux-x86-soundlibs )
+	X? ( app-emulation/emul-linux-x86-xlibs )
+	app-emulation/emul-linux-x86-compat"
+
+JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
+
+QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so
+	opt/${P}/lib/i386/libdeploy.so
+	opt/${P}/lib/i386/client/libjvm.so
+	opt/${P}/lib/i386/server/libjvm.so"
+QA_DT_HASH="opt/${P}/.*"
+
+src_unpack() {
+	mkdir bundled-jdk
+	cd bundled-jdk
+	sh "${DISTDIR}"/${At} --accept-license --unpack || die "Failed to unpack"
+
+	cd ..
+	bash "${FILESDIR}"/construct-${SLOT}.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct-${SLOT}.sh failed"
+}
+
+src_compile() {
+	# Set PaX markings on all JDK/JRE executables to allow code-generation on
+	# the heap by the JIT compiler. This has to be done before CDS - #215225
+	pax-mark m $(list-paxables "${S}"/bin/*)
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	"${S}"/bin/java -client -Xshare:dump || die
+	"${S}"/bin/java -server -Xshare:dump || die
+}
+
+src_install() {
+	local dirs="bin lib man javaws plugin"
+	dodir /opt/${P}
+
+	cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy"
+
+	dodoc README THIRDPARTYLICENSEREADME.txt || die
+	dohtml Welcome.html || die
+	dodir /opt/${P}/share/
+
+	if use nsplugin; then
+		local plugin_dir="ns7-gcc29"
+		if has_version '>=sys-devel/gcc-3' ; then
+			plugin_dir="ns7"
+		fi
+
+		install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+		install_mozilla_plugin /opt/${P}/lib/i386/libnpjp2.so plugin2
+	fi
+
+	# 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}\/jre/" \
+#		-e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
+#		${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
+#		${T}/sun_java-${SLOT}.desktop
+
+#	domenu ${T}/sun_java-${SLOT}.desktop
+
+	set_java_env
+	java-vm_revdep-mask
+}
+
+pkg_postinst() {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+
+	elog
+	elog "Two variants of the nsplugin are available via eselect java-nsplugin:"
+	elog "${VMHANDLE} and ${VMHANDLE}-plugin2 (the Next-Generation Plug-In) "
+	ewarn "Note that the ${VMHANDLE}-plugin2 works only in Firefox 3!"
+	elog "For more info see https://jdk6.dev.java.net/plugin2/"
+	elog
+
+	if ! use X; then
+		local xwarn="X11 libraries and/or"
+	fi
+
+	echo
+	ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed."
+	ewarn "Be careful which Java libraries you attempt to use."
+}