openjdk8: update to 8u242

BSD specific fixes:
- Fix BsdNativeDispatcher
- Support thread name setting on OpenBSD and NetBSD

Security fixes:
- S8225261: Better method resolutions
- S8224909, CVE-2020-2583: Unlink Set of LinkedHashSets
- S8225279: Better XRender interpolation
- S8226352, CVE-2020-2590: Improve Kerberos interop capabilities
- S8227758: More valid PKIX processing
- S8227816: More Colorful ICC profiles
- S8228548, CVE-2020-2593: Normalize normalization for all
- S8229951, CVE-2020-2601: Better Ticket Granting Services
- S8230279: Improve Pack200 file reading
- S8230318: Better trust store usage
- S8230967: Improve Registry support of clients
- S8231129: More glyph images
- S8231139: Improved keystore support
- S8231422, CVE-2020-2604: Better serial filter handling
- S8231795, CVE-2020-2659: Enhance datagram socket support
- S8232419: Improve Registry registration
- S8234037, CVE-2020-2654: Improve Object Identifier Processing

~100 additional minor bugfixes.

4 files changed, 21 insertions, 54 deletions

diff --git a/lang/openjdk8/Makefile b/lang/openjdk8/Makefile
index 5217b76b941..d30a5c52f7a 100644
--- a/lang/openjdk8/Makefile
+++ b/lang/openjdk8/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.89 2020/02/08 22:26:42 jdolecek Exp $
+# $NetBSD: Makefile,v 1.90 2020/03/06 10:50:08 tnn Exp $
 
 DISTNAME=	openjdk-jdk8u-${GITHUB_TAG}
-PKGREVISION= 	1
 PKGNAME=	openjdk8-1.8.${GITHUB_TAG:C/.*u([0-9]+).*/\1/}
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=battleblow/}
 MASTER_SITES+=	${MASTER_SITE_LOCAL:=openjdk7/}	# for bootstrap kits
 GITHUB_PROJECT=	openjdk-jdk8u
-GITHUB_TAG=	jdk8u232-b09.1
+GITHUB_TAG=	jdk8u242-b07.1
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://openjdk.java.net/
@@ -250,7 +249,7 @@ do-install:
 	${INSTALL_DATA} ${WRKDIR}/cacerts.out				\
 	  ${DESTDIR}${JAVA_HOME}/jre/lib/security/cacerts
 	rm -f ${DESTDIR}${JAVA_HOME}/include/jni_md.h
-	ln -s ${LOWER_OPSYS:S/sunos/solaris/}/jni_md.h					\
+	ln -s ${LOWER_OPSYS:S/sunos/solaris/}/jni_md.h			\
 	  ${DESTDIR}${JAVA_HOME}/include/jni_md.h
 
 .if ${OPSYS} == "NetBSD"
diff --git a/lang/openjdk8/distinfo b/lang/openjdk8/distinfo
index 1b126e8ea9f..40185690829 100644
--- a/lang/openjdk8/distinfo
+++ b/lang/openjdk8/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.76 2020/02/08 22:26:42 jdolecek Exp $
+$NetBSD: distinfo,v 1.77 2020/03/06 10:50:08 tnn Exp $
 
 SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334
 RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815
@@ -32,11 +32,11 @@ SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 29b
 RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = b13d0e42839fb746d41f9001e488162b47803140
 SHA512 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 1403e582dacd0474e57d9aa8f1333060c50d099ef5d2c5a992ff7f63dcde2e538ff1e7fb78e45d12fd5aea6daf0704672e7f326399d415ee0d6bb53b6f925e9f
 Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 37883700 bytes
-SHA1 (openjdk7/openjdk-jdk8u-jdk8u232-b09.1.tar.gz) = 0cad18a0c348d32fc347d27f11a30b63c7b2912e
-RMD160 (openjdk7/openjdk-jdk8u-jdk8u232-b09.1.tar.gz) = 124ecc82ef3c80c6da9fe88f021600b8e90fa8fa
-SHA512 (openjdk7/openjdk-jdk8u-jdk8u232-b09.1.tar.gz) = 8179a402157f951ead3624b45bad8d5a7416f224a2b160f68b1f3788289a1cf8a2fc70efb7ad1a8a0416f48f89876e5d1c1c343d26c7452f2cf9d79906316107
-Size (openjdk7/openjdk-jdk8u-jdk8u232-b09.1.tar.gz) = 85766372 bytes
-SHA1 (patch-aa) = df056ced73a06e9a2c5ae59d15218a6f38c2ab5e
+SHA1 (openjdk7/openjdk-jdk8u-jdk8u242-b07.1.tar.gz) = 458d3f25362bd88eb99b26c5734271006c26a85d
+RMD160 (openjdk7/openjdk-jdk8u-jdk8u242-b07.1.tar.gz) = b79f30ca037bd7a018904455d72a7febd1c645c7
+SHA512 (openjdk7/openjdk-jdk8u-jdk8u242-b07.1.tar.gz) = 12edf3a75da10139a2590a125fdae066e180db2578593a688c2878a17aa180f978abdcacb99c58b709809c9a97b567a771007b3c24e47c3145b0de509ed9cc91
+Size (openjdk7/openjdk-jdk8u-jdk8u242-b07.1.tar.gz) = 85837823 bytes
+SHA1 (patch-aa) = 60c0ba1b3362c7d521e9919236c3aaede67d1ef1
 SHA1 (patch-al) = f65f739805c2ef471a4de10d6da42e86c5561b8c
 SHA1 (patch-an) = fce4da00762770c1c0592bd225bf73e875252178
 SHA1 (patch-ap) = 89114a9ee048b92d897509feb283cf9aeeac9fc5
