ok
On 2026/11/05 18:25, Kurt Miller wrote:
> Update to 11.0.33.0.3+10-1 GA:
> * Upstream release notes:
>
> https://www.oracle.com/java/technologies/javase/11-0-33-relnotes.html#R11_0_33
>
> https://www.oracle.com/java/technologies/javase/11-0-33-0-2-relnotes.html#R11_0_33_0_2
>
> https://www.oracle.com/java/technologies/javase/11-0-33-0-3-relnotes.html#R11_0_33_0_3
> * Contains upstream security fixes:
> https://openjdk.org/groups/vulnerability/advisories/2026-10-20
> https://openjdk.org/groups/vulnerability/advisories/2026-10-21
> https://openjdk.org/groups/vulnerability/advisories/2026-10-24
> * Removes installing ../files/blocked.certs now that it is built by
> the jdk correctly
> * Remove patches committed upstream at bsd-port
> * Contains a series of upstream/bsd-port fixes for various tier1
> failures. All tier1 tests pass now with a few intermittent
> failures.
>
> A note on version numbers: Oracle used the 5th level version number
> to release their fixes for eMudhra certs and also tagged openjdk 17-25
> using the same scheme (e.g. 25.0.5.0.3). However, for openjdk-11 they did
> not do that. I have opted to set the 5th level version number to match
> Oracle's security releases for jdk-11 to try to avoid confusion about where
> eMudhra issues are fixed on OpenBSD.
>
> $ /usr/local/jdk-11/bin/java -version
> openjdk version "11.0.33.0.3" 2026-10-20
> OpenJDK Runtime Environment (build 11.0.33.0.3+10-1)
> OpenJDK 64-Bit Server VM (build 11.0.33.0.3+10-1, mixed mode)
>
> Tested on aarch64, amd64, i386, sparc64. okay?
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/jdk/11/Makefile,v
> diff -u -p -u -r1.77 Makefile
> --- Makefile 26 Oct 2026 14:07:56 -0000 1.77
> +++ Makefile 5 Nov 2026 15:38:50 -0000
> @@ -4,19 +4,17 @@ USE_NOBTCFI= Yes
> DPB_PROPERTIES= parallel
>
> COMMENT= OpenJDK Software Development Kit v${VERSION_STR}
> -BASE_VER= 11.0.32
> -BUILD_VER= 9
> +BASE_VER= 11.0.33
> +BUILD_VER= 10
> BSD_PORT_REL= 1
> -VERSION_STR= ${BASE_VER}+${BUILD_VER}-${BSD_PORT_REL}
> -PACKAGE_VER= ${BASE_VER}.${BUILD_VER}.${BSD_PORT_REL}
> +VERSION_STR= ${BASE_VER}.0.3+${BUILD_VER}-${BSD_PORT_REL}
> +PACKAGE_VER= ${BASE_VER}.0.3.${BUILD_VER}.${BSD_PORT_REL}
> PKGNAME= jdk-${PACKAGE_VER}
> PKGSTEM= jdk-11
> EPOCH= 0
>
> -REVISION= 4
> -
> DIST_SUBDIR= jdk
> -DISTNAME= jdk-${VERSION_STR}
> +DISTNAME= jdk-${BASE_VER}+${BUILD_VER}-${BSD_PORT_REL}
> WRKDIST= ${WRKDIR}/jdk11u-jdk-${BASE_VER}-${BUILD_VER}-${BSD_PORT_REL}
> BOOTJDK_DATE= 20251101
>
> @@ -159,7 +157,6 @@ JVMARCH= ${MACHINE_ARCH:S/i386/x86/:S/am
> BUILDDIR= ${WRKDIST}/build/bsd-${JVMARCH}-normal-server-release
> IMAGEDIR= ${BUILDDIR}/images/jdk
> WRKTMP= ${WRKDIR}/tmp
> -JDKFILESDIR= ${.CURDIR}/../files
>
> post-extract:
> sed -i "s|#!/bin/bash|#!\${LOCALBASE}/bin/bash|" ${WRKDIST}/configure
> @@ -180,8 +177,6 @@ post-build:
> do-install:
> ${INSTALL_DATA_DIR} ${PREFIX}/${PKGSTEM}
> cd ${IMAGEDIR} && tar -cf - * | tar -C ${PREFIX}/${PKGSTEM} -xf -
> - ${INSTALL_DATA} ${JDKFILESDIR}/blocked.certs \
> - ${PREFIX}/${PKGSTEM}/lib/security/
> ln -fs ${SYSCONFDIR}/ssl/jdk-cacerts \
> ${PREFIX}/${PKGSTEM}/lib/security/cacerts
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/jdk/11/distinfo,v
> diff -u -p -u -r1.37 distinfo
> --- distinfo 27 Jul 2026 16:53:36 -0000 1.37
> +++ distinfo 5 Nov 2026 15:38:50 -0000
> @@ -1,9 +1,9 @@
> -SHA256 (jdk/jdk-11.0.32+9-1.tar.gz) =
> +N3mpjsM9RrvOAfazmCz7InVFKkX6BrhmAGMuy2dm/w=
> +SHA256 (jdk/jdk-11.0.33+10-1.tar.gz) =
> l2Dhb04eA0SY8gezzCtZG7PluDR6p/37C+cN5xKGS6k=
> SHA256 (jdk/openjdk-jdk11u-bootjdk-aarch64-20251101.tar.gz) =
> jF/p65MhOSy/QnGZDXP+3syJLpZCc/gROV30O83L8Og=
> SHA256 (jdk/openjdk-jdk11u-bootjdk-amd64-20251101.tar.gz) =
> LEfkAvzVOqxLTXoOEU0216n3RZqhJruiqcHjWXsNK5s=
> SHA256 (jdk/openjdk-jdk11u-bootjdk-i386-20251101.tar.gz) =
> 6mXRDPKRR94o4uLgwVmC77Dc1+mqB2VoAKR2AtIx6Vc=
> SHA256 (jdk/openjdk-jdk11u-bootjdk-sparc64-20251101.tar.gz) =
> w6qLZo8QCLBZ69KTA4zCtWrzvkqEvGRyLSj4eXVtE8Q=
> -SIZE (jdk/jdk-11.0.32+9-1.tar.gz) = 116890315
> +SIZE (jdk/jdk-11.0.33+10-1.tar.gz) = 116956554
> SIZE (jdk/openjdk-jdk11u-bootjdk-aarch64-20251101.tar.gz) = 115132436
> SIZE (jdk/openjdk-jdk11u-bootjdk-amd64-20251101.tar.gz) = 115763330
> SIZE (jdk/openjdk-jdk11u-bootjdk-i386-20251101.tar.gz) = 104868595
> Index: patches/patch-make_autoconf_version-numbers
> ===================================================================
> RCS file: patches/patch-make_autoconf_version-numbers
> diff -N patches/patch-make_autoconf_version-numbers
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-make_autoconf_version-numbers 5 Nov 2026 15:38:50
> -0000
> @@ -0,0 +1,15 @@
> +Match Oracle's version to reduce confusion about if eMudhra certs
> +have been removed.
> +
> +Index: make/autoconf/version-numbers
> +--- make/autoconf/version-numbers.orig
> ++++ make/autoconf/version-numbers
> +@@ -30,7 +30,7 @@ DEFAULT_VERSION_FEATURE=11
> + DEFAULT_VERSION_INTERIM=0
> + DEFAULT_VERSION_UPDATE=33
> + DEFAULT_VERSION_PATCH=0
> +-DEFAULT_VERSION_EXTRA1=0
> ++DEFAULT_VERSION_EXTRA1=3
> + DEFAULT_VERSION_EXTRA2=0
> + DEFAULT_VERSION_EXTRA3=0
> + DEFAULT_VERSION_DATE=2026-10-20
> Index: patches/patch-src_hotspot_os_bsd_os_bsd_cpp
> ===================================================================
> RCS file:
> /cvs/ports/devel/jdk/11/patches/patch-src_hotspot_os_bsd_os_bsd_cpp,v
> diff -u -p -u -r1.7 patch-src_hotspot_os_bsd_os_bsd_cpp
> --- patches/patch-src_hotspot_os_bsd_os_bsd_cpp 29 Jul 2026 12:26:47
> -0000 1.7
> +++ patches/patch-src_hotspot_os_bsd_os_bsd_cpp 5 Nov 2026 15:38:50
> -0000
> @@ -1,12 +1,9 @@
> * Workaround a livelock issue on sparc64
> -* Fix os::naked_short_nanosleep on OpenBSD when < 20 miliseconds.
> -nanosleep(2) on OpenBSD is currently accurate down to 20 miliseconds.
> -Below 20 miliseconds, use a busy loop with SpinPause.
>
> Index: src/hotspot/os/bsd/os_bsd.cpp
> --- src/hotspot/os/bsd/os_bsd.cpp.orig
> +++ src/hotspot/os/bsd/os_bsd.cpp
> -@@ -2657,8 +2657,41 @@ bool os::dont_yield() {
> +@@ -2688,7 +2688,11 @@ bool os::dont_yield() {
> }
>
> void os::naked_yield() {
> @@ -16,35 +13,5 @@ Index: src/hotspot/os/bsd/os_bsd.cpp
> + os::naked_short_nanosleep(512);
> +#endif
> }
> -+
> -+#ifdef __OpenBSD__
> -+// OpenBSD does not provide sleep functionality with nanosecond resolution,
> so we
> -+// try to approximate this with spinning combined with spin pause for sleeps
> -+// less then 20 ms
> -+void os::naked_short_nanosleep(jlong ns) {
> -+ assert(ns > -1 && ns < NANOUNITS, "Un-interruptable sleep, short time use
> only");
> -+
> -+ // if >= 20 ms use nanosleep
> -+ if (ns >= 20 * (NANOUNITS / MILLIUNITS)) {
> -+ struct timespec req, rem;
> -+ req.tv_sec = 0;
> -+ req.tv_nsec = ns;
> -+ while(::nanosleep(&req, &rem) == -1) {
> -+ if (errno == EINTR)
> -+ req = rem;
> -+ else
> -+ break;
> -+ }
> -+ return;
> -+ }
> -+
> -+ // less then 20 ms need to use busy wait
> -+ int64_t start = os::javaTimeNanos();
> -+ do {
> -+ SpinPause();
> -+ } while (os::javaTimeNanos() - start < ns);
> -+}
> -+#endif // __OpenBSD__
>
> -
> ////////////////////////////////////////////////////////////////////////////////
> - // thread priority support
> + #ifdef __OpenBSD__
> Index: patches/patch-src_hotspot_os_posix_os_posix_cpp
> ===================================================================
> RCS file: patches/patch-src_hotspot_os_posix_os_posix_cpp
> diff -N patches/patch-src_hotspot_os_posix_os_posix_cpp
> --- patches/patch-src_hotspot_os_posix_os_posix_cpp 29 Jul 2026 12:26:47
> -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,23 +0,0 @@
> -Fix os::naked_short_nanosleep on OpenBSD when < 20 miliseconds.
> -nanosleep(2) on OpenBSD is currently accurate down to 20 miliseconds.
> -Below 20 miliseconds, use a busy loop with SpinPause.
> -
> -Index: src/hotspot/os/posix/os_posix.cpp
> ---- src/hotspot/os/posix/os_posix.cpp.orig
> -+++ src/hotspot/os/posix/os_posix.cpp
> -@@ -762,6 +762,7 @@ int os::sleep(Thread* thread, jlong millis, bool inter
> - }
> - }
> -
> -+#ifndef __OpenBSD__
> - void os::naked_short_nanosleep(jlong ns) {
> - struct timespec req;
> - assert(ns > -1 && ns < NANOUNITS, "Un-interruptable sleep, short time use
> only");
> -@@ -770,6 +771,7 @@ void os::naked_short_nanosleep(jlong ns) {
> - ::nanosleep(&req, NULL);
> - return;
> - }
> -+#endif
> -
> - void os::naked_short_sleep(jlong ms) {
> - assert(ms < MILLIUNITS, "Un-interruptable sleep, short time use only");
> Index: patches/patch-src_hotspot_share_gc_g1_sparsePRT_hpp
> ===================================================================
> RCS file: patches/patch-src_hotspot_share_gc_g1_sparsePRT_hpp
> diff -N patches/patch-src_hotspot_share_gc_g1_sparsePRT_hpp
> --- patches/patch-src_hotspot_share_gc_g1_sparsePRT_hpp 3 Aug 2026
> 14:08:52 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,17 +0,0 @@
> -Fix alignment/SIGBUS on sparc64.
> -
> -Index: src/hotspot/share/gc/g1/sparsePRT.hpp
> ---- src/hotspot/share/gc/g1/sparsePRT.hpp.orig
> -+++ src/hotspot/share/gc/g1/sparsePRT.hpp
> -@@ -52,7 +52,11 @@ class SparsePRTEntry: public CHeapObj<mtGC> { (private
> - // in order to force correct alignment that could otherwise cause SIGBUS
> errors
> - // when reading the member variables. This calculates the minimum number
> of card
> - // array elements required to get that alignment.
> -+#if (defined __sparc) && (defined _LP64)
> -+ static const size_t card_array_alignment = sizeof(long) /
> sizeof(card_elem_t);
> -+#else
> - static const size_t card_array_alignment = sizeof(int) /
> sizeof(card_elem_t);
> -+#endif
> -
> - RegionIdx_t _region_ind;
> - int _next_index;
>