Security version bumps to 1.7.0.55 and 1.8.0.5; fixes bug #507776 and bug #507798, removed unstable versions from 1.7.0.51-r1, pending stabilization of 1.7.0.55.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 211 insertions, 14 deletions

diff --git a/dev-java/oracle-jre-bin/ChangeLog b/dev-java/oracle-jre-bin/ChangeLog
index 03745e9a8393..e16b4f16596c 100644
--- a/dev-java/oracle-jre-bin/ChangeLog
+++ b/dev-java/oracle-jre-bin/ChangeLog
@@ -1,6 +1,15 @@
 # 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.50 2014/03/28 14:56:47 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.51 2014/04/16 16:28:47 tomwij Exp $
+
+*oracle-jre-bin-1.8.0.5 (16 Apr 2014)
+*oracle-jre-bin-1.7.0.55 (16 Apr 2014)
+
+  16 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +oracle-jre-bin-1.7.0.55.ebuild,
+  +oracle-jre-bin-1.8.0.5.ebuild, -oracle-jre-bin-1.8.0.0.ebuild:
+  Security version bumps to 1.7.0.55 and 1.8.0.5; fixes bug #507776 and bug
+  #507798, removed unstable versions from 1.7.0.51-r1, pending stabilization of
+  1.7.0.55.
 
 *oracle-jre-bin-1.8.0.0 (28 Mar 2014)
 
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index dfa2fc84fbe1..ea8dafaf5646 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -8,20 +8,23 @@ DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a
 DIST jce_policy-8.zip 8409 SHA256 f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512 abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5 WHIRLPOOL 8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc
 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
-DIST jre-8-linux-i586.tar.gz 58128747 SHA256 59dbbc45a388854e8e0b8393afc4094a5a275a3c82441b63ae89a3bbd2d97bf5 SHA512 b0f02b5c8785f55a348c78a88c1d3ce72c0cc2bc668e07dc29f608504c4abd6e69e13ebae6a10908eeadf9a5b90fa5a47a01bfb3bf0c991666ab312eb48f715b WHIRLPOOL 6660b642ea09e2810bb2dfb635af24b2409f22b15515183e7e89ae47e43af1fb18362591eaa5e3426cc86e332cea41822e4588d1ee55077daca9b29026109437
-DIST jre-8-linux-x64.tar.gz 57021342 SHA256 267da3863c44830411a8e41c6c5632e421e1510788a81e8196bca4b62129fbc7 SHA512 a12ef294fcb9fe1d65fbc3662bcdb93f7a695143db47121e466eb96e2cdf2f8f1e940bbd11ff9acd5c5f74d5207bc7715faad07d9be9a5d0f33fd8d0a7e6fb9a WHIRLPOOL 48859006e7d83e0f9844648cddd9e641c086176089b59b92908cbf745328fe16537910e9a18e731f5bd0829ab9a64df0bcfb827fb1b7a6eb6e6399e7f89b773c
+DIST jre-7u55-linux-i586.tar.gz 48340455 SHA256 fa674c83c25a65edeca289321c9bb1c0fe9c0eaae64dc1bf3409e2c6a5f46c80 SHA512 f365a2548ea6ff9cf263b0dd71100eb70d842a4abd72d852e7698d9d7dbee97c4da2654795035adbc4519705a3d7eb81031566f2a97eaeeadaa439ca9a8867fa WHIRLPOOL 88abacb65259fd59c89a70e72ff0a258f6b0b178afa826502eb46e7109abe586094d79762148b14c1d97dce2d1b3a9e06736a92d82c839ef2fe8c8e8310918b5
+DIST jre-7u55-linux-x64.tar.gz 46933036 SHA256 973ddefe3e1cbc435458988a8868eff196970f940b84b79383fd4a8414e0b899 SHA512 09a4076c49bd79796660e9cb223156d57bb2d9d7b7d0de9d61cd3a52e34a30e43b416adc5e71ff9ffd9cea6a1ca1e0f04c5786cf5cb9560c5e5f02f9ebd9f607 WHIRLPOOL f365561f65e3e3f9642f097c66582b9861181cf41a2d6a7fade071579cde689a377bf59fbd51e7379c2f316fc204226f46bae121cf287c336e275beb2c3680ee
+DIST jre-8u5-linux-i586.tar.gz 58156527 SHA256 77a81e63325af682d52875e6699d5edd5f3be668025bcc99f5d9132c46b82053 SHA512 095feaf587e5c24bb1157e9a6bfafbcc11d1e726d4b7573b82e1412932a53a3bf942721877c95f87853b7fbc92e3dca5abe83c13d6fa52eee608c4d41afe7a30 WHIRLPOOL 973ec3d2cd30f271f56c86b0097723d5aeaf7301f9a715af3189f922c767f0d31e8c613554338f8e55c7ecf6d2bb36794c3f1c84d01e22b31829e45b73cddb29
+DIST jre-8u5-linux-x64.tar.gz 57056684 SHA256 de7ba8e27b9e7352c44608969871dc11dedadd26d81865f9a42aabff8dadba2a SHA512 961a3dc49fe8ee3bb51b871c139c65c4c020431b2ff5cbe3532c0af3e2d584a094f2a3b8aee89cf1e803bd0ae2dd3447f31377af3f16c477c0150a281a3f0378 WHIRLPOOL 3503edab4be5d345c0ecb398583420a017e8c33eb6385d7d7844326e77be6962dfb1724867721ff0e96de6cf9b62d6bd0cb6ab34071add1f5e7ff5d01712b02a
 EBUILD oracle-jre-bin-1.7.0.51.ebuild 4956 SHA256 ed3b89cb9f39b01300145c9fe6b1025e3b7d7abe44700a8c07ed8955a4d2ee3a SHA512 f133b778363b95a6f7eee606c14cf11542ef2d247bb7f4888d7873234cc002f3504a44a4333be4ac0a4c61a4acdcef0b98d98a89b28958e45b7b21c239b40959 WHIRLPOOL be92a7ecba542cbae788838517cf0c3d65b21ad8d96138f3fc9a33af4d9049e4ef1517ccd39504041d4ea8bd46bcb36a51a4bef07b638316f256bcfdd04aabd4
