Security bump. #451206

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x3C5CF75A

3 files changed, 187 insertions, 10 deletions

diff --git a/dev-java/oracle-jre-bin/ChangeLog b/dev-java/oracle-jre-bin/ChangeLog
index a2833f882c98..8989d3fea6d7 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.26 2012/12/19 18:30:24 sera Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.27 2013/01/14 07:14:27 sera Exp $
+
+*oracle-jre-bin-1.7.0.11 (14 Jan 2013)
+
+  14 Jan 2013; Ralph Sennhauser <sera@gentoo.org>
+  +oracle-jre-bin-1.7.0.11.ebuild:
+  Security bump. #451206
 
 *oracle-jre-bin-1.7.0.10 (19 Dec 2012)
 
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index 9823b4b15558..6878cf107c91 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -6,20 +6,23 @@ AUX oracle-jre-bin-1.7.env 1035 SHA256 fc49633539a944a9d684b2d33b8c4a25f2d6d68e8
 DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d SHA512 02eca7da8f3fffea388431d5352290535a63d53a1f5c795d6511ccba62445787a0ee6ad4bc1852e5262860b6d607ba2a8c6a3dbb0c3e1d7c3a67ac7bbc783204 WHIRLPOOL 02460c7ca54f5f62c3f349addf8e2a101f7a56987e9f62365fac3f703b0c93ac5de4d55697a3d04f78b547b072e0acc95a0720d2ce3b429d2fd5936d50edd1ac
 DIST jre-7u10-linux-i586.tar.gz 48107401 SHA256 0e91c275a87dc1ba049df3cfef16eb958199d80e55bea6a3555900d309615199 SHA512 62f6d6c983fa48e21fef52fc73f13aa30c8b0512fc8d243d341ac465c10c19cd3d8a3f0b93f127e42eac102c0b00cc65502acb8f7dd85593f75a7cd73c5ef8ae WHIRLPOOL be81fa175a52d498598c15b19c3d7ea42fe1814647ac9d0b8684a1a0da6dd0676e7b39514ea400bfcacdb51e4689352beca358bfeef4d3e6cd1219259f8d4786
 DIST jre-7u10-linux-x64.tar.gz 46789584 SHA256 a2a45566f4a87e70c0e13577d3bf2b7eeabcdda3279958a75ded1ece96e070d1 SHA512 9d931f53b83d87458adda191ca4cef7374a3768999c961f8634e77f9bd3fe830e615d85406f5c1d47a3eb3d18d062ee4d5f9c86bc4741eab8ae7cc1752c76219 WHIRLPOOL 01dbdd4ced63598152dfd1662bf2d67a39970493694ffb9ff9d0823579d71a0cc8ace67ae39b8a357797e3f4cb523cb7bcf74c630346f3db73fca292a55e54c3
