From: Thomas Devoogdt <thomas@devoogdt.com>
To: buildroot@buildroot.org
Cc: Thomas Perale <thomas.perale@mind.be>,
Tudor Holton <buildroot@tudorholton.com>,
Thomas Devoogdt <thomas@devoogdt.com>
Subject: [Buildroot] [PATCH v1 3/3] package/openjdk{-bin}: security bump 25.x to version 25.0.5.1+2
Date: Thu, 19 Nov 2026 13:35:32 +0100 [thread overview]
Message-ID: <20261119123532.1749442-3-thomas@devoogdt.com> (raw)
In-Reply-To: <20261119123532.1749442-1-thomas@devoogdt.com>
Fix CVE-2026-114938, a heap-based buffer overflow in the HotSpot
compiler which may result in takeover of affected Java runtimes.
This also includes security fixes from the OpenJDK advisories published
on 2026-04-21, 2026-07-21, 2026-08-18, 2026-10-20, 2026-10-21,
2026-10-24, and 2026-11-17.
Other relevant changes include certificate and cryptographic hardening,
updates to libpng 1.6.59, FreeType 2.15.0 and tzdata2026f, and fixes
for TLS, HTTP, Kerberos, JMX, JFR, and HotSpot.
The headless-build patch is now upstream and can be removed.
For details, see:
https://openjdk.org/groups/vulnerability/advisories/2026-11-17
Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
---
.checkpackageignore | 2 +-
.../openjdk-bin.hash | 3 +-
package/openjdk-bin/openjdk-bin.mk | 4 +-
...OpenJDK-in-headless-mode-without-req.patch | 144 ------------------
...ARCv2-ISA-processors-support-to-Zero.patch | 0
...pot-aarch64-macro-assembler-fix-cmp.patch} | 0
...t-share-gc-shenandoah-fix-constexpr.patch} | 0
package/openjdk/openjdk.hash | 2 +-
package/openjdk/openjdk.mk | 4 +-
9 files changed, 7 insertions(+), 152 deletions(-)
rename package/openjdk-bin/{25.0.2_10 => 25.0.5.1_2}/openjdk-bin.hash (53%)
delete mode 100644 package/openjdk/25.0.2+10/0002-8376684-Compile-OpenJDK-in-headless-mode-without-req.patch
rename package/openjdk/{25.0.2+10 => 25.0.5.1+2}/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch (100%)
rename package/openjdk/{25.0.2+10/0003-src-hotspot-aarch64-macro-assembler-fix-cmp.patch => 25.0.5.1+2/0002-src-hotspot-aarch64-macro-assembler-fix-cmp.patch} (100%)
rename package/openjdk/{25.0.2+10/0004-src-hotspot-share-gc-shenandoah-fix-constexpr.patch => 25.0.5.1+2/0003-src-hotspot-share-gc-shenandoah-fix-constexpr.patch} (100%)
diff --git a/.checkpackageignore b/.checkpackageignore
index c875aa796be..5861b778f93 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -659,7 +659,7 @@ package/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch
package/open2300/0001-fix-makefile.patch lib_patch.Upstream
package/openjdk/17.0.21.1+2/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch lib_patch.Upstream
package/openjdk/21.0.13.1+2/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch lib_patch.Upstream
-package/openjdk/25.0.2+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch lib_patch.Upstream
+package/openjdk/25.0.5.1+2/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch lib_patch.Upstream
package/openldap/0001-fix-bignum.patch lib_patch.Upstream
package/openldap/0002-disable-docs.patch lib_patch.Upstream
package/openntpd/S49ntp Shellcheck lib_sysv.Variables
diff --git a/package/openjdk-bin/25.0.2_10/openjdk-bin.hash b/package/openjdk-bin/25.0.5.1_2/openjdk-bin.hash
similarity index 53%
rename from package/openjdk-bin/25.0.2_10/openjdk-bin.hash
rename to package/openjdk-bin/25.0.5.1_2/openjdk-bin.hash
index 42892b1e6ce..29ed381fa2d 100644
--- a/package/openjdk-bin/25.0.2_10/openjdk-bin.hash
+++ b/package/openjdk-bin/25.0.5.1_2/openjdk-bin.hash
@@ -1,6 +1,5 @@
# From https://github.com/adoptium/temurin25-binaries/releases
-sha256 987387933b64b9833846dee373b640440d3e1fd48a04804ec01a6dbf718e8ab8 OpenJDK25U-jdk_x64_linux_hotspot_25.0.2_10.tar.gz
-sha256 a9d73e711d967dc44896d4f430f73a68fd33590dabc29a7f2fb9f593425b854c OpenJDK25U-jdk_aarch64_linux_hotspot_25.0.2_10.tar.gz
+sha256 760f91b22c3efc9bd1b64ff950598231be82928cc807e30691a0e7a2995a62c0 OpenJDK25U-jdk_x64_linux_hotspot_25.0.5.1_2.tar.gz
# Locally calculated
sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE
diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk
index f56d96504d8..ef11d7e9e67 100644
--- a/package/openjdk-bin/openjdk-bin.mk
+++ b/package/openjdk-bin/openjdk-bin.mk
@@ -6,8 +6,8 @@
ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_25),y)
HOST_OPENJDK_BIN_VERSION_MAJOR = 25
-HOST_OPENJDK_BIN_VERSION_MINOR = 0.2
-HOST_OPENJDK_BIN_VERSION_BUILD = 10
+HOST_OPENJDK_BIN_VERSION_MINOR = 0.5.1
+HOST_OPENJDK_BIN_VERSION_BUILD = 2
else ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_21),y)
HOST_OPENJDK_BIN_VERSION_MAJOR = 21
HOST_OPENJDK_BIN_VERSION_MINOR = 0.13.1
diff --git a/package/openjdk/25.0.2+10/0002-8376684-Compile-OpenJDK-in-headless-mode-without-req.patch b/package/openjdk/25.0.2+10/0002-8376684-Compile-OpenJDK-in-headless-mode-without-req.patch
deleted file mode 100644
index 78ab31ff621..00000000000
--- a/package/openjdk/25.0.2+10/0002-8376684-Compile-OpenJDK-in-headless-mode-without-req.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From 434d082d9082c1ce2d9ea46ec3c90420442567b9 Mon Sep 17 00:00:00 2001
-From: Thomas Devoogdt <thomas@devoogdt.com>
-Date: Wed, 4 Feb 2026 06:48:59 +0000
-Subject: [PATCH] 8376684: Compile OpenJDK in headless mode without required
- X11 libraries
-
-Reviewed-by: erikj, aivanov
-
-Upstream: https://github.com/openjdk/jdk/pull/28310
-Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
----
- doc/building.html | 7 +++----
- doc/building.md | 6 ++----
- make/autoconf/libraries.m4 | 8 ++++----
- make/modules/java.desktop/lib/AwtLibraries.gmk | 16 ++++++++++++++--
- .../unix/native/common/awt/utility/rect.h | 4 ++--
- 5 files changed, 25 insertions(+), 16 deletions(-)
-
-diff --git a/doc/building.html b/doc/building.html
-index da8465bc532..f8d815a5474 100644
---- a/doc/building.html
-+++ b/doc/building.html
-@@ -1380,10 +1380,9 @@ <h4 id="alsa-1">ALSA</h4>
- can specify it by <code>--with-alsa</code>.</p></li>
- </ul>
- <h4 id="x11-1">X11</h4>
--<p>You will need X11 libraries suitable for your <em>target</em> system.
--In most cases, using Debian's pre-built libraries work fine.</p>
--<p>Note that X11 is needed even if you only want to build a headless
--JDK.</p>
-+<p>When not building a headless JDK, you will need X11 libraries
-+suitable for your <em>target</em> system. In most cases, using Debian's
-+pre-built libraries work fine.</p>
- <ul>
- <li><p>Go to <a href="https://www.debian.org/distrib/packages">Debian
- Package Search</a>, search for the following packages for your
-diff --git a/doc/building.md b/doc/building.md
-index 1a9fe6b2e78..92ebd3d32c7 100644
---- a/doc/building.md
-+++ b/doc/building.md
-@@ -1173,10 +1173,8 @@ #### ALSA
-
- #### X11
-
--You will need X11 libraries suitable for your *target* system. In most cases,
--using Debian's pre-built libraries work fine.
--
--Note that X11 is needed even if you only want to build a headless JDK.
-+When not building a headless JDK, you will need X11 libraries suitable for your
-+*target* system. In most cases, using Debian's pre-built libraries work fine.
-
- * Go to [Debian Package Search](https://www.debian.org/distrib/packages),
- search for the following packages for your *target* system, and download them
-diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4
-index 96f377c2f99..8f02b7ec8a7 100644
---- a/make/autoconf/libraries.m4
-+++ b/make/autoconf/libraries.m4
-@@ -42,12 +42,12 @@ m4_include([lib-tests.m4])
- AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES],
- [
- # Check if X11 is needed
-- if test "x$OPENJDK_TARGET_OS" = xwindows || test "x$OPENJDK_TARGET_OS" = xmacosx; then
-- # No X11 support on windows or macosx
-+ if test "x$OPENJDK_TARGET_OS" = xwindows ||
-+ test "x$OPENJDK_TARGET_OS" = xmacosx ||
-+ test "x$ENABLE_HEADLESS_ONLY" = xtrue; then
- NEEDS_LIB_X11=false
- else
-- # All other instances need X11, even if building headless only, libawt still
-- # needs X11 headers.
-+ # All other instances need X11 for libawt.
- NEEDS_LIB_X11=true
- fi
-
-diff --git a/make/modules/java.desktop/lib/AwtLibraries.gmk b/make/modules/java.desktop/lib/AwtLibraries.gmk
-index 463e09e12dc..8b6b50b9e62 100644
---- a/make/modules/java.desktop/lib/AwtLibraries.gmk
-+++ b/make/modules/java.desktop/lib/AwtLibraries.gmk
-@@ -88,6 +88,10 @@ LIBAWT_EXTRA_HEADER_DIRS := \
-
- LIBAWT_CFLAGS := -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES -DMLIB_NO_LIBSUNMATH
-
-+ifeq ($(ENABLE_HEADLESS_ONLY), true)
-+ LIBAWT_CFLAGS += -DHEADLESS
-+endif
-+
- ifeq ($(call isTargetOs, windows), true)
- LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE -DMLIB_OS64BIT
- LIBAWT_RCFLAGS ?= -I$(TOPDIR)/src/java.base/windows/native/launcher/icons
-@@ -167,11 +171,18 @@ ifeq ($(call isTargetOs, windows macosx), false)
- $(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
- #
-
-+ LIBAWT_HEADLESS_EXCLUDE_FILES := \
-+ GLXGraphicsConfig.c \
-+ GLXSurfaceData.c \
-+ X11PMBlitLoops.c \
-+ X11Renderer.c \
-+ X11SurfaceData.c \
-+ #
-+
- LIBAWT_HEADLESS_EXTRA_HEADER_DIRS := \
- $(LIBAWT_DEFAULT_HEADER_DIRS) \
- common/awt/debug \
- common/font \
-- common/java2d/opengl \
- java.base:libjvm \
- #
-
-@@ -191,7 +202,8 @@ ifeq ($(call isTargetOs, windows macosx), false)
- $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \
- NAME := awt_headless, \
- EXTRA_SRC := $(LIBAWT_HEADLESS_EXTRA_SRC), \
-- EXCLUDES := medialib, \
-+ EXCLUDES := medialib opengl, \
-+ EXCLUDE_FILES := $(LIBAWT_HEADLESS_EXCLUDE_FILES), \
- ONLY_EXPORTED := $(LIBAWT_HEADLESS_ONLY_EXPORTED), \
- OPTIMIZATION := LOW, \
- CFLAGS := -DHEADLESS=true $(CUPS_CFLAGS) $(FONTCONFIG_CFLAGS) \
-diff --git a/src/java.desktop/unix/native/common/awt/utility/rect.h b/src/java.desktop/unix/native/common/awt/utility/rect.h
-index ceea38f4349..91b5a17ec58 100644
---- a/src/java.desktop/unix/native/common/awt/utility/rect.h
-+++ b/src/java.desktop/unix/native/common/awt/utility/rect.h
-@@ -28,7 +28,7 @@
- #ifndef _AWT_RECT_H
- #define _AWT_RECT_H
-
--#ifndef MACOSX
-+#if !defined(HEADLESS) && !defined(MACOSX)
- #include <X11/Xlib.h>
- typedef XRectangle RECT_T;
- #else
-@@ -39,7 +39,7 @@ typedef struct {
- int width;
- int height;
- } RECT_T;
--#endif /* !MACOSX */
-+#endif /* !HEADLESS && !MACOSX */
-
- #define RECT_EQ_X(r1,r2) ((r1).x==(r2).x && (r1).width==(r2).width)
-
---
-2.43.0
-
diff --git a/package/openjdk/25.0.2+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch b/package/openjdk/25.0.5.1+2/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch
similarity index 100%
rename from package/openjdk/25.0.2+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch
rename to package/openjdk/25.0.5.1+2/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch
diff --git a/package/openjdk/25.0.2+10/0003-src-hotspot-aarch64-macro-assembler-fix-cmp.patch b/package/openjdk/25.0.5.1+2/0002-src-hotspot-aarch64-macro-assembler-fix-cmp.patch
similarity index 100%
rename from package/openjdk/25.0.2+10/0003-src-hotspot-aarch64-macro-assembler-fix-cmp.patch
rename to package/openjdk/25.0.5.1+2/0002-src-hotspot-aarch64-macro-assembler-fix-cmp.patch
diff --git a/package/openjdk/25.0.2+10/0004-src-hotspot-share-gc-shenandoah-fix-constexpr.patch b/package/openjdk/25.0.5.1+2/0003-src-hotspot-share-gc-shenandoah-fix-constexpr.patch
similarity index 100%
rename from package/openjdk/25.0.2+10/0004-src-hotspot-share-gc-shenandoah-fix-constexpr.patch
rename to package/openjdk/25.0.5.1+2/0003-src-hotspot-share-gc-shenandoah-fix-constexpr.patch
diff --git a/package/openjdk/openjdk.hash b/package/openjdk/openjdk.hash
index 33124c17a8c..85c9f2ba009 100644
--- a/package/openjdk/openjdk.hash
+++ b/package/openjdk/openjdk.hash
@@ -1,5 +1,5 @@
# Locally computed
-sha256 9b3164cedf78d7a76a59499d7a6833145c7e0269ec7b664bfe5ee03ced2f449e openjdk-25.0.2+10.tar.gz
+sha256 b3ecd75437342ee932f71792bbbdd09cd336659324f94ad0e81e527af74d8c5c openjdk-25.0.5.1+2.tar.gz
sha256 2f00670ffe781881c6fdb60f49ecdfd12a6c0f5e2943b94d17b1f4bc714397f9 openjdk-21.0.13.1+2.tar.gz
sha256 1358a7fbe258370744a11a4be8017bd9d30a00a5fc5b784f9221815bb7444a4d openjdk-17.0.21.1+2.tar.gz
sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE
diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk
index 94e96e4924a..495ef58a0c3 100644
--- a/package/openjdk/openjdk.mk
+++ b/package/openjdk/openjdk.mk
@@ -6,8 +6,8 @@
ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_25),y)
OPENJDK_VERSION_MAJOR = 25
-OPENJDK_VERSION_MINOR = 0.2
-OPENJDK_VERSION_BUILD = 10
+OPENJDK_VERSION_MINOR = 0.5.1
+OPENJDK_VERSION_BUILD = 2
else ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_21),y)
OPENJDK_VERSION_MAJOR = 21
OPENJDK_VERSION_MINOR = 0.13.1
--
2.43.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next prev parent reply other threads:[~2026-11-19 12:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-19 12:35 [Buildroot] [PATCH v1 1/3] package/openjdk{-bin}: security bump 17.x to version 17.0.21.1+2 Thomas Devoogdt
2026-11-19 12:35 ` [Buildroot] [PATCH v1 2/3] package/openjdk{-bin}: security bump 21.x to version 21.0.13.1+2 Thomas Devoogdt
2026-11-19 12:35 ` Thomas Devoogdt [this message]
2026-11-19 14:02 ` [Buildroot] [PATCH v2 1/3] package/openjdk{-bin}: security bump 17.x to version 17.0.21.1+2 Thomas Devoogdt
2026-11-19 14:02 ` [Buildroot] [PATCH v2 2/3] package/openjdk{-bin}: security bump 21.x to version 21.0.13.1+2 Thomas Devoogdt
2026-11-19 14:02 ` [Buildroot] [PATCH v2 3/3] package/openjdk{-bin}: security bump 25.x to version 25.0.5.1+2 Thomas Devoogdt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261119123532.1749442-3-thomas@devoogdt.com \
--to=thomas@devoogdt.com \
--cc=buildroot@buildroot.org \
--cc=buildroot@tudorholton.com \
--cc=thomas.perale@mind.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox