dev-java/icedtea: Bump to 3.0.1 wrt security bug #581238

Package-Manager: portage-2.2.28

3 files changed, 20 insertions, 34 deletions

diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index bfc60fac074a..2db05691a00d 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -6,15 +6,15 @@ DIST icedtea-2.6-jdk-55c38c1ace75.tar.bz2 32434755 SHA256 1baa92ca72db1b80fff18c
 DIST icedtea-2.6-langtools-e42dd50480d3.tar.bz2 1708918 SHA256 54bb2cee7b4fc5bbc63a4c9d7008602e12f75431c7f129ade7c405b53c2363f3 SHA512 55ad5b729fe85710089017402e575b5f5f2426c54401bb40202af2bb7af722d2b3370f12f5ba6be941b60177ee45ad15911fdca554c213c09c93d9404d85565c WHIRLPOOL 6c4d5dec34dfdcd9ffc831020790529193b665f92cc7bee33df8e5a7c97a0dc51f1adb5b675c81fb347f07ed4854bcb6bec34714935995826573c2c1464d186f
 DIST icedtea-2.6-openjdk-882cfee70fe8.tar.bz2 130156 SHA256 24f813e6cb938272a4da37b46b48aa86820b13be0747747e6c8fb4aad72cadf3 SHA512 fe72b626a60e8dc7939d35069ed90e8053676e8b45a9eca78d6abb2c7e3bff15ed7f84300542e726a8cd6a8fcc73ae2f779843de79654dd6cb4ef04fb134c222 WHIRLPOOL 4cc443730734c5b3d4f57de7b3ecfaefe8029ce4143b60e80011d871f322076816edc11a39c718f0cfa6d2283315186b8fe488b1f8b5aea16736a88970af513b
 DIST icedtea-2.6.6.tar.xz 2072632 SHA256 79949744436158d9ded3a758c22da7629f843ea3913afdffc65ea0f1a26d544a SHA512 ba603ec6c16b5642d1591717ea14378ebe045e4128a8eb517de94df32c3bb03b636f051e682cf5990c3a1bcbf2460a97965cdc139bf265fe5f97bedaa539092c WHIRLPOOL 7716613f6463dcaa514c980ef0850c2ad42319275b504d0ec55e0dd54e0dbff5c74af4f53b0e466dbb41c4ab5ae2694cb3a5f74b19de4913790ef9bff6554985
