From 13e10eea12952a73da46a28118330a518f7b07f5 Mon Sep 17 00:00:00 2001 From: Jacob Wang Date: Mon, 12 May 2025 10:31:54 +0800 Subject: [PATCH 1/3] [CVE]update to java-1.8.0-openjdk-1.8.0.452.b09-2 to #IC6Z1S update to java-1.8.0-openjdk-1.8.0.452.b09-2 for CVE-2025-21587 CVE-2025-30691 CVE-2025-30698 Project: TC2024080204 Signed-off-by: Jacob Wang --- NEWS | 154 +++++++++++++++++++++++++-- download | 2 +- java-1.8.0-openjdk-portable.specfile | 8 +- java-1.8.0-openjdk.spec | 56 +++++----- 4 files changed, 180 insertions(+), 40 deletions(-) diff --git a/NEWS b/NEWS index e685e92..d8b827e 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,151 @@ Key: JDK-X - https://bugs.openjdk.java.net/browse/JDK-X CVE-XXXX-YYYY: https://cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY +New in release OpenJDK 8u452 (2025-04-15): +=========================================== +Live versions of these release notes can be found at: + * https://bit.ly/openjdk8u452 + +* CVEs + - CVE-2025-21587 + - CVE-2025-30691 + - CVE-2025-30698 +* Changes + - JDK-8037013: [TESTBUG] Fix test/java/lang/ClassLoader/Assert.sh on AIX + - JDK-8048215: [TESTBUG] java/lang/management/ManagementFactory/ThreadMXBeanProxy.java Expected non-null LockInfo + - JDK-8068305: [TEST_BUG] Test java/awt/Mixing/HWDisappear.java fails with GTKL&F + - JDK-8212096: javax/net/ssl/ServerName/SSLEngineExplorerMatchedSNI.java failed intermittently due to SSLException: Tag mismatch + - JDK-8227651: Tests fail with SSLProtocolException: Input record too big + - JDK-8240235: jdk.test.lib.util.JarUtils updates jar files incorrectly + - JDK-8244966: Add .vscode to .hgignore and .gitignore + - JDK-8250825: C2 crashes with assert(field != __null) failed: missing field + - JDK-8255466: C2 crashes at ciObject::get_oop() const+0x0 + - JDK-8261020: Wrong format parameter in create_emergency_chunk_path + - JDK-8265019: Update tests for additional TestNG test permissions + - JDK-8266881: Enable debug log for SSLEngineExplorerMatchedSNI.java + - JDK-8268457: XML Transformer outputs Unicode supplementary character incorrectly to HTML + - JDK-8285756: clean up use of bad arguments for `@clean` in langtools tests + - JDK-8309841: Jarsigner should print a warning if an entry is removed + - JDK-8316193: jdk/jfr/event/oldobject/TestListenerLeak.java java.lang.Exception: Could not find leak + - JDK-8326110: [8u] The Marlin tests should be updated after JDK-8241307 + - JDK-8337494: Clarify JarInputStream behavior + - JDK-8337692: Better TLS connection support + - JDK-8338430: Improve compiler transformations + - JDK-8339560: Unaddressed comments during code review of JDK-8337664 + - JDK-8339637: (tz) Update Timezone Data to 2024b + - JDK-8339644: Improve parsing of Day/Month in tzdata rules + - JDK-8339810: Clean up the code in sun.tools.jar.Main to properly close resources and use ZipFile during extract + - JDK-8340552: Harden TzdbZoneRulesCompiler against missing zone names + - JDK-8340660: [8u] Test com/sun/jdi/PrivateTransportTest.sh fails on MacOS + - JDK-8342562: Enhance Deflater operations + - JDK-8343007: Enhance Buffered Image handling + - JDK-8345504: Bump update version of OpenJDK: 8u452 + - JDK-8346140: [8u] tools/jar/ExtractFilesTest.java and tools/jar/MultipleManifestTest.java fails with jtreg5.1 + - JDK-8346587: Distrust TLS server certificates anchored by Camerfirma Root CAs + - JDK-8347847: Enhance jar file support + - JDK-8347965: (tz) Update Timezone Data to 2025a + - JDK-8348211: [8u] sun/management/jmxremote/startstop/JMXStartStopTest.java fails after backport of JDK-8066708 + - JDK-8349166: Bad indentation in backport of JDK-8250825 + - JDK-8350816: [8u] Update TzdbZoneRulesCompiler to ignore HST/EST/MST links + - JDK-8352097: (tz) zone.tab update missed in 2025a backport + - JDK-8353433: XCG currency code not recognized in JDK 8u + +Notes on individual issues: +=========================== + +security-libs/java.security: + +JDK-8309841: Jarsigner should print a warning if an entry is removed +==================================================================== +In previous OpenJDK releases, the jarsigner tool did not detect the +case where a file was removed from a signed JAR file but its signature +was still present. With this release, `jarsigner -verify` checks that +every signature has a matching file entry and prints a warning if this +is not the case. The `-verbose` option can also be added to the +command to see the names of the mismatched entries. + +security-libs/javax.net.ssl: + +JDK-8346587: Distrust TLS server certificates anchored by Camerfirma Root CAs +============================================================================= +In accordance with similar plans recently announced by Google, +Mozilla, Apple and Microsoft, the JDK will not trust Transport Layer +Security (TLS) certificates issued after the 15th of April 2025 which +are anchored by Camerfirma root certificates. + +Certificates issued on or before April 15th, 2025 will continue to +be trusted until they expire. + +If a server's certificate chain is anchored by an affected +certificate, attempts to negotiate a TLS session will fail with an +Exception that indicates the trust anchor is not trusted. For example, + +"TLS server certificate issued after 2025-04-15 and anchored by a +distrusted legacy Camerfirma root CA: CN=Chambers of Commerce Root - +2008, O=AC Camerfirma S.A., SERIALNUMBER=A82743287, L=Madrid (see +current address at www.camerfirma.com/address), C=EU" + +To check whether a certificate in a JDK keystore is affected by this +change, you can the `keytool` utility: + +keytool -v -list -alias -keystore + +If any of the certificates in the chain are affected by this change, +then you will need to update the certificate or contact the +organisation responsible for managing the certificate. + +These restrictions apply to the following Camerfirma root certificates +included in the JDK: + +Alias name: camerfirmachamberscommerceca [jdk] +CN=Chambers of Commerce Root +OU=http://www.chambersign.org +O=AC Camerfirma SA CIF A82743287 +C=EU +SHA256: 0C:25:8A:12:A5:67:4A:EF:25:F2:8B:A7:DC:FA:EC:EE:A3:48:E5:41:E6:F5:CC:4E:E6:3B:71:B3:61:60:6A:C3 + +Alias name: camerfirmachambersca [jdk] +CN=Chambers of Commerce Root - 2008 +O=AC Camerfirma S.A. +SERIALNUMBER=A82743287 +L=Madrid (see current address at www.camerfirma.com/address) +C=EU +SHA256: 06:3E:4A:FA:C4:91:DF:D3:32:F3:08:9B:85:42:E9:46:17:D8:93:D7:FE:94:4E:10:A7:93:7E:E2:9D:96:93:C0 + +Alias name: camerfirmachambersignca [jdk] +CN=Global Chambersign Root - 2008 +O=AC Camerfirma S.A. +SERIALNUMBER=A82743287 +L=Madrid (see current address at www.camerfirma.com/address) +C=EU +SHA256: 13:63:35:43:93:34:A7:69:80:16:A0:D3:24:DE:72:28:4E:07:9D:7B:52:20:BB:8F:BD:74:78:16:EE:BE:BA:CA + +Users can, *at their own risk*, remove this restriction by modifying +the `java.security` configuration file (or override it by using the +`java.security.properties` system property) so "CAMERFIRMA_TLS" is no +longer listed in the `jdk.security.caDistrustPolicies` security +property. + +core-libs/java.time: + +JDK-8339637: (tz) Update Timezone Data to 2024b +=============================================== +This OpenJDK release upgrades the in-tree copy of the IANA timezone +database to 2024b. This timezone update is primarily concerned with +improving historical data for Mexico, Monogolia and Portugal. It also +makes Asia/Choibalsan an alias for Asia/Ulaanbaatar and makes the MET +timezone the same as CET. + +The 2024b update also makes a number of legacy timezone IDs equal to +geographical names rather than fixed offsets, as follows: + +* EST => America/Panama instead of -5:00 +* MST => America/Phoenix instead of -7:00 +* HST => Pacific/Honolulu instead of -10:00 + +For long term support releases of OpenJDK, this change is overridden +locally to retain the existing fixed offset mapping. + New in release OpenJDK 8u442 (2025-01-21): =========================================== Live versions of these release notes can be found at: @@ -39,15 +184,12 @@ JDK-8335912/JDK-8337499: Add an operation mode to the jar command when extractin =================================================================================================================== In previous OpenJDK releases, when the jar tool extracted files from an archive, it would overwrite any existing files with the same name -in the target directory. With this release, a new option ('-k' or -'--keep-old-files') may be specified so that existing files are not -overwritten. +in the target directory. With this release, a new option ('-k') may be +specified so that existing files are not overwritten. -The option may be specified in short or long option form, as in the -following examples: +The option may be specified as in the following example: * jar xkf foo.jar -* jar --extract --keep-old-files --file foo.jar By default, the old behaviour remains in place and files will be overwritten. diff --git a/download b/download index a3d92d6..7eecc38 100644 --- a/download +++ b/download @@ -1,2 +1,2 @@ -25949f40c18348799ddb8f6143d43655 shenandoah8u442-b06.tar.xz +fef57f31111866a2470881a03376d4a1 shenandoah8u452-b09.tar.xz 870d829d8e1c38e251cc7498032a768a tapsets-icedtea-3.15.0.tar.xz diff --git a/java-1.8.0-openjdk-portable.specfile b/java-1.8.0-openjdk-portable.specfile index 4d46335..9315c28 100644 --- a/java-1.8.0-openjdk-portable.specfile +++ b/java-1.8.0-openjdk-portable.specfile @@ -269,7 +269,7 @@ # Define version of OpenJDK 8 used %global project openjdk %global repo shenandoah-jdk8u -%global openjdk_revision 8u442-b06 +%global openjdk_revision 8u452-b09 %global shenandoah_revision shenandoah%{openjdk_revision} # Define IcedTea version used for SystemTap tapsets and desktop file %global icedteaver 3.15.0 @@ -1547,6 +1547,12 @@ done %endif %changelog +* Fri Apr 11 2025 Andrew Hughes - 1:1.8.0.452.b09-1 +- Update to 8u452-b09 (GA) +- Update release notes for 8u452-b09. +- Remove long option documentation from JDK-8335912/JDK-8337499 as not present in 8u +- ** This tarball is embargoed until 2025-04-15 @ 1pm PT. ** + * Thu Jan 16 2025 Andrew Hughes - 1:1.8.0.442.b06-1 - Update to 8u442-b06 (GA) - Update release notes for 8u442-b06. diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 507c4d2..79e4619 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.2 # To rebuild this RPM, you must first rebuild the portable # RPM using the java-1.8.0-openjdk-portable.specfile, install # it and then adjust portablerelease and portablesuffix @@ -109,11 +108,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} loongarch64 +%global debug_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} # 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 %{aarch64} %{ix86} %{power64} sparcv9 sparc64 x86_64 loongarch64 +%global jit_arches %{aarch64} %{ix86} %{power64} sparcv9 sparc64 x86_64 # Set of architectures which use the Zero assembler port (!jit_arches) %global zero_arches %{arm} ppc s390 s390x # Set of architectures which run a full bootstrap cycle @@ -121,11 +120,11 @@ # Set of architectures which support SystemTap tapsets %global systemtap_arches %{jit_arches} # Set of architectures which support the serviceability agent -%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} loongarch64 +%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} # Set of architectures which support class data sharing # See https://bugzilla.redhat.com/show_bug.cgi?id=513605 # MetaspaceShared::generate_vtable_methods is not implemented for the PPC JIT -%global share_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} loongarch64 +%global share_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} # Set of architectures which support Java Flight Recorder (JFR) %global jfr_arches %{jit_arches} # Set of architectures for which alt-java has SSB mitigation @@ -133,7 +132,7 @@ # Set of architectures where we verify backtraces with gdb %global gdb_arches %{jit_arches} %{zero_arches} # Set of architectures for which we have a portable build -%global portable_build_arches %{aarch64} %{ix86} %{power64} x86_64 %{zero_arches} loongarch64 +%global portable_build_arches %{aarch64} %{ix86} %{power64} x86_64 %{zero_arches} # Architecture on which we run Java only tests %global jdk_test_arch x86_64 @@ -272,10 +271,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 @@ -304,7 +299,7 @@ # Define version of OpenJDK 8 used %global project openjdk %global repo shenandoah-jdk8u -%global openjdk_revision 8u442-b06 +%global openjdk_revision 8u452-b09 %global shenandoah_revision shenandoah%{openjdk_revision} # Define IcedTea version used for SystemTap tapsets and desktop files %global icedteaver 3.15.0 @@ -353,8 +348,9 @@ # rpmrelease numbering must start at 2 to be later than the 8.6 RPM %global rpmrelease 2 # Settings used by the portable build -%global portablerelease 1%{anolis_release} -%global portablesuffix an8 +%global portablerelease 1 +%global portablerhel 8 +%global portablesuffix el%{portablerhel} %global portablebuilddir /builddir/build/BUILD # Define milestone (EA for pre-releases, GA ("fcs") for releases) @@ -934,9 +930,7 @@ exit 0 %endif %{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/libsctp.so %{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/libsunec.so -%ifnarch loongarch64 %{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/libsystemconf.so -%endif %{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/libunpack.so %{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/libverify.so %{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/libzip.so @@ -1169,8 +1163,8 @@ Provides: jre%{?1} = %{epoch}:%{javaver} Requires: ca-certificates # Require javapackages-filesystem for ownership of /usr/lib/jvm/ Requires: javapackages-filesystem -# 2024a required as of JDK-8325150 -Requires: tzdata-java >= 2024a +# 2025a required as of JDK-8347965 +Requires: tzdata-java >= 2025a # for support of kernel stream control # libsctp.so.1 is being `dlopen`ed on demand Requires: lksctp-tools%{?_isa} @@ -1299,7 +1293,7 @@ Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{releas Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{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 @@ -1600,8 +1594,8 @@ BuildRequires: java-1.%{majorver}.0-openjdk-portable-misc = %{epoch}:%{version}- %ifarch %{zero_arches} BuildRequires: libffi-devel %endif -# 2024a required as of JDK-8325150 -BuildRequires: tzdata-java >= 2024a +# 2025a required as of JDK-8347965 +BuildRequires: tzdata-java >= 2025a # Earlier versions have a bug in tree vectorization on PPC BuildRequires: gcc >= 4.8.3-8 @@ -1913,10 +1907,8 @@ ln -s %{top_level_dir_name} openjdk # # the configure macro will do this too, but it also passes a few flags not # supported by openjdk configure script -%ifnarch loongarch64 cp %{SOURCE100} %{top_level_dir_name}/common/autoconf/build-aux/ cp %{SOURCE101} %{top_level_dir_name}/common/autoconf/build-aux/ -%endif # OpenJDK patches @@ -1947,7 +1939,6 @@ sh %{SOURCE12} %patch -P204 %endif -%ifnarch loongarch64 %patch -P1 %patch -P5 @@ -1978,17 +1969,14 @@ pushd %{top_level_dir_name} %patch -P14 -p1 %patch -P15 -p1 popd -%endif pushd %{top_level_dir_name} # Add crypto policy and FIPS support -%ifnarch loongarch64 %patch -P1001 -p1 # nss.cfg PKCS11 support; must come last as it also alters java.security %patch -P1000 -p1 # system cacerts support %patch -P539 -p1 -%endif popd # RPM-only fixes @@ -2716,11 +2704,15 @@ cjc.mainProgram(args) %endif %changelog -* Fri Feb 14 2025 Xiang Zhai - 1:1.8.0.442.b06-2.0.2 -- Add loongarch64 base support - -* Fri Feb 14 2025 Hong Wei Qin - 1:1.8.0.442.b06-2.0.1 -- Update portable pkg dist +* Fri Apr 11 2025 Andrew Hughes - 1:1.8.0.452.b09-1 +- Update to 8u452-b09 (GA) +- Update release notes for 8u452-b09. +- Remove long option documentation from JDK-8335912/JDK-8337499 as not present in 8u +- Require tzdata 2025a due to upstream inclusion of JDK-8347965 +- Sync the copy of the portable specfile with the latest update +- ** This tarball is embargoed until 2025-04-15 @ 1pm PT. ** +- Resolves: RHEL-86973 +- Resolves: RHEL-86616 * Fri Jan 17 2025 Andrew Hughes - 1:1.8.0.442.b06-2 - Update to 8u442-b06 (GA) -- Gitee From a69e3d41d26618b83f0892a032fd71f77f8b968a Mon Sep 17 00:00:00 2001 From: Jacob Wang Date: Sat, 1 Jul 2023 20:10:54 +0800 Subject: [PATCH 2/3] Update dist for portable pkg Signed-off-by: Jacob Wang --- java-1.8.0-openjdk.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 79e4619..5f17aaa 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-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-1.8.0-openjdk-portable.specfile, install # it and then adjust portablerelease and portablesuffix @@ -348,9 +349,8 @@ # rpmrelease numbering must start at 2 to be later than the 8.6 RPM %global rpmrelease 2 # Settings used by the portable build -%global portablerelease 1 -%global portablerhel 8 -%global portablesuffix el%{portablerhel} +%global portablerelease 1%{anolis_release} +%global portablesuffix an8 %global portablebuilddir /builddir/build/BUILD # Define milestone (EA for pre-releases, GA ("fcs") for releases) @@ -1293,7 +1293,7 @@ Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{releas Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{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 @@ -2704,6 +2704,9 @@ cjc.mainProgram(args) %endif %changelog +* Mon May 12 2025 Jacob Wang - 1:1.8.0.452.b09-1.0.1 +- Update portable pkg dist + * Fri Apr 11 2025 Andrew Hughes - 1:1.8.0.452.b09-1 - Update to 8u452-b09 (GA) - Update release notes for 8u452-b09. -- Gitee From 369ef49d35cc08a2d3e69bed01f727c23e488376 Mon Sep 17 00:00:00 2001 From: zhaixiang Date: Thu, 22 Feb 2024 16:33:21 +0800 Subject: [PATCH 3/3] Add loongarch64 base support --- java-1.8.0-openjdk.spec | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 5f17aaa..ef1f2f3 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-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-1.8.0-openjdk-portable.specfile, install # it and then adjust portablerelease and portablesuffix @@ -109,11 +109,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} +%global debug_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} 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 %{aarch64} %{ix86} %{power64} sparcv9 sparc64 x86_64 +%global jit_arches %{aarch64} %{ix86} %{power64} sparcv9 sparc64 x86_64 loongarch64 # Set of architectures which use the Zero assembler port (!jit_arches) %global zero_arches %{arm} ppc s390 s390x # Set of architectures which run a full bootstrap cycle @@ -121,11 +121,11 @@ # Set of architectures which support SystemTap tapsets %global systemtap_arches %{jit_arches} # Set of architectures which support the serviceability agent -%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} +%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} loongarch64 # Set of architectures which support class data sharing # See https://bugzilla.redhat.com/show_bug.cgi?id=513605 # MetaspaceShared::generate_vtable_methods is not implemented for the PPC JIT -%global share_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} +%global share_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} loongarch64 # Set of architectures which support Java Flight Recorder (JFR) %global jfr_arches %{jit_arches} # Set of architectures for which alt-java has SSB mitigation @@ -133,7 +133,7 @@ # Set of architectures where we verify backtraces with gdb %global gdb_arches %{jit_arches} %{zero_arches} # Set of architectures for which we have a portable build -%global portable_build_arches %{aarch64} %{ix86} %{power64} x86_64 %{zero_arches} +%global portable_build_arches %{aarch64} %{ix86} %{power64} x86_64 %{zero_arches} loongarch64 # Architecture on which we run Java only tests %global jdk_test_arch x86_64 @@ -272,6 +272,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 @@ -930,7 +934,9 @@ exit 0 %endif %{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/libsctp.so %{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/libsunec.so +%ifnarch loongarch64 %{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/libsystemconf.so +%endif %{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/libunpack.so %{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/libverify.so %{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/libzip.so @@ -1907,8 +1913,10 @@ ln -s %{top_level_dir_name} openjdk # # the configure macro will do this too, but it also passes a few flags not # supported by openjdk configure script +%ifnarch loongarch64 cp %{SOURCE100} %{top_level_dir_name}/common/autoconf/build-aux/ cp %{SOURCE101} %{top_level_dir_name}/common/autoconf/build-aux/ +%endif # OpenJDK patches @@ -1939,6 +1947,7 @@ sh %{SOURCE12} %patch -P204 %endif +%ifnarch loongarch64 %patch -P1 %patch -P5 @@ -1969,14 +1978,17 @@ pushd %{top_level_dir_name} %patch -P14 -p1 %patch -P15 -p1 popd +%endif pushd %{top_level_dir_name} # Add crypto policy and FIPS support +%ifnarch loongarch64 %patch -P1001 -p1 # nss.cfg PKCS11 support; must come last as it also alters java.security %patch -P1000 -p1 # system cacerts support %patch -P539 -p1 +%endif popd # RPM-only fixes @@ -2704,6 +2716,9 @@ cjc.mainProgram(args) %endif %changelog +* Mon May 12 2025 Xiang Zhai - 1:1.8.0.452.b09-1.0.2 +- Add loongarch64 base support + * Mon May 12 2025 Jacob Wang - 1:1.8.0.452.b09-1.0.1 - Update portable pkg dist -- Gitee