Security bump. #421073

Add QA_FLAGS_IGNORED. #405639

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

3 files changed, 181 insertions, 10 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index 0fe20c1f2291..d8c46b263a84 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,13 @@
 # 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.109 2012/02/17 21:53:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.110 2012/06/14 09:23:39 sera Exp $
+
+*emul-linux-x86-java-1.6.0.33 (14 Jun 2012)
+
+  14 Jun 2012; Ralph Sennhauser <sera@gentoo.org>
+  +emul-linux-x86-java-1.6.0.33.ebuild:
+  Security bump. #421073
+  Add QA_FLAGS_IGNORED. #405639
 
   17 Feb 2012; Agostino Sarubbo <ago@gentoo.org>
   emul-linux-x86-java-1.6.0.31.ebuild:
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index 4a7cebf8acef..56e2b9cce626 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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
@@ -7,18 +7,20 @@ AUX emul-linux-x86-java-1.6.env-r1 969 RMD160 dba3f41645b6f397d30bce6882cd34b094
 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
+DIST jre-6u33-linux-i586.bin 21693745 RMD160 c395a2a780a3714673e4acd4a835e1ece1abd9bb SHA1 0eb29f15703fdcb567d64e15ed41a31a5a6ab66f SHA256 6e406b3552f276238141e40c65f83928df0bf93af5f11c74ac6970cde6758f0e
 EBUILD emul-linux-x86-java-1.6.0.29.ebuild 3440 RMD160 40d8e65c7178c4270ef3f4f3b931e33f5f48a47e SHA1 6e564fbe4726720c67b5f7692d174e996ad06b38 SHA256 a42ce456196823981d815c3032da62df0bf816aee4e838bf69941eed5944d1d8
 EBUILD emul-linux-x86-java-1.6.0.31.ebuild 3221 RMD160 3dd8db3676751f1a2408101a132abcfb0a1e4dbc SHA1 3085b90f09a89b91682be3140cc4c2a9bf39397e SHA256 0a6e5243e77e043d7737f48ee1d703ad0fb9f8364678bab81a48b2c121644462
-MISC ChangeLog 22150 RMD160 faa427e9a6e5d4c69fe8f4ebfb6deb0015ebbfe9 SHA1 5d598f1053861b8b1b03b18ddcd2c53f7cb98d4a SHA256 297baf2c608e432dedc29a24ef6a95c2ecdbc009d701342d3a9f96f4076fa3d5
+EBUILD emul-linux-x86-java-1.6.0.33.ebuild 5034 RMD160 ce01ce05e48c347a86aea4e92b355896a4f8299e SHA1 9a663221710b196cbfc84954ffa9c52059001e20 SHA256 a76eadc43dfcb5f12430f277d1edfd829a62ba18629fa27e125707770b17f5f9
+MISC ChangeLog 22344 RMD160 bcd4f0129299e815a2334404ad26dbd3d5d87030 SHA1 d7f562b6521d8cf01752a9fca1052869bb5ae975 SHA256 3ae6e44e04409cc79520be1fa53e309cc9efb19fca3d61fe257a89ccab7c7a2b
 MISC metadata.xml 179 RMD160 eb23cc92511920eee7575e49cb97e3cc57ec2ffe SHA1 5f572596a2c474e808cdb21b8c2bf80f7cc011b1 SHA256 28110c7811a1bdcba5e23efc7018238140b1e9460b78215f914b7253a8c09ca8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPPsxSAAoJEOTDgjZ80txdQ2MH/352gBNxCbmrmZemvEA5QkZy
-Rip7zeGLDxH7yVjAZByHL4s2qzoBxWZ3ukyT0TuDnfq14Z3k5ECsXzZkDf0frDEq
-vpUwThofnFC0HabVFN8cUxxfhuDB3+5rd43tPGUmb4atLUw7qcLzesKBS7uRFxKH
-cPClJRmt0ZodPMqCRHZBFKrCqLXAGqcdJthRGEGYN0rvzJnrpp/Ifq8nXYgJJ/lH
-7KHfcsfPBhYoKW1AfKkZtlBDj9hnOEKRh+7sz4NVqfrhgDbxWZkmmdZGyN+Cwbs2
-YpRCAWXKjDON+Ep5OJ4cA5Xj4RH/5SDZL2DEEqwKdNWM50iLnI+PDmx25XcQL/k=
-=DLlo
+iQEcBAEBAgAGBQJP2a2rAAoJEIUJ+svaV163WHcH/2it9QrrvroQG0olodLV07Qc
+yvydFBA5saQJHIgQB4toC9EJlAsOXwxF8JP4zoWZSCLL8eU0CxsvpJGrb8AoGnWg
+x0OTPjI+4WTymGirD/0CDU15X6GcHvCSuMUG7ntRE4stL4DEKyr1ul9drATk88Qw
+gHbfp6ImuHfpz0o/xLKEN8BUv6JzP0MahTVbuOO5FNjXSNYSgn595Ix8O3zlMQje
+V3DWaSGkzscGqsHhBbUwJSVk+RD5cwfzFEiFrB44i491KD9fkUD7fbFNe1F2070n
+4e/u+V/IVCqlViDax0Merz1iDEW9/BV9ePU25LS7swIFaZhWQ61GluznBIT2Pc4=
+=Xzyg
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.33.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.33.ebuild
new file mode 100644
index 000000000000..2e80ee5208bb
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.33.ebuild
@@ -0,0 +1,162 @@
+# 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.33.ebuild,v 1.1 2012/06/14 09:23:39 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/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"
+
+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
+	find "${D}" -type d -empty -exec rmdir {} + || 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
+}
+
+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"