+DIST jre-7u11-linux-i586.tar.gz 48084234 SHA256 08b6b5cb322305d9b7a5d5b56a180299b4d23bd4f88f093d5dbcfe0b9da3ceda SHA512 a5ad0fd31bf0dc4c1b31a8734e2f9c1b006c0dbc3f891c6c693ed3f194c5fa7bddbbd33c1038ebb6bdd997156e92abbacd0ec2b3b2cf358387e9a5cd6db3f051 WHIRLPOOL bfb4be916b3f48d2998bebf8f63f160c98231366dde1332c54c29272a510c286f917b697a35f68900b412d6e0a01d239db3aaf955d8045cc1e8d0b30b1a9be3d
+DIST jre-7u11-linux-x64.tar.gz 46780809 SHA256 c4f80063fbe4fc6c6b80bdf97971288a142aa1de1e8c790b684c223f4e09068e SHA512 e32518217a53720742f8ad8b1e8116d05dee2bc063b9dbc78bd8d4d87b35a3fe4f24207ed91cf978a469857aa8ffd96502f271a30c2ad0f5b11f938bb7f73082 WHIRLPOOL 2eb8f89022786a70b6734af116a3140a636f7470edc4aadfbc7e0d2bbab8a9596e520a0912d7c3382c053b229d31f64ff0798e03db2a66affd21071eae9e3cc1
 DIST jre-7u9-linux-i586.tar.gz 47995690 SHA256 37310199e770f10d8e5f9410757062655b66723ca2b8c4dd29d9a4e9bd7d98bd SHA512 f3d4fcbd14e3b7c12a3caec5458f60378d1d5e86de89669bd8baa0d137915bba5049cce50304f7e9241e4f3baf96371be80a157763581faa9b87b0f1defffe3f WHIRLPOOL 478482805554188d844ac7d1ced6c6e7fcd1ae5d07a3f527c4a388de887f075e1f4cd840d7859a81cc6176e34db354c6229064619c57e841368974f5325afb52
 DIST jre-7u9-linux-x64.tar.gz 46684531 SHA256 16b573b3f4c18f088fc30786e5d62efc594448e7407180ffaf13a3c67cc4ed0b SHA512 390c9118c0f93f36b37488b9efa29cf1dafb1e17ae8396c89b19b2da6a42fb3e3ad748c629fa6fe07b88ed33baaa17cefc0c7eefe702a87b879826bdf8fa1be6 WHIRLPOOL 20b908a64dbb3a96843f09e514436bec2d70ffa5e1f749b7336954fc2aaf96fb5c487ca95f12ea888b30a23aff213893e95b451ff7ea03e032f9ba1d7a4cf0cc
 EBUILD oracle-jre-bin-1.7.0.10.ebuild 4833 SHA256 1362523c68363b8b63825309bbd3a52bfe186aa58555cda8dcf04b9578166dce SHA512 08e223ba2fe9ddc50f12181b1ffc115f281710b2115d033d8c3dbafc2c21e8e3d5a30265b8abe71d81ad8405d879f4c650fa727b18fe0eeece956689b85d2220 WHIRLPOOL 8e42895a8d2d90522e8b43d9f36e2b5844b7366e5af2ca96cd1bf99547527134b2e1d0532a057b0b34f5a0b26c4f9d8659083716d522f3a41379f77347442ddb
+EBUILD oracle-jre-bin-1.7.0.11.ebuild 4833 SHA256 abd4296705c6a491f04f30da2e174ef12f570e70b7c736fda0d02f6751665607 SHA512 1aee75af6c9ac3da5910b539701351cc24d8a896886ca0b690f7de38e171a8d8037393d184bfada84147bef75d0a5a3158a283237a4b75db7576fd7f924899bf WHIRLPOOL ef1a482362ff16d916faad34bf21cca9354584a612ab00c6f7212d2fca0a60de6d904b6dc38d7542ac3bc1ae7eb7042fbb0f25675ac9bd6a35e8adb4683608d7
 EBUILD oracle-jre-bin-1.7.0.9.ebuild 4868 SHA256 34729b52dd931c68a932a642e4c7eed9647291c5c3b3a1b4123b705c51acc50f SHA512 8a7b94855b76487452f33a609ea43fc85ed257b13226af572e386d4c8e0c38cd07ab3762e255d9647d16ad717866ea083584a9dd4d6f7adb3cab9c714cb33338 WHIRLPOOL 75c1b6a43425982f1df13e3114c28f94f5d9f293257f828a73454ba16b4e8ab121770ab76f877b8349f1f2e9a1d17b0e4783dc9b22ef9adde8e76059c988b3d5
-MISC ChangeLog 4752 SHA256 dd56db3ce0d1620ca6482af3ba9867f910aaa1fae6de279829548348e193de8c SHA512 bcc100a7661fa719e09721d0e76f4f4b92280c374b4e4ef2d9637ef569fbe56c08da6f63e88a00d34cfc9cc53d56756b071cbdf0356216b95138c4465c861c59 WHIRLPOOL 85a040b1149c874971e6f746e8c79141caabc8d4f8efec272ca7b52bb94a7129aafa981cad40e6bb5e30384be275196531466d00f9ecae07cb40833d0cfb9102
+MISC ChangeLog 4903 SHA256 4e9cf6c5ce1f3cdbdf95518ac30ec0356b7fec0bd732975c4318559dbe780855 SHA512 fab05d72fe5535fb4bbfc1584c12203c01462a023f6a75f5a0601380f0e29efc0b65653e79385d8393b10b18aa967d4e383aa509bb2eb37aa598981c01ee6739 WHIRLPOOL 487ff4cd4abe531554a1e29fb3c7996d3fc81f3bca5d55ea9af6cad42cbea01914a657f6fe12360ceb3a2eae077ac52bed0af23b908ffd7b7ec4d2cfa31a845c
 MISC metadata.xml 446 SHA256 6c1b5ea55c7570c8ebdc2c59ebdd09a50fd3704202ba4d0210e07161d0be2d0f SHA512 4443bb556d293a8a7cc98f5956203b355255820c1d7b3650c75adc04c0c0e10fffd7751f22f2111a2f43c8dc451ba35719a94c25223fad5559d88d9701673ffe WHIRLPOOL 7a6430e9039f2a8d03f5874eea63e980998ee0756a1df4d15cb85f8afafcacc67ccd33b34f3cfe186586ebf7245b5b1760317e2a3cfe0dadd6da693a7e39203e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ0ggzAAoJELjwI6Q8XPdaBSQH/2nXP6Xn8wdZry3P0zW44pxT
