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

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

commit:     97b978de4fd9d15f2254ee16f1293d2a93cdedc2
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 17:09:33 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 17:18:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97b978de

dev-java/icedtea-bin: Version bump to 7.2.6.8 wrt security bug #600224

Package-Manager: portage-2.3.2

 dev-java/icedtea-bin/Manifest                   |   6 +
 dev-java/icedtea-bin/icedtea-bin-7.2.6.8.ebuild | 206 ++++++++++++++++++++++++
 2 files changed, 212 insertions(+)

diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index af9d5cd..9349514 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -8,9 +8,12 @@ DIST icedtea-bin-core-3.2.0-ppc64.tar.xz 54021752 SHA256 f5eb2d85f5518356b53d079
 DIST icedtea-bin-core-3.2.0-x86.tar.xz 61103504 SHA256 e74bb34040f8bebc7edc531c73069a411075464a6d6f8aa51d3930ad1281ab83 SHA512 960b72971a13375c35c4ff7ddbd0466cab6a6434565a0841f0b760b67466b9057476be46a804afc4224c8d75cafdf21021661937197d1ea5a2674da835fb28b0 WHIRLPOOL 0decc2ed58c23f19048ca73e5a44c7d6174105a14932ef66301759ba349f3451a5f7fbd00821832b62eacbae68a7b4a4ce7f0d02bc0fce0317471adfa48f9293
 DIST icedtea-bin-core-7.2.6.7-amd64.tar.xz 53121664 SHA256 3c43a1b1ae0b49ab9c5b01fb925fc2e40e36b26ee94bb134a9041ba550abb301 SHA512 7c468356464ace98396b68596444b4e6b8545883fbe4a83e61413955f3a7f5f49d2f6eb3b97108633b03e37ac95fc328d28ec1eaff1464887e394752266da5a5 WHIRLPOOL 8f0f73fbe8d2e1fd6a3393868210c8b7d44b249392b2aa54cd399215607da8984d4979c23ae36563d04cd37b4cc9041018bf508a7596c4923abc15269fedd15f
 DIST icedtea-bin-core-7.2.6.7-x86.tar.xz 54806556 SHA256 644b8355a62484ec38357bde77ffa72843bf7c1391be305f834f43be374c62e5 SHA512 380968a2da744d2ea2a67c882416c909cc4132bb2fc9b79eb8ff263c8aa5d49c262e41792884c67a09fb93bfee371002a5fb9ebd630982d02429bd268489c264 WHIRLPOOL 84669bae688cd043ace4eb2b6912510d1f0358a7dacfbb193d8e6655b038ff82fd156743b5498c763435863cb22fd021dd7a2dbf38d6827990c6a5acf6e0c769
+DIST icedtea-bin-core-7.2.6.8-amd64.tar.xz 53161352 SHA256 f96ef80de8568e3cd9d41c7829918e77c9705866e284e1390c94f68f911887a6 SHA512 833d586119cfa218e711bbccf33aaa4934bd4bc34839920af7ab2677b93e4c5ebe844c9cc293fb1aa47265695c9ac9673eea81d44fcc533118ccfcfa2aa490a3 WHIRLPOOL a438aa02fa1b3fec1129b06c43cad7990068798956a3880c8b71fc135e2ebab01dde9f3bf84c3ed44007b65f6e52e306e00933f8d9260f0550b6720945549301
+DIST icedtea-bin-core-7.2.6.8-x86.tar.xz 54834440 SHA256 c5867db7613cb73d94c0d413f00d1bc5e5563143977bdf046ca1bc42f00a28da SHA512 da511acc62225af3a3755e6dac7f0ffb47ed9eb4c6ce7faecde6850fd499cf9427504903d94b7efe5c5126095b0ac71dd5bbe401ff47ebd8026574f105b2b9c9 WHIRLPOOL 8471a3e60dbb75befeeb8f338165d3ae28b6fa3fb602f98ca5eaca4759ed8a447a728023853d3bbd04a822411dfdcaf45dcb55f6b2ba9beac6ccacba0ee3140e
 DIST icedtea-bin-doc-3.1.0.tar.xz 11683216 SHA256 05e5ed8110123e4a0941458f4b4b73ee999029db98fcbad35033d0de97e14b25 SHA512 cd4d3f60e29777240a26ac6fffead099ee31eb05bfb2faa8f3c2c5a7c2aded3159ad0a8aecdc298e7a84bf96cae626d7c1b1cf18af24c39f02c6455d260a64a5 WHIRLPOOL a008c276bf6da08385524c8886366d2f62c2975659d6181991bcbab9f2396a8a8c5a1cdee847d71d6c994ded738d126aeacc4c7180f4a1f5202a7e01f171db00
 DIST icedtea-bin-doc-3.2.0.tar.xz 11641392 SHA256 2c519fa79584c4519978dbbd4872e50de774d2efeb6c117c9288f03351a88730 SHA512 c3e5cd37cdb53b153c012bdafb381ee1313683c8673e1d5c8dca04ce9c697055eac745fac19cc8b0b5f6d33bf552d0be5a80a6bf2e22cfaafdc4ba036401b5e0 WHIRLPOOL 086b59a8fb20171379de93ca959f79153a04adff1f5d2f1abb35447be4658ec7ddbc389767caa05cce92fbd797485c25d88de163a72469dc7a622bff244739af
 DIST icedtea-bin-doc-7.2.6.7.tar.xz 10603912 SHA256 951c33293ec4161084c6d1b40c9af836547c138985ccca2a7062f03c915aae61 SHA512 ea5b0f092388641c82a31bc143565c245dcc3eefa511ec89cd2e4ecafb8ef06b738cfea007fb6530f416d1ae1b8203a3ef495791ec0d6ce14ee4e7574c096d4f WHIRLPOOL a4745cf762dc1877e01cfb65675d990623d740015ee54c7d5b9d5f5fc72cab14a8c547aa3987f49158eb8e7013867c772365fe2905974d6e1b239c0400cfb994
