Security bump. #421073

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

3 files changed, 238 insertions, 9 deletions

diff --git a/dev-java/oracle-jre-bin/ChangeLog b/dev-java/oracle-jre-bin/ChangeLog
index 933e3e520b8d..4f3a4c101c78 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.13 2012/05/05 19:47:10 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.14 2012/06/14 09:33:22 sera Exp $
+
+*oracle-jre-bin-1.7.0.5 (14 Jun 2012)
+
+  14 Jun 2012; Ralph Sennhauser <sera@gentoo.org>
+  +oracle-jre-bin-1.7.0.5.ebuild:
+  Security bump. #421073
 
 *oracle-jre-bin-1.7.0.4 (05 May 2012)
 
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index de78bac9d3e7..274a9d93cf22 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -8,18 +8,21 @@ DIST jre-7u3-linux-i586.tar.gz 33853947 RMD160 b7f2feaa4a4a66625bdb357fc2f14c086
 DIST jre-7u3-linux-x64.tar.gz 32432120 RMD160 467517186b0bbf038982653ff9cf3446130eed9e SHA1 8a7f5280392b442c6c930058b71fc6ba7692e9f2 SHA256 eb06eab781be0c1dfaae2e5ef3afff5267e24e77f62401b09777673508b8d68c
 DIST jre-7u4-linux-i586.tar.gz 34361614 RMD160 b3fe7e489400c28511a8de6a590e2202b67a5b0a SHA1 3b57a2ca8ba561fde4a71ce9e7bb540c595d5f2b SHA256 e3514815588df66c26297a2dffa64ed90c383f273735700460b9f572c8d0cf8a
 DIST jre-7u4-linux-x64.tar.gz 32881501 RMD160 7b3bd29c9c11c1c8f8cd16448851e1ca56c33586 SHA1 7b928735d9b47d5c4c7120640b193220109f62e2 SHA256 04b6529fb500b1f1ee6d1ab8d4eb6611f0a9031258ea6ea0bc300499d86eb148
+DIST jre-7u5-linux-i586.tar.gz 34374207 RMD160 a9fbb755fdeb6ec0de314793736f89198175901e SHA1 ab4974bfdf417bab0d88483fa5d813f0eb6fbc7b SHA256 61e23f37f2fcdbc0f28755dc4692a810bbd10c67794145f37dfedf658afc9e29
+DIST jre-7u5-linux-x64.tar.gz 32876408 RMD160 68a28d4c40e105c5fda0d985d8a2148d55f18f25 SHA1 e363591ad93762a4f09fa73689d881b8a868556e SHA256 22b10ab1be0937218f1697a1a1a48e55eabd11453f5220a910da6d9179e9f579
 EBUILD oracle-jre-bin-1.7.0.3.ebuild 6799 RMD160 eb4233b5013f840a77056eecd2cf78df2f8baa63 SHA1 a7fdd553fa501cc52268f8147ef81d173e940754 SHA256 15a6f6f1d8b03f2532604edb88a98f923a3d83b992f822710f89113c22cdbf1b
 EBUILD oracle-jre-bin-1.7.0.4.ebuild 6944 RMD160 00fc0ed176e51fd64cd374cf25670fa9e242335a SHA1 45beaa55912acdae7ec32fcf66b5d984db7b007d SHA256 f4fa56e420fcd663e99acaa421dc6343aa88049d510ebcd25f27a5a078d0738f
-MISC ChangeLog 2439 RMD160 9cc68590efe18853064d64019a3c2dbb57591c31 SHA1 a3cc50c20f24f0c79c88a953d6303069951e0123 SHA256 d900221cd3e729aef7e0cc710d8f6eb4de12d2f9c77c34957acc7598153c592b
+EBUILD oracle-jre-bin-1.7.0.5.ebuild 6950 RMD160 af514e0bf914fbcce72f9cc21d69c4c2f2a385b5 SHA1 4c98951a7a1bd10e30fd36277339af89527c0eeb SHA256 e9f8d0d9ae0100c7c458ebb73e47b1f84613cb57208728448787a27cf7bc3a9b
+MISC ChangeLog 2588 RMD160 a104abcb891771ca6b19d8925b1aa954e8312068 SHA1 d8573cddea48ef8ea9febe020bf43257e385e574 SHA256 bf1924dca17a19d4a041c1494da0b556cd116d8833016c669d02e34bc7d6c1f0
 MISC metadata.xml 374 RMD160 4e6b6826d9ee188e0fa0b5a9a5e5d23b722e10f8 SHA1 0c90ab71e19ea1e34710e7944f268bd46943f57d SHA256 32decb0503e4843bf9157625a4c494955b4c93ccd079bec72da1c374c03b7fa8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPpYPMAAoJEIUJ+svaV1637JkH/juEBdJ4+PA+uZEft6JoH8AR