-EBUILD oracle-jre-bin-1.8.0.0.ebuild 5097 SHA256 e3eb25eefb1fd679853ab9d682eff86d7242eec8fd1e14bc8a46d1a22c61b5ab SHA512 9f98ca019fa44f892b0749cfd730cfc02b93de964f82214f73e2f1f9ec2548a9cfe283b8d9dcdc586a0794fc4c079c6c30058f62d7f4f5af2cf01b744c31daa8 WHIRLPOOL e797ce19e4e880a9fd450e81679df5ef659597d29410ab54c30a01dc1591219bede695b5bb1d7cd5dc261df1213b8a0fec0936d8128ed8a8049111147f3ae414
-MISC ChangeLog 8553 SHA256 a7f6d5400d8af1032bdaddebcca011e5a16c8ec42c42f220ec9a533b8214e802 SHA512 b2191fde95bca5dfddd78ab1c35277740042e730330c31285cdd0c89522acc4e49df503cd119268e6b8e8c14652398cd72db89916b3cbcb1485d4de657faecea WHIRLPOOL 1c04edd761a6bbd80681317d47aabdeeef454368a90d563d50ab744c28d3b16b48e18fa9772a735a03dc21bba0a84c27aa67540e9e1956b802ff04dfb51acb39
+EBUILD oracle-jre-bin-1.7.0.55.ebuild 4961 SHA256 bbe15e7cdca9585135e71a280fd63c1c45fccf2fc488c063b30567c112bb16e5 SHA512 20ff8ef316f1dbe0052b0f171f9de83b1d56066cbda6321d2634d489b1617197519a54f7d76e6515761ba0eb86470efe12a7921bad4a645c0289e17218f13ae2 WHIRLPOOL c44f98e4cac253027c8b49ce3f40f811abb19513b15c457d02d448727acb25db9f704676bbe5980948886f4bcc8467f60806fc7f433a2d7a54b6c5378018ed33
+EBUILD oracle-jre-bin-1.8.0.5.ebuild 5384 SHA256 ed8271cfafdbf100187d3956de712a4f563685e7b4e93187d85fe346e9cf5b1d SHA512 10a3788165df190c66be07a286d6350e9163103bf8894fe81f1c2b7eeb04da065d21b1bc095cca28ee119664b7ee6d664ce454589d9a901723300723028ab408 WHIRLPOOL 01f4ad6a43607afcc15bcd1706e2e970b84758ae26e6423a2384f0644ef8a78433239faf20817847ff1a0787fed5d2ebf5210f4abaa162bef5c7497c992eb3f1
+MISC ChangeLog 8946 SHA256 a1dba3a10b4e3d6b1fe9c6fae0582fc4ea86e548d87e397b90d5302a50b45602 SHA512 5d950ebe87df6c63acc31450bcb9ff03f24bd14bb4d1247f71fdb3bb280a253563d648c4ac0e195f847076782ab620521fdaabcb1d5e43390daed3909433033b WHIRLPOOL 0b0a934df8dc3fca7030f212a7390a5d93f8107f56361c5976d6c3a82d5943705b67390d1c94d00f09e7c8b17b7a15d1c08034ed0a984bd42a43c34753fc9524
 MISC metadata.xml 446 SHA256 6c1b5ea55c7570c8ebdc2c59ebdd09a50fd3704202ba4d0210e07161d0be2d0f SHA512 4443bb556d293a8a7cc98f5956203b355255820c1d7b3650c75adc04c0c0e10fffd7751f22f2111a2f43c8dc451ba35719a94c25223fad5559d88d9701673ffe WHIRLPOOL 7a6430e9039f2a8d03f5874eea63e980998ee0756a1df4d15cb85f8afafcacc67ccd33b34f3cfe186586ebf7245b5b1760317e2a3cfe0dadd6da693a7e39203e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTNY2iAAoJEJWyH81tNOV9AOYH/3zfQvVCfYc6cIKvaOCNausE
