Version bump, address security bug #554886. Also addresses bugs #475550, #543658, #553960.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x9C6D7DE4

4 files changed, 262 insertions, 20 deletions

diff --git a/dev-java/oracle-jre-bin/ChangeLog b/dev-java/oracle-jre-bin/ChangeLog
index 32c076bb420e..6a49636f9c23 100644
--- a/dev-java/oracle-jre-bin/ChangeLog
+++ b/dev-java/oracle-jre-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/oracle-jre-bin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.85 2015/04/19 12:09:52 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.86 2015/07/29 12:42:08 chewi Exp $
+
+*oracle-jre-bin-1.8.0.51 (29 Jul 2015)
+
+  29 Jul 2015; James Le Cuirot <chewi@gentoo.org>
+  +oracle-jre-bin-1.8.0.51.ebuild, metadata.xml:
+  Version bump, address security bug #554886. Also addresses bugs #475550,
+  #543658, #553960.
 
   19 Apr 2015; James Le Cuirot <chewi@gentoo.org>
   -oracle-jre-bin-1.7.0.76.ebuild, -oracle-jre-bin-1.8.0.40.ebuild:
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index e8b067f36d09..a8e950fd9109 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -10,26 +10,29 @@ DIST jre-7u80-linux-i586.tar.gz 48558751 SHA256 b773aef1458a4adde03af62f8163c7e4
 DIST jre-7u80-linux-x64.tar.gz 47110223 SHA256 4c01efd0d8e80bb6e2f324ec3408ce64f066d4506c7ec93a491f615a4523f4f3 SHA512 e61e78ab1be0313690e8ab8d6cbae7366dd78aa4716f47c8908178196b658b94ee318dd04043965a72c34d8ef5c1cb4902afaa2188e76eb944256f090339107d WHIRLPOOL 1af7417b327402abaf4074445f051924de8b19810668890e089b66a488dddfc7f50cdd96a012130a591940338177164f66c83caf54c5d6d370be27d119a907fe
 DIST jre-8u45-linux-i586.tar.gz 65672226 SHA256 2f0bfecaae5afe296f42064d9725100698341f87bc46dc2c71cb0a4f03ba1574 SHA512 91b4b959ed7198feb26bb5f38eb9018ec621392c968c5011914295502e417b0af032fd69602d4cf79d5ba20ccb6c1166ae8a7a8ab4cc3aa95d1c678422b894df WHIRLPOOL 327b8c99c1662d29370d9777664862cc3dfac9e07ad98c9a1f0d237efb4b48e1b9c5c89015f52b918f453f10c64099b8e3cac193a1b3f018ea206939790639b6
 DIST jre-8u45-linux-x64.tar.gz 63822322 SHA256 c156128cd92eb91e9320f61a8f36305b3382043afe3467304c6abd044d27da0a SHA512 c70d9ae5d1f2d47aab1943e4123155c10973b26d951fb220978097c676850c37c7ed48c643784989292c766f8afa141740614704ec6901d1f4882096f1c67789 WHIRLPOOL c965868d17307f8454a2acab6bbb3d86c19c059b89c72dc9b823844d0a4e2acad7674fa7297979d9e056663e31a83ac32409deca97125117632f8d20171a14cc