@@ -90,7 +90,6 @@ SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = aacb4e03f62f1a6f9b38de39a966c3
 SHA1 (patch-hotspot_src_share_vm_runtime_arguments.cpp) = 80265396c62de95b0937d770c1dba0e8a53daa80
 SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = a8e8fef04d7acb4772f57961e7df3681bd53d0b9
 SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 83b90d951ce3aa9e913a36d792ac7376fb3d8bc7
-SHA1 (patch-jdk-make-mapfiles-libnio-mapfile-bsd) = 18cd431be415c305807146309711d8b65ce04f90
 SHA1 (patch-jdk_make_CompileDemos.gmk) = 4d5e2e9b0e35e373e6246408c775c25094b6f1c7
 SHA1 (patch-jdk_make_CompileLaunchers.gmk) = d496999f10fc56b1d68283ab4636787058f51090
 SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5
diff --git a/lang/openjdk8/patches/patch-aa b/lang/openjdk8/patches/patch-aa
index 8a297691378..71d4fe122ec 100644
--- a/lang/openjdk8/patches/patch-aa
+++ b/lang/openjdk8/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.8 2019/07/25 12:00:08 tnn Exp $
+$NetBSD: patch-aa,v 1.9 2020/03/06 10:50:08 tnn Exp $
 
 -DragonFly support.
 -Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
 
---- hotspot/src/os/bsd/vm/os_bsd.cpp.orig	2019-07-18 21:55:16.000000000 +0000
+--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig	2020-01-16 18:18:12.000000000 +0000
 +++ hotspot/src/os/bsd/vm/os_bsd.cpp
-@@ -114,7 +114,7 @@
+@@ -110,7 +110,7 @@
  # include <vm/vm_param.h>
  #endif
  
@@ -140,3 +140,12 @@ $NetBSD: patch-aa,v 1.8 2019/07/25 12:00:08 tnn Exp $
      if (os_sigaction == NULL) return;
    }
  
+@@ -4028,7 +4064,7 @@ void os::set_native_thread_name(const ch
+ #elif defined(__FreeBSD__) || defined(__OpenBSD__)
+     pthread_set_name_np(pthread_self(), name);
+ #elif defined(__NetBSD__)
+-    pthread_setname_np(pthread_self(), "%s", name);
++    pthread_setname_np(pthread_self(), "%s", (void*)name);
+ #endif
+   }
+ }
diff --git a/lang/openjdk8/patches/patch-jdk-make-mapfiles-libnio-mapfile-bsd b/lang/openjdk8/patches/patch-jdk-make-mapfiles-libnio-mapfile-bsd
deleted file mode 100644
index a77d9b30fde..00000000000
--- a/lang/openjdk8/patches/patch-jdk-make-mapfiles-libnio-mapfile-bsd
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-jdk-make-mapfiles-libnio-mapfile-bsd,v 1.1 2020/02/08 22:26:42 jdolecek Exp $
-
-Avoids same issue as
-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=241317
-
-Should be fixed in openjdk 8u242 
-
---- jdk/make/mapfiles/libnio/mapfile-bsd.orig	2019-10-17 21:15:55 UTC
-+++ jdk/make/mapfiles/libnio/mapfile-bsd
-@@ -41,6 +41,7 @@ SUNWprivate_1.1 {
- 		Java_sun_nio_ch_FileChannelImpl_map0;
- 		Java_sun_nio_ch_FileChannelImpl_transferTo0;
- 		Java_sun_nio_ch_FileChannelImpl_unmap0;
-+		Java_sun_nio_ch_FileDispatcherImpl_allocate0;
- 		Java_sun_nio_ch_FileDispatcherImpl_close0;
- 		Java_sun_nio_ch_FileDispatcherImpl_closeIntFD;
- 		Java_sun_nio_ch_FileDispatcherImpl_seek0;
-@@ -135,6 +136,7 @@ SUNWprivate_1.1 {
- 		Java_sun_nio_fs_BsdNativeDispatcher_endfsstat;
- 		Java_sun_nio_fs_BsdNativeDispatcher_fsstatEntry;
- 		Java_sun_nio_fs_BsdNativeDispatcher_getfsstat;
-+		Java_sun_nio_fs_BsdNativeDispatcher_getmntonname0;
- 		Java_sun_nio_fs_BsdNativeDispatcher_initIDs;
- 		Java_sun_nio_fs_GnomeFileTypeDetector_initializeGio;
- 		Java_sun_nio_fs_GnomeFileTypeDetector_initializeGnomeVfs;
-@@ -143,6 +145,14 @@ SUNWprivate_1.1 {
- 		Java_sun_nio_fs_MagicFileTypeDetector_initialize0;
- 		Java_sun_nio_fs_MagicFileTypeDetector_probe0;
- 		Java_sun_nio_fs_UnixCopyFile_transfer;
-+		Java_sun_nio_fs_LinuxWatchService_eventSize;
-+		Java_sun_nio_fs_LinuxWatchService_eventOffsets;
-+		Java_sun_nio_fs_LinuxWatchService_inotifyInit;
-+		Java_sun_nio_fs_LinuxWatchService_inotifyAddWatch;
-+		Java_sun_nio_fs_LinuxWatchService_inotifyRmWatch;
-+		Java_sun_nio_fs_LinuxWatchService_configureBlocking;
-+		Java_sun_nio_fs_LinuxWatchService_socketpair;
-+		Java_sun_nio_fs_LinuxWatchService_poll;
- 		Java_sun_nio_fs_UnixNativeDispatcher_access0;
- 		Java_sun_nio_fs_UnixNativeDispatcher_chmod0;
- 		Java_sun_nio_fs_UnixNativeDispatcher_chown0;