-jTyPzDDEKE8CNUnZ5yewpSyavC3pA/bWyhPF9qyg8PBJY8zyC2vl6t91xhhc6DYF
-7mXSBt/LLhhNpDEhsrk31c741UUNOYMojjTp8hdEbTnWOfKxfvH7b8Jp2RYQL1wT
-IqtnM9xvAUZE9n0KOcJQlq8XmKcGJa3ZhP2JnplRBIoNWGMQzusLEj4XV4FLwczf
-NUnDaz++mpYOmScFk1jL0R21ji0d0ZNFU/XiDA/a8xLvDcgP2/wsHXV5uDW60sw7
-+GooCBkiG/Y6lxnVvbFgFcotNq4bAycxHw7H+8Ce2X4QiOy5Y9+H864se5BdXRA=
-=Pd+V
+iQEcBAEBCAAGBQJTTq+PAAoJEJWyH81tNOV9NwkIAJwjXP2LfowigS+WQLjCb4wW
+i5y4uCKwEyjEVQBUU1xnSZra4tdUnA0IJSPYSC8yELyJVXYXBOVwS3T9P/yQpU3Y
+arIzzgMhQKZqYSjwm517c3b/mG3y6U1f4bhtXLa/5o5SB8RSJtQ/MrX5n3HbqABf
+b7Fz65cQWO6urJehN9wY2XViUVdlSjm2BGNBnJ8W8N1Bp8hBwU6EAljF4Lypp457
+SDhZZBY8/3wALzv0g2Le/rTVuu8kHVF93pM0fJNOMuzLK7HZTxW8d7LGZXulUl1H
+4KQJ7hnPi3tC7HgOSuk9VA3vtbXQ2MDQD5bYxnQDKWUdYubUjH7lk/nbylMjr6E=
+=ptCQ
 -----END PGP SIGNATURE-----
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.55.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.55.ebuild
new file mode 100644
index 000000000000..e3a3de6be355
--- /dev/null
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.55.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.55.ebuild,v 1.1 2014/04/16 16:28:47 tomwij 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
+}
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.0.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.5.ebuild
index 36ff4a5c38b2..076193f0fbd9 100644
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.0.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.5.ebuild
@@ -1,6 +1,6 @@
 # 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.0.ebuild,v 1.1 2014/03/28 14:56:47 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.5.ebuild,v 1.1 2014/04/16 16:28:47 tomwij Exp $
 
 EAPI="5"
 
@@ -57,7 +57,7 @@ DEPEND="
 	jce? ( app-arch/unzip )
 	pax_kernel? ( sys-apps/paxctl )"
 
-S="${WORKDIR}/jre${S_PV}"
+S="${WORKDIR}/jre"
 
 pkg_nofetch() {
 	if use x86; then
@@ -77,6 +77,15 @@ pkg_nofetch() {
 	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