+DIST icedtea-bin-doc-7.2.6.8.tar.xz 10608092 SHA256 259f3e3bc826f93b5bab5720e21901ac1f17ef5807e9b8ff077c5315ee0275ae SHA512 84c741aea87ee9edbb4c54ee4dcecd2adc155f0598bbc1031fac5ed5e5c5828e259a839200b3f908d0928806a0c851ffcfa8aed4ec0486c11fb521a21173fafa WHIRLPOOL cadc1346bf2aeceabf60fac58d7a104012fb857962a9e7684071ca1319c2caf66d5909bfee5802d020db981db65cf58ffa70ecbf0a9ba40cfa5ba48797175d80
 DIST icedtea-bin-examples-3.1.0-amd64.tar.xz 1855912 SHA256 f5d40a7d8a6e2877f0edb331e2fe288be12f07c373b088889e7682440ea1348c SHA512 c89acc0b6e3b41f043da6a95ca73239606e6b4d262de0a38624e1f31539619c60933ffc6c92ef8f5cf2cb88b2c3bedabe129fbe88a6579c1d44a60c806112139 WHIRLPOOL e2c8567d4d419f79828157118cf2b581b25e6519b13d9fda4c54adfd3c2ac08b593a5f190d1deedfaa19cdf34003748caf6d714751e0b1538038b09005597969
 DIST icedtea-bin-examples-3.1.0-arm.tar.xz 1838976 SHA256 a64f2e9b0129847f629304cc96d3b003005afd4bef8160d53c91dd585f956c6b SHA512 a36657b5b9eb26322daaf7e47cfcc7505e76b936cd00f8e6f6b1e631b4c02e6bf652d021981a39dc70825688cf0fdb6a975855bf0a98dd4212e1c8a578d06673 WHIRLPOOL 511a9734857e31a37ce2fdaba0be1215514fd07d698a2bfe820539829d7376df0fa6d91644c63f4add4f97eb7dcca4f8aa8c8fc198c169bc0f0d76e1e62f81d6
 DIST icedtea-bin-examples-3.1.0-ppc64.tar.xz 1849324 SHA256 8ccc52218af73fe29ef15d2def1ab131637887a692599af2314e99b53cf23753 SHA512 bf1a9dd9447fdffffeaf6c8be18ea24c439c15346f4e1938a214427b491c0245f0727dd895b85a12fd22b06f3e105a4e20c82f91ba4d3347cdc2adf9922aff69 WHIRLPOOL 3cc5316a5b83c81b53ad2971860cd6bc6fde4de69560cf59d380cbba17f950cf0d0de955c8a1da1f6c4e5e8e96b7e03475ed28bc861014fd50327266290a1c8a
