dev-java/icedtea: Version bump to 7.2.6.5

This addresses vulnerabilities being handled in bug #578300.

Package-Manager: portage-2.2.28

diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 3875c9b2708676e60df17fce466d62bd82d2436b..0bd0d6058bda08cee70913a4066ca1ef4ffdf8bb 100644 (file)
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,11 +1,11 @@
-DIST icedtea-2.6-corba-2135da66cc53.tar.bz2 1072269 SHA256 26bbfae0504fb7e83fd5eaba08d9e44e0c07a609cdf7c04fb6832a097b56bc08 SHA512 2e07d6529c347625c06aed7dc25b41b5ca425aedb0652cc92df477f8a4ab1343c4aa90b1204a94a327a550d75cfe13c0adaf607b7e064e11b5a9ed07afb9313f WHIRLPOOL 2cbf0e97038907800f6d88084fc9879714c8c1297842179e3f220dde416d6f47d076fdc2c2296600aa06dcf839ec029378db8e7a662ce8c3cbfd8eda67e9ac3b
-DIST icedtea-2.6-hotspot-19d919ae5506.tar.bz2 8162545 SHA256 3747417c3ba69d1ff7d80dc6df19454c4f4023c35f8b711e47baefe2fc772e65 SHA512 be3c356fac53112324f688e6336e8bcde453284f20671a1630b97a30bfaaedf1f7915984250e51aea106fbcc25790aca3f7d4ed419499394748f0391b17782c5 WHIRLPOOL 65251c4e6d91fd8a25bb2bc83b58aacd23f3e7f4f65112d135ec04f98136e351a8175a84a05c070a42d1a351c8301c55a34f65f120e908e129cecb0ff703d32d
-DIST icedtea-2.6-jaxp-bc6edb6c12a7.tar.bz2 2733735 SHA256 097cb0423271b6439b36db190a66bab9d447dd03ee22e42a6089a3b3b8363f62 SHA512 fb9a7607403ba15759427bd7ef1740949dc9cf3892e61a643b9dcdfda7633876d38606dd06af96b0fa362eec427c68b9faa458762defe502c81cdd97290a056b WHIRLPOOL 62583d7e1907b97b90f818b9b0e76fe10a0f57342597191157f6c0a696af8f1fdc4b4968aa2112c7b42900e6a988fd291b0d5ffe7c3de7d89473e536ab6b9e56
-DIST icedtea-2.6-jaxws-271b555de438.tar.bz2 2022035 SHA256 da7604aaaedaab93ba9ad21ee5ee8f18c807606a97d60037ae8c3647e823dfa1 SHA512 cc7d9ee95ba4350c44eb1e9c08e70f6c4e5f1c115a8bc1c3af91828e8c6b814c31494426edc08e75601506e8f6208d07e8425f0f5b14ba5f5de7c7e3165b76c4 WHIRLPOOL a9376fc7ccfd9fea8adf7716aa0da93a32f855acc565b6ea39fa38cbbf3a008a035e62d54d9b2e3633c8a1c185787e0a373d2b166ef609e6483a4d28a3fdd1fc
-DIST icedtea-2.6-jdk-dc86038147b2.tar.bz2 32420326 SHA256 9d3199c0f9c39238c6920c941026cf8661a92e97845f75d74e9ff277532b5d63 SHA512 d22cba72083b65ec5b818652e0520c7b63974ecd940f6f39e27ce83cac664de15c3c4611e088056b6ae123b77f605fb61c1226c05811b03086c39cc2e12f114d WHIRLPOOL 48d3cacd5ec54c8e7dd203abd53f956669ff861ebe98e677d107d31d6964467b2387995e644a64ba238f44dab287bb2f6ef5d6e8333aa167d994cd72d74fdda3
-DIST icedtea-2.6-langtools-fd0a34cb97b4.tar.bz2 1707682 SHA256 f9b0ce14c73c263276d3dfe78601714869cd2c0463bd01c637c8556d52a7d7cc SHA512 0044e405fdaaae8fa54dd576b9efec4e51bdc0ee410eeeb3f78984a20efd6bd31b678e9b113a9d33c4eafaab3cb4ef190c78a4d02172e010282768bad917c497 WHIRLPOOL 6c70b2b176b1186eb9faf1a017becef1cc05b7c1c49ddfe5251b5660972514bb65c613cd5a5de5a11a5f104d63414947d5a3229e30294f57e67ace001acd9ef9
-DIST icedtea-2.6-openjdk-4f1e498cad9c.tar.bz2 129984 SHA256 bb02e71972ad606e739c79fc11c6dc61b4840a526a41049a600a206cc37152e2 SHA512 0b5affd4dfd76f584d1cd921026c5ae1d1017ee176f323a14eaaa5d02aa699e744f4c42ca76c31be93b334bfade63e1ca6635f9d9191640841497ba92cfb813c WHIRLPOOL 46769805754e869e4348925e96e63acec443e7e7bc4181925eb3610181d78784c54e288d0383668607b86945ee1e2eb7eeb345a161abb4524cb9f5acc77566c2
-DIST icedtea-2.6.4.tar.xz 2078228 SHA256 d20a365feea95a4c01c9f9db1f7562f471f638bc672db9de6c6e654d2d826164 SHA512 96373c8452b3087804d906544cd84ddae5bd3969314bd856cb89a9aa02c49fde0ea04d602f6d0d9e82308d34c60aa6c309314ec03ec7c73a4bf3c18a8825d1e0 WHIRLPOOL 688051df4a304874761f5e37bd0b003e20df17cf9f1552230b9638aa6df62d09c8c29dcdf3c7646b523266cc40ad0b4a4528bf4dfb46eae2e91d7e5e575dbc5c
+DIST icedtea-2.6-corba-389551542e13.tar.bz2 1072454 SHA256 427969fdd78513a11ddd9d5131a068e0b26ca2c8f14951bf8b161fecd07fe77f SHA512 b9b48e79dc183e823caa2bc8600de001618ce5c9a10671639ade9cc6515ddf90a8a4554cf76c7633632ffc71833f247b39ae184a8c625f11cdd92a393eefb201 WHIRLPOOL 0a14f7f118c4bd4623b0351f870927e08485d79ede3153b7d171f9fc303b8a8dba182185c1db9b21fd88ad094d8706890c77cbfbb5dccb8a587130e53c37d622
+DIST icedtea-2.6-hotspot-04d7046d2d41.tar.bz2 8164174 SHA256 43983232fb10abeac99478e7045c04a93fef86185e2b9ee9c7b46f2903441cfc SHA512 7ecd1880eaa3e5c5dcad9ed083bd530e13f0a13476ee4594c37d2bbb55ca816423609075e97aadb3072010163bcb9b16935b5047688315af74a2d63099323a38 WHIRLPOOL 268d38ac11f1af3648e482d8e27b327b2d2ca7fcf7f2eab1350374c2dde4afa8373ac97ed3ef9531921bae8dbe7a07114c0dc2f14dc50f04bb50e078b0197aa7
+DIST icedtea-2.6-jaxp-8a56658cb829.tar.bz2 2732669 SHA256 7bb5e1bc9f0807061e157aeb356dd0e3b9fa019fb316beee3aa0181a335ba37a SHA512 64ad347aebc763ff8f9db3821b0197a400ffb5c6c75900be9b25d2af0b090323bebb0ab44b6f43a8d5c1a13f9d779dadf07a99d245281cfbcc0673db30b063cb WHIRLPOOL 83c9773b809dd85baa637152b3bbc2d7f9c7c61c4659a16edbc883ea0efaa70dde0533395b1e8b1f17fcc8b2f9cccd85e244e773b16bcf0cc735b8f51f4c076c
+DIST icedtea-2.6-jaxws-9c049d7f5adc.tar.bz2 2021930 SHA256 4e759ade7e47713f6f26afc1ffcd02f2edf967582fae2ec6b4d73dc81be926d0 SHA512 8b71f5bcdad6e2191c100d8095aa0bbffaafc79a4a4b81d495430ba6c4ea1287b407f36333def5384f646cd18d916270b900f8af475641ed8c5d3361dc613d69 WHIRLPOOL f8cbe3646698c3d8b564b700ea53c2e1cf37ce8f47498a286173cfe338330bc640844c4e0d6271e283c84c2db71f76f7bf8127fbf93145ed87a972662a3df32a
+DIST icedtea-2.6-jdk-e727fe32654c.tar.bz2 32423186 SHA256 cd3810553b1066c21f2fe08a73de72e38ba7e72295cd32dec70db481a24421ba SHA512 459c0ae24f9514020d794d8acf0189c0ef9dff589f034a061cea605890ae7ed6327ab4adc1761be406bd8e3c808d3f4506b3610b8096c5045844f54aac51c994 WHIRLPOOL 861ca3d1163357e5c5562146e8940082bfbc36e7cb12ac0517d68f5d4a4e98c8ddeeabc0376d2b9db2bbfd2742c64014f7deaa8553269a798be8e5e3f399969b
+DIST icedtea-2.6-langtools-f6593c32cc46.tar.bz2 1707644 SHA256 6c6c676c60af61638a0c3176f0312fcc0abad16d1d3cdbe11aeefcc3357a78d9 SHA512 d469a26381d5163998c85f9afa33facd1d46650b7097cdeb190d4b50b087abea5fb3b4caf8a72e228e5c7d012dc1e2c44c0bca6d4363be354f2923f48127aa8e WHIRLPOOL 940591f4601f00eb3ba5422a7687e148a4acb61ece99e29daa0eff145f4897750b9780af5cceb21aa1a1a951d4ce6dc84427bb76bbb42a23acab5e977cca501c
+DIST icedtea-2.6-openjdk-8e728c41fec5.tar.bz2 130030 SHA256 c66f56a91a6fa9e3c889bbbc5432a4e082b7d3735188fb508fa7ec70c142abdb SHA512 10626285c0dda1fa9ba3b843cc70d61c1d417dd87e5def60d8df6d19b4ce40d2b0b0e007b6a52b4468b5a152aa50f9efc6a45dfe6f31cfbf2d47897bee3ca13f WHIRLPOOL 8f4f5e5c4e75a0d9aae89872482925a37b80a7e85d74a8d6968c28fa3dd488176ddeff9c62f81b90a4e994ac2c04d6704b6a2eba4cf734783ff106af8942ce25
+DIST icedtea-2.6.5.tar.xz 2072216 SHA256 e752304496bb11ae9952beb11e6743dd84e55b340eaca716f310c5a0f48b53f7 SHA512 8b6dd1fcec8ceaa0525872123ab9327093c5df35b322569942909a0a61e0bd4225984e2f17f30bd392b829368379cbd3efc8b14ce09a442b9d13eaa78d749d5a WHIRLPOOL 8bd4512ddbeceeda7515a4e74555243582a8201eb800f7a357cb67e9744f30d030fbadd571e4130a18d9c43cbb4f25227e453e95976ae83118e0a79f4f6f2b39
 DIST icedtea-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
 DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4
 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4