-DIST icedtea-3.0-corba-37af47894175.tar.xz 936876 SHA256 d77480d5d0c9620562a66b01fda9be4de58c2881cec680b4f2682ef09087b3cc SHA512 21b2f069f1eaca62a46518173de3c1368963db489f436d5ad705c7cb36ecc259d342c059c4c593427e96604164f78be761e1fe4118d8517ece3630280524ad30 WHIRLPOOL ac7292f0a32cfa7b58d3616b704bfd90ead49044bb51fccc1ca87900555d15f28b3d3137512fe007b40f0a130d3e6eb9d805112725914b0f0721ac8dbad8794c
-DIST icedtea-3.0-hotspot-5e587a29a6aa.tar.xz 6766584 SHA256 76717fa6a84fde60075c19fbc261709bd9c3b849952c817c0ac6b46b757ac0d7 SHA512 c8a2355ef81ad1dd4a2f6be0e5cdaba9d6d66a4fd5514718cc09ed391bcce269a17a34fbc89d7c6d3e7a2632f2ffcb0028a8faaf41649055a096407a24cacd0e WHIRLPOOL 4e83ea5ee631ca76e7919a944f9f1a3a007ca951a99552ee087bd6d2d6e027c5ce9963ec3c593c8132a984dd9818fc42abfb0792b3628d44491488700b20ec09
-DIST icedtea-3.0-jaxp-4ed5441e40e1.tar.xz 2296120 SHA256 4ccce5442642561cda78116a019f5c0ea690725a374ccf5695b3af00393d26e8 SHA512 47e968f674176f74706ab268098a1635a54de7282993abc46a1c72c8d24f21216ed898bbca830623f5afd11912a744138547d6d22a82f68fa1ba15ccc7a9e375 WHIRLPOOL e94f961336d1e8b176ab2486ae98852049f930af3ee31dd3f7491544244c78d6b5657334fb45b9cc863bb6c377a6b1ab5d71df1257d02bc9e79513cd41ecc2ce
-DIST icedtea-3.0-jaxws-a81c04154cc5.tar.xz 2266356 SHA256 ef550609aaa526084256a7fdf6c326015641d6d8c80540c830c0c62302a2f076 SHA512 53ef8dfb1fa0602bfbbb75ca1f8a80af6c09029f22e69625680ce55aa04b820bdfc042d57e5edafbf25ea4f43c32fb988bad9e19b78676cb937af9062ec28ca2 WHIRLPOOL d76bae6c0b1540fe28dbbb5d516fea2c09facb29fd605df38429273e8358de6d0ca1f685098aa3c334a4ca9eeff66ff9759ba704697786a230315d236e01cca1
-DIST icedtea-3.0-jdk-3334efeacd83.tar.xz 38245460 SHA256 fa74b8aaa389495a685f3a28151a1957ff8ff88a4d4792059c5c1fb7c12eb1cd SHA512 92106e36d9dd522c355eec877709862b7e1ae18790a0965fa7fc74c1cd2b4aea145b630e37fa953e9cfd0feaadcba0117675bbb8e2c5705379078e16ac53a37e WHIRLPOOL 86cd77313b1fc50d6ff96de3e41d2d9c53627971ba475120d1724a1a690876e3383be6633baf074e14d95f0c0c16727f4bda5465ee66423dba1c8cc6533ab800
-DIST icedtea-3.0-langtools-dd581e8047e6.tar.xz 2055716 SHA256 e0e0e6a7cf8575506579306f76cca872b01a3f08a4880fb9b316444fb206ea86 SHA512 da64e53d360f591af599105cb244898f5092c3613f12f013244f9180b27629efcc0d5abbf2cf3043fd8c80edccfb9ad34dff854f36e539d24d206f6908c4f908 WHIRLPOOL f96b5afc4744f0cab3efdbb460da1c82bd2d8a370b59891ca3d0d351ecaf772c8c8414f92267be52f816d7d227d3dc175db2058fb6c9b7a7113b634fa47038e0
-DIST icedtea-3.0-nashorn-697c5f792bec.tar.xz 2220600 SHA256 b4c59d8269511f2073498518e599ec91dff11c57cadc0b97fa88af81835122c0 SHA512 e719c91ede0db0a5a0c97ff8ee165fadfecab053a48116d48974e24af06559540d2924b0d582fa4d4d5e4971ebc5929aa70b775f0fc6991c8311ca78d7860cd2 WHIRLPOOL e29ab3b81d095034e90c2996802f2c4ce1b338be817cf81ffddb084eedf52638e2b011b379534a9856303d3c3b722ef699d61d25a18f8e7910442c3139e01265
-DIST icedtea-3.0-openjdk-8ed8d26a3f9a.tar.xz 330164 SHA256 5b032673d74c4e2529427b9570b177285dc9a6430d016ef2e072dd2167669031 SHA512 9b0c6952e66708810cbdcd4f0a093f8d6f954c5cf1d098b6d70eced8908689fc0716fbb76ea6344c4a01127177fb078b31706551289aa7bd80fb649efe4d9018 WHIRLPOOL 361e0f9d3653a5718b3a2a1609c5b73adcee89c22f81e1c108c39499b5e755be639241a1de2946622731255ccbb8d00b097f77176fd31e7b9cfebfdcf94e1feb
-DIST icedtea-3.0.0.tar.xz 1402156 SHA256 947add69b3b89d7685cb0c9e2b51fc561e27f6e7c0bf1ea98dac8156fa8629a9 SHA512 80bece0c0dbe4c0eaf8716abd0018ae71fc62dd9a3698eeca37383af51884cac5b1185f226003e396b4b5691beca478b5419755795f906962e9f66674294ae9b WHIRLPOOL 4811b4041f96e2debc1f8760eb1c9c318f3c40b36ee45042788c99b74c9886c46a9859fe23eb369f531c596252a89e80b32b71b364e13bd1478c04e66911e824
+DIST icedtea-3.0-corba-a6736e860d67.tar.xz 937360 SHA256 42351003e03f8893435e424e652558ac7e6e7af86a0cf01338c84184b8ab6e50 SHA512 63aeb0f41b8d889a8e1f4a5a8033903145f4ef5bbdc5606085ee23f59f1696323a201e5ebd5ba9bb926b895bd773bdbce6bd1e2f421a4e13d499974cdc601c2c WHIRLPOOL f39270d8032772a86675ffb7a0c148743a765d4f133856a6dda203597143924f7695ce69637ade527cd2e615bfc0070045d881ad4b77d8db064b24b20cebe4fc
+DIST icedtea-3.0-hotspot-7bb48ba4de4f.tar.xz 6767200 SHA256 c15794ae90ee52222b73a5c8eb0a397062226fe8215aeed72fdf28f9c26780de SHA512 700c95265ff36912472126762a41642f4e49153411730748d112ee630497d4b5e487666755ccce1e3965ed55abde775ae44813bda24069a34a28be81b62b64d2 WHIRLPOOL d8f940158f08b0e171e7cb527ada65e17cad9c3ba09ac8c71bd6e126e27c2255dca6b8a2398eebd8b6b7db7df283fa57b74818607e2a8a68bffb0196e8d2c01f
+DIST icedtea-3.0-jaxp-c7145fc644df.tar.xz 2296808 SHA256 c0a9d523d451b895066dd747ee595eebba29f5626e9a69d9467cccd9b2df37c4 SHA512 39082376e3f24f589eab24c586c5af724e78f24a76b6d9c376b4b7197a36a9aabf85d7ad0717dc4ccc336ae8b1deb55e6d47f7ce5808150133814b9241f2a0e8 WHIRLPOOL 3a4f727482efc70938acb99d12bee9a81de5f89926607e9aaf46af681fc3e7364bb3fd2423d82f10ee62479a10cfc8ac2c944dc92ec61f5932855afda3cb6cf7
+DIST icedtea-3.0-jaxws-412389386184.tar.xz 2266852 SHA256 e378c1f46b067c9527d174c3683f4022eca3fe17bcf0e79177fa1713197d3338 SHA512 c8ef598c1625d3868302d1baefb9e40b7cd9540593278ff11c2cec73a7007d589daf873cb6ae06104d002f84a527f702ad673619b8970f8b1a542cf75014ec80 WHIRLPOOL 50c22b3433481cab34cbe028048314d17296fcf59239aeec8fa8e97d51b1cbb359d051e5ee8728027f81ed7f9a50ff73399c919c080e3baaf2db985e36bd8b21
+DIST icedtea-3.0-jdk-dab76de2f91c.tar.xz 38264484 SHA256 550556487de7fd769a9398082f26b358a2e5c07c2c1eb09724f0862667589cdd SHA512 54820354f847b2d28afb2523cd9cf4c24407add86135ccd30713c1c0319aa30a97b8a6fc6ac83e0fd100e1c00f4e96007f115faf4a3f5346865c535d80c19a93 WHIRLPOOL 794630afeecce34c1ac57b1f382b5fec4f60db25904fe3edba02f2105cac66f0e867162a92f6fed5a20b51ee03f7b39d91b0b9885c6f079b95953a985da62915
+DIST icedtea-3.0-langtools-ad6886e3a101.tar.xz 2056412 SHA256 2602601152576021736028604e56cf32f8e3f5997fe220e90297132274a251ca SHA512 9f5f1b69171b67320dd48cf7e88ae337983c1b90c516b034fd823ee349c0f1aa2554ccd22f59ce6d24aae530686c09bfcff1c48925f92f16b29e8327662ca574 WHIRLPOOL 21463b6d1cfebbe4a0dc127b934edecb347827f7351cd4ce4a717b7560ea3a6c8aaee74a76454f50879607f09e2d33a16f29520076d3c1446d16978461faf075
+DIST icedtea-3.0-nashorn-c89dc17f7c75.tar.xz 2220176 SHA256 e7040d55a499c002cd6edcedc44890072a2f88cb19a341950e5865c544b51edc SHA512 3cf12d2696b630eec2a4c6fefe08db9e14db62bbd81a3a4546ef886f6b7fa059a2f41dd3a4377ab2da1f65d371b70766caac4054b447454863de82ce961c3d31 WHIRLPOOL ad2ede063f0e6cb1a67f90d42ddcf2ab33175008361620abf04ccc1a55b9e3c2a8a9827100137842c8f6de2a3af367b6143c0916a5ffa4920dbcd33fb66547c0
+DIST icedtea-3.0-openjdk-6a70821528ba.tar.xz 330720 SHA256 8b766fffa39d67e62802a8cddd23e02b0ac2fd6aff48658b4b08fd6dbee38184 SHA512 5054d4a541b8f3e6fd09cd44355b39d3a0e1ea27247bcaf8bb800e1e3cf23a4133076383b74c19be1928a5fc0c3986ab3303614a834b9741209dcf20eb19d703 WHIRLPOOL 7ea8c98d4dca75325841929aa8049ecf713e637124e4ce6f9a98d7845d25153d851c42f632132ab61ff6823e0aeab07ad0dc43e6f699d4f3747b536e90eb0b76
+DIST icedtea-3.0.1.tar.xz 1403400 SHA256 346ce30de1de6c493729b79b246f250438fc5b8df7eae47229a97f9000a73af2 SHA512 01506994e3c4b4a1dc927251de0db5e5a22754031604cf7c8660597525616d3205527ed768d67aa4b4c62b40a0e3fbd3327c97b95c81b634175dec69c5802c8f WHIRLPOOL 0641f49b6fcccb3981e2756a2403638897887634ff09b6ede9ae61af80259b5bc1168c6c5f236a07157befec4a1fe848d0814afe5515bb5a98c591370c62dacb
 DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4
 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 SHA256 bf48f6b725a4dc0c936f6770a67ab4074c3bb35352d5de727368350d32549808 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7 WHIRLPOOL ad72950f37af738b6a6b472b8410a8c8ba52c53d6243976ba983f1802e082c7778d831db202468b7ec5e036dbea1513af6345c666c68b52bae2a95941567cdf0
 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
