!67 sync master to openEuler-24.03-LTS-SP1

From: @Autistic_boyya 
Reviewed-by: @kuenking111 
Signed-off-by: @kuenking111

Backport-JDK-8207908-JMXStatusTest.java-fails-assert.patch

@@ -1,73 +0,0 @@
-Subject: Backport JDK-8207908 JMXStatusTest.java fails assertion intermittently
-
----
- .../management/jmxremote/startstop/JMXStatusTest.java  |  5 ++---
- .../jmxremote/startstop/ManagementAgentJcmd.java       | 10 +++++-----
- 2 files changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/test/jdk/sun/management/jmxremote/startstop/JMXStatusTest.java b/test/jdk/sun/management/jmxremote/startstop/JMXStatusTest.java
-index 1e6259ef0..fc1b48832 100644
---- a/test/jdk/sun/management/jmxremote/startstop/JMXStatusTest.java
-+++ b/test/jdk/sun/management/jmxremote/startstop/JMXStatusTest.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -88,8 +88,6 @@ abstract public class JMXStatusTest {
-         args.addAll(getCustomVmArgs());
-         args.add(TEST_APP_NAME);
-         testAppPb = ProcessTools.createTestJavaProcessBuilder(args);
--
--        jcmd = new ManagementAgentJcmd(TEST_APP_NAME, false);
-     }
- 
-     @BeforeMethod
-@@ -98,6 +96,7 @@ abstract public class JMXStatusTest {
-             TEST_APP_NAME, testAppPb,
-             (Predicate<String>)l->l.trim().equals("main enter")
-         );
-+        jcmd = new ManagementAgentJcmd(testApp, false);
-     }
- 
-     @AfterMethod
-diff --git a/test/jdk/sun/management/jmxremote/startstop/ManagementAgentJcmd.java b/test/jdk/sun/management/jmxremote/startstop/ManagementAgentJcmd.java
-index 0781bc941..7135f6ea2 100644
---- a/test/jdk/sun/management/jmxremote/startstop/ManagementAgentJcmd.java
-+++ b/test/jdk/sun/management/jmxremote/startstop/ManagementAgentJcmd.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -47,11 +47,11 @@ final class ManagementAgentJcmd {
-     private static final String CMD_STATUS = "ManagementAgent.status";
-     private static final String CMD_PRINTPERF = "PerfCounter.print";
- 
--    private final String id;
-+    private final long pid;
-     private final boolean verbose;
- 
--    public ManagementAgentJcmd(String targetApp, boolean verbose) {
--        this.id = targetApp;
-+    public ManagementAgentJcmd(Process targetApp, boolean verbose) {
-+        this.pid = targetApp.pid();
-         this.verbose = verbose;
-     }
- 
-@@ -174,7 +174,7 @@ final class ManagementAgentJcmd {
-      * @throws InterruptedException
-      */
-     private String jcmd(Consumer<String> c, String ... command) throws IOException, InterruptedException {
--        return jcmd(id, c, command);
-+        return jcmd(Long.toString(pid), c, command);
-     }
- 
-     /**
--- 
-2.33.0
-

Backport-JDK-8320682-[AArch64]-C1-compilation-fails-.patch

@@ -1,109 +0,0 @@
-Subject: Backport of JDK-8320682：[AArch64] C1 compilation fails with "Field too big for insn"
-
----
- src/hotspot/share/c1/c1_globals.hpp           |  6 +-
- .../compiler/arguments/TestC1Globals.java     | 67 +++++++++++++++++++
- 2 files changed, 71 insertions(+), 2 deletions(-)
- create mode 100644 test/hotspot/jtreg/compiler/arguments/TestC1Globals.java
-
-diff --git a/src/hotspot/share/c1/c1_globals.hpp b/src/hotspot/share/c1/c1_globals.hpp
-index 1c22cf16c..3ef4bbc2d 100644
---- a/src/hotspot/share/c1/c1_globals.hpp
-+++ b/src/hotspot/share/c1/c1_globals.hpp
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -275,9 +275,11 @@
-   develop(bool, InstallMethods, true,                                       \
-           "Install methods at the end of successful compilations")          \
-                                                                             \
-+  /* The compiler assumes, in many places, that methods are at most 1MB. */ \
-+  /* Therefore, we restrict this flag to at most 1MB.                    */ \
-   develop(intx, NMethodSizeLimit, (64*K)*wordSize,                          \
-           "Maximum size of a compiled method.")                             \
--          range(0, max_jint)                                                \
-+          range(0, 1*M)                                                \
-                                                                             \
-   develop(bool, TraceFPUStack, false,                                       \
-           "Trace emulation of the FPU stack (intel only)")                  \
-diff --git a/test/hotspot/jtreg/compiler/arguments/TestC1Globals.java b/test/hotspot/jtreg/compiler/arguments/TestC1Globals.java
-new file mode 100644
-index 000000000..fbb4951d9
---- /dev/null
-+++ b/test/hotspot/jtreg/compiler/arguments/TestC1Globals.java
-@@ -0,0 +1,67 @@
-+/*
-+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/**
-+ * @test
-+ * @bug 8316653
-+ * @requires vm.debug
-+ * @summary Test flag with max value.
-+ *
-+ * @run main/othervm -XX:NMethodSizeLimit=1M
-+ *                   compiler.arguments.TestC1Globals
-+ */
-+
-+/**
-+ * @test
-+ * @bug 8318817
-+ * @requires vm.debug
-+ * @requires os.family == "linux"
-+ * @summary Test flag with max value combined with transparent huge pages on
-+ *          Linux.
-+ *
-+ * @run main/othervm -XX:NMethodSizeLimit=1M
-+ *                   -XX:+UseTransparentHugePages
-+ *                   compiler.arguments.TestC1Globals
-+ */
-+
-+/**
-+ * @test
-+ * @bug 8320682
-+ * @requires vm.debug
-+ * @summary Test flag with max value and specific compilation.
-+ *
-+ * @run main/othervm -XX:NMethodSizeLimit=1M
-+ *                   -XX:CompileOnly=java.util.HashMap::putMapEntries
-+ *                   -Xcomp
-+ *                   compiler.arguments.TestC1Globals
-+ *
-+ */
-+
-+ package compiler.arguments;
-+
-+ public class TestC1Globals {
-+ 
-+     public static void main(String args[]) {
-+         System.out.println("Passed");
-+     }
-+ }
-\ No newline at end of file
--- 
-2.33.0
-

Backport-JDK-8329174-update-CodeBuffer-layout-in-com.patch

@@ -40,18 +40,6 @@ index ab8aed1cb..4bc33cc89 100644
  //                                  +----------------+
  //    + _total_size ->              |                |
  //
-@@ -1061,11 +1062,6 @@ void CodeSection::print(const char* name) {
- }
- 
- void CodeBuffer::print() {
--  if (this == nullptr) {
--    tty->print_cr("null CodeBuffer pointer");
--    return;
--  }
--
-   tty->print_cr("CodeBuffer:");
-   for (int n = 0; n < (int)SECT_LIMIT; n++) {
-     // print each section
 -- 
 2.33.0
 

Backport-JDK-8331391-Enhance-the-keytool-code-by-inv.patch

@@ -1,36 +0,0 @@
-Subject: Backport JDK-8331391 Enhance the keytool code by invoking the buildTrustedCerts method for essential options
-
----
- .../share/classes/sun/security/tools/keytool/Main.java        | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Main.java b/src/java.base/share/classes/sun/security/tools/keytool/Main.java
-index edb0b4195..3e2e5dec2 100644
---- a/src/java.base/share/classes/sun/security/tools/keytool/Main.java
-+++ b/src/java.base/share/classes/sun/security/tools/keytool/Main.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -1119,7 +1119,6 @@ public final class Main {
-             }
-         }
- 
--        KeyStore cakstore = buildTrustedCerts();
-         // -trustcacerts can be specified on -importcert, -printcert or -printcrl.
-         // Reset it so that warnings on CA cert will remain for other command.
-         if (command != IMPORTCERT && command != PRINTCERT
-@@ -1128,6 +1127,7 @@ public final class Main {
-         }
- 
-         if (trustcacerts) {
-+            KeyStore cakstore = buildTrustedCerts();
-             if (cakstore != null) {
-                 caks = cakstore;
-             } else {
--- 
-2.33.0
-

Backport-JDK-8332866-Crash-in-ImageIO-JPEG-decoding-.patch

@@ -1,38 +0,0 @@
-Subject: Backport JDK-8332866 Crash in ImageIO JPEG decoding when MEM_STATS in enabled
-
----
- src/java.desktop/share/native/libjavajpeg/imageioJPEG.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c b/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
-index c4c38dc0f..b4281458d 100644
---- a/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
-+++ b/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -666,8 +666,6 @@ static void imageio_reset(JNIEnv *env,
- static void imageio_dispose(j_common_ptr info) {
- 
-     if (info != NULL) {
--        free(info->err);
--        info->err = NULL;
-         if (info->is_decompressor) {
-             j_decompress_ptr dinfo = (j_decompress_ptr) info;
-             free(dinfo->src);
-@@ -678,6 +676,8 @@ static void imageio_dispose(j_common_ptr info) {
-             cinfo->dest = NULL;
-         }
-         jpeg_destroy(info);
-+        free(info->err);
-+        info->err = NULL;
-         free(info);
-     }
- }
--- 
-2.33.0
-

Backport-JDK-8340623-Remove-outdated-PROCESSOR_ARCHI.patch

@@ -8,13 +8,6 @@ diff --git a/src/java.base/windows/native/libjava/java_props_md.c b/src/java.bas
 index 2ff4c9e88..280747d0d 100644
 --- a/src/java.base/windows/native/libjava/java_props_md.c
 +++ b/src/java.base/windows/native/libjava/java_props_md.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
 @@ -263,9 +263,6 @@ cpu_isalist(void)
      SYSTEM_INFO info;
      GetSystemInfo(&info);

Backport-of-8337067-Test-runtime-classFileParserBug-.patch

@@ -1,28 +0,0 @@
-Subject: Backport of 8337067: Test runtime/classFileParserBug/Bad_NCDFE_Msg.java won't compile
-
----
- .../jtreg/runtime/classFileParserBug/Bad_NCDFE_Msg.java        | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/test/hotspot/jtreg/runtime/classFileParserBug/Bad_NCDFE_Msg.java b/test/hotspot/jtreg/runtime/classFileParserBug/Bad_NCDFE_Msg.java
-index 1baf5bdc8..346794d4c 100644
---- a/test/hotspot/jtreg/runtime/classFileParserBug/Bad_NCDFE_Msg.java
-+++ b/test/hotspot/jtreg/runtime/classFileParserBug/Bad_NCDFE_Msg.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -31,6 +31,7 @@
-  *          java.management
-  * @compile C.java
-  * @run driver Bad_NCDFE_Msg
-+ **/
- 
- import java.io.File;
- import jdk.test.lib.process.ProcessTools;
--- 
-2.33.0
-

Backport-of-JDK-8316895-SeenThread-print_action_que.patch

@@ -1,40 +0,0 @@
-Subject: Backport of JDK-8316895 SeenThread::print_action_queue called on a null pointer
-
----
- src/hotspot/share/classfile/placeholders.cpp | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/src/hotspot/share/classfile/placeholders.cpp b/src/hotspot/share/classfile/placeholders.cpp
-index 0f08e80dd..555317f63 100644
---- a/src/hotspot/share/classfile/placeholders.cpp
-+++ b/src/hotspot/share/classfile/placeholders.cpp
-@@ -80,8 +80,7 @@ public:
-    void set_next(SeenThread* seen) { _stnext = seen; }
-    void set_prev(SeenThread* seen) { _stprev = seen; }
- 
--  void print_action_queue(outputStream* st) {
--    SeenThread* seen = this;
-+  static void print_action_queue(SeenThread* seen, outputStream* st) {
-     while (seen != nullptr) {
-       seen->thread()->print_value_on(st);
-       st->print(", ");
-@@ -327,13 +326,13 @@ void PlaceholderEntry::print_on(outputStream* st) const {
-   }
-   st->cr();
-   st->print("loadInstanceThreadQ threads:");
--  loadInstanceThreadQ()->print_action_queue(st);
-+  SeenThread::print_action_queue(loadInstanceThreadQ(), st);
-   st->cr();
-   st->print("superThreadQ threads:");
--  superThreadQ()->print_action_queue(st);
-+  SeenThread::print_action_queue(loadInstanceThreadQ(), st);
-   st->cr();
-   st->print("defineThreadQ threads:");
--  defineThreadQ()->print_action_queue(st);
-+  SeenThread::print_action_queue(loadInstanceThreadQ(), st);
-   st->cr();
- }
- 
--- 
-2.33.0
-

Backport-of-JDK-8328723-IP-Address-error-when-client.patch

@@ -1,40 +0,0 @@
-Subject: Backport of JDK-8328723 IP Address error when client enables HTTPS endpoint check on server socket
-
----
- .../sun/security/ssl/X509TrustManagerImpl.java    | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java b/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
-index e3df4c162..58794e5dc 100644
---- a/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
-+++ b/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -428,8 +428,17 @@ final class X509TrustManagerImpl extends X509ExtendedTrustManager
-         }
- 
-         if (!identifiable) {
--            checkIdentity(peerHost,
--                    trustedChain[0], algorithm, chainsToPublicCA);
-+            try {
-+                checkIdentity(peerHost,
-+                        trustedChain[0], algorithm, chainsToPublicCA);
-+            } catch(CertificateException ce) {
-+                if (checkClientTrusted && "HTTPS".equalsIgnoreCase(algorithm)) {
-+                    throw new CertificateException("Endpoint Identification Algorithm " +
-+                            "HTTPS is not supported on the server side");
-+                } else {
-+                    throw ce;
-+                }
-+            }
-         }
-     }
- 
--- 
-2.33.0
-

openjdk-21.spec

@@ -160,7 +160,7 @@
 # Used via new version scheme. JDK 19 was
 # GA'ed in March 2022 => 22.3
 %global vendor_version_string BiSheng
-%global securityver 5
+%global securityver 6
 # buildjdkver is usually same as %%{majorver},
 # but in time of bootstrap of next jdk, it is majorver-1,
 # and this it is better to change it here, on single place
@@ -180,7 +180,7 @@
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{origin}
 %global minorver        0
-%global buildver        11
+%global buildver        7
 %global rpmrelease      1
 # 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
 %if %is_system_jdk
@@ -899,7 +899,7 @@ Name:    java-21-%{origin}
 Version: %{newjavaver}.%{buildver}
 # This package needs `.rolling` as part of Release so as to not conflict on install with
 # java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as
-Release: 3
+Release: 1
 
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
 # and this change was brought into RHEL-4. java-1.5.0-ibm packages
@@ -979,7 +979,6 @@ Patch9: add-downgrade-the-glibc-symbol-of-fcntl.patch
 Patch10: Backport-JDK-8336855-Duplicate-protected-declaration.patch
 Patch11: Backport-JDK-8334758-Incorrect-note-in-Javadoc-for-a.patch
 Patch12: Backport-JDK-8323699-MessageFormat.toPattern-generat.patch
-Patch15: Backport-JDK-8332866-Crash-in-ImageIO-JPEG-decoding-.patch
 Patch16: Backport-JDK-8333805-Replaying-compilation-with-null.patch
 Patch19: 8339351-Remove-duplicate-line-in-FileMapHeader-print.patch
 Patch21: 8339149-jfr_flush_event_writer-return-value-type-mis.patch
@@ -990,17 +989,12 @@ Patch26: 8335610-DiagnosticFramework-CmdLine-is_executable-co.patch
 Patch27: Backport-of-8337245-Fix-wrong-comment-of-StringConca.patch
 Patch28: Backport-of-8337274-Remove-repeated-the.patch
 Patch29: backport-of-8339298-Remove-unused-function-declarati.patch
-Patch31: Backport-JDK-8320682-[AArch64]-C1-compilation-fails-.patch
 Patch32: BackPort-JDK-8336346-Fix--Wzero-as-null-pointer-cons.patch
 Patch37: Backport-JDK-8336080-Fix--Wzero-as-null-pointer-cons.patch
 Patch38: Backport-JDK-8336152-Remove-unused-forward-declarati.patch
 Patch39: Backport-of-8330191-Fix-typo-in-precompiled.hpp.patch
 Patch40: Backport-of-8337787-Fix-Wzero-as-null-pointer-consta.patch
 Patch41: Backport-of-8337712-Wrong-javadoc-in-java.util.Date-.patch
-Patch42: Backport-of-8337067-Test-runtime-classFileParserBug-.patch
-Patch45: Backport-of-JDK-8316895-SeenThread-print_action_que.patch
-Patch46: Backport-of-JDK-8328723-IP-Address-error-when-client.patch
-Patch48: Backport-JDK-8207908-JMXStatusTest.java-fails-assert.patch
 Patch49: Backport-JDK-8328107-Shenandoah-C2-TestVerifyLoopOpt.patch
 Patch50: Backport-JDK-8328553-Get-rid-of-JApplet-in-test-jdk-.patch
 Patch51: Backport-JDK-8329754-The-ThreadSafe-attribute-is-ign.patch
@@ -1010,7 +1004,6 @@ Patch55: Backport-JDK-8313909-JVMCI-assert-cp-tag_at-index-.i.patch
 Patch56: Backport-JDK-8304484-CDS-dynamic-dumping-incorrectly.patch
 Patch57: Backport-JDK-8322812-Manpage-for-jcmd-is-missing-JFR.patch
 Patch58: Backport-JDK-8327538-The-SSLExtension-class-specifie.patch
-Patch59: Backport-JDK-8331391-Enhance-the-keytool-code-by-inv.patch
 Patch60: Backport-JDK-8333599-Improve-description-of-b-matche.patch
 Patch62: Backport-JDK-8336012-Fix-usages-of-jtreg-reserved-pr.patch
 Patch63: Backport-JDK-8336879-Always-true-condition-img-null-.patch
@@ -1266,7 +1259,6 @@ pushd %{top_level_dir_name}
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch15 -p1
 %patch16 -p1
 %patch19 -p1
 %patch21 -p1
@@ -1277,17 +1269,12 @@ pushd %{top_level_dir_name}
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
-%patch31 -p1
 %patch32 -p1
 %patch37 -p1
 %patch38 -p1
 %patch39 -p1
 %patch40 -p1
 %patch41 -p1
-%patch42 -p1
-%patch45 -p1
-%patch46 -p1
-%patch48 -p1
 %patch49 -p1
 %patch50 -p1
 %patch51 -p1
@@ -1297,7 +1284,6 @@ pushd %{top_level_dir_name}
 %patch56 -p1
 %patch57 -p1
 %patch58 -p1
-%patch59 -p1
 %patch60 -p1
 %patch62 -p1
 %patch63 -p1
@@ -1874,8 +1860,27 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect
 
 
 %changelog
-* Wed Dec 25 2024 Dingli Zhang <dingli@iscas.ac.cn> - 1:21.0.5.11-3
+* Tue Feb 11 2025 Pan Xuefeng <panxuefeng@loongson.cn> - 1:21.0.6.7-1
+- update LoongArch64 port to 21.0.6
+
+* Thu Jan 23 2025 Benshuai5D <zhangyunbo7@huawei.com> - 1:21.0.6.7-0
+- update to jdk21.0.6-ga
+- delete Backport-JDK-8207908-JMXStatusTest.java-fails-assert.patch
+- delete Backport-JDK-8320682-[AArch64]-C1-compilation-fails-.patch
+- delete Backport-JDK-8331391-Enhance-the-keytool-code-by-inv.patch
+- delete Backport-JDK-8332866-Crash-in-ImageIO-JPEG-decoding-.patch
+- delete Backport-of-8337067-Test-runtime-classFileParserBug-.patch
+- delete Backport-of-JDK-8316895-SeenThread-print_action_que.patch
+- delete Backport-of-JDK-8328723-IP-Address-error-when-client.patch
+- modify Backport-JDK-8329174-update-CodeBuffer-layout-in-com.patch
+- modify Backport-JDK-8340623-Remove-outdated-PROCESSOR_ARCHI.patch 
+
+* Wed Dec 25 2024 Dingli Zhang <dingli@iscas.ac.cn> - 1:21.0.5.11-4
 - Remove double colons from patch names
+- Fix typo in chagelog
+
+* Thu Dec 5 2024 kuenking111 <wangkun49@huawei.com> - 1:21.0.5.11-3
+- disable LTO
 
 * Mon Nov 11 2024 Dingli Zhang <dingli@iscas.ac.cn> - 1:21.0.5.11-2
 - Remove redundant patch to fix ci check