+DIST jre-8u51-linux-i586.tar.gz 65731094 SHA256 e59a6fc88e1fc62167be684ffd5de90f5d31f1c7b7e6361dde24b45afeaa8d3a SHA512 6b459f70c1bc4007a0e10e89682c5c33601b795f6693eda0836e49b9e248229e109947232aef7b9d15b38f92931a134bc96833408e44572bf3f3b2da301ad275 WHIRLPOOL dca9c6d3f68917561d1bc84fb9d33ba01907d57eee1487c7e080989a6b89332a4f8e198717b8c4fe992c71d6715aa0e058bb02bd9b90ed8a7055cbc1747e4311
+DIST jre-8u51-linux-x64.tar.gz 63861111 SHA256 25c2146b4ff1a12a9449589f8372f7f67cb63d6f6ad2b7f9ec92181cd3a31cee SHA512 7b3c8be7ba4014041e86b2dd597d027285185f9e8a484110bea589d73e4e35a9d709d57198610f466ea05ef8ea4b7e696f1fc844a60511d0ba111f666de5cf44 WHIRLPOOL 1472b32649afbed578eaf1b31006a2020bd217a3f75b9b7d7bc2fd8c32bcd422dfd46e7d11e2e5e34904a1f5cc0bd03885cb0c1515ccd63985ca974a6d61eddb
 EBUILD oracle-jre-bin-1.7.0.80.ebuild 5513 SHA256 fe55ea8d6c8b1aa419694d49eda2beb4421b3908f8a20f30f4f987ac42282457 SHA512 57a4ebca2af407eb5690855fc9f4e703f61599ed702b3888d4d8cba8acfe11f66fe989ebafd40084c0d02e5960e70809df2831faa1e530ca849b8a4d8cb0abc9 WHIRLPOOL d55ffff90fbc711934a3a916f8eb4c8aec85458a3269a63325d02f7345119f8d742673b55e9b61414572bd7b5a32f93ee3779232cc44a996c074fe6ca2a2575f
 EBUILD oracle-jre-bin-1.8.0.45.ebuild 5907 SHA256 78ee2ff1b65518ef3d7a2104afcd2ec1f48d35fb43db014fd6e333b37a62774c SHA512 976e18d762c5fe04a13af9c0e482b052ef410ad0ef2dfdaffcd174a464483408fed63312c2110781791fc1eca02b196738c6f190bfc09c5717ac3c1965df4ade WHIRLPOOL 1857eb2a3116373d0af67d9c8b44d058a6123e4b8acd80ac6472b483713320ed1db9b43758131cbccd3fbc80bcdaa4ae4efed224ecb1ab4dad6746502b6fe614
