Version bump, security bug #306579.

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

3 files changed, 170 insertions, 12 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index f7f7f2c9ef4c..ddfe9c00d714 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.278 2010/03/30 17:44:10 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.279 2010/03/30 20:15:21 caster Exp $
+
+*sun-jdk-1.6.0.19 (30 Mar 2010)
+
+  30 Mar 2010; Vlastimil Babka <caster@gentoo.org> +sun-jdk-1.6.0.19.ebuild:
+  Version bump, security bug #306579.
 
   30 Mar 2010; Christian Faulhammer <fauli@gentoo.org>
   sun-jdk-1.6.0.18-r1.ebuild:
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 28aaa235f546..170f312df63c 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fontconfig.Gentoo.properties 10932 RMD160 ce1fb555f3f5f281f328c8016e12407ac0893819 SHA1 59f68c06f4f727bc72449a76bd4941cbee626373 SHA256 893b469c87ba547122fe158941c00512bf3f15046251f4b8639d967203d32bc1
 AUX sun-jdk-1.5.env 859 RMD160 657a54eebf4f8773204ca442e48845e163a67154 SHA1 59241ca2cf7f5b2c2f5dcc3d69accb43d8ffb419 SHA256 6e5998ae21e11ee3981f613f4ca6615aebeec024fd6b9926e6097fb1ba976585
 AUX sun-jdk-1.6.env 940 RMD160 2061347f8137915ed421c7592a6909b51bb2110d SHA1 3520843a513f53f8a04782d9a6b373736c24f624 SHA256 f8669f72a512ca892dbe2f4b153ac39e92b6f4e33d3693e969d670134c5b15b8
@@ -10,16 +7,12 @@ DIST jdk-6u17-dlj-linux-amd64.bin 81905547 RMD160 5ad629c427e14bbf13c0fc8470c574
 DIST jdk-6u17-dlj-linux-i586.bin 81824577 RMD160 07ad522edd80e19e71152e37544128ddd600c42c SHA1 bca59cb275f37b492e69ceecbda75a573d94b553 SHA256 4ba74424271670cc65405d6ab9a5480cb299ce9fb19c800096ce012d7d662b2e
 DIST jdk-6u18-dlj-linux-amd64.bin 84826124 RMD160 b8ff139c22e4c2e454ed7b2c7df1e34c0113d5a3 SHA1 4c16d02ecb7b0f729e3888da67310f7ea2e9f668 SHA256 6ec4d76ca50deb67ecf2ec6e4116c657bc67a0986957e51d42fbc2761063cb17
 DIST jdk-6u18-dlj-linux-i586.bin 84770500 RMD160 3c4f611e0593f6edb45f04399d9d049fae54359d SHA1 f7d0cefd581f523ac96ca99eb54ba4116fa29e0a SHA256 1097aa37004163878f61b3522fe7d13bdf7e1f10796fc43022011d4c5f4092bb
+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
 EBUILD sun-jdk-1.5.0.22.ebuild 4158 RMD160 b6fc5b93757f79a93c4eb1c8f3ee211d8cbbf778 SHA1 e441ee623cea36114c124ef4fee1b926a1139d11 SHA256 9556b4bae4467020e084fb945cc8725bd6b9bc7167fcaef2067e17784a555038
 EBUILD sun-jdk-1.6.0.17.ebuild 4990 RMD160 034ee8479d40055d47832603cd5f9089d4c65ee2 SHA1 9e6030158e2a6eb2e3b119a5b4a7d128d836f5fd SHA256 e70f0baa80c5e846ef13e8ffeb69bd5f1f40f9bda63dfc521aa9090b35871617
 EBUILD sun-jdk-1.6.0.18-r1.ebuild 5149 RMD160 07195c7ae684a9a5a5e2a5ce5cf8c17910e42d91 SHA1 ad42aed324f367c5cbb7bb12e933c34a997a3261 SHA256 dd748912f4ddcbf806a7b9e4c65496b299722dd07dccf656b03772bb7ed2c556
 EBUILD sun-jdk-1.6.0.18.ebuild 5003 RMD160 09164756732bea0e37422d7783967034412035bd SHA1 a34822df070f899e7ba6a6e0e40b292027028c60 SHA256 2e58dd12055dda79d4cbf7520a777f4c3effd7a030308bd48b53ec33f4de83b7
