Accepting request 1330632 from Java:Factory

January 2026 CPU fixes + OpenJ9 0.57.0

OBS-URL: https://build.opensuse.org/request/show/1330632
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/java-11-openj9?expand=0&rev=34

1a6f6128aa2f639de1e33cae77a31f474ba6b1a9.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:38371f6ef59ba89f89135dd5579d0952cc4d28adb452c25c194a248da70dc5fc
-size 29265781

254af5a0452934f62e3253c5565b183c682d3495.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4c01a2db59226a198abd2c6eae857ab1028c91b616fbf80ade639aaec2e21021
-size 11151844

30b62e68b859d4a716ae799da0711722efed53de.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dba832124413f95a1ad8f5740f39df22c1c0d94fb89da967558255f462bebda0
-size 176925198

3d1045c3eaf1d7ccd9fbcbc87a8c68da9c38fda8.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:41d7abc70a24a3ad381c9cebbfd6ee70e0afa9218a3f2eb4afb3c7b124ef8935
-size 176752939

840a9adba4548aa546e36c97a1150b7306a7e07b.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:31b067d16c7c9538d99db1fb9aee79d0e208a0173f1c5deb93aaaf96e66c5cca
-size 11172351

8f9a3ed0a8d1489ec59b8d954464e0f41a9d9785.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d8700bec7fc5b7b143db5dc2559b4dc9b60087c070a378ce5bd74dd65e1fe2f4
+size 177290100

b0699311c7d9341f3d0ebf9a7a4b5546a7ca7004.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a44313209419f44cc293f1d08b545d81fd84672a0813d6e7d632a79b19cb0efa
-size 29189918

c8ee95c0c729ac0c0cb3a46a6fde45f0d0b8cc0d.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0ad6750a61071889782f158270744eea7d923603b7ebec5be5331e093bc6c10b
+size 11247044

f0754f410244ad2c42b07c5fe76983a3c7b61e87.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2f5cbaef5154551faf1ba5d410d9843b0d70e0e3e841cdf777ad93c698b7d8b5
+size 29911909

java-11-openj9-rpmlintrc

@@ -1 +0,0 @@
-addFilter("executable-stack")

java-11-openj9.changes

