Security bump. #404071

Add desktop file for jcontrol using relative path for icon. #403139
Use java-vm-2 eclass to apply PaX markings.

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

3 files changed, 131 insertions, 3 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index 534092a9c6a1..74dba8c869c2 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/emul-linux-x86-java
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.107 2011/11/05 21:34:26 caster Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.108 2012/02/16 12:05:58 sera Exp $
+
+*emul-linux-x86-java-1.6.0.31 (16 Feb 2012)
+
+  16 Feb 2012; Ralph Sennhauser <sera@gentoo.org>
+  +emul-linux-x86-java-1.6.0.31.ebuild:
+  Security bump. #404071
+  Add desktop file for jcontrol using relative path for icon. #403139
+  Use java-vm-2 eclass to apply PaX markings.
 
   05 Nov 2011; Vlastimil Babka <caster@gentoo.org>
   -emul-linux-x86-java-1.6.0.26.ebuild, -emul-linux-x86-java-1.6.0.27.ebuild,
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index bbca863ae6a9..3570182283a8 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -1,8 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX construct-1.6.sh 6799 RMD160 061317637fbdeeaaa7e7104dbc390bcf1bda763c SHA1 516bf0e3a8868c327c1120fc0bcd840d0c3a5c0b SHA256 4369309ba29da4dcdbda4ea614e2db00ff7e3a801fa58b897de818fe33d78e80
 AUX emul-linux-x86-java-1.6.env 894 RMD160 86bb5a85c4a7b51a52016376438052673da53636 SHA1 8d62dde36f42a769246235662d6f9b25490cd4c8 SHA256 47fa2c1923a0ee6940cc1deb8a12258d900cacbeabcf3e69b5bbc85ce39dc4df
 AUX emul-linux-x86-java-1.6.env-r1 969 RMD160 dba3f41645b6f397d30bce6882cd34b094729f82 SHA1 e6e3901a42082c3e46542ed8fe657418ce1b9a27 SHA256 841a8e27157b8bcc6a526bf69716ba0d0fe259255f20ec861a9fbcc2794b9df4
 AUX fontconfig.Gentoo.properties 11196 RMD160 e11989b6be27297af68bdd7040439f4d3bd09916 SHA1 58a53f90a8d0409769d371f2e07b5bec27b02469 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c
 DIST jre-6u29-linux-i586.bin 21632980 RMD160 ce7ba2ec99643b6d47f6b634d7e9fa5877513b4a SHA1 6de26b992a9920117d2f156ff5bbddf2d5b28f77 SHA256 13bd1ce27709be7d05c07221185d4f572242b14a80cea67b557e761f5ba7e440
+DIST jre-6u31-linux-i586.bin 21699103 RMD160 45252ef657d84abeaa1f22d8e3cfc7906a726645 SHA1 7fff7f6f99282ea3adc718c1f449df9107a8ad0c SHA256 c7c6882b8018e95ded4d145ae28692e2a0a4c13e66c5310d8f5c42b90b5b4dd0
 EBUILD emul-linux-x86-java-1.6.0.29.ebuild 3440 RMD160 40d8e65c7178c4270ef3f4f3b931e33f5f48a47e SHA1 6e564fbe4726720c67b5f7692d174e996ad06b38 SHA256 a42ce456196823981d815c3032da62df0bf816aee4e838bf69941eed5944d1d8
-MISC ChangeLog 21751 RMD160 5d9f58535dde27d1b5f635535c93cf35193a6122 SHA1 8f19b31bfaa55ee7c17143a4f80cdbd68918a1ad SHA256 2d8aeaf828079f6547989ef7de6e6a190129580b8df12a16d337e95be5778142
+EBUILD emul-linux-x86-java-1.6.0.31.ebuild 3223 RMD160 15cd9b7dc944471759fac337f31ca53319412e62 SHA1 e6bde674ccf9daafd25b318704d9616d74579e9f SHA256 f793045067b0b2809b7edf7049190d874b6ebee082a0e87b90f58c40aab798af
+MISC ChangeLog 22026 RMD160 f4b4892af164dba93d80153f9a0a412cc0a592a7 SHA1 1e66d12db0548e1ca9a268cf2aa050ceda2d8615 SHA256 f38889aedc03dab7b482c4036d4c5aef3d833df0aa0497468f42eb3f4178521c
 MISC metadata.xml 179 RMD160 eb23cc92511920eee7575e49cb97e3cc57ec2ffe SHA1 5f572596a2c474e808cdb21b8c2bf80f7cc011b1 SHA256 28110c7811a1bdcba5e23efc7018238140b1e9460b78215f914b7253a8c09ca8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPPPE1AAoJEIUJ+svaV163uGoIALEORaayacVSA/j/c8V71w3j
+oQW23gcR3nVhdVTNY1LjHpMJj/fQxs/EdYh5FFXUV4TwhGk4t1Mi8hcK3ghhNmlO
+nEV+MYGFMUNjdcv04XDs2fGu/uGMGgpePGYGY6ujQRgFnZiF0E3UHJmBnt5E1MqJ
+6RFdYt90bWe7Sz4sSyTJRCYpetKSMlN7xcjZFOUECgn9No9tfeu4dkyx5qsX8O8/
+g+offn4fW9B4WN5lGiwCRiF5M4PXuVEzqlBW4sQXoNMiEZ74kzJw6VD17W1oPbj0
+KtPHacZ33ZBlnIbjiNxi17/H0Cxf570gBAtaryAUO7h5s7NVC2kO/Sfzm3EZn7E=
+=hGF9
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.31.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.31.ebuild
new file mode 100644
index 000000000000..20ce89eceb68
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.31.ebuild
@@ -0,0 +1,104 @@
+# 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.31.ebuild,v 1.1 2012/02/16 12:05:58 sera 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/jre-6u31-download-1501637.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"
+
+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="alsa? ( app-emulation/emul-linux-x86-soundlibs )
+	X? ( app-emulation/emul-linux-x86-xlibs )"
+
+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() {
+	# 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 /opt/${P}
+	cp -pPR bin lib man "${ED}"/opt/${P} || die
+
+	# Remove empty dirs we might have copied
+	rmdir -v $(find "${D}" -type d -empty) || die
+
+	dodoc COPYRIGHT README
+
+	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 JDK ${SLOT} (${PN})#" \
+		-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
+
+	set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
+	java-vm_revdep-mask
+}