community/openjdk8: upgrade to icedtea 3.6.0, modernize

S8165543: Better window framing
S8169026, CVE-2017-10274: Handle smartcard clean up better
S8169966: Larger AWT menus
S8170218: Improved Font Metrics
S8171252: Improve exception checking
S8171261: Stability fixes for lcms
S8174109, CVE-2017-10281: Better queuing priorities
S8174966, CVE-2017-10285: Unreferenced references
S8175940: More certificate subject checking
S8176751, CVE-2017-10295: Better URL connections
S8178794, CVE-2017-10388: Correct Kerberos ticket grants
S8180024: Improve construction of objects during deserialization
S8180711, CVE-2017-10346: Better invokespecial checks
S8181100, CVE-2017-10350: Better Base Exceptions
S8181323, CVE-2017-10347: Better timezone processing
S8181327, CVE-2017-10349: Better X processing
S8181370, CVE-2017-10345: Better keystore handling
S8181432, CVE-2017-10348: Better processing of unresolved permissions
S8181597, CVE-2017-10357: Process Proxy presentation
S8181612, CVE-2017-10355: More stable connection processing
S8181692, CVE-2017-10356: Update storage implementations
S8183028, CVE-2016-10165: Improve CMS header processing
S8184682, CVE-2016-9840, CVE-2016-9841, CVE-2016-9842, CVE-2016-9843: Upgrade compression library

ref #8018, #8111

1 files changed, 27 insertions, 28 deletions

diff --git a/community/openjdk8/APKBUILD b/community/openjdk8/APKBUILD
index 6dafbccaa0..076bc34c2a 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.5.1
+_icedteaver=3.6.0
 # pkgver is <JDK version>.<JDK update>.<JDK build>
 # Check http://icedtea.classpath.org/wiki/Main_Page when updating!
-pkgver=8.144.01
+pkgver=8.151.12
 pkgrel=0
 pkgdesc="OpenJDK 8 provided by IcedTea"
 url="http://icedtea.classpath.org/"
