From 20c29fc5f675b2ec4b8ff777145a6610b93cf6c14d9795cf9af873e8bcc677d6 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 23 May 2024 14:35:33 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-17-openj9?expand=0&rev=65 --- 254af5a0452934f62e3253c5565b183c682d3495.zip | 3 +++ 2aad089841f6f906d5953c7c0755a0de5d9ff2e0.zip | 3 --- 2c3d78b48adf36dbbef5852b95889da5a5ce1279.zip | 3 --- 5d7d758b682a0b0f3fd0ee54713abc8f749fc86d.zip | 3 +++ b0699311c7d9341f3d0ebf9a7a4b5546a7ca7004.zip | 3 +++ ea8124dbc1b625da6f607b66d2b657dce90c96c4.zip | 3 --- java-17-openj9.spec | 19 +++++++++---------- 7 files changed, 18 insertions(+), 19 deletions(-) create mode 100644 254af5a0452934f62e3253c5565b183c682d3495.zip delete mode 100644 2aad089841f6f906d5953c7c0755a0de5d9ff2e0.zip delete mode 100644 2c3d78b48adf36dbbef5852b95889da5a5ce1279.zip create mode 100644 5d7d758b682a0b0f3fd0ee54713abc8f749fc86d.zip create mode 100644 b0699311c7d9341f3d0ebf9a7a4b5546a7ca7004.zip delete mode 100644 ea8124dbc1b625da6f607b66d2b657dce90c96c4.zip diff --git a/254af5a0452934f62e3253c5565b183c682d3495.zip b/254af5a0452934f62e3253c5565b183c682d3495.zip new file mode 100644 index 0000000..ae29e3b --- /dev/null +++ b/254af5a0452934f62e3253c5565b183c682d3495.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c01a2db59226a198abd2c6eae857ab1028c91b616fbf80ade639aaec2e21021 +size 11151844 diff --git a/2aad089841f6f906d5953c7c0755a0de5d9ff2e0.zip b/2aad089841f6f906d5953c7c0755a0de5d9ff2e0.zip deleted file mode 100644 index ff53e56..0000000 --- a/2aad089841f6f906d5953c7c0755a0de5d9ff2e0.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1c0d67c648c03a42f341246ce59e36d6261e0d9ceda9dbe7669d7f1dcc00afd9 -size 169042914 diff --git a/2c3d78b48adf36dbbef5852b95889da5a5ce1279.zip b/2c3d78b48adf36dbbef5852b95889da5a5ce1279.zip deleted file mode 100644 index f5c9b23..0000000 --- a/2c3d78b48adf36dbbef5852b95889da5a5ce1279.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:362c7d81038da6a47944af999d90a752bb0537faa415e54c7fa8e500f4ef0476 -size 29046616 diff --git a/5d7d758b682a0b0f3fd0ee54713abc8f749fc86d.zip b/5d7d758b682a0b0f3fd0ee54713abc8f749fc86d.zip new file mode 100644 index 0000000..2a7037e --- /dev/null +++ b/5d7d758b682a0b0f3fd0ee54713abc8f749fc86d.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23b4784a86e39f6f11b08a701d30516ce600f18e8e7febd2d939f76a5f25b4d4 +size 169237014 diff --git a/b0699311c7d9341f3d0ebf9a7a4b5546a7ca7004.zip b/b0699311c7d9341f3d0ebf9a7a4b5546a7ca7004.zip new file mode 100644 index 0000000..e476b10 --- /dev/null +++ b/b0699311c7d9341f3d0ebf9a7a4b5546a7ca7004.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a44313209419f44cc293f1d08b545d81fd84672a0813d6e7d632a79b19cb0efa +size 29189918 diff --git a/ea8124dbc1b625da6f607b66d2b657dce90c96c4.zip b/ea8124dbc1b625da6f607b66d2b657dce90c96c4.zip deleted file mode 100644 index f1c5c8b..0000000 --- a/ea8124dbc1b625da6f607b66d2b657dce90c96c4.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c3a8bdda984f663ca9da0b966b2e3a810ea511617e4f451ea2afc8a3e53f93e4 -size 11118810 diff --git a/java-17-openj9.spec b/java-17-openj9.spec index 1368dab..8c2c53a 100644 --- a/java-17-openj9.spec +++ b/java-17-openj9.spec @@ -31,18 +31,18 @@ # Standard JPackage naming and versioning defines. %global featurever 17 %global interimver 0 -%global updatever 10 -%global buildver 7 +%global updatever 11 +%global buildver 9 %global root_repository https://github.com/ibmruntimes/openj9-openjdk-jdk17/archive -%global root_revision 2aad089841f6f906d5953c7c0755a0de5d9ff2e0 -%global root_branch v0.43.0-release +%global root_revision 5d7d758b682a0b0f3fd0ee54713abc8f749fc86d +%global root_branch v0.44.0-release %global omr_repository https://github.com/eclipse/openj9-omr/archive -%global omr_revision ea8124dbc1b625da6f607b66d2b657dce90c96c4 -%global omr_branch v0.43.0-release +%global omr_revision 254af5a0452934f62e3253c5565b183c682d3495 +%global omr_branch v0.44.0-release %global openj9_repository https://github.com/eclipse/openj9/archive -%global openj9_revision 2c3d78b48adf36dbbef5852b95889da5a5ce1279 -%global openj9_branch v0.43.0-release -%global openj9_tag openj9-0.43.0 +%global openj9_revision b0699311c7d9341f3d0ebf9a7a4b5546a7ca7004 +%global openj9_branch v0.44.0-release +%global openj9_tag openj9-0.44.0 # priority must be 6 digits in total %if 0%{?suse_version} > 1500 || 0%{?java_bootstrap} %global priority 2701 @@ -780,7 +780,6 @@ fi %{_jvmdir}/%{sdkdir}/lib/OMRTraceFormat.dat %{_jvmdir}/%{sdkdir}/lib/default/j9ddr.dat %{_jvmdir}/%{sdkdir}/lib/default/libcuda4j29.so -%{_jvmdir}/%{sdkdir}/lib/default/libj9criu29.so %{_jvmdir}/%{sdkdir}/lib/default/libj9dmp29.so %{_jvmdir}/%{sdkdir}/lib/default/libj9gc29.so %{_jvmdir}/%{sdkdir}/lib/default/libj9gcchk29.so From 5f6c91bcde4e304eecc289e2cc1a793afae87ba7b1162ce223a427c7fc7b0b2d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 23 May 2024 15:35:27 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-17-openj9?expand=0&rev=66 --- java-17-openj9.spec | 3 +++ openj9-openssl.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 openj9-openssl.patch diff --git a/java-17-openj9.spec b/java-17-openj9.spec index 8c2c53a..242a4bb 100644 --- a/java-17-openj9.spec +++ b/java-17-openj9.spec @@ -112,6 +112,8 @@ Patch4: libdwarf-fix.patch Patch5: multiple-pkcs11-library-init.patch # Fix narrowing conversion error Patch6: openj9-no-narrowing.patch +# Fix build with older version of openssl +Patch7: openj9-openssl.patch # Fix: implicit-pointer-decl Patch13: implicit-pointer-decl.patch # @@ -364,6 +366,7 @@ rm -rvf src/java.desktop/share/native/liblcms/lcms2* %patch -P 4 -p1 %patch -P 5 -p1 %patch -P 6 -p1 +%patch -P 7 -p1 %patch -P 13 -p1 %if %{with_system_pcsc} diff --git a/openj9-openssl.patch b/openj9-openssl.patch new file mode 100644 index 0000000..ee392f5 --- /dev/null +++ b/openj9-openssl.patch @@ -0,0 +1,13 @@ +--- a/openj9/runtime/compiler/runtime/Listener.cpp ++++ b/openj9/runtime/compiler/runtime/Listener.cpp +@@ -44,6 +44,10 @@ + #include "runtime/CompileService.hpp" + #include "runtime/Listener.hpp" + ++#ifndef SSL_R_UNEXPECTED_EOF_WHILE_READING ++#define SSL_R_UNEXPECTED_EOF_WHILE_READING 294 ++#endif ++ + static bool + handleOpenSSLConnectionError(int connfd, SSL *&ssl, BIO *&bio, const char *errMsg, int ret, TR::CompilationInfo *compInfo) + { From 9712d55d95d2c42bb1ffa245e64615c90767557a65367b4a15a6726c1143ce4f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 23 May 2024 17:46:33 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-17-openj9?expand=0&rev=67 --- java-17-openj9.changes | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/java-17-openj9.changes b/java-17-openj9.changes index 7fc04b3..c76f58a 100644 --- a/java-17-openj9.changes +++ b/java-17-openj9.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu May 23 17:42:26 UTC 2024 - Fridrich Strba + +- Update to OpenJDK 17.0.11 with OpenJ9 0.44.0 virtual machine +- Including Oracle April 2024 CPU changes + * CVE-2024-21012 (bsc#1222987), CVE-2024-21094 (bsc#1222986), + CVE-2024-21011 (bsc#1222979), CVE-2024-21068 (bsc#1222983) + * OpenJ9 changes, see + https://www.eclipse.org/openj9/docs/version0.44/ +- Added patch: + * openj9-openssl.patch + + fix build with older openssl that does not define + SSL_R_UNEXPECTED_EOF_WHILE_READING + ------------------------------------------------------------------- Thu Mar 7 12:44:28 UTC 2024 - Fridrich Strba