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

Prune unused font configuration files.
Remove vulnarable.

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

4 files changed, 107 insertions, 28 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/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index 004ddabc8c6e..29e79fba4532 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -1,25 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX construct-1.6.sh 6799 SHA256 4369309ba29da4dcdbda4ea614e2db00ff7e3a801fa58b897de818fe33d78e80 SHA512 a625b1b414f63370ce802669d569ee254f7f256a927a267629267a60bf66c5d887e1557b83d21a602008b39222499d56e20cad17b0ab5dbfc13d44e8f7b0ba69 WHIRLPOOL 69459effacb42f56d339ec8010b22e5c0ede7c7a35657f42e08ead5928039c4394031c1e210914131c86d563f8c1e7b5b23ef9b2e11233c69038b6641dfb9b48
 AUX emul-linux-x86-java-1.6.env 894 SHA256 47fa2c1923a0ee6940cc1deb8a12258d900cacbeabcf3e69b5bbc85ce39dc4df SHA512 5d48ae911515c8390d1ecefadd91249061ed156bcf8658139fb3437228603d2a281f27881699db7b81b7bc28e9e15e8c763e2b5f8529144c4b8876ef008da5ee WHIRLPOOL 232faadb734f1701a2363567754287c56e2bdc7824ad517c5a9b9b90b27b7e3f605d79f2a4b8803f7859da665d27eb4716199957d8202db3c6eadae7483e7119
 AUX emul-linux-x86-java-1.6.env-r1 969 SHA256 841a8e27157b8bcc6a526bf69716ba0d0fe259255f20ec861a9fbcc2794b9df4 SHA512 c6f257971d1ad52b1af6041f84978d7029598b7abef7bd25e3d4f7e83cf170325fc80a53eaad70085bc1f45f14af6f0dc322ac729535fd6e0c80704dedb32811 WHIRLPOOL 33d29b11ef6ebe62672cb4a483867e2e38cd73827f902ed3b4d1784a466c266446b8306447e9c7ed175d7b4e416165159aef51a73b31a14df611efdeca185fed
 AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
-DIST jre-6u31-linux-i586.bin 21699103 SHA256 c7c6882b8018e95ded4d145ae28692e2a0a4c13e66c5310d8f5c42b90b5b4dd0 SHA512 55b360877c21499d9031193c50d74d055ab581a83d21f12aed186184fa1bf697fbf71275cdcd0947259d987da223a11e0e2b06dc184d92bd098811852342f19b WHIRLPOOL b936620fb4d55fa697a16c10d4156693f9cb6b7db865a891d18a11f9f93af1fea547ca6febca6da462a59fba2670c4e5a6fd9fac2913b250cd2fc39c0792d4ce
 DIST jre-6u33-linux-i586.bin 21693738 SHA256 a824c38cb57110642678f21739fe995e84c876dfcbc3d64f3091ef08adacad4a SHA512 71e92b9c650234a3c0069f7c23146e78043fbac4f9e75cb37f0401b5a2d43bf5d64471f14890bd2d7680d5fa7b2a38b443321815c207e1df378ac688827226bb WHIRLPOOL 5a001c0358edb77f169972f269a68809301f777b80f85634d2c8a214ac451ab52c65fa42900e1969c2092ac37e194c0a6eaf31458d150e2a62c9e17b3c6484c1
-EBUILD emul-linux-x86-java-1.6.0.31.ebuild 3221 SHA256 0a6e5243e77e043d7737f48ee1d703ad0fb9f8364678bab81a48b2c121644462 SHA512 4302d72d421392c076c1dcf101ec568976d9b42ac76dddcfb8f2f5904b3fb3e92bdb7dd3fcc0cbfd39b15b4f8143a22cb0950ed7a13bf57ed2d13990fdd5eac9 WHIRLPOOL c72d3ed614aa3337b03a84cca0d55c86d0b388b5bda4c252f4fd6e34bc94b62ba7307a1b78653be03dceab007ed3a063da1efd17dd279840c2f8ca115b1e7554
 EBUILD emul-linux-x86-java-1.6.0.33-r1.ebuild 5037 SHA256 73d344a95ae8a2bb971e581c993eb6409c3ac789ecf51045439229dad36389c4 SHA512 86485ac3bf0ddf52fe4d0daa1bca153d057c43959381ac93caa1a535fc3a37ff7fcead646c59bbe74d88c4ba66650cc750b1fc2881cae6e09c18097c59c42d57 WHIRLPOOL f4617fe6535394d63de65d0ab9a178c9853fe2710e7260a20895f78a2f48df9e8008e5aa69af2078d2f6d7e2ee7876a264e7dd99047b63ed66b6cb428968b6f2
