dev-java/icedtea-bin: Version bump to 7.2.6.9 wrt security bug #609562

This also uses the OpenJDK EC code instead of NSS to address #605430
as was done for 3.3.0.

Package-Manager: Portage-2.3.4, Repoman-2.3.2

2 files changed, 212 insertions, 0 deletions

diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index a86c1b453cc6..1fca18c6766b 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -4,16 +4,22 @@ DIST icedtea-bin-core-3.3.0-ppc64.tar.xz 54126156 SHA256 a0f407f5e84b4a32b69e246
 DIST icedtea-bin-core-3.3.0-x86.tar.xz 61185420 SHA256 739aa08159cdf31e1016581bc74e85094e1e0a0e0129e3f23638bb751dd614fc SHA512 7e080afd159af01497f49e7a3f78399bb45d7cef2af43b266e83fae7ff6040cabff4daecd842b4aad7a6b54ef7333d51cb3eb7b546e286dd8e51ea85e999a8de WHIRLPOOL 33a5676105a2c33b48cfa89bba7f0b3de292858e11ca38aaa83983ccbe6427a2c2b521b7386fc9908653460560e43c3063033d8b3353189eace4656a4e52b1d5
 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-core-7.2.6.9-amd64.tar.xz 53340768 SHA256 dc520389dc96e6b79ea7f7d72ec464c070977af5e17ab9843e84c406d884475e SHA512 2b7cc0fb6b1baea07c2bf429581868563f5b79cb0ff2f0d6ad7ae9fefd4ce99c9394b46ca41b04a345fe3bfa40d90654a1b30318ab1aae6e983ab5cca9571603 WHIRLPOOL 9a6781a662b7e46c5103c1098a2abc0c274bc0a3e3947437962630178647cba2a06ba3a649f5d2ba7c354a1430550e8a83cad0952e8879ce2997573b943c5817
+DIST icedtea-bin-core-7.2.6.9-x86.tar.xz 55025384 SHA256 0ea41e0bd36f23591be3a00f355ad0310e9a223892c10437b2f62ec846551d0f SHA512 a7d87789557532e9ad2ac36e836a5ea83357bfcede100e1225fa33258848f94d85cda59aae298bff3672b48b2ebdcc2efc72dab5078d3a168bdca920f00c3df7 WHIRLPOOL 95cb5658985d5e08233c0c6b6509c797b2b97464261ac42b3b2c01ba04d734aadb363401943b77842828cc1e5641bed198c850d56beee004be761b6669ef799d
 DIST icedtea-bin-doc-3.3.0.tar.xz 11683924 SHA256 7c47903bdb8aac992a52a2d51157022288162394ca1e59228a7baa757ed58721 SHA512 89ea51e86899e144aa1f0b8756887eb149ef33780ee85f17e76a1c789464a7acca761e3d542a547758faefd3305a979e55c7298589af3ece46d96fe9893b44e8 WHIRLPOOL 93747929a6dac84828073ae3d9f9c021b4802dd90d197d661796b20133f2544a14203fbce317d8f4984384792610b91fd58544d343e7c151c09782369acdc09e
 DIST icedtea-bin-doc-7.2.6.8.tar.xz 10608092 SHA256 259f3e3bc826f93b5bab5720e21901ac1f17ef5807e9b8ff077c5315ee0275ae SHA512 84c741aea87ee9edbb4c54ee4dcecd2adc155f0598bbc1031fac5ed5e5c5828e259a839200b3f908d0928806a0c851ffcfa8aed4ec0486c11fb521a21173fafa WHIRLPOOL cadc1346bf2aeceabf60fac58d7a104012fb857962a9e7684071ca1319c2caf66d5909bfee5802d020db981db65cf58ffa70ecbf0a9ba40cfa5ba48797175d80