diff --git a/dev-java/icedtea/files/8-ccache.patch b/dev-java/icedtea/files/8-ccache.patch
deleted file mode 100644
index c846dbae8625..000000000000
--- a/dev-java/icedtea/files/8-ccache.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- openjdk/common/autoconf/generated-configure.sh.orig	2016-04-01 04:32:19.000000000 +0100
-+++ openjdk/common/autoconf/generated-configure.sh	2016-04-10 20:04:53.472885447 +0100
-@@ -35764,7 +35764,7 @@
-     # precompiled headers.
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ccache supports precompiled headers" >&5
- $as_echo_n "checking if ccache supports precompiled headers... " >&6; }
--    HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.[456789]) 2> /dev/null`
-+    HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E "3\.(1\.[456789]|[2-9])") 2> /dev/null`
-     if test "x$HAS_GOOD_CCACHE" = x; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5
- $as_echo "no, disabling ccache" >&6; }
diff --git a/dev-java/icedtea/icedtea-3.0.0.ebuild b/dev-java/icedtea/icedtea-3.0.1.ebuild
index 25d6d2495731..0a142c0252e5 100644
--- a/dev-java/icedtea/icedtea-3.0.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.0.1.ebuild
@@ -12,14 +12,15 @@ ICEDTEA_VER=$(get_version_component_range 1-3)
 ICEDTEA_BRANCH=$(get_version_component_range 1-2)
 ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
 ICEDTEA_PRE=$(get_version_component_range _)