-LndVEDioCsy2qvuH0lztLJmxdlpvrHkW2Zi1tUr91mOK9fO2UO6d0/V9BLtldjCO
-d0kjJrJN2yda64C7j3R5Q20rkUGPLMpHn0UZAIJxNKaeLghrXD9zj3H6KJcR23dx
-JMteiqC7xsDUPBfJzMd1+shET/NYLFzKgpAl9CElU0Fp47iO6EEmz2p/61Q66+Fm
-NKUBwm5UlgMRFJ88pMPFTrjMw0pFz5ziPVrg28Qav8lFavqtpag9FB4v4+eO7AhT
-2ZLVIARf0mczYv6Ev3CsyWTcZDIkt7ECY37UysYF/cO1cn/Hte1N3sR2i09NTvo=
-=RQe3
+iQEcBAEBAgAGBQJP2a/wAAoJEIUJ+svaV163SdoH/0KuULk/vUmS6r4XyM2/Cur8
+GZ0qWLNllgnTCX0QTTb5TW6A9NUmf0izpblATNzAhYzruuJqroboKrelyBInDFHf
+TnYVwggRLMcLkFnh43r/QQZSV06Nh/LSVz5ogBdreiSr4Jmc3Ph+u0jVjhBCJBxI
+MeC/JP/AQPZp8IY8YpzPSFunk3iZVm+yKrJev8+AU7Da55BEVV/VQkiE8KrbQI71
+gYeW70JfBOwewmCZov6pTIVTXHnxROPU8KhqVG52nvk8KES7tb9Bzv9T32Y4rl5p
+W2gj1hOw8BVW2L6YYiVw7/1tokTKtWjrq0mEbDPuyC8XRi5lzwNAFMdXBqIqxSM=
+=HLBP
 -----END PGP SIGNATURE-----
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.5.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.5.ebuild
new file mode 100644
index 000000000000..0f25c76d4df8
--- /dev/null
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.5.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2012 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.5.ebuild,v 1.1 2012/06/14 09:33:22 sera Exp $
+
+EAPI="4"
+
+inherit java-vm-2 eutils prefix versionator
+
+UPDATE="$(get_version_component_range 4)"
+MY_PV="$(get_version_component_range 2)u${UPDATE}"
+S_PV="$(get_version_component_range 1-3)_0${UPDATE}"
+
+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-1637588.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 jce nsplugin"
+RESTRICT="fetch strip"
+
+RDEPEND="
+	X? (
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libX11
+	)
+	alsa? ( media-libs/alsa-lib )
+	!prefix? ( sys-libs/glibc )"
+DEPEND="
+	jce? ( app-arch/unzip )"
+
+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() {
+	# 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 /opt/${P}
+	cp -pPR bin lib man "${ED}"/opt/${P} || 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 /opt/${P}/lib/security/strong-jce
+		mv "${ED}"/opt/${P}/lib/security/US_export_policy.jar \
+			"${ED}"/opt/${P}/lib/security/strong-jce || die
+		mv "${ED}"/opt/${P}/lib/security/local_policy.jar \
+			"${ED}"/opt/${P}/lib/security/strong-jce || die
+		dosym /opt/${P}/lib/security/${JCE_DIR}/US_export_policy.jar \
+			/opt/${P}/lib/security/US_export_policy.jar
+		dosym /opt/${P}/lib/security/${JCE_DIR}/local_policy.jar \
+			/opt/${P}/lib/security/local_policy.jar
+	fi
+
+	if use nsplugin; then
+		install_mozilla_plugin /opt/${P}/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}.png#" \
+		lib/desktop/applications/sun_java.desktop > \
+		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
+	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
+
+	# bug #56444
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
+	eprefixify "${T}"/fontconfig.properties
+	insinto /opt/${P}/lib/
+	doins "${T}"/fontconfig.properties
+
+	# bug #388127
+	dodir /etc/sandbox.d
+	echo 'SANDBOX_PREDICT="/dev/random:/proc/self/coredump_filter"' > "${D}/etc/sandbox.d/20${VMHANDLE}"
+
+	set_java_env
+	java-vm_revdep-mask
+}
+
+QA_TEXTRELS_x86="
+	opt/${P}/lib/i386/client/libjvm.so
+	opt/${P}/lib/i386/server/libjvm.so"
+QA_FLAGS_IGNORED+="
+	/opt/${P}/bin/java
+	/opt/${P}/bin/java_vm
+	/opt/${P}/bin/javaws
+	/opt/${P}/bin/keytool
+	/opt/${P}/bin/orbd
+	/opt/${P}/bin/pack200
+	/opt/${P}/bin/policytool
+	/opt/${P}/bin/rmid
+	/opt/${P}/bin/rmiregistry
+	/opt/${P}/bin/servertool
+	/opt/${P}/bin/tnameserv
+	/opt/${P}/bin/unpack200
+	/opt/${P}/lib/jexec"
+for java_system_arch in amd64 i386; do
+	QA_FLAGS_IGNORED+="
+		/opt/${P}/lib/${java_system_arch}/headless/libmawt.so
+		/opt/${P}/lib/${java_system_arch}/jli/libjli.so
+		/opt/${P}/lib/${java_system_arch}/libawt.so
+		/opt/${P}/lib/${java_system_arch}/libdcpr.so
+		/opt/${P}/lib/${java_system_arch}/libdeploy.so
+		/opt/${P}/lib/${java_system_arch}/libdt_socket.so
+		/opt/${P}/lib/${java_system_arch}/libfontmanager.so
+		/opt/${P}/lib/${java_system_arch}/libhprof.so
+		/opt/${P}/lib/${java_system_arch}/libinstrument.so
+		/opt/${P}/lib/${java_system_arch}/libj2gss.so
+		/opt/${P}/lib/${java_system_arch}/libj2pcsc.so
+		/opt/${P}/lib/${java_system_arch}/libj2pkcs11.so
+		/opt/${P}/lib/${java_system_arch}/libjaas_unix.so
+		/opt/${P}/lib/${java_system_arch}/libjava_crw_demo.so
+		/opt/${P}/lib/${java_system_arch}/libjavaplugin_jni.so
+		/opt/${P}/lib/${java_system_arch}/libjava.so
+		/opt/${P}/lib/${java_system_arch}/libjawt.so
+		/opt/${P}/lib/${java_system_arch}/libJdbcOdbc.so
+		/opt/${P}/lib/${java_system_arch}/libjdwp.so
+		/opt/${P}/lib/${java_system_arch}/libjfr.so
+		/opt/${P}/lib/${java_system_arch}/libjpeg.so
+		/opt/${P}/lib/${java_system_arch}/libjsdt.so
+		/opt/${P}/lib/${java_system_arch}/libjsig.so
+		/opt/${P}/lib/${java_system_arch}/libjsoundalsa.so
+		/opt/${P}/lib/${java_system_arch}/libjsound.so
+		/opt/${P}/lib/${java_system_arch}/libkcms.so
+		/opt/${P}/lib/${java_system_arch}/libmanagement.so
+		/opt/${P}/lib/${java_system_arch}/libmlib_image.so
+		/opt/${P}/lib/${java_system_arch}/libnet.so
+		/opt/${P}/lib/${java_system_arch}/libnio.so
+		/opt/${P}/lib/${java_system_arch}/libnpjp2.so
+		/opt/${P}/lib/${java_system_arch}/libnpt.so
+		/opt/${P}/lib/${java_system_arch}/librmi.so
+		/opt/${P}/lib/${java_system_arch}/libsctp.so
+		/opt/${P}/lib/${java_system_arch}/libsplashscreen.so
+		/opt/${P}/lib/${java_system_arch}/libsunec.so
+		/opt/${P}/lib/${java_system_arch}/libt2k.so
+		/opt/${P}/lib/${java_system_arch}/libunpack.so
+		/opt/${P}/lib/${java_system_arch}/libverify.so
+		/opt/${P}/lib/${java_system_arch}/libzip.so
+		/opt/${P}/lib/${java_system_arch}/server/libjvm.so
+		/opt/${P}/lib/${java_system_arch}/xawt/libmawt.so"
+done