+DIST icedtea-bin-doc-7.2.6.9.tar.xz 10612564 SHA256 8b1674e37f5678aeb21c0b9ad6355aca21e03d699a8f1dc456b7a8fc7447e23c SHA512 6673ded54bd3719bcc3b53e91b426a3c71994d41dee674a5c25f4bf695fee47c77c8503313df6ab8e2c6055d779783550c70ce8e7a4d578c9e5b6af3bf9c0412 WHIRLPOOL 26243f77299e36f28303bc8dd762c2eb3fb24cad80338fc0af8a0d85d2b8bd0475a7e833fffcf0550c47c6540247f58448dd0dec0cccd3aa455b98f60a151e9c
 DIST icedtea-bin-examples-3.3.0-amd64.tar.xz 1856784 SHA256 63d0a3be2741bfeac1d2b768d5f3440346c763f5973089b0e29f7e4700db16ad SHA512 26c2fd1c09fd27ae9ad87f9d4708cc320e782598cbebd0504e914bc4554c2289cc3539ece36496f07c6cf1f32daebdd4d56f9cb078e64d96b168d857a99b170c WHIRLPOOL a1687b5dd8240893d3077637ff3d880b814a067123a677449f138a6c24fbfb02786080f550dca2b2e7a5b2add5105529367b124c190d5ba179f4be75036f27f7
 DIST icedtea-bin-examples-3.3.0-arm.tar.xz 1839564 SHA256 807aa2a27995eca0966167d89216d4c5d775715d681a49d88169021b0a6437c4 SHA512 ae178242c2d8407a655bad9589ee85f2ef2d91b8a51f4cffe30f8aa2fc1447c9465f7875366b31465df5d719322af4b0f92b0f550c539800853fc7481e981c8c WHIRLPOOL fd3b5dceebfa6119c7717df47f2110dcf4f865a05371fd677f95a633da6a910b46b9c1b8bc67d9243b0d2e8bdf937eef720c957217b2f32c053b97bed360c630
 DIST icedtea-bin-examples-3.3.0-ppc64.tar.xz 1848688 SHA256 04c566884db88b98625f28a50d7d5bc44468de54dc7dfa3bc9df51d5c43c8824 SHA512 bedec9222a56791f2a54d272b7d208faac65a9cf7f862d693d2234b3a7b9dc13cbfb75fd1e0dc30088877624b45e1a42902af9dc2dc8c66b1ea038fb8c535823 WHIRLPOOL d9c85433674c0f3316f6440e943793a38fd18fd0cf92a146a75ba8b67fc274fd2e41cf9bbe181204af1b7f3fdcb8ca47156df654bf6bfd637ba37a5fb0340307
 DIST icedtea-bin-examples-3.3.0-x86.tar.xz 1862264 SHA256 dc804edcbb89b3dff58eb148382aa3511a0d1ba9a9eebb4f9e8e63acaa2aa8af SHA512 fb659100e676aba74312797a326fac25fe298544ddb490ddcc557e6a6423351c95197a4198b61c08bae83514f728dafe45dde11ccf60cb7609f357830ffb6615 WHIRLPOOL 8c922ed311be294e8e88c08d85853dba835e1d854cbd3b20d4f550e45a1735ad1d0676b77010a1b8a905aa3cb6928557e3cde9e6677b74209d466e62511c670d
 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-examples-7.2.6.9-amd64.tar.xz 1796792 SHA256 edb89de7176d9a155e75034c737666aefceadc9f8026845c7b0175234bb73532 SHA512 5a456c4a3dc27161c0da5fac7f757e59beafafe0ce3d2adf36901f71955cc8075d52507e418f8cd1346d3381754ce5e4ca4a1d40eacbc2f6a37d52abd326dbf8 WHIRLPOOL 2dd6162a0f425a52ec4c4ca61ecf3e431f35da3c6565b0917901dedcdd0a763aee051b24269129975491f396a896b340b5387d8c74ef6e86685dbdf6071cfa50
