community/openjdk8: upgrade to 3.7.0 (java 8u161b12)

fixes #3678
ref https://github.com/alpinelinux/aports/pull/3678

3 files changed, 17 insertions, 30 deletions

diff --git a/community/openjdk8/APKBUILD b/community/openjdk8/APKBUILD
index 076bc34c2a2..f5a7642589b 100644
--- a/community/openjdk8/APKBUILD
+++ b/community/openjdk8/APKBUILD
@@ -2,10 +2,10 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=openjdk8
-_icedteaver=3.6.0
+_icedteaver=3.7.0
 # pkgver is <JDK version>.<JDK update>.<JDK build>
 # Check http://icedtea.classpath.org/wiki/Main_Page when updating!
-pkgver=8.151.12
+pkgver=8.161.12
 pkgrel=0
 pkgdesc="OpenJDK 8 provided by IcedTea"
 url="http://icedtea.classpath.org/"
@@ -44,7 +44,7 @@ subpackages="$pkgname-dbg $pkgname-jre-lib:jrelib:noarch $pkgname-jre $pkgname-j
 _dropsver=$_icedteaver
 _dropsurl="http://icedtea.classpath.org/download/drops/icedtea8/$_dropsver"
 
-source="http://icedtea.classpath.org/download/source/icedtea-$_icedteaver.tar.gz
+source="http://icedtea.classpath.org/download/source/icedtea-$_icedteaver.tar.xz
 	openjdk-$_dropsver.tar.xz::$_dropsurl/openjdk.tar.xz
 	corba-$_dropsver.tar.xz::$_dropsurl/corba.tar.xz
 	jaxp-$_dropsver.tar.xz::$_dropsurl/jaxp.tar.xz