diff --git a/dev-java/icedtea/files/icedtea-bug-2781.patch b/dev-java/icedtea/files/icedtea-bug-2781.patch
deleted file mode 100644 (file)
index 5cc32c3..0000000
--- a/dev-java/icedtea/files/icedtea-bug-2781.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-# HG changeset patch
-# User Stefan Ring <stefan@complang.tuwien.ac.at>
-# Date 1452083014 -3600
-# Node ID 9295d3c06eb706407b5af1412674c8f0a0ce9fdf
-# Parent  468081e3e037df27b6427aa298dfaaa20f4ba4bf
-Fix some oversights during a large macro cleanup in 1e9787c3484e
-
-diff --git cacao/cacao/src/vm/jit/verify/typecheck-common.cpp cacao/cacao/src/vm/jit/verify/typecheck-common.cpp
---- cacao/cacao/src/vm/jit/verify/typecheck-common.cpp
-+++ cacao/cacao/src/vm/jit/verify/typecheck-common.cpp
-@@ -281,7 +281,7 @@
- 
-               dv->type = sv->type;
-               if (dv->type == TYPE_ADR) {
--                      dv->typeinfo = sv->typeinfo;
-+                      typeinfo_t::clone(sv->typeinfo, dv->typeinfo);
-               }
-       }
-       return true;
-diff --git cacao/cacao/src/vm/jit/verify/typeinfo.cpp cacao/cacao/src/vm/jit/verify/typeinfo.cpp
---- cacao/cacao/src/vm/jit/verify/typeinfo.cpp
-+++ cacao/cacao/src/vm/jit/verify/typeinfo.cpp
-@@ -1674,6 +1674,7 @@
-       classref_or_classinfo common;
-       classref_or_classinfo elementclass;
-       int dimension;
-+      ArrayType elementtype;
-       bool changed;
-       typecheck_result r;
- 
-diff --git cacao/cacao/src/vm/resolve.cpp cacao/cacao/src/vm/resolve.cpp
---- cacao/cacao/src/vm/resolve.cpp
-+++ cacao/cacao/src/vm/resolve.cpp
-@@ -703,7 +703,7 @@
- 
-       /* uninitialized objects are illegal here */
- 
--      if (subtinfo->is_primitive()) {
-+      if (subtinfo->is_newobject()) {
-               exceptions_throw_verifyerror(refmethod,
-                               "Invalid use of uninitialized object");
-               return resolveFailed;

diff --git a/dev-java/icedtea/icedtea-7.2.6.4-r1.ebuild b/dev-java/icedtea/icedtea-7.2.6.5-r1.ebuild
similarity index 94%
rename from dev-java/icedtea/icedtea-7.2.6.4-r1.ebuild
rename to dev-java/icedtea/icedtea-7.2.6.5-r1.ebuild
index 9d0e86f024710d6863a1b27019274fefb197a174..f1c743e23909498fd028d17c373d23c216c633a8 100644 (file)
--- a/dev-java/icedtea/icedtea-7.2.6.4-r1.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.5-r1.ebuild
@@ -16,13 +16,13 @@ ICEDTEA_VER=$(get_version_component_range 2-4)
 ICEDTEA_BRANCH=$(get_version_component_range 2-3)
 ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
 ICEDTEA_PRE=$(get_version_component_range _)
-CORBA_TARBALL="2135da66cc53.tar.bz2"
-JAXP_TARBALL="bc6edb6c12a7.tar.bz2"
-JAXWS_TARBALL="271b555de438.tar.bz2"
-JDK_TARBALL="dc86038147b2.tar.bz2"
-LANGTOOLS_TARBALL="fd0a34cb97b4.tar.bz2"
-OPENJDK_TARBALL="4f1e498cad9c.tar.bz2"
-HOTSPOT_TARBALL="19d919ae5506.tar.bz2"
+CORBA_TARBALL="389551542e13.tar.bz2"
+JAXP_TARBALL="8a56658cb829.tar.bz2"
+JAXWS_TARBALL="9c049d7f5adc.tar.bz2"
+JDK_TARBALL="e727fe32654c.tar.bz2"
+LANGTOOLS_TARBALL="f6593c32cc46.tar.bz2"
+OPENJDK_TARBALL="8e728c41fec5.tar.bz2"
+HOTSPOT_TARBALL="04d7046d2d41.tar.bz2"
 
 CACAO_TARBALL="cacao-c182f119eaad.tar.gz"
 JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
@@ -61,7 +61,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 RESTRICT="test"
 
 IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt infinality
-       jamvm javascript +jbootstrap kerberos nsplugin nss pax_kernel
+       jamvm javascript +jbootstrap kerberos libressl nsplugin nss pax_kernel
        pulseaudio sctp selinux smartcard source +sunec test +webstart zero"
 
 REQUIRED_USE="gtk? ( !headless-awt )"
@@ -79,7 +79,8 @@ X_COMMON_DEP="
        >=x11-libs/libXi-1.1.3
        >=x11-libs/libXrender-0.9.4
        >=x11-libs/libXtst-1.0.3
-       x11-libs/libXt"
+       x11-libs/libXt
+       x11-libs/libXcomposite"
 X_DEPEND="
        >=x11-libs/libXau-1.0.3
        >=x11-libs/libXdmcp-1.0.2
@@ -146,7 +147,8 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_
        >=dev-java/ant-core-1.8.2
        dev-lang/perl
        >=dev-libs/libxslt-1.1.26
-       dev-libs/openssl
+       !libressl? ( dev-libs/openssl )
+       libressl? ( dev-libs/libressl )
        sys-apps/attr
        sys-apps/lsb-release
        virtual/pkgconfig
@@ -193,11 +195,6 @@ src_unpack() {
 }
 
 java_prepare() {
-       if ! use cups; then
-               # CUPS is always needed at build time but you can at least make it dlopen.
-               sed -i 's/SYSTEM_CUPS="true"/SYSTEM_CUPS="false"/g' Makefile.in || die
-       fi
-
        # For bootstrap builds as the sandbox control file might not yet exist.
        addpredict /proc/self/coredump_filter
 
@@ -266,9 +263,8 @@ src_configure() {
                cacao_config="--enable-cacao"
 
                # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2612
-               # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2781
-               export DISTRIBUTION_PATCHES="${SLOT}-cacao-pr-157.patch icedtea-bug-2781.patch"
-               ln -snf "${FILESDIR}"/{${SLOT}-cacao-pr-157,icedtea-bug-2781}.patch . || die
+               export DISTRIBUTION_PATCHES="${SLOT}-cacao-pr-157.patch"
+               ln -snf "${FILESDIR}"/${SLOT}-cacao-pr-157.patch . || die
        fi
 
        # Turn on Zero if needed (non-HS/CACAO archs) or requested
@@ -312,6 +308,7 @@ src_configure() {
                $(use_enable !headless-awt system-gif) \
                $(use_enable !headless-awt system-png) \
                $(use_enable !debug optimizations) \
+               $(use_enable cups system-cups) \
                $(use_enable doc docs) \
                $(use_enable gtk system-gtk) \
                $(use_enable infinality) \