-YBm40e5M0TtLzphOo+85Eb6eWAV2DCuWnoIhbBbv6o60A+We5HbTdWwgJ27E3IJO
-yvniDwdJPkMEe+pkitwRytymLnWC+XYRrIIjtS0EFhU/DJNSd0AHwwhz12fLfggU
-slzP9F/sUadNPBwhcUjlhX7emA/E4bgZB0cVS+tUCd6oZ4cthyj7Nwms6w3kUJMB
-/Ew5+ELXfDx6xfts2v10rpgC22OI7ReYpqjdOmzVNBLR/ihjhav9l2jgymzDTTZZ
-ZpeEG2QxFK03wBD8VOkNdR1YdKN6VbME4XsX0Sfcx8PsS9WwQI1UkItxtllr61M=
-=qwiN
+iQEcBAEBCAAGBQJQ87EcAAoJELjwI6Q8XPdaX5IH/0GkBAokChuTruASlpFsrrnY
++kAChfuC28+Qnqf/j48VwV9hNuqJm2sgvlsD7khs5Zjvg/d4Cr9asCnGysDQRYMg
+F7/ZldIyHHh/jTS4dE+S2CgKrJQsdgKjR3qWOYGr8132w5HySLeebJDOWSpqNthq
+eER3XTPx9KzWnDSNyeS3sgqfP92y3TKtFnjmihq5gjRXkYnFsMUV88lKRhxEbfpl
+V42+TSimgFHRvRVqr8XWKzl/+4tByxiARowEKPdQY0c0e7n3+CFwCesqh5oX4nvt
+lZEXJAwcn1GySaSHgOD7zwGhmb1J+AWUpVucfeVjZbFeqZxNFDolkF3BdYNAcUc=
+=XdqI
 -----END PGP SIGNATURE-----
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.11.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.11.ebuild
new file mode 100644
index 000000000000..506a67915d60
--- /dev/null
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.11.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2013 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.7.0.11.ebuild,v 1.1 2013/01/14 07:14:27 sera Exp $
+
+EAPI="5"
+
+inherit java-vm-2 eutils prefix versionator
+
+MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
+S_PV="$(replace_version_separator 3 '_')"
+
+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/jre7-downloads-1880261.html"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
+
+JCE_DIR="UnlimitedJCEPolicy"
+JCE_FILE="${JCE_DIR}JDK7.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.7"
+KEYWORDS="~amd64 ~x86"
+IUSE="X alsa fontconfig jce nsplugin pax_kernel"
+
+RESTRICT="fetch strip"
+QA_PREBUILT="*"
+
+RDEPEND="
+	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="
+	jce? ( app-arch/unzip )
+	pax_kernel? ( sys-apps/paxctl )"
+
+S="${WORKDIR}/jre${S_PV}"
+
+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_prepare() {
+	if use jce; then
+		mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die
+	fi
+}
+
+src_compile() {
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${S}"
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	if use x86; then
+		bin/java -client -Xshare:dump || die
+	fi
+	bin/java -server -Xshare:dump || die
+
+	# Create files used as storage for system preferences.
+	mkdir .systemPrefs || die
+	touch .systemPrefs/.system.lock || die
+	touch .systemPrefs/.systemRootModFile || die
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest}"
+
+	# 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
+
+	# 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
+}