Version bump, security bug #525464.

Package-Manager: portage-2.2.14/cvs/Linux x86_64

3 files changed, 203 insertions, 16 deletions

diff --git a/dev-java/oracle-jre-bin/ChangeLog b/dev-java/oracle-jre-bin/ChangeLog
index 825db23bb5b6..968af8078d7a 100644
--- a/dev-java/oracle-jre-bin/ChangeLog
+++ b/dev-java/oracle-jre-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/oracle-jre-bin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.65 2014/11/01 07:07:24 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.66 2014/11/01 13:06:36 caster Exp $
+
+*oracle-jre-bin-1.8.0.25 (01 Nov 2014)
+
+  01 Nov 2014; Vlastimil Babka <caster@gentoo.org>
+  +oracle-jre-bin-1.8.0.25.ebuild:
+  Version bump, security bug #525464.
 
 *oracle-jre-bin-1.7.0.71 (01 Nov 2014)
 
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index ae6ae61a3d84..becb9245c9e5 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
 AUX oracle-jre-bin-1.7.env 1035 SHA256 fc49633539a944a9d684b2d33b8c4a25f2d6d68e82fe644adbf2a499c178617b SHA512 a075562804594b6a3187e0c0e58f93883ead699470dd0ff8a37e717b3af52e3d6cf0757df43d507e149e1bcb2814e53eef14388ce8d513c174d0a813524e3815 WHIRLPOOL 7d08a3bc883cc2d3de3d37d46366b24b2bed4ce35233ab2f1ac4179adfa30787cb3bc948bf074d2ba59151352ab453a08efa2436281079623066e6f8303a00bf
 AUX oracle-jre-bin-1.8.env 1035 SHA256 4ad3d79687682b76df29e4d1f5e6a1bec87fca4149b817da09f9398bc25f793b SHA512 8ebdc1100214c2707332beedd10bc665e386a0d994fe8b154b33a053f555d3064192bbcb4e664ca841d2d7d381d07d0baca3d586c66bc5317e9b99c23d4d09e6 WHIRLPOOL 16367932a4a6b484d1cdf0394511c5a47cb1c04baf44fba179dfbe471f1261345ead58af85497afc7b5d2e4f86fcb55f1514dde0b1658619e863b109d206dd41
@@ -14,20 +11,12 @@ DIST jre-8u11-linux-i586.tar.gz 58188271 SHA256 b1348b4842cc23862ea9ef69f71674f4
 DIST jre-8u11-linux-x64.tar.gz 57081154 SHA256 17d0d015c3bd7e535490c6ce869655b6ac4024ba3dc39dc9ed743de4376750a4 SHA512 e8d7aaa89a566e7fdabf12fddfb8eecada98dbece9163bdbfdccc42f6a0a4d52bbf94ad1e5902c194460c653c05066f980fd937d6d8ffa5cced9eeb1f4d8b9ae WHIRLPOOL 54182e5ee3a3aa111eff1314a74db6cb4179359e723782300e2616eb1b930f9e54f5581d3e19d9649da234ce9ec501036e8dd068f619585d5cb43e7041b5e455
 DIST jre-8u20-linux-i586.tar.gz 64515446 SHA256 340bb9bb882c90792439a3688e234c04378e03bf9cda39f1c9de2acbc3b159c1 SHA512 f2c6d2e2072e3f0334836976f3164cbfbeee08d5be60223a9995b19da75493b1c0a66683e20585a3cdbfedb5c896dd9d9c2b5e1f7caf58da54a35055ff6cb53a WHIRLPOOL cccede05074a49b5b7d26668353e37d480c1bce308bf2397c13974a912c7fe638569c5b7deed6b42d5b7f7ccfa2647418d917aeff6f22e87664cb5f4193ed0c0
 DIST jre-8u20-linux-x64.tar.gz 62751094 SHA256 23f149928ae7d7f97d9b93eb859f197744ffad2d4082a96fcde24021a08cab34 SHA512 598fb645372d6c940a1626f7e92af8e66d6a3da844ecbdad6ccc930138750bf6e3926ca43e30e27c21ca46d8319e851a913f92959d5c2be35f41b8c0344b95d8 WHIRLPOOL e84ea54d05f87535440775c7b77a205c9440c8face6e0668d345e3011ce1dd5e7649bb5edb74440030f7cbde18dfb702f4fa5d4a0e13fc03ce625af9662ccba8
