From 4408193a2c3d340037e0a499bf14d3c37f4bfb1d Mon Sep 17 00:00:00 2001 From: Jacob Wang Date: Thu, 23 Oct 2025 16:38:22 +0800 Subject: [PATCH 1/3] [CVE]update to java-17-openjdk-17.0.17.0.10-1 to #ID38B8 update to java-17-openjdk-17.0.17.0.10-1 for CVE-2025-53057 CVE-2025-53066 Project: TC2024080204 Signed-off-by: Jacob Wang --- download | 2 +- java-17-openjdk-portable.specfile | 32 ++++++++++++++++-- java-17-openjdk.spec | 55 ++++++++++++++++++------------- 3 files changed, 63 insertions(+), 26 deletions(-) diff --git a/download b/download index 2e1ba2b..911136d 100644 --- a/download +++ b/download @@ -1,2 +1,2 @@ -f7b7171b66dd522f55720778c879852f openjdk-17.0.16+8.tar.xz +04e946e19905b3fd4a984ba937fd0588 openjdk-17.0.17+10.tar.xz 5d441d6217cc75372ca5a0943997cb24 tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz diff --git a/java-17-openjdk-portable.specfile b/java-17-openjdk-portable.specfile index bf03fe8..ecdfb7c 100644 --- a/java-17-openjdk-portable.specfile +++ b/java-17-openjdk-portable.specfile @@ -315,7 +315,7 @@ # New Version-String scheme-style defines %global featurever 17 %global interimver 0 -%global updatever 16 +%global updatever 17 %global patchver 0 # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, @@ -379,7 +379,7 @@ %global origin_nice OpenJDK %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 8 +%global buildver 10 %global rpmrelease 1 #%%global tagsuffix %%{nil} # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit @@ -756,7 +756,7 @@ Provides: bundled(freetype) = 2.13.3 # Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h Provides: bundled(giflib) = 5.2.2 # Version in src/java.desktop/share/native/libharfbuzz/hb-version.h -Provides: bundled(harfbuzz) = 10.4.0 +Provides: bundled(harfbuzz) = 11.2.0 # Version in src/java.desktop/share/native/liblcms/lcms2.h Provides: bundled(lcms2) = 2.17.0 # Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h @@ -1832,6 +1832,32 @@ done %endif %changelog +* Thu Oct 16 2025 Andrew Hughes - 1:17.0.17.0.10-1 +- Update NEWS for jdk-17.0.17+10 (GA) +- Move prior JDK-8309841 release note to appropriate section + +* Tue Oct 14 2025 Thomas Fitzsimmons - 1:17.0.17.0.10-1 +- Update to jdk-17.0.17+10 (GA) +- Add to .gitignore openjdk-17.0.17+10.tar.xz +- Set buildver to 10 +- Set is_ga to 1 +- Update sources to openjdk-17.0.17+10.tar.xz +- ** This tarball is embargoed until 2025-10-21 @ 1pm PT. ** + +* Thu Sep 18 2025 Thomas Fitzsimmons - 1:17.0.17.0.7-0.1.ea +- Update to jdk-17.0.17+7 (EA) +- Add to .gitignore openjdk-17.0.17+7-ea.tar.xz +- Set updatever to 17 +- Set buildver to 7 +- Set is_ga to 0 +- Update sources to openjdk-17.0.17+7-ea.tar.xz +- Set bundled harfbuzz version to 11.2.0 +- Update NEWS for jdk-17.0.17+7 (EA) + +* Mon Jul 21 2025 Thomas Fitzsimmons - 1:17.0.16.0.8-1 +- Synchronize openjdk_news.sh from java-21-openjdk vanilla branch +- Resolves: OPENJDK-3950 + * Wed Jul 09 2025 Andrew Hughes - 1:17.0.16.0.8-1 - Update NEWS for jdk-17.0.16+8 (GA) diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec index a499661..368b1fe 100644 --- a/java-17-openjdk.spec +++ b/java-17-openjdk.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.1 # To rebuild this RPM, you must first rebuild the portable # RPM using the java-17-openjdk-portable.specfile, install # it and then adjust portablerelease and portablesuffix @@ -123,11 +122,11 @@ # Set of architectures which support multiple ABIs %global multilib_arches %{power64} sparc64 x86_64 # Set of architectures for which we build slowdebug builds -%global debug_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} s390x loongarch64 +%global debug_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} s390x # Set of architectures for which we build fastdebug builds -%global fastdebug_arches x86_64 ppc64le aarch64 loongarch64 +%global fastdebug_arches x86_64 ppc64le aarch64 # Set of architectures with a Just-In-Time (JIT) compiler -%global jit_arches %{arm} %{aarch64} %{ix86} %{power64} s390x sparcv9 sparc64 x86_64 loongarch64 +%global jit_arches %{arm} %{aarch64} %{ix86} %{power64} s390x sparcv9 sparc64 x86_64 # Set of architectures which use the Zero assembler port (!jit_arches) %global zero_arches ppc s390 # Set of architectures which run a full bootstrap cycle @@ -137,15 +136,15 @@ # Set of architectures with a Ahead-Of-Time (AOT) compiler %global aot_arches x86_64 %{aarch64} # Set of architectures which support the serviceability agent -%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm} loongarch64 +%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm} # Set of architectures which support class data sharing # As of JDK-8005165 in OpenJDK 10, class sharing is not arch-specific # However, it does segfault on the Zero assembler port, so currently JIT only %global share_arches %{jit_arches} # Set of architectures for which we build the Shenandoah garbage collector -%global shenandoah_arches x86_64 %{aarch64} loongarch64 +%global shenandoah_arches x86_64 %{aarch64} # Set of architectures for which we build the Z garbage collector -%global zgc_arches x86_64 loongarch64 +%global zgc_arches x86_64 # Set of architectures for which alt-java has SSB mitigation %global ssbd_arches x86_64 # Set of architectures for which java has short vector math library (libjsvml.so) @@ -300,10 +299,6 @@ %global archinstall aarch64 %global stapinstall arm64 %endif -%ifarch loongarch64 -%global archinstall loongarch64 -%global stapinstall loongarch64 -%endif # 32 bit sparc, optimized for v9 %ifarch sparcv9 %global archinstall sparc @@ -329,7 +324,7 @@ # New Version-String scheme-style defines %global featurever 17 %global interimver 0 -%global updatever 16 +%global updatever 17 %global patchver 0 # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, @@ -384,12 +379,11 @@ %global origin_nice OpenJDK %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 8 -# rpmrelease numbering must start at 2 to be later than the 8.6 RPM -%global rpmrelease 2 +%global buildver 10 +%global rpmrelease 1 # Settings used by the portable build -%global portablerelease 1%{anolis_release} -%global portablesuffix an8 +%global portablerelease 1 +%global portablesuffix el8 %global portablebuilddir /builddir/build/BUILD # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit @@ -1256,7 +1250,7 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{anolis_release}%{?dist} +Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist} # Equivalent for the portable build %global prelease %{?eaprefix}%{portablerelease}%{?extraver} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons @@ -1486,7 +1480,7 @@ Provides: bundled(freetype) = 2.13.3 # Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h Provides: bundled(giflib) = 5.2.2 # Version in src/java.desktop/share/native/libharfbuzz/hb-version.h -Provides: bundled(harfbuzz) = 10.4.0 +Provides: bundled(harfbuzz) = 11.2.0 # Version in src/java.desktop/share/native/liblcms/lcms2.h Provides: bundled(lcms2) = 2.17.0 # Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h @@ -2504,9 +2498,26 @@ cjc.mainProgram(args) %endif %changelog -* Wed Jul 23 2025 Jacob Wang - 1:17.0.16.0.8-2.0.1 -- Update portable pkg dist -- Add loongarch64 base support +* Thu Oct 16 2025 Thomas Fitzsimmons - 1:17.0.17.0.10-1 +- Update to jdk-17.0.17+10 (GA) +- Add to .gitignore openjdk-17.0.17+10.tar.xz +- Set buildver to 10 +- Set rpmrelease to 1, remove 'must start at 2' comment +- Set is_ga to 1 +- Update sources to openjdk-17.0.17+10.tar.xz +- Sync java-17-openjdk-portable.specfile from openjdk-portable-rhel-8 +- Resolves: RHEL-119449 +- ** This tarball is embargoed until 2025-10-21 @ 1pm PT. ** + +* Fri Sep 26 2025 Thomas Fitzsimmons - 1:17.0.17.0.7-0.2.ea +- Update to jdk-17.0.17+7 (EA) +- Add to .gitignore openjdk-17.0.17+7-ea.tar.xz +- Set updatever to 17 +- Set buildver to 7 +- Set is_ga to 0 +- Update sources to openjdk-17.0.17+7-ea.tar.xz +- Set bundled harfbuzz version to 11.2.0 +- Sync java-17-openjdk-portable.specfile from openjdk-portable-rhel-8 * Wed Jul 09 2025 Thomas Fitzsimmons - 1:17.0.16.0.8-2 - Update to jdk-17.0.16+8 -- Gitee From 0b7b6993be593b56a4a81cdd3a412e42c5321a48 Mon Sep 17 00:00:00 2001 From: Jacob Wang Date: Sat, 1 Jul 2023 20:50:26 +0800 Subject: [PATCH 2/3] Update portable pkg dist Signed-off-by: Jacob Wang --- java-17-openjdk.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec index 368b1fe..ee9cf2f 100644 --- a/java-17-openjdk.spec +++ b/java-17-openjdk.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 # To rebuild this RPM, you must first rebuild the portable # RPM using the java-17-openjdk-portable.specfile, install # it and then adjust portablerelease and portablesuffix @@ -382,8 +383,8 @@ %global buildver 10 %global rpmrelease 1 # Settings used by the portable build -%global portablerelease 1 -%global portablesuffix el8 +%global portablerelease 1%{anolis_release} +%global portablesuffix an8 %global portablebuilddir /builddir/build/BUILD # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit @@ -1250,7 +1251,7 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist} +Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{anolis_release}%{?dist} # Equivalent for the portable build %global prelease %{?eaprefix}%{portablerelease}%{?extraver} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons @@ -2498,6 +2499,9 @@ cjc.mainProgram(args) %endif %changelog +* Thu Oct 23 2025 Jacob Wang - 1:17.0.17.0.10-1.0.1 +- Update portable pkg dist + * Thu Oct 16 2025 Thomas Fitzsimmons - 1:17.0.17.0.10-1 - Update to jdk-17.0.17+10 (GA) - Add to .gitignore openjdk-17.0.17+10.tar.xz -- Gitee From fe2cd68a38757c82a3a990e53a0c19042ce9e906 Mon Sep 17 00:00:00 2001 From: zhaixiang Date: Thu, 22 Feb 2024 16:42:37 +0800 Subject: [PATCH 3/3] Add loongarch64 base support --- java-17-openjdk.spec | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec index ee9cf2f..868f8ae 100644 --- a/java-17-openjdk.spec +++ b/java-17-openjdk.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.1 +%define anolis_release .0.2 # To rebuild this RPM, you must first rebuild the portable # RPM using the java-17-openjdk-portable.specfile, install # it and then adjust portablerelease and portablesuffix @@ -123,11 +123,11 @@ # Set of architectures which support multiple ABIs %global multilib_arches %{power64} sparc64 x86_64 # Set of architectures for which we build slowdebug builds -%global debug_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} s390x +%global debug_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} s390x loongarch64 # Set of architectures for which we build fastdebug builds -%global fastdebug_arches x86_64 ppc64le aarch64 +%global fastdebug_arches x86_64 ppc64le aarch64 loongarch64 # Set of architectures with a Just-In-Time (JIT) compiler -%global jit_arches %{arm} %{aarch64} %{ix86} %{power64} s390x sparcv9 sparc64 x86_64 +%global jit_arches %{arm} %{aarch64} %{ix86} %{power64} s390x sparcv9 sparc64 x86_64 loongarch64 # Set of architectures which use the Zero assembler port (!jit_arches) %global zero_arches ppc s390 # Set of architectures which run a full bootstrap cycle @@ -137,15 +137,15 @@ # Set of architectures with a Ahead-Of-Time (AOT) compiler %global aot_arches x86_64 %{aarch64} # Set of architectures which support the serviceability agent -%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm} +%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm} loongarch64 # Set of architectures which support class data sharing # As of JDK-8005165 in OpenJDK 10, class sharing is not arch-specific # However, it does segfault on the Zero assembler port, so currently JIT only %global share_arches %{jit_arches} # Set of architectures for which we build the Shenandoah garbage collector -%global shenandoah_arches x86_64 %{aarch64} +%global shenandoah_arches x86_64 %{aarch64} loongarch64 # Set of architectures for which we build the Z garbage collector -%global zgc_arches x86_64 +%global zgc_arches x86_64 loongarch64 # Set of architectures for which alt-java has SSB mitigation %global ssbd_arches x86_64 # Set of architectures for which java has short vector math library (libjsvml.so) @@ -300,6 +300,10 @@ %global archinstall aarch64 %global stapinstall arm64 %endif +%ifarch loongarch64 +%global archinstall loongarch64 +%global stapinstall loongarch64 +%endif # 32 bit sparc, optimized for v9 %ifarch sparcv9 %global archinstall sparc @@ -2499,8 +2503,9 @@ cjc.mainProgram(args) %endif %changelog -* Thu Oct 23 2025 Jacob Wang - 1:17.0.17.0.10-1.0.1 +* Thu Oct 23 2025 Jacob Wang - 1:17.0.17.0.10-1.0.2 - Update portable pkg dist +- Add loongarch64 base support * Thu Oct 16 2025 Thomas Fitzsimmons - 1:17.0.17.0.10-1 - Update to jdk-17.0.17+10 (GA) -- Gitee