From 8eee8ada98445429a47f2e85f4aa127b87f504b0279f13c60d5ed6c02f5e428d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 7 Aug 2024 22:09:25 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main java-1_8_0-openjdk revision c9991f2e66af755df626e9943b55f956 --- aarch32-git.tar.xz | 4 +- fix-build-with-gcc14.patch | 87 +++++++++++++++++++++++++++++ icedtea-3.31.0.tar.xz | 3 - icedtea-3.32.0.tar.xz | 3 + java-1_8_0-openjdk.changes | 109 ++++++++++++++++++++++++++++++++++++- java-1_8_0-openjdk.spec | 19 ++++--- openjdk-git.tar.xz | 4 +- shenandoah-git.tar.xz | 4 +- 8 files changed, 215 insertions(+), 18 deletions(-) create mode 100644 fix-build-with-gcc14.patch delete mode 100644 icedtea-3.31.0.tar.xz create mode 100644 icedtea-3.32.0.tar.xz diff --git a/aarch32-git.tar.xz b/aarch32-git.tar.xz index c4d4c57..92ae1dd 100644 --- a/aarch32-git.tar.xz +++ b/aarch32-git.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0618a366fba88ce7ac40ea07eef3b91a419cdc996ae4552c67a6e27e848e8bd -size 7208488 +oid sha256:008dea6c05024fea64e4ee942f806f6bd62bc9effd825a22d565cc609f5da77d +size 7214208 diff --git a/fix-build-with-gcc14.patch b/fix-build-with-gcc14.patch new file mode 100644 index 0000000..1c04d57 --- /dev/null +++ b/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; diff --git a/icedtea-3.31.0.tar.xz b/icedtea-3.31.0.tar.xz deleted file mode 100644 index dbec24f..0000000 --- a/icedtea-3.31.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b3fa4846b767c21ffa37884c04260d70e13f3b3a7a247557c453ea9aeaa7cb5 -size 1574600 diff --git a/icedtea-3.32.0.tar.xz b/icedtea-3.32.0.tar.xz new file mode 100644 index 0000000..00f8dfa --- /dev/null +++ b/icedtea-3.32.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40aaf6c20cb8067ae6a69ca8a0087793ef56c23ddfd8b5b83fb5080885b96c40 +size 1576460 diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes index 53d122a..b8ab78d 100644 --- a/java-1_8_0-openjdk.changes +++ b/java-1_8_0-openjdk.changes @@ -1,3 +1,111 @@ +------------------------------------------------------------------- +Thu Aug 1 06:21:31 UTC 2024 - Fridrich Strba + +- Update to version jdk8u422 (icedtea-3.32.0) + * Security fixes + + JDK-8314794, CVE-2024-21131, bsc#1228046: Improve UTF8 String + supports + + JDK-8319859, CVE-2024-21138, bsc#1228047: Better symbol + storage + + JDK-8320097: Improve Image transformations + + JDK-8320548, CVE-2024-21140, bsc#1228048: Improved loop + handling + + JDK-8322106, CVE-2024-21144, bsc#1228050: Enhance Pack 200 + loading + + JDK-8323231, CVE-2024-21147, bsc#1228052: Improve array + management + + JDK-8323390: Enhance mask blit functionality + + JDK-8324559, CVE-2024-21145, bsc#1228051, : Improve 2D image + handling + + JDK-8325600: Better symbol storage + * Import of OpenJDK 8 u422 build 05 + + JDK-8025439: [TEST BUG] [macosx] + PrintServiceLookup.lookupPrintServices doesn't work properly + since jdk8b105 + + JDK-8069389: CompilerOracle prefix wildcarding is broken for + long strings + + JDK-8159454: [TEST_BUG] javax/swing/ToolTipManager/7123767/ + /bug7123767.java: number of checked graphics configurations + should be limited + + JDK-8198321: javax/swing/JEditorPane/5076514/bug5076514.java + fails + + JDK-8203691: [TESTBUG] Test + /runtime/containers/cgroup/PlainRead.java fails + + JDK-8205407: [windows, vs<2017] C4800 after 8203197 + + JDK-8235834: IBM-943 charset encoder needs updating + + JDK-8239965: XMLEncoder/Test4625418.java fails due to "Error: + Cp943 - can't read properly" + + JDK-8240756: [macos] SwingSet2:TableDemo:Printed Japanese + characters were garbled + + JDK-8256152: tests fail because of ambiguous method resolution + + JDK-8258855: Two tests sun/security/krb5/auto/ + /ReplayCacheTestProc.java and ReplayCacheTestProcWithMD5.java + failed on OL8.3 + + JDK-8262017: C2: assert(n != __null) failed: Bad immediate + dominator info. + + JDK-8268916: Tests for AffirmTrust roots + + JDK-8278067: Make HttpURLConnection default keep alive + timeout configurable + + JDK-8291226: Create Test Cases to cover scenarios for + JDK-8278067 + + JDK-8291637: HttpClient default keep alive timeout not + followed if server sends invalid value + + JDK-8291638: Keep-Alive timeout of 0 should close connection + immediately + + JDK-8293562: KeepAliveCache Blocks Threads while Closing + Connections + + JDK-8303466: C2: failed: malformed control flow. Limit type + made precise with MaxL/MinL + + JDK-8304074: [JMX] Add an approximation of total bytes + allocated on the Java heap by the JVM + + JDK-8313081: MonitoringSupport_lock should be unconditionally + initialized after 8304074 + + JDK-8315020: The macro definition for LoongArch64 zero build + is not accurate. + + JDK-8316138: Add GlobalSign 2 TLS root certificates + + JDK-8318410: jdk/java/lang/instrument/BootClassPath/ + /BootClassPathTest.sh fails on Japanese Windows + + JDK-8320005: Allow loading of shared objects with .a + extension on AIX + + JDK-8324185: [8u] Accept Xcode 12+ builds on macOS + + JDK-8325096: Test java/security/cert/CertPathBuilder/akiExt/ + /AKISerialNumber.java is failing + + JDK-8325927: [8u] Backport of JDK-8170552 missed part of the + test + + JDK-8326686: Bump update version of OpenJDK: 8u422 + + JDK-8327440: Fix "bad source file" error during beaninfo + generation + + JDK-8328809: [8u] Problem list some CA tests + + JDK-8328825: Google CAInterop test failures + + JDK-8329544: [8u] sun/security/krb5/auto/ + /ReplayCacheTestProc.java cannot find the testlibrary + + JDK-8331791: [8u] AIX build break from JDK-8320005 backport + + JDK-8331980: [8u] Problem list CAInterop.java#certignarootca + test + + JDK-8335552: [8u] JDK-8303466 backport to 8u requires 3 + ::Identity signature fixes + * Bug fixes + + JDK-8331730: [8u] GHA: update sysroot for cross builds to + Debian bullseye + + JDK-8333669: [8u] GHA: Dead VS2010 download link + + JDK-8318039: GHA: Bump macOS and Xcode versions + +------------------------------------------------------------------- +Fri Jun 14 13:31:41 UTC 2024 - Fridrich Strba + +- Fix condition enabling shenandoah GC only for Factory. It was by + mistake enabled for SLE too (bsc#1226274) +- Disable shenandoah for all distributions, since the shenandoah + hotspot tarball is rather out of sync. + +------------------------------------------------------------------- +Mon May 6 17:41:21 UTC 2024 - Fridrich Strba + +- Added patch: + * fix-build-with-gcc14.patch + + fix build with gcc14 + + pointer/integer type precision + ------------------------------------------------------------------- Sat Apr 20 20:17:41 UTC 2024 - Fridrich Strba @@ -85,7 +193,6 @@ Sat Apr 20 20:17:41 UTC 2024 - Fridrich Strba * Bug fixes + Support make 4.4 - ------------------------------------------------------------------- Thu Mar 7 12:58:44 UTC 2024 - Fridrich Strba diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec index 29ba576..d402b41 100644 --- a/java-1_8_0-openjdk.spec +++ b/java-1_8_0-openjdk.spec @@ -18,7 +18,7 @@ %{!?aarch64:%global aarch64 aarch64 arm64 armv8} %global jit_arches %{ix86} x86_64 ppc64 ppc64le %{aarch64} %{arm} -%global icedtea_version 3.31.0 +%global icedtea_version 3.32.0 %global buildoutputdir openjdk.build/ # Convert an absolute path to a relative path. Each symbolic link is # specified relative to the directory in which it is installed so that @@ -31,8 +31,8 @@ # priority must be 6 digits in total %global priority 1805 %global javaver 1.8.0 -%global updatever 412 -%global buildver 08 +%global updatever 422 +%global buildver 05 # Standard JPackage directories and symbolic links. %global sdklnk java-%{javaver}-openjdk %global archname %{sdklnk} @@ -128,11 +128,11 @@ %if 0%{?__isa_bits} %global bits %{__isa_bits} %endif -%if 0%{?suse_version} > 1500 && !0%{?sle_version} -%global with_shenandoah 1 -%else +#if 0%{?suse_version} > 1500 && !0%{?sle_version} +#global with_shenandoah 1 +#else %global with_shenandoah 0 -%endif +#endif %global NSS_LIBDIR %(pkg-config --variable=libdir nss) %bcond_without bootstrap %bcond_with zero @@ -180,6 +180,8 @@ Patch2: 1015432.patch Patch3: java-atk-wrapper-security.patch # Fix use of unintialized memory in adlc parser Patch12: adlc-parser.patch +# Fix different integer/pointer type mismatches that are fatal with gcc14 +Patch13: fix-build-with-gcc14.patch # Avoid triggering inactivity timeout while generating javadoc in zero VM Patch14: zero-javadoc-verbose.patch # Fix detection of jobserver support @@ -500,7 +502,7 @@ sh autogen.sh %ifarch %{arm} --with-hotspot-src-zip=%{SOURCE2} \ %else -%if %{without zero} && %{with shenandoah} +%if %{without zero} && %{with_shenandoah} --with-hotspot-src-zip=%{SOURCE3} \ --with-hotspot-build=shenandoah \ %endif @@ -513,6 +515,7 @@ patch -p0 -i %{PATCH1} patch -p0 -i %{PATCH2} patch -p0 -i %{PATCH3} patch -p0 -i %{PATCH12} +patch -p0 -i %{PATCH13} %if %{with zero} patch -p0 -i %{PATCH14} diff --git a/openjdk-git.tar.xz b/openjdk-git.tar.xz index 71fa2ec..61f02fe 100644 --- a/openjdk-git.tar.xz +++ b/openjdk-git.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:025ee37a17aea9b24ffd0ebec42e70d34e77c5880cfed057f574192752e9d7d8 -size 59573848 +oid sha256:6e017ff32b12300e25663ef0f83578ac2ec487562acdd79a10128176625357a9 +size 59607728 diff --git a/shenandoah-git.tar.xz b/shenandoah-git.tar.xz index 5d1163e..4c1346b 100644 --- a/shenandoah-git.tar.xz +++ b/shenandoah-git.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9a6b10dfea3b6d5594b64b86990f69b99743fd969fa1b4b41805f6b357416a4 -size 7294308 +oid sha256:4d67e489e6fdd7c9fca527b60d453d42cdf753bd8a4c4113ea4853f110cedb70 +size 7298616