+DIST jre-8u25-linux-i586.tar.gz 64545312 SHA256 e8e879417fb8c3b7bb63955ecd88d6f6b2467acf2c0e62c9ed2c49b628ad5669 SHA512 82fefdda537e60ff87bb2e12dc3790676395d83a94b18ad2aa29a621b30e94f039510d9b863a3095bdc9be7ae23b48238c3f544bb0575306bddbb7ffcdd5537b WHIRLPOOL 3cb698a6521ca75da430270403a6d1ea41064ba3a46ab6fc3d7b31b814064df9ce38c8566ad80a3e7df4baa591364f2bfcff35867b79699a2cac2a49c625b4f1
+DIST jre-8u25-linux-x64.tar.gz 62763875 SHA256 fbf3b9ddd4ae534ead10411bc425a0faf460118aadff480bca366888c1cf879f SHA512 423ae7ad308d49c31c37085372524c75c4c970aaa80b9c2d6072461266d5951738470adf1d90c8e0a04f0867855f3f6dfbba1aeacf047d3015b90427d4357e52 WHIRLPOOL 40e51a6bc8153104a01f0ada1359126e7fc2a6c8e2f8e5a7c631cbc01eb039cdb6127511c7e1c27435bac2adb70c15ddc1244a12097033dbfa69bed90aceba9d
 EBUILD oracle-jre-bin-1.7.0.65.ebuild 5184 SHA256 3ea2a2d54cc331b5a4a0dd7b513299748b2f955772f5904649f831c310d96eed SHA512 546107c37636fe7cbe188028ad2facddeca4a4a57172870d02c7f21a0a05fa461d9ba09abd78f140f99250999386c6b6e28f8eb08250e210e3e7b7888e8f422a WHIRLPOOL aa926cda6981df64178652ce6249d73ccd0f11c908c7d6672f9f7b54f88dc4c55c95651e351075537b955d16246ae112950dfe475eb3730f6b80d7b5985cbf2c
 EBUILD oracle-jre-bin-1.7.0.71.ebuild 5496 SHA256 6a1c44252b335fc8ad3b4dd3f3a0319fcd42880c0bbbb14e2069bc15ec66cc4c SHA512 af1854d56f17a2a466820f72dda4ce77621aa13812af08ba310c193880ed2b823f36565f61eba40ed5501d87124514e99121eea4a5841e1d6260e2b54a5b25b0 WHIRLPOOL 02d77a1d2644ca4be8c4a143fab6fac21b76292430632bebea57ad74085fde98e1ed428a11733ad9aa2d54ffbfcef8b2bb6b41a7f4595645b78599ae7ed1ffd4
 EBUILD oracle-jre-bin-1.8.0.11.ebuild 5610 SHA256 b840d9cba111ee749b00144038169ed9218215f9da504572429ff96368d65be6 SHA512 9eaa3bd01ce51e8a95166d4b6eb099c4c6f3e6eec226bb5aedaf4b36f6f3b57f7561dbfc220c513f2d6017e06e605c042f149427369d54c02beae35b3885e5b2 WHIRLPOOL 1a20c131cb104452f930cb951c506ad903bf9e0d67743f7f90ff078e650305f77a149c814417bb173aa85a29cdd748dd9d74b43a8b16312ac9e46193b091261c
 EBUILD oracle-jre-bin-1.8.0.20.ebuild 5611 SHA256 bf91fa9d97567c463ce137d998d0dfc761fc166eb29fdaacce30fd76dc77a50d SHA512 eafc6036c1c7be252ef30586e2fa1a6121ad892afd6b5e83b27f7b341b5201677b54b144736d2692ded7c929fa5c8d3727cdf9ab8d704ac1cc44ab5f00e610bf WHIRLPOOL 88f10639c9dd101c99d60704f35cf75e89160101afabe4bff688e0fa4801865b71f7177dcaa76c12f512e6f4b8465547d26289364c29091c55b022234829f293
