diff --git a/461bf3c70bd87f1bc8422214cdb5c6c3a0ae4ff1.zip b/461bf3c70bd87f1bc8422214cdb5c6c3a0ae4ff1.zip new file mode 100644 index 0000000..536d099 --- /dev/null +++ b/461bf3c70bd87f1bc8422214cdb5c6c3a0ae4ff1.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1768342a83cf4178cabe156979687c4100195dd7c9da140f7e201bd232eaa14 +size 29079664 diff --git a/5eee6ad9d0969d938892cd186056ae66912c7a61.zip b/5eee6ad9d0969d938892cd186056ae66912c7a61.zip new file mode 100644 index 0000000..867259a --- /dev/null +++ b/5eee6ad9d0969d938892cd186056ae66912c7a61.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:76e32d13b55d19a59ef19b5a23c68973a134cc6955b579fc88e78eea7ff7640a +size 11108342 diff --git a/b73cbdd342820514352b3a14d6d58fdb4d570a45.zip b/b73cbdd342820514352b3a14d6d58fdb4d570a45.zip new file mode 100644 index 0000000..6e1519f --- /dev/null +++ b/b73cbdd342820514352b3a14d6d58fdb4d570a45.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e66b818ca090a508ff971d52e1c23866f4eef55e24c9d77a606a7c39dfc4487a +size 132891225 diff --git a/c4d2c2bafb3f2fc681c2b94ec3ffc426e93bb9d6.zip b/c4d2c2bafb3f2fc681c2b94ec3ffc426e93bb9d6.zip deleted file mode 100644 index 9eb587e..0000000 --- a/c4d2c2bafb3f2fc681c2b94ec3ffc426e93bb9d6.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:27aa3b82569c0e3fc347c263f151f69bd2b6a7fc83f4f06c24ee96b2fc5f6228 -size 132852940 diff --git a/d12d10c9ea2de2cf363095e609536ffe451bd25f.zip b/d12d10c9ea2de2cf363095e609536ffe451bd25f.zip deleted file mode 100644 index 03bfceb..0000000 --- a/d12d10c9ea2de2cf363095e609536ffe451bd25f.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb0732120798ec4b83139cb7567aa9547cb03c046e4d4ccfd30d0c153a07a220 -size 29039092 diff --git a/e80bff83b7fda8875071d89de7c73184d847085d.zip b/e80bff83b7fda8875071d89de7c73184d847085d.zip deleted file mode 100644 index 79170b3..0000000 --- a/e80bff83b7fda8875071d89de7c73184d847085d.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f3e7e7e10b60c25a8ae52a2dbc6c57812d68f9196c527332b509a0acbe1d03ab -size 11073241 diff --git a/java-1_8_0-openj9.changes b/java-1_8_0-openj9.changes index 173ffac..1fda043 100644 --- a/java-1_8_0-openj9.changes +++ b/java-1_8_0-openj9.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Nov 22 18:19:11 UTC 2023 - Fridrich Strba + +- Update to OpenJDK 8u392 build 08 with OpenJ9 0.41.0 virtual + machine +- Including Oracle October 2023 CPU changes + * CVE-2023-22067 (bsc#1216379), CVE-2023-22081 (bsc#1216374) +- Including Openj9 0.41.0 fixes of CVE-2023-5676, bsc#1217214 + * For other OpenJ9 changes, see + https://www.eclipse.org/openj9/docs/version0.41 +- Removed patch: + * link-with-as-needed.patch + + big part not needed anymore besides one hunk integrated into + system-libjpeg.patch +- Modified patch: + * system-libjpeg.patch + + rediff and integrate one hunk from link-with-as-needed.patch + ------------------------------------------------------------------- Tue Aug 15 07:06:29 UTC 2023 - Fridrich Strba diff --git a/java-1_8_0-openj9.spec b/java-1_8_0-openj9.spec index 2ab28ea..62eef80 100644 --- a/java-1_8_0-openj9.spec +++ b/java-1_8_0-openj9.spec @@ -26,18 +26,18 @@ %global abs2rel perl -e %{script} %global syslibdir %{_libdir} # Standard JPackage naming and versioning defines. -%global updatever 382 -%global buildver b05 +%global updatever 392 +%global buildver b08 %global root_repository https://github.com/ibmruntimes/openj9-openjdk-jdk8/archive -%global root_revision c4d2c2bafb3f2fc681c2b94ec3ffc426e93bb9d6 -%global root_branch v0.40.0-release +%global root_revision b73cbdd342820514352b3a14d6d58fdb4d570a45 +%global root_branch v0.41.0-release %global omr_repository https://github.com/eclipse/openj9-omr/archive -%global omr_revision e80bff83b7fda8875071d89de7c73184d847085d -%global omr_branch v0.40.0-release +%global omr_revision 5eee6ad9d0969d938892cd186056ae66912c7a61 +%global omr_branch v0.41.0-release %global openj9_repository https://github.com/eclipse/openj9/archive -%global openj9_revision d12d10c9ea2de2cf363095e609536ffe451bd25f -%global openj9_branch v0.40.0-release -%global openj9_tag openj9-0.40.0 +%global openj9_revision 461bf3c70bd87f1bc8422214cdb5c6c3a0ae4ff1 +%global openj9_branch v0.41.0-release +%global openj9_tag openj9-0.41.0 # priority must be 6 digits in total %global priority 1801 %global javaver 1.8.0 @@ -120,7 +120,6 @@ Patch32: stringop-overflow.patch Patch201: system-libjpeg.patch Patch202: system-libpng.patch Patch203: system-lcms.patch -Patch205: link-with-as-needed.patch Patch210: openj9-no-werror.patch Patch300: alternative-path-to-tzdb_dat.patch BuildRequires: alsa-lib-devel @@ -352,7 +351,6 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2* %patch201 -p1 %patch202 -p1 %patch203 -p1 -%patch205 -p1 %patch210 diff --git a/link-with-as-needed.patch b/link-with-as-needed.patch deleted file mode 100644 index 7e9a9be..0000000 --- a/link-with-as-needed.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- jdk8/jdk/make/CompileLaunchers.gmk 2014-09-26 08:53:47.340118668 +0200 -+++ jdk8/jdk/make/CompileLaunchers.gmk 2014-09-26 08:54:18.702392301 +0200 -@@ -504,7 +504,7 @@ - # binary (at least on linux) which causes the size to differ between old and new build. - ifeq ($(USE_EXTERNAL_LIBZ), true) - UNPACKEXE_CFLAGS := -DSYSTEM_ZLIB -- UNPACKEXE_ZIPOBJS := -lz -+ UNPACKEXE_LIBS := -lz - else - UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib - UNPACKEXE_ZIPOBJS := $(JDK_OUTPUTDIR)/objs/libzip/zcrc32$(OBJ_SUFFIX) \ -@@ -560,9 +560,9 @@ - LDFLAGS_posix := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \ - $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX)) \ - $(call SET_SHARED_LIBRARY_ORIGIN), \ -- LDFLAGS_linux := -lc, \ -+ LDFLAGS_linux := , \ - LDFLAGS_solaris := $(UNPACKEXE_LDFLAGS_solaris) -lc, \ -- LDFLAGS_SUFFIX := $(LIBCXX), \ -+ LDFLAGS_SUFFIX := $(UNPACKEXE_LIBS) $(LIBCXX), \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \ - OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \ - PROGRAM := unpack200, \ ---- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2014-09-26 08:53:47.341118645 +0200 -+++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2014-09-26 08:54:22.383307050 +0200 -@@ -760,10 +760,10 @@ - $(BUILD_LIBJAVAJPEG_CLOSED_INCLUDES) \ - $(BUILD_LIBJAVAJPEG_HEADERS), \ - MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \ -- LDFLAGS := $(LDFLAGS_JDKLIB) $(LIBJPEG_LIBS) \ -+ LDFLAGS := $(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \ -- LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \ -+ LDFLAGS_SUFFIX := $(LIBJPEG_LIBS) $(LDFLAGS_JDKLIB_SUFFIX), \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=javajpeg.dll" \ diff --git a/system-libjpeg.patch b/system-libjpeg.patch index ecbb6a1..4fb3f6f 100644 --- a/system-libjpeg.patch +++ b/system-libjpeg.patch @@ -1,6 +1,6 @@ ---- jdk8/common/autoconf/libraries.m4 2015-02-17 13:27:11.468829365 +0100 -+++ jdk8/common/autoconf/libraries.m4 2015-02-17 13:27:49.143980484 +0100 -@@ -608,11 +608,36 @@ +--- jdk8/common/autoconf/libraries.m4 2023-11-22 18:11:00.405573557 +0100 ++++ jdk8/common/autoconf/libraries.m4 2023-11-22 18:13:07.916625522 +0100 +@@ -609,11 +609,36 @@ # Check for the jpeg library # @@ -41,9 +41,9 @@ AC_SUBST(USE_EXTERNAL_LIBJPEG) ############################################################################### ---- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2015-02-17 13:25:22.125292473 +0100 -+++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2015-02-17 13:28:30.812041352 +0100 -@@ -704,18 +704,20 @@ +--- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2023-11-22 18:11:00.615575289 +0100 ++++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2023-11-22 18:15:26.204333006 +0100 +@@ -702,18 +702,20 @@ ########################################################################################## @@ -70,7 +70,7 @@ endif endif -@@ -730,37 +733,50 @@ +@@ -728,37 +730,50 @@ # $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \ # \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) ) # ifeq ($(CC_43_OR_NEWER), 1) @@ -107,14 +107,14 @@ - $(BUILD_LIBJPEG_CLOSED_INCLUDES) \ - -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \ - MAPFILE := $(BUILD_LIBJPEG_MAPFILE), \ -- LDFLAGS := $(LDFLAGS_JDKLIB) \ + $(BUILD_LIBJAVAJPEG_CLOSED_INCLUDES) \ + $(BUILD_LIBJAVAJPEG_HEADERS), \ + MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \ -+ LDFLAGS := $(LDFLAGS_JDKLIB) $(LIBJPEG_LIBS) \ + LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \ - LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \ +- LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \ ++ LDFLAGS_SUFFIX := $(LIBJPEG_LIBS) $(LDFLAGS_JDKLIB_SUFFIX), \ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=jpeg.dll" \ @@ -135,7 +135,7 @@ ########################################################################################## -@@ -1206,6 +1222,13 @@ +@@ -1197,6 +1212,13 @@ GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib endif @@ -149,7 +149,7 @@ ifneq ($(OPENJDK_TARGET_OS), macosx) LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen else -@@ -1268,11 +1291,13 @@ +@@ -1259,11 +1281,13 @@ EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \ LANG := C, \ OPTIMIZATION := LOW, \ @@ -165,8 +165,8 @@ LDFLAGS_SUFFIX_solaris := -lc, \ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ RC_FLAGS := $(RC_FLAGS) \ ---- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2015-02-17 13:25:22.295288644 +0100 -+++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2015-02-17 13:27:49.145980439 +0100 +--- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2023-11-22 18:11:00.668909063 +0100 ++++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2023-11-22 18:13:07.916625522 +0100 @@ -89,7 +89,7 @@ java.security.AccessController.doPrivileged( new java.security.PrivilegedAction() { @@ -176,9 +176,9 @@ return null; } }); ---- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2015-02-17 13:25:22.295288644 +0100 -+++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2015-02-17 13:27:49.145980439 +0100 -@@ -179,7 +179,7 @@ +--- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2023-11-22 18:11:00.668909063 +0100 ++++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2023-11-22 18:13:07.916625522 +0100 +@@ -177,7 +177,7 @@ java.security.AccessController.doPrivileged( new java.security.PrivilegedAction() { public Void run() { @@ -187,8 +187,8 @@ return null; } }); ---- jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2015-02-17 13:25:22.170291459 +0100 -+++ jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2015-02-17 13:27:49.146980416 +0100 +--- jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2023-11-22 18:11:00.855577269 +0100 ++++ jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2023-11-22 18:13:07.916625522 +0100 @@ -56,7 +56,7 @@ java.security.AccessController.doPrivileged( new java.security.PrivilegedAction() { @@ -198,8 +198,8 @@ return null; } }); ---- jdk8/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2015-02-17 13:25:22.531283329 +0100 -+++ jdk8/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2015-02-17 13:27:49.146980416 +0100 +--- jdk8/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2023-11-22 18:11:01.012245228 +0100 ++++ jdk8/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2023-11-22 18:13:07.919958884 +0100 @@ -51,7 +51,7 @@ /* headers from the JPEG library */ @@ -209,8 +209,8 @@ #undef MAX #define MAX(a,b) ((a) > (b) ? (a) : (b)) ---- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2015-02-17 13:25:22.539283148 +0100 -+++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2015-02-17 13:27:49.147980394 +0100 +--- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2023-11-22 18:11:01.028912033 +0100 ++++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2023-11-22 18:13:07.919958884 +0100 @@ -25,9 +25,9 @@ #include "splashscreen_impl.h"