-CORBA_TARBALL="37af47894175.tar.xz"
-JAXP_TARBALL="4ed5441e40e1.tar.xz"
-JAXWS_TARBALL="a81c04154cc5.tar.xz"
-JDK_TARBALL="3334efeacd83.tar.xz"
-LANGTOOLS_TARBALL="dd581e8047e6.tar.xz"
-OPENJDK_TARBALL="8ed8d26a3f9a.tar.xz"
-NASHORN_TARBALL="697c5f792bec.tar.xz"
-HOTSPOT_TARBALL="5e587a29a6aa.tar.xz"
+
+CORBA_TARBALL="a6736e860d67.tar.xz"
+JAXP_TARBALL="c7145fc644df.tar.xz"
+JAXWS_TARBALL="412389386184.tar.xz"
+JDK_TARBALL="dab76de2f91c.tar.xz"
+LANGTOOLS_TARBALL="ad6886e3a101.tar.xz"
+OPENJDK_TARBALL="6a70821528ba.tar.xz"
+NASHORN_TARBALL="c89dc17f7c75.tar.xz"
+HOTSPOT_TARBALL="7bb48ba4de4f.tar.xz"
 
 CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
 JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
@@ -60,9 +61,9 @@ KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 
 IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt
 	jamvm +jbootstrap libressl nsplugin pax_kernel
-	pulseaudio sctp selinux smartcard +source sunec test +webstart zero"
+	pulseaudio sctp selinux smartcard +source +sunec test +webstart zero"
 
-REQUIRED_USE="gtk? ( !headless-awt ) test? ( sunec )"
+REQUIRED_USE="gtk? ( !headless-awt )"
 
 # Ideally the following were optional at build time.
 ALSA_COMMON_DEP="
@@ -266,10 +267,6 @@ src_configure() {
 		zero_config="--enable-zero"
 	fi
 
-	# https://bugs.openjdk.java.net/browse/JDK-8067132
-	export DISTRIBUTION_PATCHES="${SLOT}-ccache.patch"
-	ln -snf "${FILESDIR}"/${SLOT}-ccache.patch . || die
-
 	# IcedTea itself doesn't handle ccache yet.
 	if has ccache ${FEATURES}; then
 		ewarn 'ccache has been known to break IcedTea. Disable it before filing bugs.'