From: Peter Michael Green Date: Mon, 5 Oct 2026 01:09:02 +0000 (+0000) Subject: Merge tag '21.0.12.1+1-1_deb13u1+rpi1' of 172.17.3.10:/build/git/o/openjdk-21 into... X-Git-Tag: archive/raspbian/25.0.5_7ea-1+rpi1~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bd5ed218b6cf22d18ccc42fb6ff740a707fec6f9;p=openjdk-25.git Merge tag '21.0.12.1+1-1_deb13u1+rpi1' of 172.17.3.10:/build/git/o/openjdk-21 into forky-staging --- bd5ed218b6cf22d18ccc42fb6ff740a707fec6f9 diff --cc debian/changelog index 5326823f7,f0855686d..19d493901 --- a/debian/changelog +++ b/debian/changelog @@@ -1,42 -1,22 +1,51 @@@ -openjdk-21 (21.0.12.1+1-1~deb13u1+rpi1) trixie-staging; urgency=medium ++openjdk-25 (25.0.5~7ea-1+rpi1) forky-staging; urgency=medium + + [changes taken from 17.0.4+8-1~deb11u1+rpt1 by Serge Schneider] + * Build with client jvm variant + - https://github.com/raspberrypi/linux/issues/3306#issuecomment-1030781000 + * Default to client jvm on armhf + - -- Raspbian forward porter Fri, 04 Sep 2026 21:17:08 +0000 ++ -- Peter Michael Green Mon, 05 Oct 2026 01:08:05 +0000 ++ +openjdk-25 (25.0.5~7ea-1) unstable; urgency=medium + + * OpenJDK 25.0.5 snapshot, build 7. + * Cherry-pick upstream patches to resolve FFM font rendering crash + and memory leak (LP: #2155650): + - d/p/jdk-8337853.diff: Temporary directory was filling up + with the temporary font files. + - d/p/jdk-8371066.diff: Remove unused classes so that other font patches + apply cleanly. + - d/p/jdk-8378603.diff: libfontmanager FFM was using mismatched free + and malloc, when overriden with LD_LIBRARY_PRELOAD. + - d/p/jdk-8378607.diff: GlyphLayout cache prevented Fonts from being + garbage collected. + - d/p/jdk-8378615.diff: FFM call stub was holding global JNI reference + to the font. + * d/rules: add --with-external-symbols-in-bundles=full configure + option (JDK-8373246). + * d/B-jre-*.overrides.in: Drop exit-in-shared-library lintian + override. + + -- Vladimir Petko Thu, 24 Sep 2026 19:52:19 +1200 -openjdk-21 (21.0.12.1+1-1~deb13u1) trixie-security; urgency=medium +openjdk-25 (25.0.5~6ea-1) unstable; urgency=medium - * Rebuild for trixie + * OpenJDK 25.0.5 snapshot, build 6. + * d/JB-{jre-headless,testsuport}.overrides.in: suppress specific- + address-in-shared-library for i386 (JDK-6454213). + * d/rules: disable tree-slp-vectorize for Ubuntu S390x builds (LP: + #2095441). Add workaround for Launchpad C2 crash. + * Regenerate man pages and control files. + * d/p/jdk-8388170.diff: Refresh patch. - -- Moritz Muehlenhoff Wed, 19 Aug 2026 19:55:58 +0200 + -- Vladimir Petko Wed, 16 Sep 2026 08:57:18 +1200 -openjdk-21 (21.0.12.1+1-1) unstable; urgency=medium +openjdk-25 (25.0.4.1+1-1) unstable; urgency=medium - * OpenJDK 21.0.12.1 release, build 1. + * OpenJDK 25.0.4.1 release, build 1. - CVEs: + + CVE-2026-70906 + CVE-2026-61308 + CVE-2026-70907 + CVE-2026-60589 diff --cc debian/patches/series index d5ee120a8,5c724e3f9..40b90b08a --- a/debian/patches/series +++ b/debian/patches/series @@@ -39,17 -47,7 +39,18 @@@ jdk-8335238-workaround.patc # FIXME: which one of these two? zero-alpha-workaround.diff #jdk-8347014-proposed.patch -jdk-8359735.patch +power-opt.diff +test-empty-path.patch jdk-8381555.diff +jdk-8385738.diff jdk-8387580.diff +jdk-8377035.diff +jdk-8388170.diff +# start: fix FFM font rendering issues in openjdk-25 +jdk-8337853.diff +jdk-8371066.diff +jdk-8378603.diff +jdk-8378607.diff +jdk-8378615.diff +# end: FFM font rendering issues + client_default.diff