From 5cb44b944c205b14df65775e8c08597f509b961d Mon Sep 17 00:00:00 2001
From: DigitalCoffee <code@digitalcoffee.dev>
Date: Tue, 18 Aug 2026 21:37:23 -0400
Subject: [PATCH 1/2] openjdk25: update to 25.0.5+2.

---
 srcpkgs/openjdk25/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openjdk25/template b/srcpkgs/openjdk25/template
index 14c1adb4ad1ea8..b98295e6dc1321 100644
--- a/srcpkgs/openjdk25/template
+++ b/srcpkgs/openjdk25/template
@@ -1,6 +1,6 @@
 # Template file for 'openjdk25'
 pkgname=openjdk25
-version=25.0.3+0
+version=25.0.5+2
 revision=1
 _gtest_ver=1.14.0
 _java_ver="${version%%.*}"
@@ -43,7 +43,7 @@ license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz
  https://github.com/google/googletest/archive/refs/tags/v${_gtest_ver}.tar.gz"
-checksum="e571ba045ef06ca7e5cc7c6539509dd04012fdaad258c4466744600409845f34
+checksum="aecbf31a39e25ac219905c68d95910c3cbf7f3bfacac6f9713be0e46c6b349aa
  8ad598c73ad796e0d8280b082cebd82a630d73e73cd3c70057938a6501bba5d7"
 alternatives="jdk:/usr/lib/jvm/default-jdk:/${_jdk_home}"
 provides="java-environment-${version}_1"

From 6765cc7f939b7c7338f56513cd55a74eccc79cf8 Mon Sep 17 00:00:00 2001
From: DigitalCoffee <code@digitalcoffee.dev>
Date: Tue, 18 Aug 2026 21:39:18 -0400
Subject: [PATCH 2/2] mandrel: update to 25.0.4.0.

patches mx for python 3.14, see
https://github.com/oracle/graal/issues/13277
---
 .../patches/mx-extract-python-3.14.patch      | 13 +++++++++++++
 srcpkgs/mandrel/template                      | 19 ++++++++++++-------
 2 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/mandrel/patches/mx-extract-python-3.14.patch

diff --git a/srcpkgs/mandrel/patches/mx-extract-python-3.14.patch b/srcpkgs/mandrel/patches/mx-extract-python-3.14.patch
new file mode 100644
index 00000000000000..8b651a95beb9af
--- /dev/null
+++ b/srcpkgs/mandrel/patches/mx-extract-python-3.14.patch
@@ -0,0 +1,13 @@
+diff --git a/src/mx/_impl/mx.py b/src/mx/_impl/mx.py
+index 60e14f6d..ce796dac 100755
+--- a/mx/src/mx/_impl/mx.py
++++ b/mx/src/mx/_impl/mx.py
+@@ -8444,6 +8444,10 @@ class TarExtractor(Extractor):
+         return ar.getnames()
+ 
+     def _extractall(self, ar, dst):
++        # Force the filter to 'fully_trusted' when available
++        if hasattr(tarfile, 'fully_trusted_filter'):
++            return ar.extractall(dst, filter=tarfile.fully_trusted_filter)
++
+         return ar.extractall(dst)
diff --git a/srcpkgs/mandrel/template b/srcpkgs/mandrel/template
index b3b6bc6d7d5925..ccc1128a569dcf 100644
--- a/srcpkgs/mandrel/template
+++ b/srcpkgs/mandrel/template
@@ -1,9 +1,9 @@
 # Template file for 'mandrel'
 pkgname=mandrel
-version=23.1.8.0
+version=25.0.4.0
 revision=1
-_java_ver=21
-_mx_ver=6.53.2
+_java_ver=25
+_mx_ver=7.85.1
 archs="aarch64* x86_64*"  # upstream supported archs
 hostmakedepends="openjdk${_java_ver} openjdk${_java_ver}-jmods
  openjdk${_java_ver}-src openjdk${_java_ver}-static-libs python3"
@@ -15,11 +15,16 @@ homepage="https://github.com/graalvm/mandrel"
 distfiles="https://github.com/graalvm/mandrel-packaging/archive/refs/tags/mandrel-${version}-Final.tar.gz>packaging-${version}.tar.gz
  https://github.com/graalvm/mandrel/archive/refs/tags/mandrel-${version}-Final.tar.gz
  https://github.com/graalvm/mx/archive/refs/tags/${_mx_ver}.tar.gz"
-checksum="22ed7c881299c50c915ea6b7545134048f4ecf232c86c7dd260ee759df0dafa5
- ae7f53c476a5f763ca3027f81e70aa170c8fb69a67cf1299083cfaeedd412ded
- 567c95449922b448d78daade5ba7bd91729a75367b69806f1bd590988a1ef717"
+checksum="7739e5218729819b3d57449e766d5222a99ceca218c5b98d9751ad85f07a4d5b
+ e6d178da534fb48611bb0b0ed6206b9386e5c482cd8e6c588b351c0541fedd33
+ 475ca3716610e3e98eb4ec4ef0dd9d2a45a089b3344460e802a107ae99cc1f0c"
 shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
 nocross=yes
+skip_extraction="${_mx_ver}.tar.gz"
+
+post_extract() {
+	vsrcextract -C mx ${_mx_ver}.tar.gz
+}
 
 # XXX: only static builds with native-image work
 # (else TEXTREL issues)
@@ -29,7 +34,7 @@ do_build() {
 	export PATH=/usr/libexec/chroot-git:$PATH
 	. /etc/profile.d/jdk.sh
 	$JAVA_HOME/bin/java -ea build.java \
-		--mx-home $PWD/../mx-* \
+		--mx-home $PWD/../mx \
 		--mandrel-repo $PWD/../mandrel-mandrel-* \
 		--verbose
 }