CVS commit: pkgsrc/lang/openjdk11

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Wed Feb  5 14:22:42 UTC 2020

Modified Files:
        pkgsrc/lang/openjdk11: Makefile PLIST distinfo
        pkgsrc/lang/openjdk11/patches: patch-src_hotspot_os_bsd_os__bsd.cpp

Log Message:
openjdk11: Update to 1.11.0.6.10

Changelog:
Updated BSD port of JDK 11

Additional features include:

    Update to 11.0.6 GA
    Fix remote HotSpot debugging on BSD
    Add support for setting thread names on BSD (useful for top -H)


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/openjdk11/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/openjdk11/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/openjdk11/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/openjdk11/patches/patch-src_hotspot_os_bsd_os__bsd.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/openjdk11/Makefile
diff -u pkgsrc/lang/openjdk11/Makefile:1.11 pkgsrc/lang/openjdk11/Makefile:1.12
--- pkgsrc/lang/openjdk11/Makefile:1.11 Sun Jan 26 17:31:30 2020
+++ pkgsrc/lang/openjdk11/Makefile      Wed Feb  5 14:22:42 2020
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2020/01/26 17:31:30 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2020/02/05 14:22:42 ryoon Exp $
 
 DISTNAME=      openjdk-jdk11u-${GITHUB_TAG:C/\+/-/}
 PKGNAME=       openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
-PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=battleblow/}
 GITHUB_PROJECT=        openjdk-jdk11u
-GITHUB_TAG=    jdk-11.0.5+10-1
+GITHUB_TAG=    jdk-11.0.6+10-1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://openjdk.java.net/

Index: pkgsrc/lang/openjdk11/PLIST
diff -u pkgsrc/lang/openjdk11/PLIST:1.1 pkgsrc/lang/openjdk11/PLIST:1.2
--- pkgsrc/lang/openjdk11/PLIST:1.1     Tue Oct  1 12:36:34 2019
+++ pkgsrc/lang/openjdk11/PLIST Wed Feb  5 14:22:42 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2019/10/01 12:36:34 tnn Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/02/05 14:22:42 ryoon Exp $
 bin/openjdk11-jar
 bin/openjdk11-java
 bin/openjdk11-javac
@@ -28,6 +28,7 @@ java/openjdk11/bin/jconsole
 java/openjdk11/bin/jdb
 java/openjdk11/bin/jdeprscan
 java/openjdk11/bin/jdeps
+java/openjdk11/bin/jfr
 java/openjdk11/bin/jimage
 java/openjdk11/bin/jinfo
 java/openjdk11/bin/jjs
@@ -283,7 +284,7 @@ java/openjdk11/legal/java.desktop/lcms.m
 java/openjdk11/legal/java.desktop/libpng.md
 java/openjdk11/legal/java.desktop/mesa3d.md
 java/openjdk11/legal/java.desktop/opengl.md
-java/openjdk11/legal/java.desktop/xwindows.md
+java/openjdk11/legal/java.desktop/xwd.md
 java/openjdk11/legal/java.instrument/ADDITIONAL_LICENSE_INFO
 java/openjdk11/legal/java.instrument/ASSEMBLY_EXCEPTION
 java/openjdk11/legal/java.instrument/LICENSE

