Version bump, security bug #314531.

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

3 files changed, 160 insertions, 2 deletions

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 116c28c9af15..40c9c52aee26 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 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.173 2010/04/15 22:10:36 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.174 2010/04/16 09:40:16 caster Exp $
+
+*sun-jre-bin-1.6.0.20 (16 Apr 2010)
+
+  16 Apr 2010; Vlastimil Babka <caster@gentoo.org>
+  +sun-jre-bin-1.6.0.20.ebuild:
+  Version bump, security bug #314531.
 
   15 Apr 2010; Vlastimil Babka <caster@gentoo.org>
   -sun-jre-bin-1.6.0.17.ebuild, -sun-jre-bin-1.6.0.18.ebuild,
diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
index 34b18a7d168f..1d56e82b568d 100644
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -7,7 +7,10 @@ DIST jdk-5.0u22-dlj-linux-amd64.bin 44213188 RMD160 00cecc02b5a02b00732954f5dab6
 DIST jdk-5.0u22-dlj-linux-i586.bin 49782555 RMD160 f015e1502b357cccd45695a5c4bc41ba113d3a30 SHA1 611e56dd3dc0e25b286c374c60b56b5e76569fb2 SHA256 1c2e853b60e408176ec924e717fb7ec7953a9dddbfc397de91536e9084cf9e46
 DIST jdk-6u19-dlj-linux-amd64.bin 84884457 RMD160 9d6a1e4a1c90bfcc82ebdac3a67ad46febd51343 SHA1 272a92b20929d00a3f332c7cca81aea596f0b0f3 SHA256 6b96586edfe17f8d41708fde9f332e2baeb4c15f8f54921235dc6f5ed35eabba
 DIST jdk-6u19-dlj-linux-i586.bin 84828696 RMD160 7b0b23363fc0a807724cc290bd24560c99ac84de SHA1 8f3b750bd108a38fb3931e6bd5b0fcd6ab13951b SHA256 008d53b129909456699ac725e19e21c1a59b91737fc1724d0ff26278f73bf9b0
+DIST jdk-6u20-dlj-linux-amd64.bin 84885416 RMD160 4a62ba9ea54128fe227afd3ff1678286d41616df SHA1 3612cd55715cee3c02894818f9edbd08d71bdea1 SHA256 1e482a05a3741f215613fed15e5d6644520614533b2393ec807674cc2e2d8a88
+DIST jdk-6u20-dlj-linux-i586.bin 84828910 RMD160 6f015c434363e8ac89cdf435c3c71634dea01d8a SHA1 b9866ab9923ba88d95fe3629ece3a6dbbbad1300 SHA256 dbfc1338fd18b59b66701de87ee8d553b8a7fce348966ee8a50728d08e474dbe
 EBUILD sun-jre-bin-1.5.0.22.ebuild 3082 RMD160 b0ff3f603d5f01e33b7fa0622ea9acfb44340dc1 SHA1 d5c752b4600113544e2bcf6a4f3864b45b3b35d7 SHA256 3f3ce45ce2fa0deee1906c649cd60e0d7922cfa7ba4a851480f96de722c4ff7a
 EBUILD sun-jre-bin-1.6.0.19.ebuild 4660 RMD160 0352dfffb3c7af99392846c1d330b65d05ebcdbc SHA1 fe59ab593f58180e9d720c40d07fca448b385a36 SHA256 59fa92604872dff30625770955a2954e24b6d5607ddae7846782e64c0dfa1ee9
