Version bump, security bug #433094.

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

3 files changed, 226 insertions, 3 deletions

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 5ba07c8721cb..6fb93ac9782d 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/sun-jre-bin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.219 2012/08/23 20:15:34 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.220 2012/08/31 10:45:04 caster Exp $
+
+*sun-jre-bin-1.6.0.35 (31 Aug 2012)
+
+  31 Aug 2012; Vlastimil Babka <caster@gentoo.org> +sun-jre-bin-1.6.0.35.ebuild:
+  Version bump, security bug #433094.
 
 *sun-jre-bin-1.6.0.34 (23 Aug 2012)
 
@@ -1115,4 +1120,3 @@
   sun-jre-1.4.2.03.ebuild, files/sun-jre-1.4.2.03:
   First version of the Sun JRE, I primarily based this on the sun-jdk-1.4.2.03
   ebuild, I hope I ported it over correctly
-
diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
index 274f5f86b4cb..7a9cfe73a0cd 100644
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -8,9 +8,12 @@ DIST jre-6u33-linux-ia64.bin 22876388 SHA256 d39f06a0f6a18e94cc1d884f8d1c9d695ef
 DIST jre-6u33-linux-x64.bin 21300793 SHA256 c8a596ece07c79131fd33c65ab61f6099b203a42c0fe2daedb24360a15ab70ab SHA512 ced532e0eedab8312dfd242c624e59fde3ed8428eb1ec443ca0183522261b4af5979b566e3c88e27882e7eca9af7210735ed88841164ca06a9fb2d0fd6db1349 WHIRLPOOL 6ffcbd081e277e32e596eb0f4faf2de47b5c523622f7972e2bee4e7c60e8caea13111fea677bde7a076c1e051529a80bce1d0bc03713dcb4a837aabd63a28711
 DIST jre-6u34-linux-i586.bin 21697699 SHA256 c8274dd85af48a881276790e4b685b6a74b81eb3b4d60fa65e49820f932e1acf SHA512 7dc1c31c7fcb9721769e1c74b6aef29f698912879bcdf06973b99bb987ae7f9059b8b1abd487c180d1b560b38bfa11b0746256ed0ad63b3c01bbc14096bc7354 WHIRLPOOL c7f36a3e68931b204aa21d49f3305b19f905cea3c4d5f3001834ad3beac56c2bfb702e69841beed76383b9a451a347d93f66a5161937fe486034feadd9980e62
 DIST jre-6u34-linux-x64.bin 21302095 SHA256 affbb1851a2235130cb8f6d6cf467a3b130474b417658418bf8a4d85cff0dbaf SHA512 d8b50060ce190c44261a15c081bab731e6b5fede0e2643e99a778a84fe95c8023f79dd5a5aa840d42cd49b629c3f28d0bcad55528d6dd32d4ccbbe9b6c844832 WHIRLPOOL 5f98b815db24b65e2b7527f2769d2c5c9747bc13395751d8b98e3ae009f8eb6d1e5685356bfdbbece468e5f4a4c127a0f8935213e8b07316ba0a97f752e04284