@@ -71,12 +71,12 @@ builddir="$srcdir/icedtea-$_icedteaver"
 
 unpack() {
 	if [ -z "$force" ]; then
-		verify || return 1
-		initdcheck || return 1
+		verify
+		initdcheck
 	fi
 	mkdir -p "$srcdir"
 	msg "Unpacking sources..."
-	tar -C "$srcdir" -zxf icedtea-$_icedteaver.tar.gz || return 1
+	tar -C "$srcdir" -zxf icedtea-$_icedteaver.tar.gz
 }
 
 prepare() {
@@ -97,7 +97,7 @@ prepare() {
 			;;
 		*.patch)
 			msg "Applying patch $patch"
-			patch -p1 -i "$srcdir"/$patch || return 1
+			patch -p1 -i "$srcdir"/$patch
 			;;
 		esac
 	done
@@ -151,9 +151,8 @@ build() {
 		--with-pkgversion="Alpine ${pkgver}-r${pkgrel}" \
 		--enable-nss \
 		--enable-sunec \
-		--enable-non-nss-curves \
-		|| return 1
-	make || return 1
+		--enable-non-nss-curves
+	make
 }
 
 # TODO: Run tests or at least try to compile and run hello world.
@@ -168,7 +167,7 @@ package() {
 
 	mkdir -p "$pkgdir"/$_java_home
 
-	cp -a openjdk.build/images/j2sdk-image/* "$pkgdir"/$_java_home/ || return 1
+	cp -a openjdk.build/images/j2sdk-image/* "$pkgdir"/$_java_home/
 	rm "$pkgdir"/$_java_home/src.zip
 
 	# This archive contains absolute paths from the build environment,
@@ -177,7 +176,7 @@ package() {
 	rm -f "$pkgdir"/$_jrelib/server/classes.jsa
 
 	# pax mark again (due to fakeroot xattr handling bug)
-	./pax-mark-vm "$pkgdir"/$_java_home true || return 1
+	./pax-mark-vm "$pkgdir"/$_java_home true
 
 	# symlink to shared java cacerts store
 	rm -f "$pkgdir"/$_java_home/jre/lib/security/cacerts
@@ -201,7 +200,7 @@ jrelib() {
 
 		dir=${file%/*}
 		mkdir -p "$subpkgdir"/$_java_home/$dir
-		mv "$pkgdir"/$_java_home/$file "$subpkgdir"/$_java_home/$dir || return 1
+		mv "$pkgdir"/$_java_home/$file "$subpkgdir"/$_java_home/$dir
 	done
 }
 
@@ -221,11 +220,11 @@ jre() {
 
 		dir=${file%/*}
 		mkdir -p "$subpkgdir"/$_java_home/$dir
-		mv "$pkgdir"/$_java_home/$file "$subpkgdir"/$_java_home/$dir || return 1
+		mv "$pkgdir"/$_java_home/$file "$subpkgdir"/$_java_home/$dir
 	done
 
 	# Pax mark again (due to fakeroot xattr handling bug).
-	"$builddir"/pax-mark-vm "$subpkgdir"/$_java_home true || return 1
+	"$builddir"/pax-mark-vm "$subpkgdir"/$_java_home true
 }
 
 jrebase() {
@@ -236,22 +235,22 @@ jrebase() {
 		"$subpkgdir"/$_java_home/lib/$_jarch
 
 	mv "$pkgdir"/$_java_home/lib/$_jarch/jli \
-		"$subpkgdir"/$_java_home/lib/$_jarch/ || return 1
+		"$subpkgdir"/$_java_home/lib/$_jarch/
 
 	local file; for file in java orbd rmid servertool unpack200 keytool \
 			pack200 rmiregistry tnameserv; do
-		mv "$pkgdir"/$_java_home/bin/$file "$subpkgdir"/$_java_home/bin/ || return 1
+		mv "$pkgdir"/$_java_home/bin/$file "$subpkgdir"/$_java_home/bin/
 	done
 
 	# Rest of the jre subdir (which were not taken by -jre subpkg).
-	mv "$pkgdir"/$_java_home/jre "$subpkgdir"/$_java_home/ || return 1
+	mv "$pkgdir"/$_java_home/jre "$subpkgdir"/$_java_home/
 
 	# Pax mark again (due to fakeroot xattr handling bug).
-	"$builddir"/pax-mark-vm "$subpkgdir"/$_java_home true || return 1
+	"$builddir"/pax-mark-vm "$subpkgdir"/$_java_home true
 }
 
 doc() {
-	default_doc || return 1
+	default_doc
 
 	mkdir -p "$subpkgdir"/$_java_home/
 	mv "$pkgdir"/$_java_home/man "$subpkgdir"/$_java_home/
@@ -266,15 +265,15 @@ demos() {
 		"$subpkgdir"/$_java_home/
 }
 
-sha512sums="c806032e5337fdd516dc7e616608fd50e31406eab21ae31a61a0d30acf2ecf1eb28d162d558e60f04ad2bdfea1f1888601427751ee5efaacc8161f3fa89afbb0  icedtea-3.5.1.tar.gz
-13ea05cdc90f18a1600c7771314fcf2d07bfef186e7fe9125cf37e4a62f51a1d26dab653ee294fd9079419b3297f812c6b9c516def11ede8355dd2f6d8e7a08a  openjdk-3.5.1.tar.xz
-19d4e311edd3ed5f388373e3c819a9317dbaa561c4a22c924079cef284d16ce06d5468510b84fe3f1867570e8caed915ec4edc2479bd44686493bcf9fbf523de  corba-3.5.1.tar.xz
-5f932ce9453412d3a1b3108cf143836712cc46676093441b02db24652d4d30dbf21849cbb6fe75071961312c747289b8feccdf23c94b9e9ab2b78bdefd7c72df  jaxp-3.5.1.tar.xz
-3259181c303fc1642816e5d3291d81e80fb62764edd38734876e9581d4d1fcb718bf5f2cc8dbf0362f218105effa50fa50a4e4b79e08501e991ff4bdbbf881cb  jaxws-3.5.1.tar.xz
-9f60583ffd61d8dec73f17c7dbbf12e275c9c46b8cbafc59a969b11a0b65ae1f6366051fc1c76538b217a2b55510e112a815b279a9c19046f7035d2680ca2b9f  jdk-3.5.1.tar.xz
-856fecddf01c6eb89055bd905d0df1d61d4a1605f4663ff33357c1d4372150ddf4d5d2e6e8f2c4d8c92071075b7090c9fdbe5a10d2c0c61b1d242fe938dc1b8c  langtools-3.5.1.tar.xz
-c16b5db736b553acb74bce50f37213a181fc26a6fdc7ef9242aa40c46afea78e52ec08a167f5fe29023e0ecef1f92b45b51250208d63ef88f5686fe2b12d4c34  hotspot-3.5.1.tar.xz
-3e3ca6942b32c1b342a108cdd08d72da49249c88c4f5da04b2e822dcb12d144584a10eb7e5c109f9bf49cd84ab957577db83d55ff31471ef76b0748b44b54896  nashorn-3.5.1.tar.xz
+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
 1f470432275d5beaa8b4e4352a2f24a4a00593546dc4f3bd857794c89e521e8e6d6abc540762bbd769be3e1e3da058e134dc5dc066d12b9b8a1f0656040a795c  fix-paxmark.patch
 bfa16565d71453a0ba4204cb7ee0f8cb8c9a272c4d71d1357af4425183e64ef8df77ae1df1bbb0f984cf2d6d04a49124a6ef50f09dfee80c5b5734596e0b2a8e  icedtea-hotspot-musl.patch
 e5cf4d70f96fc1e72ae8b97a887adb96092ff36584711cbb8de9d9fa9e859cb8731d638838de0d9591239fc44ffe5c74422d1842bd9f10a0c00dff1627bdeeef  icedtea-hotspot-musl-ppc.patch