-MISC ChangeLog 30928 RMD160 05d6377063ad1606edf88f0e3733ebe7e9caffe6 SHA1 c80fd6fe62ba2cd74373a52dae64f373798bbd59 SHA256 77cfdfc05f2ef970761c583ed84289fc1caa124cb38203547f2e5a6ccbd525ec
+EBUILD sun-jre-bin-1.6.0.20.ebuild 4662 RMD160 324daae27793c953394d60c3949e1ab868065661 SHA1 db825c59e194f95aa9c5c6a5e42fa4257be5284a SHA256 910de5758b77345d94e1281afdecb0e5e9705237e8cf6996d6476f487d048009
+MISC ChangeLog 31087 RMD160 6c561cb05f90a52b2678ecff6a683ee06227a53e SHA1 41ac76a5075531948104e598e397ab187aa398d1 SHA256 0d33ed73c0f276ab255d4b553dd1f20f18ba6aada7cc1e88f08e9ddcb995588f
 MISC metadata.xml 349 RMD160 ae6db154651b0c2b160e1e6956fb722cb52f2e8b SHA1 219312b9ae33153d205b514009927531ee14b93a SHA256 fe0ef52d77b220fb36e9c39d2148bf03ec11223d80320cdc066c0fa723a1ae7d
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.20.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.20.ebuild
new file mode 100644
index 000000000000..cef749841871
--- /dev/null
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.20.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2010 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.6.0.20.ebuild,v 1.1 2010/04/16 09:40:16 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)u${UPDATE}"
+
+SUFFIX=".bin"
+X86_AT="jdk-${MY_PV}-dlj-linux-i586${SUFFIX}"
+AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64${SUFFIX}"
+
+DESCRIPTION="Sun's Java SE Runtime Environment"
+HOMEPAGE="http://java.sun.com/javase/6/"
+URL_BASE="http://download.java.net/dlj/binaries"
+SRC_URI="x86? ( ${URL_BASE}/${X86_AT} )
+		amd64? ( ${URL_BASE}/${AMD64_AT} )"
+SLOT="1.6"
+LICENSE="dlj-1.1"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="strip"
+IUSE="X alsa jce nsplugin odbc"
+
+DEPEND="jce? ( =dev-java/sun-jce-bin-1.6.0* )"
+RDEPEND="${DEPEND}
+	sys-libs/glibc
+	x86? ( =virtual/libstdc++-3.3 )
+	alsa? ( media-libs/alsa-lib )
+	X? (
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXp
+		x11-libs/libXtst
+		amd64? ( x11-libs/libXt )
+		x11-libs/libX11
+	)
+	odbc? ( dev-db/unixODBC )"
+
+JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
+
+QA_TEXTRELS_x86="opt/${P}/lib/i386/client/libjvm.so
+	opt/${P}/lib/i386/motif21/libmawt.so
+	opt/${P}/lib/i386/libdeploy.so
+	opt/${P}/lib/i386/server/libjvm.so"
+
+src_unpack() {
+	mkdir bundled-jdk
+	cd bundled-jdk
+	sh "${DISTDIR}"/${A} --accept-license --unpack || die "Failed to unpack"
+
+	cd ..
+	bash "${FILESDIR}/construct-1.6.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
+	if use x86; then
+		einfo "Creating the Class Data Sharing archives"
+		"${S}"/bin/java -client -Xshare:dump || die
+		"${S}"/bin/java -server -Xshare:dump || die
+	fi
+}
+
+src_install() {
+	local dirs="bin lib man"
+
+	# only X86 has the plugin and javaws
+	use x86 && dirs="${dirs} 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 jce; then
+		cd "${D}/opt/${P}/lib/security"
+		dodir /opt/${P}/lib/security/strong-jce
+		mv "${D}"/opt/${P}/lib/security/US_export_policy.jar \
+			"${D}"/opt/${P}/lib/security/strong-jce || die
+		mv "${D}"/opt/${P}/lib/security/local_policy.jar \
+			"${D}"/opt/${P}/lib/security/strong-jce || die
+		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/lib/security/
+		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/lib/security/
+	fi
+
+	if use nsplugin; then
+		local plugin_dir="ns7-gcc29"
+		if has_version '>=sys-devel/gcc-3' ; then
+			plugin_dir="ns7"
+		fi
+
+		if use x86 ; then
+			install_mozilla_plugin /opt/${P}/lib/i386/libnpjp2.so
+			install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so old_oji
+		else
+			install_mozilla_plugin /opt/${P}/lib/amd64/libnpjp2.so
+		fi
+	fi
+
+	# install control panel for Gnome/KDE
+	if [[ -e "${D}/opt/${P}/plugin/desktop/sun_java.desktop" ]]; then
+		sed -e "s/\(Name=Java\)/\1 Control Panel for Sun JRE ${SLOT}/" \
+			-e "s#Exec=.*#Exec=/opt/${P}/bin/ControlPanel#" \
+			-e "s#Icon=.*#Icon=/opt/${P}/plugin/desktop/sun_java.png#" \
+			"${D}/opt/${P}/plugin/desktop/sun_java.desktop" > \
+			"${T}/sun_jre-${SLOT}.desktop" || die
+		domenu "${T}/sun_jre-${SLOT}.desktop" || die
+	fi
+
+	# bug #56444
+	insinto /opt/${P}/lib/
+	newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
+
+	set_java_env
+	java-vm_revdep-mask
+}
+
+pkg_postinst() {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+
+	if use x86 && use nsplugin; then
+		elog
+		elog "Two variants of the nsplugin are available via eselect java-nsplugin:"
+		elog "Note that starting with ${PN}-1.6.0.18-r1 their naming and the default changed,"
+		elog "users with the old plugin set are switched to the new default automatically."
+		elog "The default ${VMHANDLE} is the new 'plugin2' which works in Firefox 3 (xulrunner-1.9)"
+		elog "and newer, the ${VMHANDLE}-old_oji is the old plugin using the OJI API"
+		elog "that was removed in Firefox 3.6 (xulrunner-1.9.2)."
+		elog "For more info see https://jdk6.dev.java.net/plugin2/"
+		elog
+	fi
+
+	if use amd64 && use nsplugin; then
+		elog
+		elog "The amd64 version ships the new 'plugin2' browser plugin which works"
+		elog "in Firefox 3+ and other recent browser versions."
+		elog "For more info see https://jdk6.dev.java.net/plugin2/"
+		elog
+	fi
+}