-MISC ChangeLog 52283 RMD160 1e73c46fb10ca11619a9111a53addd9506613201 SHA1 d1f68f21768aed22e543ba003c44c99f027e9209 SHA256 f7e5ac342bd689ba74bd768406f738f3ff608aab154b1e2110b5b54b0d88f05c
+EBUILD sun-jdk-1.6.0.19.ebuild 5148 RMD160 bda0c76a3d003af15c43860415793487557dcb84 SHA1 929206d5d14917db34d3777c1eef43fc046a0168 SHA256 8a20d5c6d63659e4f4db7d6970f3c3bf2d49b4d54701b44dc5b9b5ef78d72730
+MISC ChangeLog 52433 RMD160 363be770ab96917289621c8a80d12f3905d554eb SHA1 d2d5643546d32f2a9c3273251e8b5eab436707be SHA256 8208874575595893a87af465667c44c813c9c72eefcd1d2c8d9ce5df18dadb90
 MISC metadata.xml 429 RMD160 e6edae84d0d56c48e9d6e631d1f0612535f26f2d SHA1 4b6faf61f3869bbbccc405c7c07932dd630737ea SHA256 2fef8162216b2e78806cdc6ba5b0ff2619a482aa3ce0ecf909ffa17ba309428c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuyOHAACgkQNQqtfCuFneN4jACffcTc3HQd1k9RikWGG8HX8pz7
-bcoAnAmyBoCUDMvN22HM0e+KfM3fWD9X
-=xH8L
------END PGP SIGNATURE-----
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.19.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.19.ebuild
new file mode 100644
index 000000000000..25e4d3f5ea38
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.19.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2010 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.6.0.19.ebuild,v 1.1 2010/03/30 20:15:21 caster Exp $
+
+inherit versionator java-vm-2 eutils pax-utils
+
+UPDATE="$(get_version_component_range 4)"
+UPDATE="${UPDATE#0}"
+MY_PV="$(get_version_component_range 2)u${UPDATE}"
+X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin"
+AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin"
+
+DESCRIPTION="Sun's Java SE Development Kit"
+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 derby doc examples jce nsplugin odbc"
+
+QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so
+	opt/${P}/jre/lib/i386/libdeploy.so
+	opt/${P}/jre/lib/i386/client/libjvm.so
+	opt/${P}/jre/lib/i386/server/libjvm.so"
+QA_DT_HASH="opt/${P}/.*"
+
+DEPEND="jce? ( =dev-java/sun-jce-bin-1.6.0* )"
+RDEPEND="${DEPEND}
+	doc? ( =dev-java/java-sdk-docs-1.6.0* )
+	sys-libs/glibc
+	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"
+
+S="${WORKDIR}/jdk$(replace_version_separator 3 _)"
+
+src_unpack() {
+	sh "${DISTDIR}"/${A} --accept-license --unpack || die "Failed to unpack"
+}
+
+src_compile() {
+	# Set PaX markings on all JDK/JRE executables to allow code-generation on
+	# the heap by the JIT compiler. This needs to be done before CDS - #215225
+	pax-mark m $(list-paxables "${S}"{,/jre}/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 include jre lib man"
+
+	use derby && dirs="${dirs} db"
+
+	dodir /opt/${P}
+
+	cp -pPR $dirs "${D}/opt/${P}/" || die "failed to copy"
+	dodoc COPYRIGHT || die
+	dohtml README.html || die
+
+	cp -pP src.zip "${D}/opt/${P}/" || die
+
+	if use examples; then
+		cp -pPR demo sample "${D}/opt/${P}/" || die
+	fi
+
+	if use jce; then
+		cd "${D}/opt/${P}/jre/lib/security"
+		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/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
+		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/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}/jre/lib/i386/libnpjp2.so
+			install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so old_oji
+		else
+			install_mozilla_plugin /opt/${P}/jre/lib/amd64/libnpjp2.so
+		fi
+	fi
+
+	# create dir for system preferences
+	dodir /opt/${P}/jre/.systemPrefs
+	# Create files used as storage for system preferences.
+	touch "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
+	chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
+	touch "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
+	chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
+
+	if [[ -f "${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then
+		# install control panel for Gnome/KDE
+		# The jre also installs these so make sure that they do not have the same
+		# Name
+		sed -e "s/\(Name=\)Java/\1 Java Control Panel for Sun JDK ${SLOT}/" \
+			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/ControlPanel#" \
+			-e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
+			"${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
+			"${T}"/sun_jdk-${SLOT}.desktop
+
+		domenu "${T}"/sun_jdk-${SLOT}.desktop
+	fi
+
+	# bug #56444
+	insinto /opt/${P}/jre/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
+}