[gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea-bin/

["James Le Cuirot" <chewi@gentoo.org>]

commit:     ecad2df4eb487e7a8d6cf2ab3b0908bdc5f8ef2f
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 22:12:58 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 08:43:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecad2df4

dev-java/icedtea-bin: Bump to 7.2.6.5 wrt security bug #578300

Package-Manager: portage-2.2.28

 dev-java/icedtea-bin/Manifest                   |   8 +
 dev-java/icedtea-bin/icedtea-bin-7.2.6.5.ebuild | 186 ++++++++++++++++++++++++
 2 files changed, 194 insertions(+)

diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 0716473..3474f30 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -8,9 +8,13 @@ DIST icedtea-bin-core-7.2.6.4-amd64.tar.xz 53010708 SHA256 16e33d1f686c657c9b16c
 DIST icedtea-bin-core-7.2.6.4-arm.tar.xz 43993060 SHA256 980d3185cda11cc4b7b6287d3a7a5ea7c87e5b138f066f9fc6d2a2ec6b7157d6 SHA512 892b7e0268baabd2e921d5144e233c127698bff21da075f77c3b96b0c70a0a4b9515cd184bc992f89c3821eea9decaac3bee507ceeb0758573280b51f92e6928 WHIRLPOOL ba334447e3ae703c8240667be155844b470b54753792dc6c8ae207a73b3a9b278752eee4a085d13cc5b6fa5371da631cc6e02607d524810df14f056745821ac9
 DIST icedtea-bin-core-7.2.6.4-ppc64.tar.xz 42990476 SHA256 b5a94318086797e230e9cdc3f87224464979b5024ce0a02a6a10875e15bc5609 SHA512 be065eeb6682163b290ad4374a2d24ed4c7cb042d2253962bb9c2129d1a78ec97439c3e0fa4f3a6db74fbaee2f9ef8f09dd80188d55b5aabde320a13c1c8d2e4 WHIRLPOOL 266bbb109cae1d97befc1cca6a915f989ec5d43b689499c42a26d3be7a5903bd4c9ae7cc571f044b59f0a786ab74bd68b8eb46691ac743f31b9e20eb23cedd5f
 DIST icedtea-bin-core-7.2.6.4-x86.tar.xz 54661536 SHA256 9329914ee4a6072afb940e2a3f63b5ee356cb1d332a94b46d38e54ea68c2a4b2 SHA512 42348aca553722161102f7eaa9833ff4723b183a2844d5a2cdab9d1dd88ac02e991971a61c8b934f1455b21f9a11947b2a753283941135495c84717ca55cd825 WHIRLPOOL 3548ec0058b38cfc551a687f8f1fc998872975d3c9bd07124b3593ed8da59c2a689de133c414ec934cee8a47e5a4ef915e42ab9c4541cbf7d2b358505e6d729c
+DIST icedtea-bin-core-7.2.6.5-amd64.tar.xz 53018784 SHA256 6adb5ae0e07b29f89cf3ee4a4ed8739ad92f3eb6d276e38ac56056570b70f263 SHA512 9b65828ae84939a7951ed26ed1e55abe42bc8362447b8c8b408e6ea64b80252d1de49a2ab17493dbd920fbc8b496b530486e35946c87094bf5ade452100c80ef WHIRLPOOL 0ab1babb5cdfb17f69692f4430226a0217de6b9ac4f691b700dbdd123b5f221592092f68ba548834692387b580633f704388d12ab20d2212a23793cfbfc243d9
+DIST icedtea-bin-core-7.2.6.5-arm.tar.xz 43997476 SHA256 d897fbcb7e0587ebb3c1cda83b558eb231983bb44cb2fc306b0fe30c0692d4f9 SHA512 8a328f5f508a815b2e13f0cf27d21a724c29e6228007e6dde418f1a41981d3c3d8c205586560c1f0110e68a176cb58329cd80510a3e33aca0994a78a4456bd89 WHIRLPOOL 4ef90a28853456c16e6698f6e6fe4d46eb745062773da10cd8c75071c5a7b7dc73ae1da21dac1474f156e06cda98a5ceb94a65fe8b79b1415c722126deacf43c
+DIST icedtea-bin-core-7.2.6.5-x86.tar.xz 54670860 SHA256 ffdee3645634771922e6b160012ba2200c7f59e91dd890e8e61f2b35126751ca SHA512 7ec33501a2118f85f3bd14435eb9aca5711b77fa379db21b63d50d5f20da33cb3818d876f8be3ab40d7cbd8df7120d0b73d06415284463d50614510a59ebd41d WHIRLPOOL 7cfec521ab9cad48cd1296c76c12d8cc57a830a416fba591d0d7e0d7ef195341a3b401196049516c0a905dafcb36323bb68bb013b4cb4ea6b6a702972a984800
 DIST icedtea-bin-doc-3.0.0_pre09.tar.xz 11648012 SHA256 98e2d1940a5042d5ea9752a5e2783f37e7996cccad20e84a499838a929681f41 SHA512 f577153f2158a6a8984ff21049716981c5ec6e5a524c81d516890b5eef55a457b1071d6a1a05e7df19902a0e6033eb96a4c65f9927680903162c2abae1283ab7 WHIRLPOOL 126e967ae2298951f1b090152a3833fe7ebc1defde34267ea19c613c69fa72d0c4ac566c4b63a9515e8bb0e7b16d096b827bae5e0e099140c806b21e097b945a
 DIST icedtea-bin-doc-6.1.13.9.tar.xz 9853020 SHA256 94ff85ba64be5c8cfcf261cb6293e48cc3239c1c9da69e98fbc744a82620bd16 SHA512 501d483dccfc349c6dd8a55f9d509d2859774054be9b9ca8020a75e3975d740d78d40184aa86f16b5ea948e16b74944ce4d890396d8ccb5209f7a9514a8b649a WHIRLPOOL 751afbb1e0e2384419424d9ae093893c2e377c004c69d0e06979385823f743ee33321b3c3076e0c8e0b16625a159293d81f959455ca6ee779dfdfa5fc5361907
 DIST icedtea-bin-doc-7.2.6.4.tar.xz 10603692 SHA256 07e1bf90c61b56bf311d528891f30ed0cd67f073e6019aa92c8907c86bf1c6ac SHA512 6c97c37926989b1a36bb1fe9712caf6270c539646aeb76d30a10e9479ecbf734f2f56ef934f774a9cfe4d713651fd0b8c99872f6651f2d7e3c86a18294f9ea79 WHIRLPOOL 023eb8ee8851882101cff967d7ee58f69aa569257f113e512faef2ba3eebf066f01b80440cfbb59c7ed67b36630426ea88300724e7348611ae80c498e5da8b84
+DIST icedtea-bin-doc-7.2.6.5.tar.xz 10605544 SHA256 ae3e5078e8705fffbd95e986c99ce5ed8f8e76474f2c3c005aed0eef67b55377 SHA512 e24f52b8d39e329fed5e8f76a6d15a168454c252db653b46eb4fc5dad63483afefab07794718b9149a76bb62ccdb9f6eda8da9229043eab362bf359b04b118dc WHIRLPOOL 42693d3769ee3ab9af6200d7702244a941a07a01f41f3db655cae28b5bddc527989860dbfdc93681cb4ef22ea5b0c2a489ffc765abb15317ee07762a46f2b863
 DIST icedtea-bin-examples-3.0.0_pre09-amd64.tar.xz 1811968 SHA256 2a497aaec02378dccf7141dccf926afe43f6089832404f7f3bb5e4152ebc67c9 SHA512 c87d7449d556be739b634c44331ca51eb975c8ebb9c3932cf463969898d7ce41169849c1c52273d40ce9701264a1292b8fac45eb81302ed2fe65abc223072719 WHIRLPOOL 581aa58ecfd454e4347aa8733ca12fc6730a4165ac2eb494ff86b061aa3ab5b887abe812f837f4f3599d8f9e351e3b332d276bd6454b1cf0f8dcf9be69ecd8ba
 DIST icedtea-bin-examples-3.0.0_pre09-arm.tar.xz 1794592 SHA256 ad6ab000a0f727a9ed6a6d2b9d35ab553a261586af20238698fed75e33f1027b SHA512 c15ab276a4534b741111cc1628e5bb3893f1dadd03b18c084ff48b41d1a5426060aa63b6025bf9d9e28f2861c8789ba6e22ea4b70b6c401917a70fc7df9d017d WHIRLPOOL 2cd72d7ea034e0b775c3ecad27025c77c4ac01de7e5040a47514a738ed11837099c04dcffba8afd2b0de60c9210ef834a3bd3af8b3b1cdae5d026ebd3175e4a0
 DIST icedtea-bin-examples-3.0.0_pre09-ppc64.tar.xz 1804896 SHA256 8364f463b5a424a7e60ed724ee90b2af0ad30ac6fe2616a96eb5969893474d8e SHA512 dc2feeaa920145f007c29d17ee0cdb6de9d316f2515c2fef4ce5a4db1439895c2fcd7802061ef37e1655bbd617b26f3391ac73574bd75980697d953df6760b59 WHIRLPOOL 0c412aef95eec0c5b0ed2164c2ebb6b82cf9ba98fa830414cbb71227d18f66ee53deb0ef3bd299c04f3b9101aead027fdc783dbb618be4306cc091fa894df07a
@@ -21,6 +25,10 @@ DIST icedtea-bin-examples-7.2.6.4-amd64.tar.xz 1796924 SHA256 1cba4146c597bd9cae
 DIST icedtea-bin-examples-7.2.6.4-arm.tar.xz 1779692 SHA256 2b0965c93b8b1fe97ac25519739f132824f2f6cfb0662dcc93e5016f640f3024 SHA512 a16bcf86f3fba0dfd09d233cc53cb7e49f52317479b84db5d49939e3d22afdc31c2e75ec81bc8ebe7635e993097d0bc0d7b0e9610cfe3c6491b0f69f578e4e55 WHIRLPOOL 1ecbc914e22fe52697a57d0e5cb202c96478a07447f33877a7e3ad3b8e27f35e640ecf856e35c4c1e288220208efc0244b0b1f93ff6f1b83df0e64b001695e5c
 DIST icedtea-bin-examples-7.2.6.4-ppc64.tar.xz 1790468 SHA256 cb0b8ce994281676259f92e91b513f23765ad7364367986f46bbbeca661a914d SHA512 d749f6d42a7c05bc2499a4df69b6921e0fc36bbf12bef1cd64cf79fc13b1c256c2b10159f120bbf5546696777a3d71e64a3370903cfc49d095925931eb12f75f WHIRLPOOL 44b41eb5f857f695e305f85ab7f3a6b71989372f1b327ba6d8dab1251237fe9ea274bf29e32663644298b44febef3b5b220fa740793bc62e40811b1a0a9aded2
 DIST icedtea-bin-examples-7.2.6.4-x86.tar.xz 1796620 SHA256 16591cca92ef9470873f89c6c2291b458c4dc441a8adac1e4a1c34bd5f9514a4 SHA512 7ca0d297247a367c63de0c016949a1157f987592d6481347d31d2b127db71f932f6444c75c42c55357494579357fed65c3261a25ad046f14d473cf58b585822f WHIRLPOOL 8d28811e3c83534e5a2545a15ce3729827073099095e43923d653b6ac3d6d6f4838e24757e6aefd87603e22f27a2a82cacc219459bfe7f2b5f5346750d9cb25a
+DIST icedtea-bin-examples-7.2.6.5-amd64.tar.xz 1796824 SHA256 9730fca1e431168169e71a6cd28120e2da97894771ff99bcfd3fc814ed85402d SHA512 a931737a56fffd65ba3dee00d68a22ee365c783e87cf37cf0fd69620465acb9b5f64bd36ba3798a5d9549f96f7290500a0abbe5d5cee40fc66c5db15b44ecdc5 WHIRLPOOL 5affef2b772efbd96d6fe799bd686b7155fcfff1b3738f116cd8265fa2e784dcece7867d456657f0a213b663c8d7ffe4799cf1ba30e1dab1d9ed57b256121081
+DIST icedtea-bin-examples-7.2.6.5-arm.tar.xz 1779800 SHA256 563ac5025c8d3a6f0066ca479d9f0053e6bd2440dbe07b2dbfbcf3aee6a87699 SHA512 3c98a62aebf83e5e6e36443b8c42925a2534e15cc369cef4d06d39b81e82057007758462c5b7731a36e862d93a7e547ef2051b9aef313f24fa261277715771b7 WHIRLPOOL 4dc678d1b9e5a9245fb01fb93fd76e6892783444a2026cbd44ccc843cb8229328a43687688c849605e933605366b6904abfea9c152477f9db50b4f7b91ba0c06
+DIST icedtea-bin-examples-7.2.6.5-x86.tar.xz 1796620 SHA256 1571042672d5d53e4f56e84397411273639e45d05ac706d0b845ac8355f82484 SHA512 ee59bc512af1555480a9219cd01bf2e4f935534c2ba93f8323b4e1dcd69131920dd9ab621e3dd8e68e9cd3cd6fb63ef19274a37b4e954d4570f98211a501e005 WHIRLPOOL 9abc2a7198e31cf33796df0c6ac5b5008ab53d286da086e7e5f526e366339fe68e1c506276cb7044fb7eaf07070de2d00a979b941931665f3a20f9b899bba273
 DIST icedtea-bin-src-3.0.0_pre09.tar.xz 45635304 SHA256 9138300b1ad16e7c5a300887f621093ed38491cd80231cd90c77870459c09d18 SHA512 e81faaa8bf9eda613dbd9be6880b5c3bf99b7a466a2c48c6082f16f8506cdd50664177d0a66b535e5aead6e2836f4f886fb9700ceb2f386239013e845b273498 WHIRLPOOL 978b51c8583883965700f3b6d793e0c4c66e089fe8c79794aec7046ea261e7a425abdc4b0688dda8e46978800c3a1e345f5861060e3439b7b0a52aa74e70d021
 DIST icedtea-bin-src-6.1.13.9.tar.xz 39778948 SHA256 11ed522199d3919f7013f4d3d4fb2324d4505ca60fdbcb015faf635c4dfcfc70 SHA512 4c02e7368ed21882afe68cbba3475a16a30276110282d28984586f1c1e0c3d14278e70e495fc74676ba57df3849b8f60ea24da49c6f41070319c46962f1a221a WHIRLPOOL b6daed3717d434688e8946976d96857ce904d510cb45fc30b464e86d1c123ccb2a81ee07bea432ad6fb5148d1b0a73bebe7f51a0bc2f5b1308701a4fce436d79
 DIST icedtea-bin-src-7.2.6.4.tar.xz 40039764 SHA256 62f0cc8dee7a518c01e3fb1cc821686440171c67e32936faedbfd57500d7a252 SHA512 e4e208766f35b9a0d720c5e853bbded04cc38f5f972ff83c759786bdaef43e5a454361be61f677ff57686007d9e393e15345ba9577abf189f94ebb6067ca885c WHIRLPOOL dc9102f20caf079d61a816ed21c791348fe1717cf4424d5b5b8e1928010bcee7eab885bf44a438934ccf6562f1f8b6259a31f45d32b1bf752e893e1153c1cb0e
+DIST icedtea-bin-src-7.2.6.5.tar.xz 40046964 SHA256 85bd4d4bc2abed47ef2bf7dd5eadbf5837efe67fe4cc322dea8096d47a980930 SHA512 cc5de0f6ede1a342380d5a1ce9ec279ae7f7bab46ea5504c0c39318ece75ad867fbb095e8a8aac5ecc64a02bc8376cf283b36f9a21fbcd485b8d0be636ebd047 WHIRLPOOL 276845b53eea26df67542e240c7f3068fa554c610be1ff7cd43729a57bb74ced6082f5920cc7deee81b8b286bedd24866c67909fa82574aba73e7ca19411e46e

diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.6.5.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.6.5.ebuild
new file mode 100644
index 0000000..45c0721
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.6.5.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-vm-2 multilib prefix toolchain-funcs versionator
+
+dist="https://dev.gentoo.org/~chewi/distfiles"
+TARBALL_VERSION="${PV}"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
+	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
+
+for arch in amd64 arm x86; do
+	SRC_URI+="
+		${arch}? (
+			${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
+			examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
+		)"
+done
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="7"
+KEYWORDS="-* ~amd64 ~arm ~x86"
+
+IUSE="+alsa cjk +cups doc examples +gtk headless-awt nsplugin nss pulseaudio selinux source +webstart"
+REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="opt/.*"
+
+# gsettings-desktop-schemas is needed for native proxy support. #431972
+RDEPEND=">=dev-libs/glib-2.42:2
+	>=dev-libs/nss-3.16.1-r1
+	>=dev-libs/nspr-4.10
+	>=gnome-base/gsettings-desktop-schemas-3.12.2
+	media-fonts/dejavu
+	>=media-libs/fontconfig-2.11:1.0
+	>=media-libs/freetype-2.5.5:2
+	>=media-libs/lcms-2.6:2
+	>=sys-devel/gcc-4.9.3
+	>=sys-libs/glibc-2.21
+	>=sys-libs/zlib-1.2.8-r1
+	virtual/jpeg:62
+	alsa? ( >=media-libs/alsa-lib-1.0 )
+	!headless-awt? (
+		>=media-libs/giflib-4.1.6-r1
+		media-libs/libpng:0/16
+		>=x11-libs/libX11-1.6
+		>=x11-libs/libXcomposite-0.4
+		>=x11-libs/libXext-1.3
+		>=x11-libs/libXi-1.7
+		>=x11-libs/libXrender-0.9.8
+		>=x11-libs/libXtst-1.2
+	)
+	cjk? (
+		media-fonts/arphicfonts
+		media-fonts/baekmuk-fonts
+		media-fonts/lklug
+		media-fonts/lohit-fonts
+		media-fonts/sazanami
+	)
+	cups? ( >=net-print/cups-2.0 )
+	gtk? (
+		>=dev-libs/atk-2.16.0
+		>=x11-libs/cairo-1.14.2
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.24:2
+		>=x11-libs/pango-1.36
+	)
+	selinux? ( sec-policy/selinux-java )"
+
+DEPEND="!arm? ( dev-util/patchelf )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7(+)] )
+	nsplugin? ( dev-java/icedtea-web:0[icedtea7(+),nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_prepare() {
+	if ! use alsa; then
+		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
+	if use headless-awt; then
+		rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
+		   {,jre/}bin/policytool bin/appletviewer || die
+	fi
+
+	if ! use gtk; then
+		rm -v jre/lib/$(get_system_arch)/libjavagtk.* || die
+	fi
+
+	# NSS is already required because of SunEC. The nss flag in the
+	# icedtea package just comments or uncomments this line.
+	sed -i "/=sun\.security\.pkcs11\.SunPKCS11/s/^#*$(usex nss '/' '/#')/" jre/lib/security/java.security || die
+
+	if [[ -n "${EPREFIX}" ]]; then
+		# The binaries are built on a non-prefixed system so the
+		# fontconfig needs to have prefixes inserted.
+		sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
+		eprefixify jre/lib/fontconfig.Gentoo.properties
+	fi
+
+	# Fix the RPATHs, except on arm.
+	# https://bugs.gentoo.org/show_bug.cgi?id=543658#c3
+	# https://github.com/NixOS/patchelf/issues/8
+	if use arm; then
+		ewarn "The RPATHs on these binaries are normally modified to avoid"
+		ewarn "conflicts with an icedtea installation built from source. This"
+		ewarn "is currently not possible on ARM so please refrain from"
+		ewarn "installing dev-java/icedtea on the same system."
+	else
+		local old="/usr/$(get_libdir)/icedtea${SLOT}"
+		local new="${EPREFIX}/opt/${P}"
+		local elf rpath
+
+		for elf in $(find -type f -executable ! -name "*.cgi" || die); do
+			rpath=$(patchelf --print-rpath "${elf}" || die "patchelf ${elf}")
+
+			if [[ -n "${rpath}" ]]; then
+				patchelf --set-rpath "${rpath//${old}/${new}}" "${elf}" || die "patchelf ${elf}"
+			fi
+		done
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	# doins doesn't preserve executable bits.
+	cp -pRP bin include jre lib man "${ddest}" || die
+
+	dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+	use doc && dodoc -r doc/html
+
+	if use examples; then
+		cp -pRP demo sample "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	if use webstart || use nsplugin; then
+		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings"
+		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings"
+	fi
+	if use webstart; then
+		dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws"
+		dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws"
+	fi
+
+	# Both icedtea itself and the icedtea ebuild set PAX markings but we
+	# disable them for the icedtea-bin build because the line below will
+	# respect end-user settings when icedtea-bin is actually installed.
+	java-vm_set-pax-markings "${ddest}"
+
+	set_java_env
+	java-vm_revdep-mask "${dest}"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	if use nsplugin; then
+		if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 7.2.4.3 ${REPLACING_VERSIONS} ]]; then
+			elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
+			elog "If you had icedtea-bin-7 nsplugin selected, you may see a related error below"
+			elog "The switch should complete properly during the subsequent installation of icedtea-web"
+			elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
+		fi
+	fi
+
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+}