+DIST jre-6u35-linux-i586.bin 21697122 SHA256 55959143e602cb4edf2786d0f78c288eb44e7f105836aa949f2e0081a2fbd70c SHA512 981c9177b910f3530acf9b0998e33c79c9d5e0bb6da73694d87d48be50a30ba349e088e7b32ba8bf3b3c6b48789d12948eb82477123944dfef61d2972ddf88a5 WHIRLPOOL 8313107f4aee0b877bc4ba4f4fe22738a41a0229e04af7b0b528fe23b820ec207efff6a7565c97985e8b9497ff73c1b7f4117b281ab286b49d91583f45a67835
+DIST jre-6u35-linux-x64.bin 21301595 SHA256 13c6d118e0f923c5dbaed49bdfd82857be7453c831000088305d47182bfad089 SHA512 789ed7eb4e3e4e9ee8170521da643d5713bd486b622f3cc3e10f9fa74360c31e98fe45ae7e599dd181067f2d0f81e6149f9628f6ed346c3356462d30077b41ea WHIRLPOOL 479bbf7e7e446d9fbc5bda230aaf00a6fc5d46631d47f604602d2b851c04f817753fe562ba15679cdaa86a5da6b99a2a8d526284d1e72a2cc13122c3b120c0fa
 EBUILD sun-jre-bin-1.6.0.33-r1.ebuild 6904 SHA256 ed522a5bfefdca5efe1a649517016c9cabdec950aeb0444e9084bdaaa5d990a5 SHA512 8a7d97e30a09fe1b75900002d5cc5023eee7044d10dc8b49a0ec1f96a62b555791a5f2c8d57347f573ca8a85d2e763e352391b5c79ac58ec18b1cf667a075374 WHIRLPOOL 0c8855abb7d326e248e4ce48b962634c547f6c8e27f1905e15e35005c53020f9689d3621f3cd5f046f8ac0f758344f56468544f1e73f3c80df82b455bb6a0631
 EBUILD sun-jre-bin-1.6.0.33-r2.ebuild 7179 SHA256 13a41f882b7d8eede69a5d176c898fe4b0aa94aea6424ea3674a1cfe3000dd64 SHA512 e81e2c450871d6b996a7a12dd90993889d676f1237489cb0dcd768518a248ae03acaf322ee4aeb6f86625f74a5801f75fa0eef6ff03ed88cc012f33322e739cf WHIRLPOOL 408d92ccf99aaadbc16261bb7ecab489d63b2f7e2fade64a34db743a299b9f3547b74978e7a779cf8707c55c80728e857d2268b7f379932a4f5406716d9525f6
 EBUILD sun-jre-bin-1.6.0.33.ebuild 6904 SHA256 6b9b4042f9fe6ea91cf0399e66675d1b9747686b689aefaceeb0545fe96b8cbc SHA512 4ca3aa3c3e5492bbfc64ad7f23a1078fd4c2009371ae422f7dab6637bef44fb9b96dec79ec9444ccca57bf8ab0a49b07fb40dc9f3bde8f3e0e4a30e40b9d54b2 WHIRLPOOL 249bdae80e1dbd16b1816b82ab16d69f6f89b91518dc43b5cbed637735608c7de92065e26ba2c4c984f82929105c6b152907d567d63474971b23ed19998fbf2c
 EBUILD sun-jre-bin-1.6.0.34.ebuild 7179 SHA256 cc0dbd22c68653342e1e03606635efe290f0722092de06b1c210a7d685b65fc2 SHA512 afaaeb5fda2a0703db3d4fca5f8c95ca3ed16c9aa7e253f2424ff9b917d7749eed4edd9be8171758c94d50bbb7a0e1b6525ff6d51595dab4f6bf38a395c62def WHIRLPOOL b0fd9c9d7024493c48cffe23abd86194f2a8d21da7e1b4e53de4fe852063c3d5089f2f76c49609688cf1a200310c0f85f1c26b9ede7001224b94620b47fe4d7b