@@ -76,7 +76,7 @@ unpack() {
 	fi
 	mkdir -p "$srcdir"
 	msg "Unpacking sources..."
-	tar -C "$srcdir" -zxf icedtea-$_icedteaver.tar.gz
+	tar -C "$srcdir" -Jxf icedtea-$_icedteaver.tar.xz
 }
 
 prepare() {
@@ -265,15 +265,15 @@ demos() {
 		"$subpkgdir"/$_java_home/
 }
 
-sha512sums="29e57951ff1dcb2bd01594fe3cee3e6347862aeb80dd149f98f08d46f93cae0f74076b907cd2fcd776a97023fbd7b1f3f8841417a73b357a320900cba004d56e  icedtea-3.6.0.tar.gz
-db794e9bd39f8994b29677dec62b5f47e5ab92b75a3c9c1922903095269a94d4f44b57a73360d64671f3c9a1403d83dbd0251354818842b2f95ac13073d19f27  openjdk-3.6.0.tar.xz
-5af5898c71e2f8b4feeb55d0976828ed89cc089048b64c5b8ffe55bc0db267e58c21bc6099737a50245352f6b1ccb510fbca3871c371bbc5109323c9a372e698  corba-3.6.0.tar.xz
-b557ef3a702ec2689578485d6a7444350aa6ce55b0eea6757996b52026e877861f6989a33b4b429dc56cbf7ff81c142696dac893552bdc7330213f45cbbea665  jaxp-3.6.0.tar.xz
-2857819706bfad4b69e228a3cb4a139d094f605f1961dd739913015219cb38871f604b806aae4d584bc6e1b35b92406a7e9cf2b2afedee18cc4fdbfe14120f4d  jaxws-3.6.0.tar.xz
-7dcf19770ef989093a309efa6ac154482ed33ac6a72e61f1b646798bf55fdc5e81ce5333abeec01f25a8296a00ba34d8ff95f6de89155f92e8a52218faefb8e9  jdk-3.6.0.tar.xz
-92787dcd32ef1f19c1bc01d0dc1e604c09af81dc380eef6584f6c7bc221b285cc14ec5c13226178e2f44e904353af69f416bafe55db6ad414ad79db4878220d8  langtools-3.6.0.tar.xz
-231775c3f7610388f2f5b11b60aed927e9f50cf0a65bf0675402b72c77ec1c4253e6151cbe0a27f9254297af024eae0f0ddd30a3d4b084699e730249202b9c51  hotspot-3.6.0.tar.xz
-950989f71c7fef858eb8cd20024a2094e8d102b921d05fb1e4a320a431c3306178269e737f02318c448f57cd540ae6996552880ae419ef647e7dedb6b4a6ebbf  nashorn-3.6.0.tar.xz
+sha512sums="f2dc2464139d18385d4734e6380d7c4efc69f0e5b507218397032e0ea1b2e0d96688c88979de90a1fcd453809a4b1d6081ce2970f4e3cc73a236bd2d17bcc704  icedtea-3.7.0.tar.xz
+c8049c0101d270a8cce87973b60ddcea60297604dcc1d7cf6b26efe7c06806b18ab9f2a6012fc382b366009ec43d1cd5a27714ef5ec6028c71992eb4e8b6d1c1  openjdk-3.7.0.tar.xz
+5fae98bec6b54c4bcc374db940256163fa9db2c8f9447c78e61887ecbce16f98bbd00720e9fe78f860bb2d83bc062e3beb430b637ea200d935aaae1f3e905243  corba-3.7.0.tar.xz
+4c4c17a61c74dcfe8f6187055f43e47daa0f2f5f9ab6692f2149c98e4306d6e582c21d3d8d3061cfd2e7807889f645f3b8a446a7b84ca556459225df593ba996  jaxp-3.7.0.tar.xz
+d68741e7f60c87c22e50c50852bbf0598f36c3c594bd70d6f575c4962b5c8d7ff99a83ddd570a15497f4f47d456c26c400b523f789dbfca542dbf023b8e93f9e  jaxws-3.7.0.tar.xz
+0cc54dd32a06595ae30e087ada15b0dee2f17f0ef9e5aa8e93fd7beba2937e774d444586f06208e26b904f024b6dc458855d35f59b2d531b801529daa67e3cb8  jdk-3.7.0.tar.xz
+46016102f230eb56c614fc44d1deb698bb39cade7e5d34b9a2bcf792014c57f88d15d6c3ceff456dfef9e1eaa99486901784c1254afeb3cc67338dd500ef526f  langtools-3.7.0.tar.xz
+c7c2e4ccccdc4fd9ac2f4c71e9a89997dd68fbd73a966015f9e764489cdf0027479d4c335c8f339d5ee2eb2968bc187a12e3c5e72d94ad59556cfb452a732658  hotspot-3.7.0.tar.xz
+4ca935a07bb7b5b8e3f0274bc120b6264290b6218a97457a6648ade04bd302b3838b398bd7ce423dcfe2f9bee03827332bd61abb21d9d8e58232b01acf48ccf6  nashorn-3.7.0.tar.xz
 1f470432275d5beaa8b4e4352a2f24a4a00593546dc4f3bd857794c89e521e8e6d6abc540762bbd769be3e1e3da058e134dc5dc066d12b9b8a1f0656040a795c  fix-paxmark.patch
 bfa16565d71453a0ba4204cb7ee0f8cb8c9a272c4d71d1357af4425183e64ef8df77ae1df1bbb0f984cf2d6d04a49124a6ef50f09dfee80c5b5734596e0b2a8e  icedtea-hotspot-musl.patch
 e5cf4d70f96fc1e72ae8b97a887adb96092ff36584711cbb8de9d9fa9e859cb8731d638838de0d9591239fc44ffe5c74422d1842bd9f10a0c00dff1627bdeeef  icedtea-hotspot-musl-ppc.patch
@@ -281,8 +281,8 @@ e5cf4d70f96fc1e72ae8b97a887adb96092ff36584711cbb8de9d9fa9e859cb8731d638838de0d95
 f6365cfafafa008bd6c1bf0ccec01a63f8a39bd1a8bc87baa492a27234d47793ba02d455e5667a873ef50148df3baaf6a8421e2da0b15faac675867da714dd5f  icedtea-jdk-execinfo.patch
 48533f87fc2cf29d26b259be0df51087d2fe5b252e72d00c6ea2f4add7b0fb113141718c116279c5905e03f64a1118082e719393786811367cf4d472b5d36774  icedtea-jdk-fix-ipv6-init.patch
 b135991c76b0db8fa7c363e0903624668e11eda7b54a943035c214aa4d7fc8c3e8110ed200edcec82792f3c9393150a9bd628625ddf7f3e55720ff163fbbb471  icedtea-jdk-fix-libjvm-load.patch
-cdebe2c59657e7fd317a4841b2fbe95d9e8d7ee9d1593edf352ed7f49a92a42cbce82cbaa404d3f02c6d273eae03222a79559c09bf6cf439396c5ec5434f5458  icedtea-jdk-musl.patch
+1fbc32ddc528c7c0099dbc1e48f88d29dccf55e7b8997793aa1d3d8408003a1223d898cca4248e1a12d343d3feec5144f875e6cdac8460d763c73ab3ad7e49f9  icedtea-jdk-musl.patch
 e8d9f1b867bf4fc84aa00d1237b264bcf503b1ed5f34735e14b0b747a728953fe0051a5af69ed058d377fbf65d8be1ed9e38fe5fc6edb2d50b31f34bf3ba91dc  icedtea-jdk-includes.patch
 7e6fa46b10c630517bfa46943858aea1d032c12d32ba3fcb7a2143ae1e896c34fa4cb8f925af80cb19f8e29149b835aa054adfd30ebb00539f6c78588d6f5211  icedtea-jdk-getmntent-buffer.patch
 662d662d0a7a84be2978e921317589f212f3ba3b7629527ba0f1140b5ac4c1024893e0ed176211688ed1a4505968c4befc841ed57ffcdbb9d355c2cb0571b167  icedtea-autoconf-config.patch
-313ba3467efad73120d307c16be8e793fa39de92d6c28c2faed11c14dd6f60e0f1a290f330d4dc849ae8f97c7bea84eec2d0be02c70bc9903664e22497dd2d22  icedtea-jdk-tls-nist-curves.patch"
+9ea7ac942baf29cc619bc2e1acd59201b9f6d38f39a517b495d7613aec746459200c81afb57c5fcdcb856f6bc8b33f7566c8593fed07e5c73f43e08f1072d458  icedtea-jdk-tls-nist-curves.patch"
diff --git a/community/openjdk8/icedtea-jdk-musl.patch b/community/openjdk8/icedtea-jdk-musl.patch
index 7cbced1bf50..97946ba424f 100644
--- a/community/openjdk8/icedtea-jdk-musl.patch
+++ b/community/openjdk8/icedtea-jdk-musl.patch
@@ -47,18 +47,6 @@ diff -ru openjdk.orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c openjdk
  #define HAS_GLIBC_GETHOSTBY_R   1
  #endif
  
-diff -ru openjdk.orig/jdk/src/solaris/native/java/net/NetworkInterface.c openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c
---- openjdk.orig/jdk/src/solaris/native/java/net/NetworkInterface.c	2017-01-25 04:22:03.000000000 +0000
-+++ openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c	2017-02-06 11:23:47.047832009 +0000
-@@ -46,7 +46,6 @@
- 
- #if defined(__linux__)
- #include <sys/ioctl.h>
--#include <bits/ioctls.h>
- #include <sys/utsname.h>
- #include <stdio.h>
- #endif
-Only in openjdk/jdk/src/solaris/native/java/net: NetworkInterface.c.orig
 diff -ru openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
 --- openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	2017-01-25 04:22:03.000000000 +0000
 +++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	2017-02-06 11:23:47.047832009 +0000
@@ -70,7 +58,6 @@ diff -ru openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
  #include <sys/utsname.h>
  #include <netinet/ip.h>
  
-Only in openjdk/jdk/src/solaris/native/java/net: PlainDatagramSocketImpl.c.orig
 diff -ru openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c
 --- openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c	2017-01-25 04:22:03.000000000 +0000
 +++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c	2017-02-06 11:23:47.047832009 +0000
diff --git a/community/openjdk8/icedtea-jdk-tls-nist-curves.patch b/community/openjdk8/icedtea-jdk-tls-nist-curves.patch
index 24c4c44a533..75fb3af8cf0 100644
--- a/community/openjdk8/icedtea-jdk-tls-nist-curves.patch
+++ b/community/openjdk8/icedtea-jdk-tls-nist-curves.patch
@@ -17,8 +17,8 @@ Related issues:
 * https://bugzilla.redhat.com/show_bug.cgi?id=1022017
 * https://bugzilla.redhat.com/show_bug.cgi?id=1348525
 
---- openjdk.orig/jdk/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java	2017-05-08 20:03:50.000000000 -0700
-+++ openjdk/jdk/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java	2017-06-14 13:37:00.000000000 -0700
+--- openjdk.orig/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java	2017-05-08 20:03:50.000000000 -0700
++++ openjdk/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java	2017-06-14 13:37:00.000000000 -0700
 @@ -168,21 +168,10 @@
                      "contains no supported elliptic curves");
              }