@@ -21,6 +24,9 @@ DIST icedtea-bin-examples-3.2.0-ppc64.tar.xz 1849596 SHA256 651c133546ecce8ee5eb
 DIST icedtea-bin-examples-3.2.0-x86.tar.xz 1861832 SHA256 77e0dfbd7cc8d75e98ee899ea4052b0a6c0d667a5e23ca2463d534c0958bf549 SHA512 f3dfd7b3e1d3227208f9682cbac99c369c0ebdfb066c54ae48a58f37de7ddc1c12a6c61a39024e34e834bff71fcd2e55fab94a3047f444a50f1408f8497234de WHIRLPOOL ea337a4fe44c195f74bb7a7f5d4ef7d772eba8bc0dc507b8f2bb261ebfc0b873d4f19dda83ae881421dc916b59e87085b54846d35a6513554a81eed855f9d892
 DIST icedtea-bin-examples-7.2.6.7-amd64.tar.xz 1796532 SHA256 711c3f1591bd3defc6ffdbaafe7e4b4a461147fdff3012e80728421b432e43aa SHA512 07abe3a1887231a8869df1cdfef616e9ed2e22b63541edb854720400bbd2256a1f50839e12102e958cd6214f5142c73b939606d2969f7330dc88636210244cc8 WHIRLPOOL 907d97a54709a1406523940affcdb08459d5c90437b135ad71d5591a8cc7843baa74d5da924466632e8b741ae831568a4781e9218529493479e300f888e76417
 DIST icedtea-bin-examples-7.2.6.7-x86.tar.xz 1796696 SHA256 82e40bf4724268a1305a664e34b5d75548f83e24c73a0fb92dd6ddda8192b534 SHA512 6b4fdeb8cdb08fb9ecc09bed84a6c61c3b17382a86c3ce6934da02302302de5bfbfbab7414bc28325da01d04f695065603d9c48dfd21671a978784e25ce923a8 WHIRLPOOL 48d737e0b1a5fd738d76ee26e4573f6c54bb76b4ca80c7495d6daec9c46e4b2e11f4800de96d809465952961a6e75608b343969db1c87bc55eabaa19fca68dba
+DIST icedtea-bin-examples-7.2.6.8-amd64.tar.xz 1796596 SHA256 115bc46dcd307ca9abb264f3b5a2e541c5e4e12fddd7a522d066b0cff249ca42 SHA512 f3fe08e294c1aee2d64a89ab69cb002fd01b640289bc9b68a84aa5261ef4a7432b6be245a144fba628a701354079a1e2d2e0676fd0fa2a1febc612936e157492 WHIRLPOOL d74bb84a95200606e04816f669ddfede9f1991b1df755e1a9cddc91c26301a1ae353470c7e209468f7acae4d34ceed35ed6445d356510fdfa1a2e793a43995d3
+DIST icedtea-bin-examples-7.2.6.8-x86.tar.xz 1796976 SHA256 50c9601c379d51d732ad7e349d2b873973ff2b1f383d7fade4fb2139eee15e8f SHA512 ab3101a86fcc62c2ca159830dffaff561f54cf1dc75ebce45efd72341881c97b078b8213040f70e41b421b17d81c3fa093371be2e160bcfaca7d5ef6ad2dfd31 WHIRLPOOL e2ebfc5fc099e03eab164d09d7ad13db8b97fcb6514961e5b0203bcb42f4ba28a45aadcbcbccf9d6933beb98c6929cecd6f61a51e5260d7c1a078d8d5535f921
 DIST icedtea-bin-src-3.1.0.tar.xz 45670204 SHA256 4a96edba2b2d8cf91253bf2ceb55316729e9688f456abfd46695dceb96dfeaa6 SHA512 f1416398761f66bb57803368aca9bf17a14b4366b99ab3fe8ca3e470c026e962a2554c1b089b879e6d0ce43626a3eacbc81bf6b6f13f9593df54fe05b78256bd WHIRLPOOL 10ee09c2d860f6f0ea1f2fb3d545fd5909e1d6b6fa16d59f873ec35bcfd02d229a294df6ef3b9bdec8c9d899b562df4056d0cfa626454d9d774499b805d5c8cc
 DIST icedtea-bin-src-3.2.0.tar.xz 45643056 SHA256 46c456813e585b6466d253945ae7e708519a8ab7216961561307db845b9890ee SHA512 b0b163c816358e2390767d88a0e8f2a1c210f09a9bc5841907cbef146aab403c43bf67329ab79a41b071be001f0473324673ac7d806bb7a553622cec6301242d WHIRLPOOL c30371045f66ad0d3e829209660cfb28e2d3c98940caa1e59f7c267603db25b7d754ee84f7e7fe551d862fc9b9d9bf33d04c2ca9c4c994984f00cbb1282cf05e
 DIST icedtea-bin-src-7.2.6.7.tar.xz 40090732 SHA256 99f5fe4d198751551b9ba35dcc24deaafa978f1e33c95aaf4e561ef20884f6b8 SHA512 4d7fc20910e7c18d7ec4dbeb85210390a606e05df5696b5b87eb097e1335741695b037f477c21eefcac69455040fae03827589f3b78cba563f98ff8aefed7a0a WHIRLPOOL 2b538dba26778bec9f651c4bf98e285418a0b60f142beba5234fb0697d6673c6109d67a38e4776d89782cfbe89723b1eabefcb380c7bf8697efe0382f414c622
