non-maintainer security bump due to slacking java herd (bug #498148)

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 202 insertions, 17 deletions

diff --git a/dev-java/oracle-jre-bin/ChangeLog b/dev-java/oracle-jre-bin/ChangeLog
index 9e0b55f0a32f..b1d64c64027d 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.45 2013/10/19 19:52:52 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.46 2014/01/17 16:43:14 polynomial-c Exp $
+
+*oracle-jre-bin-1.7.0.51 (17 Jan 2014)
+
+  17 Jan 2014; Lars Wendler <polynomial-c@gentoo.org>
+  +oracle-jre-bin-1.7.0.51.ebuild:
+  non-maintainer security bump due to slacking java herd (bug #498148).
 
   19 Oct 2013; Agostino Sarubbo <ago@gentoo.org>
   -oracle-jre-bin-1.7.0.25.ebuild, -oracle-jre-bin-1.7.0.40.ebuild:
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index 43aa24b9c55f..38042205fcea 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -1,28 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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
 DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d SHA512 02eca7da8f3fffea388431d5352290535a63d53a1f5c795d6511ccba62445787a0ee6ad4bc1852e5262860b6d607ba2a8c6a3dbb0c3e1d7c3a67ac7bbc783204 WHIRLPOOL 02460c7ca54f5f62c3f349addf8e2a101f7a56987e9f62365fac3f703b0c93ac5de4d55697a3d04f78b547b072e0acc95a0720d2ce3b429d2fd5936d50edd1ac
 DIST jre-7u45-linux-i586.tar.gz 48265934 SHA256 c6cec1ce57bc9b8b425f26e4e57ccdffc9667e4daf8ddca0d695e2db108ab233 SHA512 63e5257412187792dc8a1e8620d2cbf27d2a6db971c0ca1fad3f8263f8285d44e678c6b4a06bb1acfa638673979aa26efb48960e0e921adaf66aaa186b0e95f0 WHIRLPOOL 13dfb8ef7edb964539e20cb3ccaecd18f47f131c3dbbbeb0eacb5260921f942bb4c532905ad2ac0e2131f9a443ecefdd8a9467e323cb9f6a12e057c13eecf25d
 DIST jre-7u45-linux-x64.tar.gz 46842143 SHA256 e107d8ca8dcd570207b4eff793e7b83a1ff82f1ed4ea8a80d88f5edc000c74c7 SHA512 bdb5d968b80345229d7872298b40bfa24a483c1aed0bdab633dc0de70d1393e8735270cc3ee04091d6175769b230a736f2fd32e2a7192d73cb5e60f1c16e386d WHIRLPOOL bef669b01399b5a092b92c85fad08979f8c095d864331cfb5cb3b3c1a36bd40eca7942c43a5b00b9bea988540eb19a6e8d6e68261f35a1f98fbcbf278ea0ac58
+DIST jre-7u51-linux-i586.tar.gz 48333427 SHA256 f6807069ff45576ffff173a2ee4355bdf5a493e9b463bde9196b942af4f6fcdb SHA512 e5a2d841e7f924b606d3d3e94f75bad273f9952ff94b94f081d73614d0001326a9ac974412840c994e66dcc5d2bf582c193a08cb725f435f2770fb01d9546b3a WHIRLPOOL 5cf27c761ea3c2c8ad395dcb8563dc5e4933552a48d1e64e77071bf84e86bd34aa19f590859a143a9c986fda0b7594f4ef6e27d89fcaef0c52a678bd30a6eaa0
+DIST jre-7u51-linux-x64.tar.gz 46904005 SHA256 a8ef4fd8403398f9c2579bb97b5e6643661dabd510e4c3b79529ede9e1f8584a SHA512 16d5ca50c243e62ed1db8c0ac23581699ec1f97443f9cdd6292febf304a18fd8a3f1b2e0acb862e874065eb40981c83f94b3cbf4ed8c1458e8b65a265bb934e3 WHIRLPOOL 708cacdc15c718a88d003b3657de88231d803bb5ecd0a999d22526ba37110d93629a8d04c0c3e2ef839fcee86b55d761fec0c6af04aecb5a12e5c938bac02552
 EBUILD oracle-jre-bin-1.7.0.45.ebuild 4956 SHA256 f51f15b386b1459b8b457c73d12492c1b3359c26586131d49744478fd8078d6e SHA512 566e6ef07f2a8a48cc7cfdeb00ac42a32743e8ddaece645cd5451c64b6b61851718bd711b77fe64e333a5092fb83066d9b9148ce5b364b923ec779da214653ec WHIRLPOOL bf6d0144f7f1928d46e273b5056d4998745557848c8bb7f38b9514698b9562627cb4e860e7dc9d53d21956f5a383d959b57a8d37fd1550037ea9139c69a4d3f0
-MISC ChangeLog 7734 SHA256 ac388fa3c816fc84a807f68403e66c992ef0adabc6bf105d8300d4ac93aa6351 SHA512 488a6693031ad7ae3a2ab7c9bcdbe4c750b20e22ed1ca84aefc898a643f4137a84221cebf784eaa6b73b44cb3a158800d37d0be6aae9e640a982148f7740eab2 WHIRLPOOL 5dd0e76eeddd3a645ac1cd7c7e62d091f2ef5c30c31c49dbd2d3f5131637cc929587a40a8d971e77ce2b771f47a4d3a03810dfc4b64ae21d7e808465e662c759
+EBUILD oracle-jre-bin-1.7.0.51.ebuild 4967 SHA256 8925a7aa4c7212ff4ee26802deead274c530fbc158e90a8c2e71d4186935c9b3 SHA512 f682bcc6697438d5bace817b57e3c71d6a5e4aec6f7cb930810a964c6f4060da301ac7d1f35a26ddaa049ae95791406b060ba217054ad52d01fa5ef2b0264d9c WHIRLPOOL be5b41ab36612d00dfb4b777441023793fa3b6924ca5f1a0f6d5756ac26645cfa524c663b2721a983d8bca452c359fb979d8495957fe8587072cc7761febfa37
+MISC ChangeLog 7945 SHA256 cf16d7acfec2191c6ea918206e7a99003b779b46651f7baa257fcc0770e0abb2 SHA512 769d5945541de6cda464b2a51c8ac3cd3912b4ed8c6c0dc0d285f37395a4092941c6e4daeb1b6e95c0086a412bf40f1bdbb6e69fab82085a1f9a470020c99f30 WHIRLPOOL 1931a2431373b185954fa93214db04d89e7f8061402976133d777a3cb2811c639842f536d748b12442d88c3c0d00c92c38ad5367b81cff33126c41adf22ff61c
 MISC metadata.xml 446 SHA256 6c1b5ea55c7570c8ebdc2c59ebdd09a50fd3704202ba4d0210e07161d0be2d0f SHA512 4443bb556d293a8a7cc98f5956203b355255820c1d7b3650c75adc04c0c0e10fffd7751f22f2111a2f43c8dc451ba35719a94c25223fad5559d88d9701673ffe WHIRLPOOL 7a6430e9039f2a8d03f5874eea63e980998ee0756a1df4d15cb85f8afafcacc67ccd33b34f3cfe186586ebf7245b5b1760317e2a3cfe0dadd6da693a7e39203e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSYuMVAAoJELp701BxlEWfk2QP/At0M8meoivW5XkgDC9QTs3v
-L8MnGO4xwfYSa6XS9mWuztIuMFlARTMloGgXGKMRknjHgYQU2/y5tIkRAy3eRj07
-tvwlrbKe32pEdZKTOicg5ULWZBTWiqomzScdhDilnLeUXzAxaEFjco78LzQR7UvL
-ZzVieeY8Lu11e/BYjAXGuCVjEWIkrc6/BtkYiSiUxUcIC6evfCkSx1BotOT3xTOe
-uToAI7fCwCSVMc8HR0/zlLtdH9vf4PYN9EBgcWbPDh7XDwAp3gieRwI1jNKnBCRP
-AYoKJydsDq8CI+WNpRJ/I1vou8bH6mJJR07nDmqB/+ePvfxz1NhYCsYwpGZ8RfNV
-2YpCFY1qHBHTVklIRCegeLiskj4ymkCWUI1l2AxvQJPfPcvNQXZElM7ZxnNnk3ah
-T1JYNcPmCd60ytBLdVXOzouLmceXKYduprM3ZEZ0Y4XeBBCAr/U5vcdu5HfiI3Ec
-4xCQlsCXHcRLCDCSn510s3CJDE1aKtW7EaX+NxmTH0Oc3xPHgZi5OXaf9WwvSS/0
-bDJv19ECqxhMLDCDrhpGG4x4hzQu2QQMgQiBS3Zjq6JcKSYSzyLpKb/4Y8jCgrTE
-zdOb1WIuanAE3aadnynzn1UxnLj/2IsZ4l3JGHROxUtCNd6psO/+9eV+83MzVjmh
-JZijed/OvEMjVscMFxpB
-=5Vkn
+iQIcBAEBCAAGBQJS2V2jAAoJEPiazRVxLXTF/q8P/1Nw9Izjz8tCjMVzP+rsA/DI
+bQUv63dKWO3s5FjMRHsK5TU8DThxwe6HTA69wuxiO0GNe6lR5ZIBnFg/vg6MdCOF
+uDJ1jTHDAPEQAYfrqoegLcn8TxqgjMIszfSQZK42DZCRI9NRaBJnWLtHQqP6aHwG
+zolSbWpLqieWiMYuBtpoETl8cIduBFcant6Nk/7glCS4wkhfqT5go4k/Sh5bQNxi
+VUo3dNdJR/a35ERix5QFgagm4/g8ue3Ebpkk/EpCvLuDqu9u6vBctNCYwu+sS3D9
+rNmS7UQ74DZPrUL4Q7XiOCspKys/tV+rhDjtGV2IX1NIBHuEcOU3GeCTwRFhq9V3
+dDj9T8Kxh9XCfgu0j3nP4UswiGUWzYHV8u/6zoNm737ug4R5vahZa+mu244xSyxb
+dbr27vUe0Yv+S3jHNUKeq5QReT9cj2ic2jxbachBja6fCkWtwm5n0z1Is0LHIxFj
+mAOu5ANLOinYY9M0DgsaN4p5KrWUzYWdjV7vnqh2mDPxtf1M1/NudmIOpYd3Pzof
+aMaXzBWrjMoCeu5MKYy5ynLWZYE4M68Ujzc2REEouZ1w2rESTmBCC57Gta29oAOz
+Fjlbgq3rZn78KperlcAnV0nzaIWjXWm/sJhB9RjtZgyNmi9fQ/T9INMC9P9sN6Y5
+83Kk0Knr38bD1LaNxjCw
+=G3Yh
 -----END PGP SIGNATURE-----
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.51.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.51.ebuild
new file mode 100644
index 000000000000..0f637708742c
--- /dev/null
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.51.ebuild
@@ -0,0 +1,176 @@
+# 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.7.0.51.ebuild,v 1.1 2014/01/17 16:43:14 polynomial-c 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"
+	case ${ARCH} in
+		arm|ia64)
+			bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			bin/java -client -Xshare:dump || die
+			bin/java -server -Xshare:dump || die
+			;;
+		*)
+			bin/java -server -Xshare:dump || die
+			;;
+	esac
+
+	# 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
+}