@@ -1,3 +1,137 @@
+-------------------------------------------------------------------
+Mon Feb  2 21:03:49 UTC 2026 - Fridrich Strba <fstrba@suse.com>
+
+- Updagte to OpenJDK 11.0.30 with OpenJ9 0.57.0 virtual machine
+- Including Oracle January 2026 CPU changes
+  * CVE-2026-21925 (bsc#1257034), CVE-2026-21932 (bsc#1257036),
+    CVE-2026-21933 (bsc#1257037), CVE-2026-21945 (bsc#1257038)
+  * OpenJ9 changes, see
+    https://www.eclipse.org/openj9/docs/version0.57/
+
+-------------------------------------------------------------------
+Wed Jan 14 15:02:20 UTC 2026 - Fridrich Strba <fstrba@suse.com>
+
+- Do not depend on update-desktop-files (jsc#PED-14507)
+
+-------------------------------------------------------------------
+Fri Oct 31 07:51:56 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Update to OpenJDK 11.0.29 with OpenJ9 0.56.0 virtual machine
+- Including Oracle October 2025 CPU changes
+  * CVE-2025-53057 (bsc#1252414), CVE-2025-53066 (bsc#1252417)
+  * OpenJ9 changes, see
+    https://www.eclipse.org/openj9/docs/version0.56/
+- Removed patches:
+  * omr-libdwarf-2.patch
+  * bootcycle.patch
+    + fixed in this version
+- Added patch:
+  * reproducible-version.patch
+    + make the time in generated header reproducible
+
+-------------------------------------------------------------------
+Wed Sep 24 07:27:32 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * omr-libdwarf-2.patch
+    + fix build with libdwarf 2.x where the includes are in
+      libdwarf-2 subdirectory
+
+-------------------------------------------------------------------
+Sat Aug 30 15:05:30 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Remove pack200 and unpack200 from alternatives
+
+-------------------------------------------------------------------
+Sat Jul 26 20:45:31 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Update to OpenJDK 11.0.28 with OpenJ9 0.53.0 virtual machine
+- Including Oracle July 2025 CPU changes
+  * CVE-2025-30749 (bsc#1246595), CVE-2025-30754 (bsc#1246598),
+    CVE-2025-30761 (bsc#1246580), CVE-2025-50059 (bsc#1246575),
+    CVE-2025-50106 (bsc#1246584)
+  * OpenJ9 changes, see
+    https://www.eclipse.org/openj9/docs/version0.53/
+- Removed patches:
+  * fix-build-with-gcc15.patch
+  * libdwarf-fix.patch
+  * openj9-noexecstack.patch
+  * stringop-overflow.patch
+    + fixed in this version
+- Modified patches:
+  * openj9-nogit.patch.in
+  * openssl-OSSL_LIB_CTX.patch
+    + rediff to changed context
+- Added patch:
+  * bootcycle.patch
+    + fix bootcycle-images target
+- Enable bootcycle build
+
+-------------------------------------------------------------------
+Mon Jul 21 10:59:48 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Do not embed rebuild counter (bsc#1246806)
+
+-------------------------------------------------------------------
+Tue Jun 17 15:58:52 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Add -std=gnu99 to CFLAGS to fix gcc15 compile time error. Since
+  the C++ part is on -std=gnu++98, this is the closest.
+- Added patch:
+  * fix-build-with-gcc15.patch
+    + fix a typo in omr that is fatal with gcc15
+
+-------------------------------------------------------------------
+Fri May  9 20:01:10 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Update to OpenJDK 11.0.27 with OpenJ9 0.51.0 virtual machine
+- Including Oracle April 2025 CPU changes
+  * CVE-2025-21587 (bsc#1241274), CVE-2025-30691 (bsc#1241275),
+    CVE-2025-30698 (bsc#1241276)
+  * OpenJ9 changes, see
+    https://www.eclipse.org/openj9/docs/version0.51/
+- Removed patch:
+  * openj9-nasm-noexecstack.patch
+    + chosing a better upstream solution
+- Added patch:
+  * openj9-noexecstack.patch
+    + better upstream solution to the previous fix
+- Modified patch:
+  * openssl-OSSL_LIB_CTX.patch
+    + rediff
+
+-------------------------------------------------------------------
+Wed May  7 06:25:42 UTC 2025 - Simon Lees <sflees@suse.de>
+
+- export CMAKE_POLICY_VERSION_MINIMUM="3.5" to ignore cmakes
+  minimum version warnings
+
+-------------------------------------------------------------------
+Tue Feb 18 15:58:18 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * openj9-nasm-noexecstack.patch
+    + fix wrong execstack flag in libj9jit (bsc#1235844)
+
+-------------------------------------------------------------------
+Fri Feb  7 08:37:23 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Update to OpenJDK 11.0.26 with OpenJ9 0.49.0 virtual machine
+- Including Oracle October 2024 and January 2025 CPU changes
+  * CVE-2024-21208 (bsc#1231702), CVE-2024-21210 (bsc#1231711),
+    CVE-2024-21217 (bsc#1231716), CVE-2024-21235 (bsc#1231719),
+    CVE-2025-21502 (bsc#1236278)
+  * OpenJ9 changes, see 
+    https://www.eclipse.org/openj9/docs/version0.49/
+- Added patch:
+  * openssl-OSSL_LIB_CTX.patch
+    + allow building with openssl < 3
+
+-------------------------------------------------------------------
+Wed Feb  5 12:23:28 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+-  removed unneeded xorg-x11-proto-devel BuildRequires (bsc#1236804)
+
 -------------------------------------------------------------------
 Tue Aug  6 08:09:09 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
@@ -20,6 +154,8 @@ Thu May 23 17:35:17 UTC 2024 - Fridrich Strba <fstrba@suse.com>
   * CVE-2024-21012 (bsc#1222987), CVE-2024-21094 (bsc#1222986),
     CVE-2024-21011 (bsc#1222979), CVE-2024-21085 (bsc#1222984),
     CVE-2024-21068 (bsc#1222983)
+- Including OpenJ9/OMR specific fix:
+  * CVE-2024-3933 (bsc#1225470)
   * OpenJ9 changes, see 
     https://www.eclipse.org/openj9/docs/version0.44/
 - Added patch:

java-11-openj9.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package java-11-openj9
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2026 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,19 +30,19 @@
 # Standard JPackage naming and versioning defines.
 %global featurever      11
 %global interimver      0
-%global updatever       24
+%global updatever       30
 %global patchver        0
-%global buildver        8
-%global root_repository https://github.com/ibmruntimes/openj9-openjdk-jdk11/archive
-%global root_revision   30b62e68b859d4a716ae799da0711722efed53de
-%global root_branch     v0.46.0-release
+%global buildver        7
+%global root_repository https://github.com/ibmruntimes/openj9-openjdk-jdk%{featurever}/archive
+%global root_revision   8f9a3ed0a8d1489ec59b8d954464e0f41a9d9785
+%global root_branch     v0.57.0-release
 %global omr_repository  https://github.com/eclipse/openj9-omr/archive
-%global omr_revision    840a9adba4548aa546e36c97a1150b7306a7e07b
-%global omr_branch      v0.46.0-release
+%global omr_revision    c8ee95c0c729ac0c0cb3a46a6fde45f0d0b8cc0d
+%global omr_branch      v0.57.0-release
 %global openj9_repository https://github.com/eclipse/openj9/archive
-%global openj9_revision 1a6f6128aa2f639de1e33cae77a31f474ba6b1a9
-%global openj9_branch   v0.46.0-release
-%global openj9_tag      openj9-0.46.0
+%global openj9_revision f0754f410244ad2c42b07c5fe76983a3c7b61e87
+%global openj9_branch   v0.57.0-release
+%global openj9_tag      openj9-0.57.0
 # priority must be 6 digits in total
 %global priority        2101
 %global javaver         %{featurever}
@@ -59,12 +59,13 @@
 %global cacerts  %{_jvmdir}/%{sdkdir}/lib/security/cacerts
 # real file made by update-ca-certificates
 %global javacacerts %{_var}/lib/ca-certificates/java-cacerts
-%global bootcycle 0
+%global bootcycle 1
 %if %{debug}
 %global debugbuild slowdebug
 %else
 %global debugbuild release
 %endif
+%global docsdir build/%{debugbuild}/images
 %if %{bootcycle}
 %global imagesdir build/%{debugbuild}/bootcycle-build/images
 %global imagestarget bootcycle-images
@@ -76,6 +77,9 @@
 # Turn on/off some features
 %global with_system_pcsc 1
 %global with_system_harfbuzz 1
+%if 0%{?gcc_version} < 7
+%define with_gcc 7
+%endif
 Name:           java-%{featurever}-openj9
 Version:        %{featurever}.%{interimver}.%{updatever}.%{patchver}
 Release:        0
@@ -94,30 +98,28 @@ Source14:       TestCryptoLevel.java
 # Ensure ECDSA is working
 Source15:       TestECDSA.java
 Source100:      openj9-nogit.patch.in
-Source1000:     %{name}-rpmlintrc
 # Restrict access to java-atk-wrapper classes
-Patch3:         java-atk-wrapper-security.patch
-# Allow building with newer libdwarf
-Patch4:         libdwarf-fix.patch
+Patch1:         java-atk-wrapper-security.patch
 # Allow multiple initialization of PKCS11 libraries
-Patch5:         multiple-pkcs11-library-init.patch
+Patch2:         multiple-pkcs11-library-init.patch
 # Fix build with older openssl
-Patch7:         openj9-openssl.patch
+Patch3:         openssl-OSSL_LIB_CTX.patch
+Patch4:         openj9-openssl.patch
 # Fix: implicit-pointer-decl
-Patch13:        implicit-pointer-decl.patch
+Patch5:         implicit-pointer-decl.patch
 #
-Patch15:        system-pcsclite.patch
+Patch10:        system-pcsclite.patch
 #
 Patch20:        loadAssistiveTechnologies.patch
 #
 Patch30:        JDK-8208602.patch
 Patch31:        aarch64.patch
-#
-Patch32:        stringop-overflow.patch
+Patch32:        reproducible-version.patch
 #
 # OpenJDK specific patches
 #
-Patch302:       disable-doclint-by-default.patch
+Patch300:       disable-doclint-by-default.patch
+#
 BuildRequires:  alsa-lib-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -129,6 +131,8 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  fontconfig-devel
 BuildRequires:  freetype2-devel
+BuildRequires:  gcc%{?with_gcc}
+BuildRequires:  gcc%{?with_gcc}-c++
 BuildRequires:  giflib-devel
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  java-ca-certificates
@@ -151,8 +155,6 @@ BuildRequires:  nasm
 BuildRequires:  openssl-devel
 BuildRequires:  pkgconfig
 BuildRequires:  unzip
-BuildRequires:  update-desktop-files
-BuildRequires:  xorg-x11-proto-devel
 BuildRequires:  xprop
 BuildRequires:  zip
 # Requires rest of java
@@ -198,13 +200,6 @@ Provides:       jre1.7.x
 Provides:       jre1.8.x
 Provides:       jre1.9.x
 ExclusiveArch:  x86_64 ppc64le s390x aarch64
-%if 0%{?suse_version} < 1500
-BuildRequires:  gcc7
-BuildRequires:  gcc7-c++
-%else
-BuildRequires:  gcc >= 7
-BuildRequires:  gcc-c++ >= 7
-%endif
 %if %{bootcycle}
 BuildRequires:  java-devel >= 10
 BuildConflicts: java-devel >= 12
@@ -330,7 +325,7 @@ BuildArch:      noarch
 The OpenJDK %{featurever} API documentation.
 
 %prep
-%setup -q -n openj9-openjdk-jdk11-%{root_revision} -a 1 -a 2
+%setup -q -n openj9-openjdk-jdk%{featurever}-%{root_revision} -a 1 -a 2
 
 # Set up the build tree using the subrepository tarballs
 pwd
@@ -347,14 +342,14 @@ rm -rvf src/java.desktop/share/native/libsplashscreen/giflib
 rm -rvf src/java.desktop/share/native/liblcms/cms*
 rm -rvf src/java.desktop/share/native/liblcms/lcms2*
 
+%patch -P 1 -p1
+%patch -P 2 -p1
 %patch -P 3 -p1
 %patch -P 4 -p1
 %patch -P 5 -p1
-%patch -P 7 -p1
-%patch -P 13 -p1
 
 %if %{with_system_pcsc}
-%patch -P 15 -p1
+%patch -P 10 -p1
 %endif
 
 %patch -P 20 -p1
@@ -363,7 +358,7 @@ rm -rvf src/java.desktop/share/native/liblcms/lcms2*
 %patch -P 31 -p1
 %patch -P 32 -p1
 
-%patch -P 302 -p1
+%patch -P 300 -p1
 
 cat %{SOURCE100} \
     | sed "s/@OPENJ9_SHA@/`expr substr '%{openj9_revision}' 1 7`/g" \
@@ -384,9 +379,12 @@ for file in %{SOURCE11} ; do
 done
 
 %build
+# Remove cmake4 error due to not setting
+# min cmake version - sflees.de
+export CMAKE_POLICY_VERSION_MINIMUM=3.5
 export ARCH_DATA_MODEL=64
 
-EXTRA_CFLAGS="-Wno-error -Wno-maybe-uninitialized -fno-delete-null-pointer-checks -fno-lifetime-dse"
+EXTRA_CFLAGS="-Wno-error -Wno-maybe-uninitialized -std=gnu99 -fno-delete-null-pointer-checks -fno-lifetime-dse"
 EXTRA_CPP_FLAGS="-Wno-error -Wno-maybe-uninitialized -std=gnu++98 -fno-delete-null-pointer-checks -fno-lifetime-dse"
 
 %ifarch ppc64le
@@ -394,18 +392,21 @@ EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-strict-aliasing"
 %endif
 
 bash configure \
-%if 0%{?suse_version} < 1500
-    CPP=cpp-7 \
-    CXX=g++-7 \
-    CC=gcc-7 \
-    NM=gcc-nm-7 \
+%if 0%{?with_gcc}
+    CPP=cpp-%{with_gcc} \
+    CXX=g++-%{with_gcc} \
+    CC=gcc-%{with_gcc} \
+    NM=gcc-nm-%{with_gcc} \
 %endif
+    --with-extra-cflags="$EXTRA_CFLAGS" \
+    --with-extra-cxxflags="$EXTRA_CPP_FLAGS" \
     --with-version-pre="" \
-    --with-version-opt="suse-%{release}-%{_arch}" \
+    --with-version-opt="suse-0%{?suse_version}-%{_arch}" \
     --disable-warnings-as-errors \
     --disable-warnings-as-errors-omr \
     --disable-warnings-as-errors-openj9 \
     --disable-keep-packaged-modules \
+    --enable-jfr \
     --with-debug-level=%{debugbuild} \
     --with-conf-name=%{debugbuild} \
     --with-zlib=system \
@@ -503,6 +504,10 @@ pushd %{imagesdir}
   # Install jmods
   cp -a jmods %{buildroot}%{_jvmdir}/%{sdkdir}
 
+popd
+
+pushd %{docsdir}
+
 # Install Javadoc documentation.
 install -d -m 755 %{buildroot}%{_javadocdir}
 cp -a docs %{buildroot}%{_javadocdir}/%{sdklnk}
@@ -520,7 +525,6 @@ done
 install -d -m 0755 %{buildroot}%{_datadir}/{applications,pixmaps}
 install -d -m 0755 %{buildroot}/%{_jvmdir}/%{sdkdir}/lib/desktop/
 install -m 0644 jconsole.desktop %{buildroot}/%{_jvmdir}/%{sdkdir}/lib/desktop/
-%suse_update_desktop_file %{buildroot}/%{_jvmdir}/%{sdkdir}/lib/desktop/jconsole.desktop
 
 # Find demo directories.
 find %{buildroot}%{_jvmdir}/%{sdkdir}/demo \
@@ -560,24 +564,18 @@ update-alternatives \
   --slave %{_jvmdir}/jre jre %{_jvmdir}/%{jrelnk} \
   --slave %{_bindir}/jjs jjs %{jrebindir}/jjs \
   --slave %{_bindir}/keytool keytool %{jrebindir}/keytool \
-  --slave %{_bindir}/pack200 pack200 %{jrebindir}/pack200 \
   --slave %{_bindir}/rmid rmid %{jrebindir}/rmid \
   --slave %{_bindir}/rmiregistry rmiregistry %{jrebindir}/rmiregistry \
-  --slave %{_bindir}/unpack200 unpack200 %{jrebindir}/unpack200 \
   --slave %{_mandir}/man1/java.1$ext java.1$ext \
   %{_mandir}/man1/java-%{sdklnk}.1$ext \
   --slave %{_mandir}/man1/jjs.1$ext jjs.1$ext \
   %{_mandir}/man1/jjs-%{sdklnk}.1$ext \
   --slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \
   %{_mandir}/man1/keytool-%{sdklnk}.1$ext \
-  --slave %{_mandir}/man1/pack200.1$ext pack200.1$ext \
-  %{_mandir}/man1/pack200-%{sdklnk}.1$ext \
   --slave %{_mandir}/man1/rmid.1$ext rmid.1$ext \
   %{_mandir}/man1/rmid-%{sdklnk}.1$ext \
   --slave %{_mandir}/man1/rmiregistry.1$ext rmiregistry.1$ext \
   %{_mandir}/man1/rmiregistry-%{sdklnk}.1$ext \
-  --slave %{_mandir}/man1/unpack200.1$ext unpack200.1$ext \
-  %{_mandir}/man1/unpack200-%{sdklnk}.1$ext \
   || :
 
 update-alternatives \
@@ -736,6 +734,7 @@ fi
 %dir %{_jvmdir}/%{sdkdir}/lib/desktop
 %dir %{_jvmdir}/%{sdkdir}/lib/security
 %dir %{_jvmdir}/%{sdkdir}/lib/j9vm
+%dir %{_jvmdir}/%{sdkdir}/lib/jfr
 %dir %{_jvmdir}/%{sdkdir}/conf
 %dir %{_jvmdir}/%{sdkdir}/conf/security
 %dir %{_jvmdir}/%{sdkdir}/conf/security/policy
@@ -747,6 +746,7 @@ fi
 
 %{_jvmdir}/%{sdkdir}/release
 %{_jvmdir}/%{sdkdir}/bin/java
+%{_jvmdir}/%{sdkdir}/bin/jfr
 %{_jvmdir}/%{sdkdir}/bin/jitserver
 %{_jvmdir}/%{sdkdir}/bin/jjs
 %{_jvmdir}/%{sdkdir}/bin/keytool
@@ -801,6 +801,8 @@ fi
 %{_jvmdir}/%{sdkdir}/lib/java*.properties
 %{_jvmdir}/%{sdkdir}/lib/jexec
 %{_jvmdir}/%{sdkdir}/lib/jli/libjli.so
+%{_jvmdir}/%{sdkdir}/lib/jfr/default.jfc
+%{_jvmdir}/%{sdkdir}/lib/jfr/profile.jfc
 %{_jvmdir}/%{sdkdir}/lib/jrt-fs.jar
 %{_jvmdir}/%{sdkdir}/lib/jspawnhelper
 %{_jvmdir}/%{sdkdir}/lib/jvm.cfg
@@ -837,11 +839,13 @@ fi
 %{_jvmdir}/%{sdkdir}/lib/libunpack.so
 %{_jvmdir}/%{sdkdir}/lib/libverify.so
 %{_jvmdir}/%{sdkdir}/lib/libzip.so
+%{_jvmdir}/%{sdkdir}/lib/metadata.blob
 %{_jvmdir}/%{sdkdir}/lib/modules
 #%{_jvmdir}/%{sdkdir}/lib/openj9-notices.html
 %{_jvmdir}/%{sdkdir}/lib/options.default
 %{_jvmdir}/%{sdkdir}/lib/psfontj2d.properties
 %{_jvmdir}/%{sdkdir}/lib/psfont.properties.ja
+%{_jvmdir}/%{sdkdir}/lib/schema.xsd
 %{_jvmdir}/%{sdkdir}/lib/tzdb.dat
 %{_jvmdir}/%{sdkdir}/lib/*/libjsig.so
 %{_jvmdir}/%{sdkdir}/lib/*/libjvm.so

libdwarf-fix.patch

@@ -1,85 +0,0 @@
---- a/omr/ddr/lib/ddr-scanner/dwarf/DwarfScanner.cpp
-+++ b/omr/ddr/lib/ddr-scanner/dwarf/DwarfScanner.cpp
-@@ -1497,6 +1497,13 @@ DwarfScanner::traverse_cu_in_debug_section(Symbol_IR *ir)
- 	Dwarf_Half addressSize = 0;
- 	Dwarf_Unsigned nextCUheader = 0;
- 	Dwarf_Error error = NULL;
-+#ifdef DW_LIBDWARF_VERSION_MAJOR
-+	Dwarf_Half lengthSize = 0;
-+	Dwarf_Half extensionSize = 0;
-+	Dwarf_Sig8 typeSignature;
-+	Dwarf_Unsigned typeOffset = 0;
-+	Dwarf_Half nextCUheaderType = 0;
-+#endif
- 
- 	/* Go over each cu header. */
- 	while (DDR_RC_OK == rc) {
-@@ -1504,7 +1511,11 @@ DwarfScanner::traverse_cu_in_debug_section(Symbol_IR *ir)
- 		_typeOffsetMap.clear();
- 		_ir = &newIR;
- 
-+#ifdef DW_LIBDWARF_VERSION_MAJOR
-+		int ret = dwarf_next_cu_header_d(_debug, true, &cuHeaderLength, &versionStamp, &abbrevOffset, &addressSize, &lengthSize, &extensionSize, &typeSignature, &typeOffset, &nextCUheader, &nextCUheaderType, &error);
-+#else
- 		int ret = dwarf_next_cu_header(_debug, &cuHeaderLength, &versionStamp, &abbrevOffset, &addressSize, &nextCUheader, &error);
-+#endif
- 		if (DW_DLV_ERROR == ret) {
- 			ERRMSG("Failed to get next dwarf CU header.");
- 			rc = DDR_RC_ERROR;
-@@ -1518,7 +1529,11 @@ DwarfScanner::traverse_cu_in_debug_section(Symbol_IR *ir)
- 		Dwarf_Die childDie = NULL;
- 
- 		/* Expect the CU to have a single sibling - a DIE */
-+#ifdef DW_LIBDWARF_VERSION_MAJOR
-+		if (DW_DLV_ERROR == dwarf_siblingof_b(_debug, NULL, true, &cuDie, &error)) {
-+#else
- 		if (DW_DLV_ERROR == dwarf_siblingof(_debug, NULL, &cuDie, &error)) {
-+#endif
- 			ERRMSG("Getting sibling of CU: %s\n", dwarf_errmsg(error));
- 			rc = DDR_RC_ERROR;
- 			break;
-@@ -1617,12 +1632,20 @@ DwarfScanner::scanFile(OMRPortLibrary *portLibrary, Symbol_IR *ir, const char *f
- 	}
- 
- 	if (DDR_RC_OK == rc) {
-+#ifdef DW_LIBDWARF_VERSION_MAJOR
-+		unsigned int groupNumber = DW_GROUPNUMBER_ANY;
-+#else
- 		Dwarf_Unsigned access = DW_DLC_READ;
-+#endif
- 		Dwarf_Handler errhand = 0;
- 		Dwarf_Ptr errarg = NULL;
- 		intptr_t native_fd = omrfile_convert_omrfile_fd_to_native_fd(fd);
- 		DwarfScanner::scanFileName = filepath;
-+#ifdef DW_LIBDWARF_VERSION_MAJOR
-+		res = dwarf_init_b((int)native_fd, groupNumber, errhand, errarg, &_debug, &error);
-+#else
- 		res = dwarf_init((int)native_fd, access, errhand, errarg, &_debug, &error);
-+#endif
- 		if (DW_DLV_OK != res) {
- 			ERRMSG("Failed to initialize libDwarf scanning %s: %s\nExiting...\n", filepath, dwarf_errmsg(error));
- 			if (NULL != error) {
-@@ -1640,7 +1663,11 @@ DwarfScanner::scanFile(OMRPortLibrary *portLibrary, Symbol_IR *ir, const char *f
- 
- 		DEBUGPRINTF("Unloading libDwarf");
- 
-+#ifdef DW_LIBDWARF_VERSION_MAJOR
-+		res = dwarf_finish(_debug);
-+#else
- 		res = dwarf_finish(_debug, &error);
-+#endif
- 		if (DW_DLV_OK != res) {
- 			ERRMSG("Failed to Unload libDwarf: %s\nExiting...\n", dwarf_errmsg(error));
- 			if (NULL != error) {
-@@ -1681,7 +1708,11 @@ DwarfScanner::getNextSibling(Dwarf_Die *die)
- 	Dwarf_Error err = NULL;
- 
- 	/* Get the next sibling and free the previous one if successful. */
-+#ifdef DW_LIBDWARF_VERSION_MAJOR
-+	int ret = dwarf_siblingof_b(_debug, *die, true, &nextSibling, &err);
-+#else
- 	int ret = dwarf_siblingof(_debug, *die, &nextSibling, &err);
-+#endif
- 	if (DW_DLV_ERROR == ret) {
- 		ERRMSG("Getting sibling of die:%s\n", dwarf_errmsg(err));
- 	} else if (DW_DLV_OK == ret) {

openj9-no-narrowing.patch

@@ -1,21 +0,0 @@
---- a/openj9/runtime/compiler/env/j9methodServer.cpp
-+++ b/openj9/runtime/compiler/env/j9methodServer.cpp
-@@ -2634,7 +2634,7 @@ TR_ResolvedRelocatableJ9JITServerMethod::validateMethodFieldAttributes(const TR_
-    return equal;
-    }
- 
--TR_J9ServerMethod::TR_J9ServerMethod(TR_FrontEnd * fe, TR_Memory * trMemory, J9Class * aClazz, uintptr_t cpIndex)
-+TR_J9ServerMethod::TR_J9ServerMethod(TR_FrontEnd * fe, TR_Memory * trMemory, J9Class * aClazz, int32_t cpIndex)
-    : TR_J9Method()
-    {
-    TR_ASSERT(cpIndex != -1, "cpIndex shouldn't be -1");
---- a/openj9/runtime/compiler/env/j9methodServer.hpp
-+++ b/openj9/runtime/compiler/env/j9methodServer.hpp
-@@ -326,6 +326,6 @@ protected:
- class TR_J9ServerMethod : public TR_J9Method
-    {
- public:
--   TR_J9ServerMethod(TR_FrontEnd *trvm, TR_Memory *, J9Class * aClazz, uintptr_t cpIndex);
-+   TR_J9ServerMethod(TR_FrontEnd *trvm, TR_Memory *, J9Class * aClazz, int32_t cpIndex);
-    };
- #endif // J9METHODSERVER_H

openj9-nogit.patch.in

@@ -1,6 +1,6 @@
 --- a/closed/OpenJ9.gmk
 +++ b/closed/OpenJ9.gmk
-@@ -40,11 +40,11 @@ VersionPairs :=
+@@ -38,11 +38,11 @@ VersionPairs :=
  # ----------
  # $1 - repository display name
  # $2 - variable name
@@ -14,7 +14,7 @@
    ifneq (,$$($2))
      VersionLabelWidth := $(shell $(ECHO) "$1" | $(AWK) "{ width = length; print (width > $(VersionLabelWidth) ? width : $(VersionLabelWidth)) }")
      VersionPairs += "$1" "$$($2)"
-@@ -60,17 +60,16 @@ define ShowVersions
+@@ -58,18 +58,18 @@ define ShowVersions
  	@$(PRINTF) "    %-$(VersionLabelWidth)s - %s\n" $(VersionPairs)
  endef # ShowVersions
  
@@ -25,6 +25,8 @@
 +$(call GetVersion, openjdk,  OPENJDK_SHA,   @OPENJDK_SHA@,  required)
 +$(call GetVersion, openj9,   OPENJ9_SHA,    @OPENJ9_SHA@,   required)
 +$(call GetVersion, omr,      OPENJ9OMR_SHA, @OPENJ9OMR_SHA@, required)
++$(call GetVersion, openssl,  OPENSSL_SHA,   @OPENSSL_SHA@ )
+ $(call GetVersion, vendor,   VENDOR_SHA,    $(VENDOR_TOPDIR))
  
  # Find OpenJ9 tag associated with current commit (suppressing stderr in case there is no such tag).
 -OPENJ9_TAG := $(shell $(GIT) -C $(OPENJ9_TOPDIR) describe --exact-match HEAD 2>/dev/null)
@@ -37,18 +39,3 @@
    ifeq (,$(OPENJ9_BRANCH))
      $(error Could not determine OpenJ9 branch)
    endif
---- a/closed/custom/ReleaseFile.gmk
-+++ b/closed/custom/ReleaseFile.gmk
-@@ -18,9 +18,9 @@
- # 2 along with this work; if not, see <http://www.gnu.org/licenses/>.
- # ===========================================================================
- 
--SOURCE_REVISION := OpenJDK:$(shell $(GIT) -C $(TOPDIR) rev-parse --short HEAD)
--SOURCE_REVISION += OpenJ9:$(shell $(GIT) -C $(OPENJ9_TOPDIR) rev-parse --short HEAD)
--SOURCE_REVISION += OMR:$(shell $(GIT) -C $(OPENJ9OMR_TOPDIR) rev-parse --short HEAD)
-+SOURCE_REVISION := OpenJDK:@OPENJ9_SHA@
-+SOURCE_REVISION += OpenJ9:@OPENJ9_SHA@
-+SOURCE_REVISION += OMR:@OPENJ9OMR_SHA@
- ifeq (true,$(BUILD_OPENJCEPLUS))
-   SOURCE_REVISION += OpenJCEPlus:$(shell $(GIT) -C $(OPENJCEPLUS_TOPDIR) rev-parse --short HEAD)
- endif

openssl-OSSL_LIB_CTX.patch

@@ -0,0 +1,13 @@
+--- a/closed/src/java.base/share/native/libjncrypto/NativeCrypto.c
++++ b/closed/src/java.base/share/native/libjncrypto/NativeCrypto.c
+@@ -77,6 +77,10 @@
+ # include <pthread.h>
+ #endif /* defined(WINDOWS) */
+ 
++#if OPENSSL_VERSION_MAJOR < 3
++typedef struct ossl_lib_ctx_st OSSL_LIB_CTX;
++#endif
++
+ /* Header for NativeCrypto loading methods. */
+ static void * find_crypto_symbol(void *handle, const char *symname);
+ static void * find_crypto_library(jboolean traceEnabled, jboolean skipBundled, const char *chomepath);

reproducible-version.patch

@@ -0,0 +1,11 @@
+--- a/omr/tools/compiler/scripts/generateVersion.pl
++++ b/omr/tools/compiler/scripts/generateVersion.pl
+@@ -39,7 +39,7 @@ if (defined $ENV{"TR_BUILD_NAME"}) {
+     # FIXME: try to include a workspace name too
+     # Optionally, check if the user has defined $USER_TR_VERSION, and incorporate
+     # too.
+-    my $time = POSIX::strftime("%Y%m%d_%H%M", localtime($^T));
++    my $time = POSIX::strftime("%Y%m%d_%H%M", localtime($ENV{SOURCE_DATE_EPOCH} || $^T));
+     $snapshot_name = $rel . "_" . $time . "_" . $ENV{LOGNAME};
+ }
+ 

stringop-overflow.patch

@@ -1,20 +0,0 @@
-diff -urEbwB openj9-openjdk-jdk17.orig/omr/compiler/optimizer/OMRSimplifierHandlers.cpp openj9-openjdk-jdk17/omr/compiler/optimizer/OMRSimplifierHandlers.cpp
---- openj9-openjdk-jdk17.orig/omr/compiler/optimizer/OMRSimplifierHandlers.cpp	2023-03-28 09:18:57.979474249 +0200
-+++ openj9-openjdk-jdk17/omr/compiler/optimizer/OMRSimplifierHandlers.cpp	2023-03-28 09:49:47.316000333 +0200
-@@ -22,6 +22,9 @@
- #ifndef OMR_SIMPLIFIERHANDLERS_INCL
- #define OMR_SIMPLIFIERHANDLERS_INCL
- 
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wstringop-overflow"
-+
- #include "optimizer/OMRSimplifierHelpers.hpp"
- #include "optimizer/SimplifierHandlers.hpp"
- 
-@@ -17353,5 +17356,6 @@
-    return node;
-    }
- 
-+#pragma GCC diagnostic pop
- 
- #endif