-MISC ChangeLog 14230 SHA256 c5fea4427a85e63d43598b19ecfbfeaf7b136866cde79ae0fa78c13b262c8fe5 SHA512 a41a2e527f95ae3d6f5242665cb0f0f466e7a7d092a0837f82668f595e7d92336ecfd10ca25fc3402164da422cb9ba9990cd730a768c59afc4044d28308012e0 WHIRLPOOL 8004a35f6be0b38db7bfdee88dac513a4bb618960db62b01cef781f0c6857c74e50d7fa86916d13a4da539da2a41ed6f062e3de3e8b5d8ef00371c659842c2eb
-MISC metadata.xml 446 SHA256 6c1b5ea55c7570c8ebdc2c59ebdd09a50fd3704202ba4d0210e07161d0be2d0f SHA512 4443bb556d293a8a7cc98f5956203b355255820c1d7b3650c75adc04c0c0e10fffd7751f22f2111a2f43c8dc451ba35719a94c25223fad5559d88d9701673ffe WHIRLPOOL 7a6430e9039f2a8d03f5874eea63e980998ee0756a1df4d15cb85f8afafcacc67ccd33b34f3cfe186586ebf7245b5b1760317e2a3cfe0dadd6da693a7e39203e
+EBUILD oracle-jre-bin-1.8.0.51.ebuild 6607 SHA256 28523de1cf18eb98aeba360c1fe4188b1661e806256fa1c52e1e4288c9027b32 SHA512 8883c3b09035445b2647a56956b9acca217f51b250122875b3146cda7aac2fe73289642dd6b39fe9976b12b2283d55695fcea8ac6a0fb83559434f4ca0af51ad WHIRLPOOL d8b3a02fd8cf09692fe60604107f5f66f827ada40ebe9aa1e040fa07a5e8529a1ca0fea006b10c62ba5194dc26d362e3d78209ca9362f7271cdfcbe8f8c30817
+MISC ChangeLog 14465 SHA256 c40efbb3c297813dd43abce0f0398030cff05b058c58c30cb049e75f63e09a7e SHA512 6d7324332c7978ecf59a622377577913462949a8230101591c0a6b8de6e14f2f9d9a016231bdacaa5e922fef8f90e7785e9871825f347497aba97ac1d023b767 WHIRLPOOL 50fd6cfb8bc1d2df170b84dbb302959531b66d6d286da7f0622b339d9aacab5aec3ecf11cfe14ead43f557b9a3ae44aa09f755dace21830abb602f5a9a380ee4
+MISC metadata.xml 619 SHA256 1ea8b12bea866c49594f370181df413cfb27aaf20fb656d9aac1576de1f7d79e SHA512 6968c22ba115f08a8ab540cc672d298764ff50fb01b67b05bf86aec5598de834fc4355255888a9a6d92ed11599770f8ef1630c8efe3675abff2b7e5e8861a25a WHIRLPOOL 12c66a05fbd8e07bb7b95bb0d5ddfefea4cee34508b421188fe6ccf0fb747b71e4fdd2090442c30df664cdb040f619adee8da9ac6e3a66cf65fc1ccea6581499
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVM5sRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVuMohXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
-MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kH9EQAJ3E1tn3d1bAQpEPlh4y7ICs
-8bF/u2xAyMTAjJTs87QTiOX8f1kF7tHBZ+iAytEEHJ1KkqKDGxFAHaQNFraJTTD5
-Y4pJoSy3UO9/IRmkef44exIyi6ZDHtolDfS6mGEF/Akv86WMh6lZl+x4ElS6l2Kh
-BXMxRMWVQfL21ZPFdhdq63O58usFbROTLbFy47/CI7RPKEgrpWymugexoRwYVjpv
-GYNXR/hrh+YtaDZc1ngk86kGKeR+PmXhbgqRy39aUCiC+vhz37jBJavmemtAYzud
-L7y/UL5xgCtgbaIkaXciCPS0Eu+rqZZNBXgOpAjs3LB3khZNFtAc4jt6ZMQzAx+d
-p2dJxCJ1+9DJ1PcF0OQfo1rDduM9EAfl2wkV4wCAaiaODgC/E/Kuq5cyFk67NqS8
-tu4R4DzOdOoHTY09xoSq6ABEoUCACfB1neRGWAyAJqAaOGrzH8ognpE8EbupWeE5
-iEb359XR/drJvESGl3caXHvR/s6fWTdnGmF+jxwxRdcKyN7FXtIrUb6ETNRkdAew
-pYiMMPcgSNa7RziPzTaPH8Za3BPcKHyqhxV7fc5jpBB3A1jfT/Zt7dgFANgKFV2p
-A5LdOz45OCd2VOPfIAFJl/oftzXUiLuUW95KX31H8rzVZ5+4+b63OtjE4jVh+osH
-vyfC04VPbeVwhHU/I6ag
-=g5GH
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3k8T0P+gML66hNXwxAd+u1/t49kmP9
+nCQ1lT892ErXJDbJiVr5XlXieV9S745bYYOaiir1vaXi3HLitOXKZJFoXAdDNVLS
+ZvYdo9N9lt5eYizEVbKIV2QFvEpsq+r7f+w6kuy0E5aaZ5wBfpkywEcuhAfhSHt+
+ZFFRgFNFku45nurByyvDWSsKnh20AdNb9xz7uydLuI6kLilJSYPwXupOSWf7GnT4
+5SQzTuJMwVrsuF0Cg4+Ytyh9AV/9KIuavnAS0OOY+sb84kGHZ0lafNaWT61J/XYs
+PFoIQ6vMz7CorGqBnoZjh9kul4bNfgm9YvlLpgKwAZVm9cWcsQL1rTrveCf+ap+s
+gTZ9o4W8kV+LlBX4ytDV8123ygY9SQgFpNH8WfQeKr3SRTgfgFugjNzwg/7pH4qA
+tysp3qi8kubLL/BkoEP+p/dTrvuO5e0vd0qMFL2+I4e9LA221qTFoXlXXHG2t+QD
+ZCbMi0JrPuBZtJRyXDOU1NNfyZKp+2WA0IVGzvBI9+BLrUeRPvYceeD4PiZSms0m
+7bJVwHvh6qb3vH9i64MQJv9ukB5m5pITK03BHa+quEEyhhmweSRABsAbZ028gWrC
+tYkrHEwedw8gHHholqxuv/D7yAXZk7VRBvTLDAws9p8EDwlQ/lE/Br1pS/8q1inc
+Fvo1uEGpnomGv97ATsuh
+=CgEc
 -----END PGP SIGNATURE-----