+DIST icedtea-bin-examples-7.2.6.9-x86.tar.xz 1796468 SHA256 e766aca0dce9ef7e43c4866f7cbd7b9f780a444385259b0d8696f0737ccee65a SHA512 36ed733a1fddca19f6ed23ce66abf77864d1d08a4aed21712cd58aade8699ea39a2113dc74c5404cd875c2aa49b6ca98e02fa8cff82970926a9eb676e2d2f438 WHIRLPOOL 0fe6951506e49493d1ef10c0724089a19e3fe04069c0979d9b91e0428ccab3f382757db407f03866fc80269bd4098004df57759e785f1fd0e48adac24def04d3
 DIST icedtea-bin-src-3.3.0.tar.xz 45698204 SHA256 47aca8467e1b5baf61ba59d80786a54d2f5b2f4651de2d87604ecab0318117a2 SHA512 668d8fa653d2e773c633e74f9043c7ee0a67f04775c8e317f2515c47a85a0cb2732e2d7a30ad0ce05521c32e6d1de19ccfbc7558b4b3d4b60b73765e1a854eaa WHIRLPOOL 0fd4dd6a7483dbd5826938922a339364b006324f01da7d39eba7d38eb73010abd47f9cfe5b16d419163c34e302973e4c5eba0c1fcf759f584dd3d7947c3a59ad
 DIST icedtea-bin-src-7.2.6.8.tar.xz 40105456 SHA256 9fcc1ebcfa3518804c45215f4e83ea282a87dff2b4b52461cd878c77a5812b2d SHA512 3ba29db8f6edeb3433d03a1b679ea21ead501c7e343fdee15531ff0e86061bca3e37498c75362aaee319424dc6464803659c24089def3f3c579bcf86fe7a6ba6 WHIRLPOOL d0ab4d61ba741b9955deb958927efff871c8941127707dee860a4317c1fdf17301b456739591a81f998d9a2bdaf55eccdd26717df228e9c70960b101e8dd7ab3
+DIST icedtea-bin-src-7.2.6.9.tar.xz 40197760 SHA256 3e59c465de83f5a9f9fb66da1c3af0a0d5fc5da76285ad936846bc675f7823e5 SHA512 392de5356226daff9b91fb79813dce3a8f383136637c5d7f2647ab3cfd664dbc3eadd65b1387c7bc74c9e476c1bed4a02b0efc10445aba27d1ba60d746f892a9 WHIRLPOOL f2b83a21476e611747de33a06ada376bfe15a45336be7ab287db5fabfd2999defa73b12666a4cc4a7fa04ae893e1a0447f05951dbac49cb9fdcc32697c907125
 DIST icedtea-bin-sunec-3.3.0-amd64.tar.xz 58104 SHA256 4a6a621b8fe4375e4bb8b5af40b05601ed51e7afa2a487cd58f0f3da1d634f09 SHA512 0753b3880f2337c60c34b31d60ffbd98e3f11da130771301a6fa01ae4d407705f41f99d53740bcce7972e62df3f277a1c8d4b6c8c5127c349bf0e78daac0b36c WHIRLPOOL 500fcbd2dca3e652804f04b0fc1dc57974d44e1556fdfa7cead513228765cf4f5e664a3771316fb85612efbdbe0eda2302042dda05f43a868c6cb68bcc6d713d
 DIST icedtea-bin-sunec-3.3.0-arm.tar.xz 54160 SHA256 17551c0f12d9769ec5a94c33aac4f8feba71b7c9ed6ce2ddc22d2b9165cae062 SHA512 4e53cbd500bcfc62a491c2e1f7a3bf1e75080e4e5694406d2fe2eea983b506893d6d076262af196ea728f0a15963d6219c3745b32b2e8501a5ac5239b047eaff WHIRLPOOL 2aeb9f1841839ba58c14bc5be2c9a43dcede9b4ecf200d20338977d94c99a5d9fdb972af51176cc2496189f1fbfaf438f138db7e9787bbe0ce924c75acf9fce6
 DIST icedtea-bin-sunec-3.3.0-ppc64.tar.xz 52984 SHA256 796d90328f9ae45eabf0d1f18a3be69468433dfc742c21469a092f5933559fbb SHA512 55ce61e02381bab6951acc652e57a0870ac31076f23a3ab53bf8b6facb3357dba50d93f3cc7f40eed15e17adb91ebc6f4d944a680ff5bfc7d343caf14014dc18 WHIRLPOOL 8f7f217025d9eb20042fdb0adae03fc34fca21ff59c9c9adb61982da785eab64cb2f87bc7e9fb5c7d9012e27f4a11198c5fa0f1b08dc086c42ed4b55315b2ee5
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.6.9.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.6.9.ebuild
new file mode 100644
index 000000000000..2f0581985f59
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.6.9.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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%
+	>=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%
+	)
+	nss? (
+		>=dev-libs/nss-3.16.1-r1%
+		>=dev-libs/nspr-4.10%
+	)"
+
+# 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
+
+	# The nss flag in the icedtea package just (un)comments 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
+}