-MISC ChangeLog 11093 SHA256 4d9965232d818f9b736638b05db4127e47c00c77142b63a173a66fc7bd458dc1 SHA512 2257e6521d730c0b1b8b7b5b6b94beb88b5926c4f4454ed40784f8607302c7e617f04435f87375a63258c4cbcceea90b9bbd0f43c6175c0024b769b78f3c2e97 WHIRLPOOL cb88a56a9e5bba488d78c3b7f2b340f3587807df6f3f3d64600f0c56dce0ee90f3723c7d45040f717e1ca45301e0e1a1ee56921cc063ec7cac87916473c99f10
+EBUILD oracle-jre-bin-1.8.0.25.ebuild 5612 SHA256 99314352e4ecf778451fbf2561134dc5fd78e7b3b0c88f1a38f5a2ac7bdc2e1f SHA512 4a90ee8052b14097f6772f57ec9b1ac8fad714ffb7cc97cab9ff40b6c97847abba193f87d3ce7c1b2f13edd9d325a08b77a08edac62864b8f4a1e189e120b723 WHIRLPOOL 1a70c613a6e388c470ce3a21fe029b7bf25f6567e5a8787bf68c761eda1ab01aa2bdd90232de4c5c06d65b588967c9512209a297758597872f6bd14db4963117
+MISC ChangeLog 11259 SHA256 ddc3fcd790c522fbf67a6e31b3da382f8934f4a8144844baa0e56952a85ae039 SHA512 fe84c815db9eb47e1e10961202c2478ea9edcf27af613e88712e1771712bcd8b1f1fe9bea2cb7cb158be098e7f93d57fe76b8552ba47ffc085d3bdceea6b29b8 WHIRLPOOL 235bdc1147c3daaa9e648005550719de00fd95fcdf9f450c24d3e123be5f7cd5745c2e71eae66ddd9195ad6a167ba4307ec81a96900f26c4ac2bf34318d8f170
 MISC metadata.xml 446 SHA256 6c1b5ea55c7570c8ebdc2c59ebdd09a50fd3704202ba4d0210e07161d0be2d0f SHA512 4443bb556d293a8a7cc98f5956203b355255820c1d7b3650c75adc04c0c0e10fffd7751f22f2111a2f43c8dc451ba35719a94c25223fad5559d88d9701673ffe WHIRLPOOL 7a6430e9039f2a8d03f5874eea63e980998ee0756a1df4d15cb85f8afafcacc67ccd33b34f3cfe186586ebf7245b5b1760317e2a3cfe0dadd6da693a7e39203e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAEBCAAGBQJUVIatAAoJEKCEBkJ3xQHtl9IH/j2CSh65CWfaLZc/FT5PAFFs
-hPo5WLNeMXY/94RiZ1Dc+3BTgIvjHOn8o5UP1wVZlU/AnqPqyaOm+vtXLe3LDmCu
-SZvF2WIAYYoCBkZm/HzOczDSLti4WoXrr82zNYlBOygisUsFzQRiw6EvsZ1BcDKW
-QEIeCH0Aq9WHFz5o7wE3dLKrg0CRuYjvN19XX1o6iylHnnvXHCoC2sTQBqC5IGHA
-agsW9x8UnCBAzgeLbEClEcZuOUFGq7nxQ0U+k1l47NNZ2YpX17HkP0qPyaoijGHy
-vRGXft1VadzzPP9wwsGN81+YpFsCzljIBV3ggvB3QYNbxuxfWu1Ud2bFwU+JtLY=
-=afNr
------END PGP SIGNATURE-----
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.25.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.25.ebuild
new file mode 100644
index 000000000000..6975fd5cf172
--- /dev/null
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.25.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2014 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.25.ebuild,v 1.1 2014/11/01 13:06:36 caster Exp $
+
+EAPI="5"
+
+inherit java-vm-2 eutils prefix versionator
+
+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}"
+
+X86_AT="jre-${MY_PV}-linux-i586.tar.gz"
+AMD64_AT="jre-${MY_PV}-linux-x64.tar.gz"
+
+# 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"
+
+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="
+	x86? ( ${X86_AT} )
+	amd64? ( ${AMD64_AT} )
+	jce? ( ${JCE_FILE} )"
+
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="1.8"
+KEYWORDS="~amd64 ~x86"
+IUSE="X alsa fontconfig jce nsplugin pax_kernel selinux"
+
+RESTRICT="fetch strip"
+QA_PREBUILT="*"
+
+COMMON_DEP="
+	selinux? ( sec-policy/selinux-java )"
+RDEPEND="${COMMON_DEP}
+	X? (
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libX11
+	)
+	alsa? ( media-libs/alsa-lib )
+	fontconfig? ( media-libs/fontconfig )
+	!prefix? ( sys-libs/glibc )"
+# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
+# marking. #427642
+DEPEND="${COMMON_DEP}
+	jce? ( app-arch/unzip )
+	pax_kernel? ( sys-apps/paxctl )"
+
+S="${WORKDIR}/jre"
+
+pkg_nofetch() {
+	if use x86; then
+		AT=${X86_AT}
+	elif use amd64; then
+		AT=${AMD64_AT}
+	fi
+
+	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
+}
+
+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
+
+	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
+	# writable executable segments
+	if use x86; then
+		rm -vf lib/i386/libjavaplugin_oji.so \
+			lib/i386/libjavaplugin_nscp*.so
+		rm -vrf plugin/i386
+	fi
+	# Without nsplugin flag, also remove the new plugin
+	local arch=${ARCH};
+	use x86 && arch=i386;
+	if ! use nsplugin; then
+		rm -vf lib/${arch}/libnpjp2.so \
+			lib/${arch}/libjavaplugin_jni.so
+	fi
+
+	dodir "${dest}"
+	cp -pPR	bin lib man "${ddest}" || die
+
+	# 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
+
+	dodoc COPYRIGHT README
+
+	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}"/lib/${arch}/libnpjp2.so
+	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/7/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
+
+	set_java_env
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}