Accepting request 1176636 from Java:Factory

April 2024 security fixes

OBS-URL: https://build.opensuse.org/request/show/1176636
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/java-1_8_0-openj9?expand=0&rev=26

0fa9d9c53243b300211f1e7dabee29164552fe0b.zip

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

254af5a0452934f62e3253c5565b183c682d3495.zip

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

2c3d78b48adf36dbbef5852b95889da5a5ce1279.zip

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

3f438d726eabae33b2687e565530272909ff37ad.zip

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

alternative-path-to-tzdb_dat.patch

@@ -1,63 +0,0 @@
---- a/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java	2020-01-22 11:12:33.000000000 +0100
-+++ b/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java	2020-01-29 09:40:23.558260593 +0100
-@@ -31,6 +31,7 @@
- import java.io.DataInputStream;
- import java.io.File;
- import java.io.FileInputStream;
-+import java.io.InputStream;
- import java.io.IOException;
- import java.io.StreamCorruptedException;
- import java.security.AccessController;
-@@ -47,6 +48,7 @@
- import java.util.Map;
- import java.util.Map.Entry;
- import java.util.Objects;
-+import java.util.Properties;
- import java.util.Set;
- import java.util.SimpleTimeZone;
- import java.util.concurrent.ConcurrentHashMap;
-@@ -251,7 +253,15 @@
-         AccessController.doPrivileged(new PrivilegedAction<Object>() {
-             public Object run() {
-                 try {
--                    String libDir = System.getProperty("java.home") + File.separator + "lib";
-+                    final String homeDir = System.getProperty("java.home");
-+                    if (homeDir == null) {
-+                        throw new Error("java.home is not set");
-+                    }
-+                    String libDir = homeDir + File.separator + "lib";
-+                    String otherDir = getZoneInfoDir(libDir);
-+                    if (otherDir != null)
-+                        libDir = otherDir;
-+
-                     try (DataInputStream dis = new DataInputStream(
-                              new BufferedInputStream(new FileInputStream(
-                                  new File(libDir, "tzdb.dat"))))) {
-@@ -264,6 +274,27 @@
-             }
-         });
-     }
-+
-+    private static String getZoneInfoDir(final String libDir) {
-+        return AccessController.doPrivileged (new PrivilegedAction<String>() {
-+            public String run() {
-+                File f = new File(libDir + File.separator + "tz.properties");
-+                try (BufferedInputStream bin = new BufferedInputStream(new FileInputStream(f))) {
-+                    Properties props = new Properties();
-+                    props.load(bin);
-+                    String dir = props.getProperty("sun.zoneinfo.dir");
-+                    if (dir == null)
-+                        return null;
-+                    File tzdbdat = new File(dir, "tzdb.dat");
-+                    if (tzdbdat.exists())
-+                        return dir;
-+                    return null;
-+                } catch (Exception x) {
-+                    return null;
-+                }
-+            }
-+        });
-+    }
- 
-     private static void addOldMapping() {
-         for (String[] alias : oldMappings) {

b0699311c7d9341f3d0ebf9a7a4b5546a7ca7004.zip

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

ea8124dbc1b625da6f607b66d2b657dce90c96c4.zip

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

fix-build-with-gcc14.patch

@@ -0,0 +1,87 @@
+--- openjdk/jdk/src/share/bin/splashscreen_stubs.c
++++ openjdk/jdk/src/share/bin/splashscreen_stubs.c
+@@ -61,11 +61,11 @@ typedef char* (*SplashGetScaledImageName_t)(const char* fileName,
+ #define INVOKEV(name) _INVOKE(name, ,;)
+ 
+ int     DoSplashLoadMemory(void* pdata, int size) {
+-    INVOKE(SplashLoadMemory, NULL)(pdata, size);
++    INVOKE(SplashLoadMemory, 0)(pdata, size);
+ }
+ 
+ int     DoSplashLoadFile(const char* filename) {
+-    INVOKE(SplashLoadFile, NULL)(filename);
++    INVOKE(SplashLoadFile, 0)(filename);
+ }
+ 
+ void    DoSplashInit(void) {
+@@ -87,4 +87,4 @@ void    DoSplashSetScaleFactor(float scaleFactor) {
+ char*    DoSplashGetScaledImageName(const char* fileName, const char* jarName,
+                                     float* scaleFactor) {
+     INVOKE(SplashGetScaledImageName, NULL)(fileName, jarName, scaleFactor);
+-}
+\ No newline at end of file
++}
+--- openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
+@@ -2850,14 +2850,14 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage
+     pb = &data->pixelBuf;
+ 
+     if (setPixelBuffer(env, pb, buffer) == NOT_OK) {
+-        freeArray(scale, numBands);
++        freeArray((void**)scale, numBands);
+         return data->abortFlag;  // We already threw an out of memory exception
+     }
+ 
+     // Allocate a 1-scanline buffer
+     scanLinePtr = (JSAMPROW)malloc(scanLineSize);
+     if (scanLinePtr == NULL) {
+-        freeArray(scale, numBands);
++        freeArray((void**)scale, numBands);
+         JNU_ThrowByName( env,
+                          "java/lang/OutOfMemoryError",
+                          "Writing JPEG Stream");
+@@ -2879,7 +2879,7 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage
+             JNU_ThrowByName(env, "javax/imageio/IIOException", buffer);
+         }
+ 
+-        freeArray(scale, numBands);
++        freeArray((void**)scale, numBands);
+         free(scanLinePtr);
+         return data->abortFlag;
+     }
+@@ -2928,7 +2928,7 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage
+         (*env)->ReleaseIntArrayElements(env, QtableSelectors, qsels, JNI_ABORT);
+     }
+     if (!success) {
+-        freeArray(scale, numBands);
++        freeArray((void**)scale, numBands);
+         free(scanLinePtr);
+         return data->abortFlag;
+     }
+@@ -2949,7 +2949,7 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage
+     if (GET_ARRAYS(env, data,
+                    (const JOCTET **)(&dest->next_output_byte)) == NOT_OK) {
+         (*env)->ExceptionClear(env);
+-        freeArray(scale, numBands);
++        freeArray((void**)scale, numBands);
+         free(scanLinePtr);
+         JNU_ThrowByName(env,
+                         "javax/imageio/IIOException",
+@@ -2987,7 +2987,7 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage
+             scanData = (*env)->GetIntArrayElements(env, scanInfo, NULL);
+             if (scanData == NULL) {
+                 RELEASE_ARRAYS(env, data, (const JOCTET *)(dest->next_output_byte));
+-                freeArray(scale, numBands);
++                freeArray((void**)scale, numBands);
+                 free(scanLinePtr);
+                 return data->abortFlag;
+             }
+@@ -3086,7 +3086,7 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage
+         jpeg_abort((j_common_ptr)cinfo);
+     }
+ 
+-    freeArray(scale, numBands);
++    freeArray((void**)scale, numBands);
+     free(scanLinePtr);
+     RELEASE_ARRAYS(env, data, NULL);
+     return data->abortFlag;

java-1_8_0-openj9.changes

@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Thu May 23 17:21:33 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Update to OpenJDK 8u412 build 08 with OpenJ9 0.44.0 virtual
+  machine
+- Including Oracle April 2024 CPU changes
+  * CVE-2024-21094 (bsc#1222986), CVE-2024-21011 (bsc#1222979),
+    CVE-2024-21085 (bsc#1222984), CVE-2024-21068 (bsc#1222983)
+  * OpenJ9 changes, see
+    https://eclipse.dev/openj9/docs/version0.44
+- Added patch:
+  * openj9-openssl.patch
+    + fix build with older openssl that does not define
+      SSL_R_UNEXPECTED_EOF_WHILE_READING
+
+-------------------------------------------------------------------
+Mon May  6 17:41:21 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * fix-build-with-gcc14.patch
+    + fix build with gcc14
+    + pointer/integer type precision
+
+-------------------------------------------------------------------
+Thu Mar  7 12:44:28 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Removed patch:
+  * alternative-path-to-tzdb_dat.patch
+    + Remove the possibility to use the system timezone-java. It
+      creates more problems then it solves (bsc#1213470)
+
+-------------------------------------------------------------------
+Tue Feb 20 15:43:24 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use %patch -P N instead of deprecated %patchN.
+
 -------------------------------------------------------------------
 Mon Feb 12 16:01:06 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

java-1_8_0-openj9.spec

@@ -28,18 +28,18 @@
 %global abs2rel perl -e %{script}
 %global syslibdir       %{_libdir}
 # Standard JPackage naming and versioning defines.
-%global updatever       402
-%global buildver        b06
+%global updatever       412
+%global buildver        b08
 %global root_repository https://github.com/ibmruntimes/openj9-openjdk-jdk8/archive
-%global root_revision   0fa9d9c53243b300211f1e7dabee29164552fe0b
-%global root_branch     v0.43.0-release
+%global root_revision   3f438d726eabae33b2687e565530272909ff37ad
+%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
 %global priority        1801
 %global javaver         1.8.0
@@ -115,13 +115,15 @@ Patch4:         libdwarf-fix.patch
 # Fix narrowing conversion error
 Patch5:         openj9-no-narrowing.patch
 # Fix build with gcc 13
-Patch32:        stringop-overflow.patch
+Patch31:        stringop-overflow.patch
+# Fix build with gcc 14
+Patch32:        fix-build-with-gcc14.patch
 # Patches for system libraries
 Patch201:       system-libjpeg.patch
 Patch202:       system-libpng.patch
 Patch203:       system-lcms.patch
 Patch210:       openj9-no-werror.patch
-Patch300:       alternative-path-to-tzdb_dat.patch
+Patch211:       openj9-openssl.patch
 BuildRequires:  alsa-lib-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -227,7 +229,6 @@ Requires:       jpackage-utils
 Requires(post): update-alternatives
 # Postun requires update-alternatives to uninstall tool update-alternatives.
 Requires(postun): update-alternatives
-Recommends:     tzdata-java8
 # Standard JPackage base provides.
 Provides:       java-%{javaver}-headless = %{version}-%{release}
 Provides:       java-headless = %{javaver}
@@ -348,21 +349,21 @@ rm -rvf jdk/src/share/native/sun/awt/giflib
 rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/cms*
 rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
 
-%patch201 -p1
-%patch202 -p1
-%patch203 -p1
+%patch -P 201 -p1
+%patch -P 202 -p1
+%patch -P 203 -p1
 
-%patch210
+%patch -P 210
+%patch -P 211 -p1
 
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%patch -P 1 -p1
+%patch -P 2 -p1
+%patch -P 3 -p1
+%patch -P 4 -p1
+%patch -P 5 -p1
 
-%patch32 -p1
-
-%patch300 -p1
+%patch -P 31 -p1
+%patch -P 32 -p1
 
 cat %{SOURCE100} \
     | sed "s/@OPENJ9_SHA@/`expr substr '%{openj9_revision}' 1 7`/g" \
@@ -439,9 +440,6 @@ find %{imagesdir}/j2sdk-image -iname '*.debuginfo' -exec rm {} \;
 
 export JAVA_HOME=$(pwd)/%{imagesdir}/j2sdk-image
 
-# Copy tz.properties
-echo "sun.zoneinfo.dir=%{_datadir}/javazi" >> $JAVA_HOME/jre/lib/tz.properties
-
 # cacerts are generated in runtime in openSUSE
 if [ -f %{imagesdir}/j2sdk-image/jre/lib/security/cacerts ]; then
         rm %{imagesdir}/j2sdk-image/jre/lib/security/cacerts

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