Accepting request 1176634 from Java:Factory

April 2024 security fixes

OBS-URL: https://build.opensuse.org/request/show/1176634
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/java-17-openj9?expand=0&rev=14
This commit is contained in:
Ana Guerrero 2024-05-24 17:52:41 +00:00 committed by Git OBS Bridge
commit 808be5f6a2
9 changed files with 48 additions and 19 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Thu May 23 17:42:26 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- 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 <fstrba@suse.com>

View File

@ -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
@ -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}
@ -780,7 +783,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

13
openj9-openssl.patch Normal file
View File

@ -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)
{