-MISC ChangeLog 38402 SHA256 b6ab60aa0e8de6ec1fb190ebda53c11be2ec3b517fb851a608f389cf6e9e80e2 SHA512 689e5b69f7608d5148393bae010adeb47ae294b12c26b23f2f66af0061d5c6477b80f51d2302b0ade4a40ad328285e47a86965ff0dda1895f448212d37d02e11 WHIRLPOOL 7fa838c27ea074d608d9a1c738b1db6a92dcd6bf91c3606ef6112fca98f13c5ce86cc050be856564a4f3451f82f5b6be5d89f1fda484571f496dce9ccabdebf6
+EBUILD sun-jre-bin-1.6.0.35.ebuild 7179 SHA256 2c3cb91b8a03ea766ebbaa9a078f30956f873af3a89765c4bf3ada7c6fb53032 SHA512 87824dd323b2feaa106ccd5eca29270e350ac47230e5f00f8ba874eabb68b79819a8e9395818a0d912a21b320a86dc9334f06f0176e031e5843881ddfdf06425 WHIRLPOOL 8870e89a29fe89cdf646f80883c26d7f64283b357808b7ba72701354e4b6caf8af0f4876c1b7c7c4dcf494d2e2460978871a39c1f76a29bc23eef8b2144038db
+MISC ChangeLog 38558 SHA256 08af2e548b13422eaaca23fe37edb6e5be484b2e1cac4f3c7c5df41932159a5e SHA512 888a60fb758e62765f98fb4626ebf8868bf500d92a61f72553fc426124f735263928f69af7bec25cb7f9c14bc1a8d05d7cc383ccc188e929df2b91ee16ad93c5 WHIRLPOOL 0aaeaf58de0b4880727b1b046538016f623c36da6d0c0d74a946157c4dfe9520514d2e9ef26e3b94ea17d6bed5880e0234d0805ed8dc7a60015f988295b65b85
 MISC metadata.xml 427 SHA256 567a5ce3eef1c4b18ed6b9f04b664a159cfe9367bba0886feef6b1069f2d6416 SHA512 e9c46980a3afe93ced0225b63841d19bd7382673e5d7c36d3e66085339d2eede7c666dcc8cb07658fd349f56e079da24196b884df5f28d0e60becdab8a790e05 WHIRLPOOL ac6a4606217946f8968cb1200ef971fc3879518bfad0ccc463284a3c39ccbecad4515ce3f22415dff4bd74b335da23a57a70af3192f9d92be84a5c3979f935d3
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.35.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.35.ebuild
new file mode 100644
index 000000000000..25873d54966c
--- /dev/null
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.35.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.35.ebuild,v 1.1 2012/08/31 10:45:04 caster Exp $
+
+EAPI="4"
+
+inherit java-vm-2 eutils prefix versionator
+
+# This URIs need to be updated when bumping!
+JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre6-downloads-1637595.html"
+
+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.bin"
+AMD64_AT="jre-${MY_PV}-linux-x64.bin"
+IA64_AT="jre-${MY_PV}-linux-ia64.bin"
+
+DESCRIPTION="Oracle's Java SE Runtime Environment"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="
+	amd64? ( ${AMD64_AT} )
+	x86? ( ${X86_AT} )"
+#	ia64? ( ${IA64_AT} )
+
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="1.6"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="X alsa jce nsplugin pax_kernel"
+
+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 )
+	jce? ( dev-java/sun-jce-bin:1.6 )
+	!prefix? ( sys-libs/glibc )"
+# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
+# marking. #427642
+DEPEND="
+	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}
+	elif use ia64; then
+		AT=${IA64_AT}
+	fi
+
+	einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package"
+	einfo "has become fetch restricted again. Alternatives are switching to"
+	einfo "dev-java/icedtea-bin:6 or the source-based dev-java/icedtea:6"
+	einfo ""
+	einfo "Please download ${AT} from:"
+	einfo "${JRE_URI}"
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_unpack() {
+	sh "${DISTDIR}"/${A} -noregister || die "Failed to unpack"
+}
+
+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
+	# limit heap size for large memory on x86 #405239
+	# this is a workaround and shouldn't be needed.
+	bin/java -server -Xmx64m -Xshare:dump || 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 {} + || 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 /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar \
+			"${dest}"/lib/security/US_export_policy.jar
+		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/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 JDK ${SLOT} (${PN})#" \
+		-e "s#Exec=.*#Exec=${dest}/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
+
+	# http://docs.oracle.com/javase/6/docs/technotes/guides/intl/fontconfig.html
+	rm "${ddest}"/lib/fontconfig.* || die
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.properties || die
+	eprefixify "${T}"/fontconfig.properties
+	insinto "${dest}"/lib/
+	doins "${T}"/fontconfig.properties
+
+	set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
+	java-vm_revdep-mask
+}
+
+QA_TEXTRELS_x86="
+	opt/${P}/lib/i386/client/libjvm.so
+	opt/${P}/lib/i386/motif21/libmawt.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}/libcmm.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}/libioser12.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}/libjpeg.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}/libmanagement.so
+		/opt/${P}/lib/${java_system_arch}/libmlib_image.so
+		/opt/${P}/lib/${java_system_arch}/libnative_chmod_g.so
+		/opt/${P}/lib/${java_system_arch}/libnative_chmod.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}/libsplashscreen.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}/motif21/libmawt.so
+		/opt/${P}/lib/${java_system_arch}/native_threads/libhpi.so
+		/opt/${P}/lib/${java_system_arch}/server/libjvm.so
+		/opt/${P}/lib/${java_system_arch}/xawt/libmawt.so"
+done