Version bump, security bug #433094.

(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)

2 files changed, 178 insertions, 1 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index 1663b3e66d3e..61afafbfffca 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-java
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.114 2012/08/03 13:53:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.115 2012/08/31 11:15:59 caster Exp $
+
+*emul-linux-x86-java-1.6.0.35 (31 Aug 2012)
+
+  31 Aug 2012; Vlastimil Babka <caster@gentoo.org>
+  +emul-linux-x86-java-1.6.0.35.ebuild:
+  Version bump, security bug #433094.
 
   03 Aug 2012; Agostino Sarubbo <ago@gentoo.org>
   emul-linux-x86-java-1.6.0.33-r1.ebuild:
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.35.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.35.ebuild
new file mode 100644
index 000000000000..96e604e0d72d
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.35.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.35.ebuild,v 1.1 2012/08/31 11:15:59 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"
+
+DESCRIPTION="Oracle's Java SE Runtime Environment (32bit)"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="${X86_AT}"
+
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="1.6"
+KEYWORDS="-* ~amd64"
+IUSE="X alsa nsplugin pax_kernel"
+
+RESTRICT="fetch strip"
+QA_TEXTRELS="
+	opt/${P}/lib/i386/client/libjvm.so
+	opt/${P}/lib/i386/motif21/libmawt.so
+	opt/${P}/lib/i386/server/libjvm.so"
+
+RDEPEND="
+	X? ( app-emulation/emul-linux-x86-xlibs )
+	alsa? ( app-emulation/emul-linux-x86-soundlibs )"
+# 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() {
+	einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package has become fetch restricted again."
+	einfo ""
+	einfo "Please download ${X86_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"
+	bin/java -client -Xshare:dump || die
+	bin/java -server -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
+	rm -vf lib/i386/libjavaplugin_oji.so \
+		lib/i386/libjavaplugin_nscp*.so
+	rm -vrf plugin/i386
+	# Without nsplugin flag, also remove the new plugin
+	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 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 "${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_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/i386/client/libjvm.so
+	/opt/${P}/lib/i386/headless/libmawt.so
+	/opt/${P}/lib/i386/jli/libjli.so
+	/opt/${P}/lib/i386/libawt.so
+	/opt/${P}/lib/i386/libcmm.so
+	/opt/${P}/lib/i386/libdcpr.so
+	/opt/${P}/lib/i386/libdeploy.so
+	/opt/${P}/lib/i386/libdt_socket.so
+	/opt/${P}/lib/i386/libfontmanager.so
+	/opt/${P}/lib/i386/libhprof.so
+	/opt/${P}/lib/i386/libinstrument.so
+	/opt/${P}/lib/i386/libioser12.so
+	/opt/${P}/lib/i386/libj2gss.so
+	/opt/${P}/lib/i386/libj2pcsc.so
+	/opt/${P}/lib/i386/libj2pkcs11.so
+	/opt/${P}/lib/i386/libjaas_unix.so
+	/opt/${P}/lib/i386/libjava_crw_demo.so
+	/opt/${P}/lib/i386/libjavaplugin_jni.so
+	/opt/${P}/lib/i386/libjava.so
+	/opt/${P}/lib/i386/libjawt.so
+	/opt/${P}/lib/i386/libJdbcOdbc.so
+	/opt/${P}/lib/i386/libjdwp.so
+	/opt/${P}/lib/i386/libjpeg.so
+	/opt/${P}/lib/i386/libjsig.so
+	/opt/${P}/lib/i386/libjsoundalsa.so
+	/opt/${P}/lib/i386/libjsound.so
+	/opt/${P}/lib/i386/libmanagement.so
+	/opt/${P}/lib/i386/libmlib_image.so
+	/opt/${P}/lib/i386/libnative_chmod_g.so
+	/opt/${P}/lib/i386/libnative_chmod.so
+	/opt/${P}/lib/i386/libnet.so
+	/opt/${P}/lib/i386/libnio.so
+	/opt/${P}/lib/i386/libnpjp2.so
+	/opt/${P}/lib/i386/libnpt.so
+	/opt/${P}/lib/i386/librmi.so
+	/opt/${P}/lib/i386/libsplashscreen.so
+	/opt/${P}/lib/i386/libunpack.so
+	/opt/${P}/lib/i386/libverify.so
+	/opt/${P}/lib/i386/libzip.so
+	/opt/${P}/lib/i386/motif21/libmawt.so
+	/opt/${P}/lib/i386/native_threads/libhpi.so
+	/opt/${P}/lib/i386/server/libjvm.so
+	/opt/${P}/lib/i386/xawt/libmawt.so
+	/opt/${P}/lib/jexec"