diff --git a/dev-java/oracle-jre-bin/metadata.xml b/dev-java/oracle-jre-bin/metadata.xml
index b66c4ba8229d..e93f517764a3 100644
--- a/dev-java/oracle-jre-bin/metadata.xml
+++ b/dev-java/oracle-jre-bin/metadata.xml
@@ -4,7 +4,9 @@
   <herd>java</herd>
   <longdescription>Oracle Java SE Runtime Environment, Official Binary Distribution</longdescription>
   <use>
-    <flag name="jce">Enable Java Cryptographic Extension Unlimited Strength Policy files</flag>
-    <flag name="pax_kernel">Use paxctl to mark the JVM binaries.</flag>
+    <flag name="awt">Install non-headless AWT libraries, needed by some GUIs (used to be X flag)</flag>
+    <flag name="javafx">Install JavaFX libraries</flag>
+    <flag name="jce">Install Java Cryptographic Extension Unlimited Strength Jurisdiction Policy Files</flag>
+    <flag name="pax_kernel">Use paxctl to mark the JVM binaries</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.51.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.51.ebuild
new file mode 100644
index 000000000000..4f4c8aed89e2
--- /dev/null
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.51.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.51.ebuild,v 1.1 2015/07/29 12:42:08 chewi Exp $
+
+EAPI="5"
+
+inherit eutils java-vm-2 prefix versionator
+
+# This URIs need updating when bumping!
+JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
+
+if [[ "$(get_version_component_range 4)" == 0 ]] ; then
+	S_PV="$(get_version_component_range 1-3)"
+else
+	MY_PV_EXT="u$(get_version_component_range 4)"
+	S_PV="$(get_version_component_range 1-4)"
+fi
+
+MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
+
+AT_amd64="jre-${MY_PV}-linux-x64.tar.gz"
+AT_x86="jre-${MY_PV}-linux-i586.tar.gz"
+
+JCE_DIR="UnlimitedJCEPolicyJDK8"
+JCE_FILE="jce_policy-8.zip"
+
+DESCRIPTION="Oracle's Java SE Runtime Environment"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="
+	amd64? ( ${AT_amd64} )
+	x86? ( ${AT_x86} )
+	jce? ( ${JCE_FILE} )"
+
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="1.8"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa +awt cups +fontconfig javafx jce nsplugin pax_kernel selinux"
+
+RESTRICT="fetch preserve-libs strip"
+QA_PREBUILT="*"
+
+# NOTES:
+#
+# * cups is dlopened.
+#
+# * libpng is also dlopened but only by libsplashscreen, which isn't
+#   important, so we can exclude that.
+#
+# * We still need to work out the exact AWT and JavaFX dependencies
+#   under MacOS. It doesn't appear to use many, if any, of the
+#   dependencies below.
+#
+RDEPEND="!x64-macos? (
+		awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+		)
+		javafx? (
+			dev-libs/glib:2
+			dev-libs/libxml2:2
+			dev-libs/libxslt
+			media-libs/freetype:2
+			x11-libs/cairo
+			x11-libs/gtk+:2
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXxf86vm
+			x11-libs/pango
+			virtual/opengl
+		)
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	!prefix? ( sys-libs/glibc:* )
+	selinux? ( sec-policy/selinux-java )"
+
+# A PaX header isn't created by scanelf so depend on paxctl to avoid
+# fallback marking. See bug #427642.
+DEPEND="jce? ( app-arch/unzip )
+	pax_kernel? ( sys-apps/paxctl )"
+
+S="${WORKDIR}/jre"
+
+pkg_nofetch() {
+	local AT_ARCH="AT_${ARCH}"
+	local AT="${!AT_ARCH}"
+
+	einfo "Please download '${AT}' from:"
+	einfo "'${JRE_URI}'"
+	einfo "and move it to '${DISTDIR}'"
+
+	if use jce; then
+		einfo "Also download '${JCE_FILE}' from:"
+		einfo "'${JCE_URI}'"
+		einfo "and move it to '${DISTDIR}'"
+	fi
+
+	einfo
+	einfo "If the above mentioned urls do not point to the correct version anymore,"
+	einfo "please download the files from Oracle's java download archive:"
+	einfo
+	einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jre-${MY_PV}-oth-JPR"
+	einfo
+
+}
+
+src_unpack() {
+	default
+
+	# Upstream is changing their versioning scheme every release around 1.8.0.*;
+	# to stop having to change it over and over again, just wildcard match and
+	# live a happy life instead of trying to get this new jre1.8.0_05 to work.
+	mv "${WORKDIR}"/jre* "${S}" || die
+}
+
+src_prepare() {
+	if use jce ; then
+		mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Create files used as storage for system preferences.
+	mkdir .systemPrefs || die
+	touch .systemPrefs/.system.lock || die
+	touch .systemPrefs/.systemRootModFile || die
+
+	if ! use alsa ; then
+		rm -vf lib/*/libjsoundalsa.* || die
+	fi
+
+	if ! use awt ; then
+		rm -vf lib/*/lib*{[jx]awt,splashscreen}* \
+		   bin/{javaws,policytool} || die
+	fi
+
+	if ! use javafx ; then
+		rm -vf lib/*/lib*{decora,fx,glass,prism}* \
+		   lib/*/libgstreamer-lite.* lib/{,ext/}*fx* || die
+	fi
+
+	if ! use nsplugin ; then
+		rm -vf lib/*/libnpjp2.* || die
+	else
+		local nsplugin=$(echo lib/*/libnpjp2.*)
+	fi
+
+	# Even though plugins linked against multiple ffmpeg versions are
+	# provided, they generally lag behind what Gentoo has available.
+	rm -vf lib/*/libavplugin* || die
+
+	dodoc COPYRIGHT
+	dodir "${dest}"
+	cp -pPR	bin lib man "${ddest}" || die
+
+	if use jce ; then
+		dodir ${dest}/lib/security/strong-jce
+		mv "${ddest}"/lib/security/US_export_policy.jar \
+			"${ddest}"/lib/security/strong-jce || die
+		mv "${ddest}"/lib/security/local_policy.jar \
+			"${ddest}"/lib/security/strong-jce || die
+		dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \
+			"${dest}"/lib/security/US_export_policy.jar
+		dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \
+			"${dest}"/lib/security/local_policy.jar
+	fi
+
+	if use nsplugin ; then
+		install_mozilla_plugin "${dest}/${nsplugin}"
+	fi
+
+	# Install desktop file for the Java Control Panel.
+	# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
+	# make_desktop_entry can't be used as ${P} would end up in filename.
+	newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
+		sun-jcontrol-${PN}-${SLOT}.png || die
+	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JRE ${SLOT}#" \
+		-e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \
+		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
+		-e "s#Application;##" \
+		-e "/Encoding/d" \
+		lib/desktop/applications/sun_java.desktop > \
+		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
+	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
+
+	# Prune all fontconfig files so libfontconfig will be used and only install
+	# a Gentoo specific one if fontconfig is disabled.
+	# http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
+	rm "${ddest}"/lib/fontconfig.* || die
+	if ! use fontconfig ; then
+		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
+		eprefixify "${T}"/fontconfig.properties
+		insinto "${dest}"/lib/
+		doins "${T}"/fontconfig.properties
+	fi
+
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${ddest}"
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	case ${ARCH} in
+		arm|ia64)
+			${ddest}/bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			${ddest}/bin/java -client -Xshare:dump || die
+			# limit heap size for large memory on x86 #467518
+			# this is a workaround and shouldn't be needed.
+			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
+			;;
+		*)
+			${ddest}/bin/java -server -Xshare:dump || die
+			;;
+	esac
+
+	# Remove empty dirs we might have copied.
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	set_java_env
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}