+EBUILD emul-linux-x86-java-1.6.0.33-r2.ebuild 5335 SHA256 5db91079201cda687ba05212e6b26681292c5eae8b2d12aaa220cef9ba52ce4c SHA512 7fa29a0dec4d6325fcb622d9a504cb455fc243d4cafaf5f15ab85e55f43b08a1813e4368ad9e092797bed4651d19e35410b1d9b7e903beae36c9830d2c6aa24a WHIRLPOOL b47a55698938e2249a343900508717200d965574a9656296794c1dafa51ad69c0fae60459eb5a5dac427752dbb3299e3218e0039b2a5d33be3be7f92d7911e6a
 EBUILD emul-linux-x86-java-1.6.0.33.ebuild 5032 SHA256 f964d639ec69c7ba0457f04e6adc108f0a3dd6df3cdfd4f6233bf52524ac3b47 SHA512 c8a0c795e1235ea9c3f0aeda28dff86e91a3fba84f68614c5ab2647adce71d7811e6ff855fa514fc306b9ac5f1d4787d33a7ab82b2db7535cc736317aa1f262e WHIRLPOOL 3b0f8789a705a57754f456ddc4b52f5b1086d70b04d0ffb834b70c84e7855d5afa479539eff5667e41fef4caeaf8eefe41a793063931fc8f8b1524a70a1d081e
-MISC ChangeLog 22796 SHA256 935a29e62674d048beac86fcf2b486d1d285616b902ddead7692eb2779f69e65 SHA512 88223b81a157dcc3f18543ac7bd6d9f29b207f35a7d9f1bd8a1689e68ec83cb1c0c317bc83fe4c3d9f0b375debbf72c111fc3681fecc063f6295ff53fafe9796 WHIRLPOOL ca210126cf1f28a198cde631acd3c24fe376b440f70074877c9de694c95ee344762ce21a2d59ff49b8c81eb1b85c7e99600af43e2b5bd3f7e4c0a4ce91811f7f
-MISC metadata.xml 179 SHA256 28110c7811a1bdcba5e23efc7018238140b1e9460b78215f914b7253a8c09ca8 SHA512 05f5e36a569e68428d16ca93068ce76f3b7cb17a7abb3f910ffc10baeb6e3a9e3bd246071adea34df3802454f8e93d410b4e41a708e01462d068d8b3bd552ad9 WHIRLPOOL 53fbc212a0ca88847bf1a341af42fbb41ac9e6e07d0bb8b7700149bd7d106655bbfe97696ed326eee8067df7349c29d33631cf641f1d2a60bcf699d5bc1ed4f1
+MISC ChangeLog 23155 SHA256 394337bdde6bc5c1d14c1f3b3df41acd687aaf47d4ce40cdcc98dc9822ba1dab SHA512 c4486d458e82e4ae53505e076b5ca2b190ebd80a9ac409e1ea94da0385f0f90439a5f040fe30fc4a21a248d912384545e4701a10379a872565f144cc6b85461a WHIRLPOOL be9aacf881fd379f8c7e7d1e5d2f5646b157215a37040cc377e3155a719b5243f645a5588e45254a794937a8346311f31dd4e41b17c6e8994ce77b2977e00ddd
+MISC metadata.xml 270 SHA256 68c40f50bd74b9038081e459c015f5786407bce5a45e2e1614566739d70cb21c SHA512 58bf7182934eb5030bae7032efde8e8b277fb4820a256d271a501904ded69b19937b1d17058ef770e3ecb7a526739bd1fae7d2163b5332fdd7e5c782cfbc647d WHIRLPOOL bf2557c8836c581b51c65a2f2488c77192072524696f36615a309d2bdb74ea7ed069f73438fe7ee0b5b83aaa7cf20162ffcdd5cbc6469411116e75805b67aeb4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJQAEV2AAoJEIUJ+svaV163hF4H/3ef9w+lRulEtxwTPjMuL0tA
-V1GeghANobgPP1t/WFSZuqPPLwDwfeomVp6iDt0Gl9hYGLf3cRmCiog0YpzCBWBS
-JEH2aoWIUA1dLKeri0IjL34tAFEGDu5sbhVHc+3DdR7zAYnasRt0Ih+lBvBBr5LV
-LmgexZTV8RSWHCwiCjFl5q0QlvsZv90sFxbWkrYZ0VMNp8O0rFndaeMEfINmDN1L
-jlK8KvyQbRi81vd9W5igZXP1CgQA1ReFSGIKvNjkXF8hrspFidadjORSJuiJ5F/y
-8eSmdQ50W29w/XIqdR+kKRYbhvoEVy1WJB/BWVG6pjQbz+lMbxqR6rb1gxGf1Vg=
-=Ap3V
+iQEcBAEBCAAGBQJQDZ9wAAoJEIUJ+svaV1636/4H/igOfFyeHJz2xF182P3dVXrw
+zECxEeQyLBoVaonoT9w+Iba/oxiMkYBILmuZPWsvYbj7rTOCOCTOlUCfzlzjTV8X
+k0ddNIr56GpSbG22Y0Ug/8q11SKfn6gkQEURVkIor9r/VF6u5j4AGZaQ1HciNM2d
+fSMLpJEhW18Ggzb6fb8kLVXOV87ZghrXWaTurKBpJZ2pydkkCaS7RAHRtX7mY+8F
+59Hjfp1ztiMolL6O01qWHLvHBI7K6haFLY0kFeogDJusp+le2fIpvEllK7dDMe8W
+Wiy9HgYv4HfU3ic2AVUG5G4vUw/MZzrpGjD6qaMM+r+DJ9GEXhxvL+gQCikFDwE=
+=Bz1y
 -----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.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>