openjdk11: update from 11.0.21+9 to 11.0.22+7

omniosorg · Jan 25, 2024 · 6064188 · 6064188
1 parent ea66c28
commit 6064188
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/build/openjdk11/build.sh b/build/openjdk11/build.sh
@@ -12,12 +12,12 @@
 # http://www.illumos.org/license/CDDL.
 # }}}
 #
-# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/functions.sh
 
 PROG=openjdk
-VER=11.0.21+9
+VER=11.0.22+7
 PKG=runtime/java/openjdk11
 SUMMARY="openjdk ${VER%%.*}"
 DESC="Open-source implementation of the eleventh edition of the "

diff --git a/build/openjdk11/patches/omnios-headless.patch b/build/openjdk11/patches/omnios-headless.patch
@@ -1,7 +1,7 @@
 diff -wpruN --no-dereference '--exclude=*.orig' a~/make/lib/Awt2dLibraries.gmk a/make/lib/Awt2dLibraries.gmk
 --- a~/make/lib/Awt2dLibraries.gmk	1970-01-01 00:00:00
 +++ a/make/lib/Awt2dLibraries.gmk	1970-01-01 00:00:00
-@@ -735,11 +735,9 @@ else # not windows
+@@ -740,11 +740,9 @@ else # not windows
        JAWT_LIBS += -lawt_xawt
      else
        JAWT_LIBS += -lawt_headless

diff --git a/build/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk b/build/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk
@@ -13,7 +13,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/make/lib/Awt2dLibraries.gmk a
      CFLAGS_windows := -DCMS_IS_WINDOWS_, \
      EXTRA_HEADER_DIRS := \
          common/awt/debug \
-@@ -554,8 +553,12 @@ else
+@@ -557,8 +556,12 @@ else
      HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES -DHB_NO_VISIBILITY
    endif
    ifeq ($(call isTargetOs, solaris), true)

diff --git a/build/openjdk11/patches/security-pkcs11.patch b/build/openjdk11/patches/security-pkcs11.patch
@@ -1,15 +1,15 @@
 diff -wpruN --no-dereference '--exclude=*.orig' a~/src/java.base/share/conf/security/java.security a/src/java.base/share/conf/security/java.security
 --- a~/src/java.base/share/conf/security/java.security	1970-01-01 00:00:00
 +++ a/src/java.base/share/conf/security/java.security	1970-01-01 00:00:00
-@@ -62,7 +62,6 @@
+@@ -65,7 +65,6 @@
  #
  #ifdef solaris
  security.provider.tbd=OracleUcrypto
 -security.provider.tbd=SunPKCS11 ${java.home}/conf/security/sunpkcs11-solaris.cfg
  #endif
  security.provider.tbd=SUN
  security.provider.tbd=SunRsaSign
-@@ -83,6 +82,8 @@ security.provider.tbd=Apple
+@@ -86,6 +85,8 @@ security.provider.tbd=Apple
  #endif
  #ifndef solaris
  security.provider.tbd=SunPKCS11

diff --git a/build/openjdk11/patches/tribblix-thrstat001.patch b/build/openjdk11/patches/tribblix-thrstat001.patch
@@ -1,8 +1,9 @@
 Local definition of wait() conflicts with wait(3C).
 
---- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadState/thrstat001/thrstat001.cpp	Fri Oct  6 06:33:33 2023
-+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadState/thrstat001/thrstat001.cpp	Thu Oct 19 09:25:58 2023
-@@ -70,7 +70,7 @@
+diff -wpruN --no-dereference '--exclude=*.orig' a~/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadState/thrstat001/thrstat001.cpp a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadState/thrstat001/thrstat001.cpp
+--- a~/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadState/thrstat001/thrstat001.cpp	1970-01-01 00:00:00
++++ a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadState/thrstat001/thrstat001.cpp	1970-01-01 00:00:00
+@@ -70,7 +70,7 @@ unlock(const char* func_name, jrawMonito
  }
 
  static void
@@ -11,7 +12,7 @@ Local definition of wait() conflicts with wait(3C).
      jvmtiError err = jvmti->RawMonitorWait(lock, (jlong)millis);
      if (err != JVMTI_ERROR_NONE) {
          printf("%s: unexpected error in RawMonitorWait: %s (%d)\n",
-@@ -229,7 +229,7 @@
+@@ -229,7 +229,7 @@ Java_nsk_jvmti_GetThreadState_thrstat001
              break;
          }
          lock("checkStatus", wait_lock);