Index: pkgsrc/lang/openjdk11/distinfo
diff -u pkgsrc/lang/openjdk11/distinfo:1.6 pkgsrc/lang/openjdk11/distinfo:1.7
--- pkgsrc/lang/openjdk11/distinfo:1.6  Sun Jan  5 13:01:55 2020
+++ pkgsrc/lang/openjdk11/distinfo      Wed Feb  5 14:22:42 2020
@@ -1,21 +1,13 @@
-$NetBSD: distinfo,v 1.6 2020/01/05 13:01:55 rhialto Exp $
+$NetBSD: distinfo,v 1.7 2020/02/05 14:22:42 ryoon Exp $
 
 SHA1 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = d76599619b8bea879b8202b3efc38a82335d2e8c
 RMD160 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = a1b998e4e7edfb73ec35b0cc94895d9af16a8cd8
 SHA512 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = 6e61996f7e3c3492b0c878644db30d72021dc4096639992e53b4440d4e2e18cd92e5630ecd4600d1917a1e63a7c814b63f74f811a40588febfe19ad8d3208a9d
 Size (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = 105760636 bytes
-SHA1 (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = 0ab80546e192cff461dfadf85ca8dc42d11a2710
-RMD160 (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = ec41da372ab1f927295a207a65a2a5f940760339
-SHA512 (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = 1bf5336e9bfeea9ecbcd347f2ea8dd3c9633df42cab13a09c7afaae94faa95b92d862dd97caf380a7037825c3324377240d5d0639b2e0b31a2d7a6316ed56359
-Size (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = 96662264 bytes
-SHA1 (jtreg-4.2-b14.tar.gz) = d6e930448fa9e753214c1f3f39cadba269dc710a
-RMD160 (jtreg-4.2-b14.tar.gz) = 57471f85bbc8c91536f8ce8ac1e73eb010f1e50c
-SHA512 (jtreg-4.2-b14.tar.gz) = 6652b6448e94fe5a0989cf92b7ecb6edfea62f3f465b36830b172b0f0c4260958a7eb8fc655bd43194cc11d6706c00821959a493101cc7580f7bda937aed530b
-Size (jtreg-4.2-b14.tar.gz) = 7238477 bytes
-SHA1 (openjdk-jdk11u-jdk-11.0.5-10-1.tar.gz) = edf8539ca16cf8ad6f8ed5a7e00ca77513c0c1ec
-RMD160 (openjdk-jdk11u-jdk-11.0.5-10-1.tar.gz) = ecd9f94df1a2e316f8b439f65a01263a62867c1e
-SHA512 (openjdk-jdk11u-jdk-11.0.5-10-1.tar.gz) = 17980060c076838bf961f03db91f5230d11c40fc0a23ec560e1cd49505a776c15240cf897a68842e4f0013a510d814207f14a6dd26666080b812551acd626277
-Size (openjdk-jdk11u-jdk-11.0.5-10-1.tar.gz) = 116849965 bytes
+SHA1 (openjdk-jdk11u-jdk-11.0.6-10-1.tar.gz) = 38f6a56467a62a68803628d15655561c67bbc43b
+RMD160 (openjdk-jdk11u-jdk-11.0.6-10-1.tar.gz) = 8215758ada6a24d3e2bf3268a4be462b03cfdfb6
+SHA512 (openjdk-jdk11u-jdk-11.0.6-10-1.tar.gz) = ecbf20dfb1eaa1a089a2e47449030ff3922e6dd1ad6b8a0432b96783c6e004eaf6b5702023856d6710e39e6d496f8d0a33559fce2f2fb1b75e69407019e5ca2b
+Size (openjdk-jdk11u-jdk-11.0.6-10-1.tar.gz) = 117035292 bytes
 SHA1 (patch-make_autoconf_basics.m4) = 5a8d3cd229f73eef34fb3860dfae1a813ec39ab5
 SHA1 (patch-make_autoconf_flags-cflags.m4) = 7ec010eb62a1e4f057b7886caf0d0efaae4b6b63
 SHA1 (patch-make_autoconf_jdk-options.m4) = d0d9fbaf29cc521fa4b62b1ea2616dc8f3b07618
@@ -30,7 +22,7 @@ SHA1 (patch-src_hotspot_cpu_aarch64_vm__
 SHA1 (patch-src_hotspot_os__cpu_bsd__aarch64_bytes__bsd__aarch64.inline.hpp) = 4153d3a12ffc24de868b2fd97498dbdf7645e499
 SHA1 (patch-src_hotspot_os__cpu_bsd__aarch64_os__bsd__aarch64.cpp) = 190f56e8c725884712d850e096955d6d694e902d
 SHA1 (patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp) = abbfd0f9bd79e6363ffb050b48d081b7d1c3a8e1
-SHA1 (patch-src_hotspot_os_bsd_os__bsd.cpp) = ee20027e4323ebf63874cedd9e4549ebb702d335
+SHA1 (patch-src_hotspot_os_bsd_os__bsd.cpp) = 049ffbb5ffbd85ffced2f4a36c4e8d5290d8e3a3
 SHA1 (patch-src_hotspot_os_bsd_os__perf__bsd.cpp) = 7bb57f82f3a93adc1970ed4215148fc02ecbcd5a
 SHA1 (patch-src_hotspot_os_posix_os__posix.cpp) = e70e8c1e59f0be184a7a1d6e9d11ac7b934ce4b2
 SHA1 (patch-src_java.base_bsd_native_libjava_ProcessHandleImpl__bsd.c) = fbc0aa6656292535fb38344fee7178b6f625f58a

Index: pkgsrc/lang/openjdk11/patches/patch-src_hotspot_os_bsd_os__bsd.cpp
diff -u pkgsrc/lang/openjdk11/patches/patch-src_hotspot_os_bsd_os__bsd.cpp:1.1 pkgsrc/lang/openjdk11/patches/patch-src_hotspot_os_bsd_os__bsd.cpp:1.2
--- pkgsrc/lang/openjdk11/patches/patch-src_hotspot_os_bsd_os__bsd.cpp:1.1      Tue Oct  1 12:36:34 2019
+++ pkgsrc/lang/openjdk11/patches/patch-src_hotspot_os_bsd_os__bsd.cpp  Wed Feb  5 14:22:42 2020
@@ -1,10 +1,8 @@
-$NetBSD: patch-src_hotspot_os_bsd_os__bsd.cpp,v 1.1 2019/10/01 12:36:34 tnn Exp $
+$NetBSD: patch-src_hotspot_os_bsd_os__bsd.cpp,v 1.2 2020/02/05 14:22:42 ryoon Exp $
 
-On NetBSD, __sigaction14 should be used as sigaction.
-
---- src/hotspot/os/bsd/os_bsd.cpp.orig 2019-09-19 12:22:38.000000000 +0000
+--- src/hotspot/os/bsd/os_bsd.cpp.orig 2020-01-15 18:29:57.000000000 +0000
 +++ src/hotspot/os/bsd/os_bsd.cpp
-@@ -383,7 +383,7 @@ void os::init_system_properties_values()
+@@ -379,7 +379,7 @@ void os::init_system_properties_values()
  #ifdef __APPLE__
    #define DEFAULT_LIBPATH "/lib:/usr/lib"
  #elif defined(__NetBSD__)
@@ -13,7 +11,7 @@ On NetBSD, __sigaction14 should be used 
  #else
    #define DEFAULT_LIBPATH "/usr/lib:/usr/local/lib"
  #endif
-@@ -3357,7 +3357,11 @@ void os::Bsd::check_signal_handler(int s
+@@ -3377,7 +3377,11 @@ void os::Bsd::check_signal_handler(int s
    struct sigaction act;
    if (os_sigaction == NULL) {
      // only trust the default sigaction, in case it has been interposed
@@ -25,3 +23,12 @@ On NetBSD, __sigaction14 should be used 
      if (os_sigaction == NULL) return;
    }
  
+@@ -3632,7 +3636,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", const_cast<char *>(name));
+ #endif
+   }
+ }