Use paxctl for pax marking as the fallback won't create the headers. Thanks to blueness. #427642

Prune unused font configuration files.
Remove vulnarable.

(Portage version: 2.1.11.9/cvs/Linux x86_64)

3 files changed, 96 insertions, 16 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index ef7e4c97ad49..ae5a3f69e77f 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,16 @@
 # 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.112 2012/07/13 15:57:29 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.113 2012/07/23 19:00:49 sera Exp $
+
+*emul-linux-x86-java-1.6.0.33-r2 (23 Jul 2012)
+
+  23 Jul 2012; Ralph Sennhauser <sera@gentoo.org>
+  -emul-linux-x86-java-1.6.0.31.ebuild,
+  +emul-linux-x86-java-1.6.0.33-r2.ebuild, metadata.xml:
+  Use paxctl for pax marking as the fallback won't create the headers. Thanks
+  to blueness. #427642
+  Prune unused font configuration files.
+  Remove vulnarable.
 
 *emul-linux-x86-java-1.6.0.33-r1 (13 Jul 2012)
 
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.33-r2.ebuild
index 5d59c87aaa8a..d4c55ddaa71f 100644
--- 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.33-r2.ebuild
@@ -1,13 +1,13 @@
 # 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.2 2012/02/17 21:53:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.33-r2.ebuild,v 1.1 2012/07/23 19:00:49 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"
+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 '_')"
@@ -20,8 +20,8 @@ SRC_URI="${X86_AT}"
 
 LICENSE="Oracle-BCLA-JavaSE"
 SLOT="1.6"
-KEYWORDS="-* amd64"
-IUSE="X alsa nsplugin"
+KEYWORDS="-* ~amd64"
+IUSE="X alsa nsplugin pax_kernel"
 
 RESTRICT="fetch strip"
 QA_TEXTRELS="
@@ -29,8 +29,13 @@ QA_TEXTRELS="
 	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 )"
+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}"
 
@@ -57,6 +62,9 @@ src_compile() {
 }
 
 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 \
@@ -69,16 +77,16 @@ src_install() {
 			lib/${arch}/libjavaplugin_jni.so
 	fi
 
-	dodir /opt/${P}
-	cp -pPR bin lib man "${ED}"/opt/${P} || die
+	dodir "${dest}"
+	cp -pPR bin lib man "${ddest}" || die
 
 	# Remove empty dirs we might have copied
-	rmdir -v $(find "${D}" -type d -empty) || die
+	find "${D}" -type d -empty -exec rmdir {} + || die
 
 	dodoc COPYRIGHT README
 
 	if use nsplugin; then
-		install_mozilla_plugin /opt/${P}/lib/${arch}/libnpjp2.so
+		install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so
 	fi
 
 	# Install desktop file for the Java Control Panel.
@@ -87,18 +95,77 @@ src_install() {
 	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#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
 
-	# bug #56444
+	# 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 /opt/${P}/lib/
+	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"
diff --git a/app-emulation/emul-linux-x86-java/metadata.xml b/app-emulation/emul-linux-x86-java/metadata.xml
index d35aab023826..e3601612a720 100644
--- a/app-emulation/emul-linux-x86-java/metadata.xml
+++ b/app-emulation/emul-linux-x86-java/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>amd64</herd>
-	<herd>java</herd>
+  <herd>amd64</herd>
+  <herd>java</herd>
+  <use>
+    <flag name="pax_kernel">Use paxctl to mark the JVM binaries.</flag>
+  </use>
 </pkgmetadata>