+DIST icedtea-bin-src-7.2.6.8.tar.xz 40105456 SHA256 9fcc1ebcfa3518804c45215f4e83ea282a87dff2b4b52461cd878c77a5812b2d SHA512 3ba29db8f6edeb3433d03a1b679ea21ead501c7e343fdee15531ff0e86061bca3e37498c75362aaee319424dc6464803659c24089def3f3c579bcf86fe7a6ba6 WHIRLPOOL d0ab4d61ba741b9955deb958927efff871c8941127707dee860a4317c1fdf17301b456739591a81f998d9a2bdaf55eccdd26717df228e9c70960b101e8dd7ab3

diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.6.8.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.6.8.ebuild
new file mode 100644
index 00000000..7022286
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.6.8.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+KEYWORDS="-* ~amd64 ~x86"
+
+inherit java-vm-2 multilib-build prefix toolchain-funcs
+
+BASE_URI="https://dev.gentoo.org/~chewi/distfiles"
+SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
+	source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
+	multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-x86.tar.xz ) ) )"
+
+for abi in amd64 x86; do
+	SRC_URI+="
+		${abi}? (
+			${BASE_URI}/${PN}-core-${PV}-${abi}.tar.xz
+			examples? ( ${BASE_URI}/${PN}-examples-${PV}-${abi}.tar.xz )
+		)"
+done
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="7"
+
+IUSE="+alsa cjk +cups doc examples +gtk headless-awt multilib nsplugin nss pulseaudio selinux source +webstart"
+REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="opt/.*"
+
+RDEPEND=">=dev-libs/glib-2.42:2%
+	>=dev-libs/nss-3.16.1-r1%
+	>=dev-libs/nspr-4.10%
+	>=media-libs/fontconfig-2.11:1.0%
+	>=media-libs/freetype-2.5.5:2%
+	>=media-libs/lcms-2.6:2%
+	>=sys-libs/zlib-1.2.8-r1%
+	virtual/jpeg:62%
+	alsa? ( >=media-libs/alsa-lib-1.0% )
+	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%
+	)
+	!headless-awt? (
+		>=media-libs/giflib-4.1.6-r1%
+		=media-libs/libpng-1.6*%
+		>=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%
+	)"
+
+# gsettings-desktop-schemas is needed for native proxy support. #431972
+RDEPEND=">=gnome-base/gsettings-desktop-schemas-3.12.2
+	media-fonts/dejavu
+	>=sys-devel/gcc-4.9.3[multilib?]
+	>=sys-libs/glibc-2.22[multilib?]
+	cjk? (
+		media-fonts/arphicfonts
+		media-fonts/baekmuk-fonts
+		media-fonts/lklug
+		media-fonts/lohit-fonts
+		media-fonts/sazanami
+	)
+	selinux? ( sec-policy/selinux-java )
+	multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
+	!multilib? ( ${RDEPEND//%/} )"
+
+DEPEND="!arm? ( dev-util/patchelf )"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_prepare() {
+	default
+
+	if ! use alsa; then
+		rm -v */jre/lib/*/libjsoundalsa.* || die
+	fi
+
+	if use headless-awt; then
+		rm -vr */jre/lib/*/{xawt,libsplashscreen.*} \
+		   */{,jre/}bin/policytool */bin/appletviewer || die
+	fi
+
+	if ! use gtk; then
+		rm -v */jre/lib/*/libjavagtk.* || die
+	fi
+
+	local lib=${P}-${ABI}/jre/lib
+
+	# 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 '/' '/#')/" \
+		${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.
+		rm ${lib}/fontconfig.Gentoo.bfc || die
+		hprefixify ${lib}/fontconfig.Gentoo.properties.src
+		mv ${lib}/fontconfig.Gentoo.properties{.src,} || die
+	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
+}
+
+multilib_src_install() {
+	local dest="/opt/${P}-${ABI}"
+	dest="${dest/%-${DEFAULT_ABI}/}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	if multilib_is_native_abi; then
+		dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+		use doc && dodoc -r ${P}/doc/html
+
+		# doins doesn't preserve executable bits.
+		cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
+
+		if use examples; then
+			cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
+		fi
+
+		if use source; then
+			cp ${P}/src.zip "${ddest}" || die
+		fi
+
+		# Use default VMHANDLE.
+		java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+	else
+		local x native=$(get_system_arch ${DEFAULT_ABI})
+
+		for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do
+			dodir "${dest}"${x%/*}
+			cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die
+		done
+
+		for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do
+			[[ ${x##*/} = ${native} ]] && continue
+			[[ -e "${ddest}"/${x#*/} ]] && continue
+			dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/}
+		done
+
+		# Use ABI-suffixed VMHANDLE.
+		VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+	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}"
+
+	# Each invocation appends to the config.
+	java-vm_revdep-mask "${EPREFIX}${dest}"
+}
+
+src_install() {
+	if use multilib; then
+		multilib_foreach_abi multilib_src_install
+	else
+		multilib_src_install
+	fi
+
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}