I68ZUR:upgrade to jdk11.0.18-GA

8224675-Late-GC-barrier-insertion-for-ZGC.patch

@@ -2764,9 +2764,9 @@ index 2f4b9faf0..10dd02f9f 100644
    static int _file_count;
    networkStream *_stream;
    xmlStream *_xml;
-@@ -97,10 +93,6 @@ class IdealGraphPrinter : public CHeapObj<mtCompiler> {
+@@ -98,10 +94,6 @@ class IdealGraphPrinter : public CHeapObj<mtCompiler> {
-   bool _traverse_outs;
    Compile *C;
+   double _max_freq;
 
 -  static void pre_node(Node* node, void *env);
 -  static void post_node(Node* node, void *env);

8231441-2-AArch64-Initial-SVE-backend-support.patch

@@ -2138,13 +2138,6 @@ diff --git a/src/hotspot/share/opto/type.hpp b/src/hotspot/share/opto/type.hpp
 index a7eec281e..6787b947d 100644
 --- a/src/hotspot/share/opto/type.hpp
 +++ b/src/hotspot/share/opto/type.hpp
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2020, 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
 @@ -53,6 +53,7 @@ class     TypeNarrowKlass;
  class   TypeAry;
  class   TypeTuple;

8268427-Improve-AlgorithmConstraints-checkAlgorithm-.patch

@@ -1,242 +0,0 @@
-From e3d9485d01941cfbbe01dc8dcea7b913c2e8469d Mon Sep 17 00:00:00 2001
-From: chenshanyao <chenshanyao@huawei.com>
-Date: Tue, 14 Sep 2021 11:43:18 +0800
-Subject: [PATCH 8/8] 8268427: Improve AlgorithmConstraints:checkAlgorithm
- performance
-
-Summary: <java> : performance
-LLT: jdk_security
-Patch Type: backport
-Bug url: https://bugs.openjdk.java.net/browse/JDK-8268427
----
- .../util/AbstractAlgorithmConstraints.java    | 39 +++++------
- .../util/DisabledAlgorithmConstraints.java    | 28 ++++----
- .../util/LegacyAlgorithmConstraints.java      |  2 +-
- .../security/AlgorithmConstraintsPermits.java | 66 +++++++++++++++++++
- 4 files changed, 95 insertions(+), 40 deletions(-)
- create mode 100644 test/micro/org/openjdk/bench/java/security/AlgorithmConstraintsPermits.java
-
-diff --git a/src/java.base/share/classes/sun/security/util/AbstractAlgorithmConstraints.java b/src/java.base/share/classes/sun/security/util/AbstractAlgorithmConstraints.java
-index 8d8c5d6fe..3f5678950 100644
---- a/src/java.base/share/classes/sun/security/util/AbstractAlgorithmConstraints.java
-+++ b/src/java.base/share/classes/sun/security/util/AbstractAlgorithmConstraints.java
-@@ -32,6 +32,7 @@ import java.security.Security;
- import java.util.ArrayList;
- import java.util.Arrays;
- import java.util.Collections;
-+import java.util.TreeSet;
- import java.util.List;
- import java.util.Set;
- 
-@@ -48,7 +49,7 @@ public abstract class AbstractAlgorithmConstraints
-     }
- 
-     // Get algorithm constraints from the specified security property.
--    static List<String> getAlgorithms(String propertyName) {
-+    static Set<String> getAlgorithms(String propertyName) {
-         String property = AccessController.doPrivileged(
-                 new PrivilegedAction<String>() {
-                     @Override
-@@ -72,38 +73,30 @@ public abstract class AbstractAlgorithmConstraints
- 
-         // map the disabled algorithms
-         if (algorithmsInProperty == null) {
--            return Collections.emptyList();
-+            return Collections.emptySet();
-         }
--        return new ArrayList<>(Arrays.asList(algorithmsInProperty));
-+        Set<String> algorithmsInPropertySet = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
-+        algorithmsInPropertySet.addAll(Arrays.asList(algorithmsInProperty));
-+        return algorithmsInPropertySet;
-     }
- 
--    static boolean checkAlgorithm(List<String> algorithms, String algorithm,
-+    static boolean checkAlgorithm(Set<String> algorithms, String algorithm,
-             AlgorithmDecomposer decomposer) {
-         if (algorithm == null || algorithm.isEmpty()) {
-             throw new IllegalArgumentException("No algorithm name specified");
-         }
- 
--        Set<String> elements = null;
--        for (String item : algorithms) {
--            if (item == null || item.isEmpty()) {
--                continue;
--            }
--
--            // check the full name
--            if (item.equalsIgnoreCase(algorithm)) {
--                return false;
--            }
-+        if (algorithms.contains(algorithm)) {
-+            return false;
-+        }
- 
--            // decompose the algorithm into sub-elements
--            if (elements == null) {
--                elements = decomposer.decompose(algorithm);
--            }
-+        // decompose the algorithm into sub-elements
-+        Set<String> elements = decomposer.decompose(algorithm);
- 
--            // check the items of the algorithm
--            for (String element : elements) {
--                if (item.equalsIgnoreCase(element)) {
--                    return false;
--                }
-+        // check the element of the elements
-+        for (String element : elements) {
-+            if (algorithms.contains(element)) {
-+                return false;
-             }
-         }
- 
-diff --git a/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java b/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
-index 3ee431e62..efc6d339f 100644
---- a/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
-+++ b/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
-@@ -85,6 +85,9 @@ public class DisabledAlgorithmConstraints extends AbstractAlgorithmConstraints {
-     private static final String PROPERTY_DISABLED_EC_CURVES =
-             "jdk.disabled.namedCurves";
- 
-+    private static final Pattern INCLUDE_PATTERN = Pattern.compile("include " +
-+            PROPERTY_DISABLED_EC_CURVES, Pattern.CASE_INSENSITIVE);
-+
-     private static class CertPathHolder {
-         static final DisabledAlgorithmConstraints CONSTRAINTS =
-             new DisabledAlgorithmConstraints(PROPERTY_CERTPATH_DISABLED_ALGS);
-@@ -95,7 +98,7 @@ public class DisabledAlgorithmConstraints extends AbstractAlgorithmConstraints {
-             new DisabledAlgorithmConstraints(PROPERTY_JAR_DISABLED_ALGS);
-     }
- 
--    private final List<String> disabledAlgorithms;
-+    private final Set<String> disabledAlgorithms;
-     private final Constraints algorithmConstraints;
- 
-     public static DisabledAlgorithmConstraints certPathConstraints() {
-@@ -130,21 +133,14 @@ public class DisabledAlgorithmConstraints extends AbstractAlgorithmConstraints {
-         disabledAlgorithms = getAlgorithms(propertyName);
- 
-         // Check for alias
--        int ecindex = -1, i = 0;
-         for (String s : disabledAlgorithms) {
--            if (s.regionMatches(true, 0,"include ", 0, 8)) {
--                if (s.regionMatches(true, 8, PROPERTY_DISABLED_EC_CURVES, 0,
--                        PROPERTY_DISABLED_EC_CURVES.length())) {
--                    ecindex = i;
--                    break;
--                }
-+            Matcher matcher = INCLUDE_PATTERN.matcher(s);
-+            if (matcher.matches()) {
-+                disabledAlgorithms.remove(matcher.group());
-+                disabledAlgorithms.addAll(
-+                        getAlgorithms(PROPERTY_DISABLED_EC_CURVES));
-+                break;
-             }
--            i++;
--        }
--        if (ecindex > -1) {
--            disabledAlgorithms.remove(ecindex);
--            disabledAlgorithms.addAll(ecindex,
--                    getAlgorithms(PROPERTY_DISABLED_EC_CURVES));
-         }
-         algorithmConstraints = new Constraints(propertyName, disabledAlgorithms);
-     }
-@@ -323,8 +319,8 @@ public class DisabledAlgorithmConstraints extends AbstractAlgorithmConstraints {
-                     "denyAfter\\s+(\\d{4})-(\\d{2})-(\\d{2})");
-         }
- 
--        public Constraints(String propertyName, List<String> constraintArray) {
--            for (String constraintEntry : constraintArray) {
-+        public Constraints(String propertyName, Set<String> constraintSet) {
-+            for (String constraintEntry : constraintSet) {
-                 if (constraintEntry == null || constraintEntry.isEmpty()) {
-                     continue;
-                 }
-diff --git a/src/java.base/share/classes/sun/security/util/LegacyAlgorithmConstraints.java b/src/java.base/share/classes/sun/security/util/LegacyAlgorithmConstraints.java
-index e4e5cedc1..550173080 100644
---- a/src/java.base/share/classes/sun/security/util/LegacyAlgorithmConstraints.java
-+++ b/src/java.base/share/classes/sun/security/util/LegacyAlgorithmConstraints.java
-@@ -40,7 +40,7 @@ public class LegacyAlgorithmConstraints extends AbstractAlgorithmConstraints {
-     public static final String PROPERTY_TLS_LEGACY_ALGS =
-             "jdk.tls.legacyAlgorithms";
- 
--    private final List<String> legacyAlgorithms;
-+    private final Set<String> legacyAlgorithms;
- 
-     public LegacyAlgorithmConstraints(String propertyName,
-             AlgorithmDecomposer decomposer) {
-diff --git a/test/micro/org/openjdk/bench/java/security/AlgorithmConstraintsPermits.java b/test/micro/org/openjdk/bench/java/security/AlgorithmConstraintsPermits.java
-new file mode 100644
-index 000000000..3cb9567b9
---- /dev/null
-+++ b/test/micro/org/openjdk/bench/java/security/AlgorithmConstraintsPermits.java
-@@ -0,0 +1,66 @@
-+/*
-+ * Copyright (c) 2021, Huawei Technologies Co., Ltd. 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.
-+ */
-+package org.openjdk.bench.java.security;
-+
-+import org.openjdk.jmh.annotations.Benchmark;
-+import org.openjdk.jmh.annotations.BenchmarkMode;
-+import org.openjdk.jmh.annotations.Fork;
-+import org.openjdk.jmh.annotations.Mode;
-+import org.openjdk.jmh.annotations.OutputTimeUnit;
-+import org.openjdk.jmh.annotations.Param;
-+import org.openjdk.jmh.annotations.Scope;
-+import org.openjdk.jmh.annotations.Setup;
-+import org.openjdk.jmh.annotations.State;
-+import sun.security.util.DisabledAlgorithmConstraints;
-+
-+import java.security.AlgorithmConstraints;
-+import java.security.CryptoPrimitive;
-+import java.util.concurrent.TimeUnit;
-+import java.util.EnumSet;
-+import java.util.Set;
-+
-+import static sun.security.util.DisabledAlgorithmConstraints.PROPERTY_TLS_DISABLED_ALGS;
-+
-+@BenchmarkMode(Mode.AverageTime)
-+@OutputTimeUnit(TimeUnit.NANOSECONDS)
-+@Fork(jvmArgsAppend = {"--add-exports", "java.base/sun.security.util=ALL-UNNAMED"})
-+@State(Scope.Thread)
-+public class AlgorithmConstraintsPermits {
-+
-+    AlgorithmConstraints tlsDisabledAlgConstraints;
-+    Set<CryptoPrimitive> primitives = EnumSet.of(CryptoPrimitive.KEY_AGREEMENT);
-+
-+    @Param({"SSLv3", "DES", "NULL", "TLS1.3"})
-+    String algorithm;
-+
-+    @Setup
-+    public void setup() {
-+        tlsDisabledAlgConstraints = new DisabledAlgorithmConstraints(PROPERTY_TLS_DISABLED_ALGS);
-+    }
-+
-+    @Benchmark
-+    public boolean permits() {
-+        return tlsDisabledAlgConstraints.permits(primitives, algorithm, null);
-+    }
-+}
-+
--- 
-2.22.0
-

8290705_fix_StringConcat_validate_mem_flow_asserts_with_unexpected_userStoreI.patch

@@ -1,145 +0,0 @@
-diff --git a/src/hotspot/share/opto/stringopts.cpp b/src/hotspot/share/opto/stringopts.cpp
-index e8e493bce..91a3c998e 100644
---- a/src/hotspot/share/opto/stringopts.cpp
-+++ b/src/hotspot/share/opto/stringopts.cpp
-@@ -1028,6 +1028,21 @@ bool StringConcat::validate_control_flow() {
-       fail = true;
-       break;
-     } else if (ptr->is_Proj() && ptr->in(0)->is_Initialize()) {
-+      // Check for side effect between Initialize and the constructor
-+      for (SimpleDUIterator iter(ptr); iter.has_next(); iter.next()) {
-+        Node* use = iter.get();
-+        if (!use->is_CFG() && !use->is_CheckCastPP() && !use->is_Load()) {
-+#ifndef PRODUCT
-+          if (PrintOptimizeStringConcat) {
-+            tty->print_cr("unexpected control use of Initialize");
-+            ptr->in(0)->dump(); // Initialize node
-+            use->dump(1);
-+          }
-+#endif
-+          fail = true;
-+          break;
-+        }
-+      }
-       ptr = ptr->in(0)->in(0);
-     } else if (ptr->is_Region()) {
-       Node* copy = ptr->as_Region()->is_copy();
-diff --git a/test/hotspot/jtreg/compiler/stringopts/SideEffectBeforeConstructor.jasm b/test/hotspot/jtreg/compiler/stringopts/SideEffectBeforeConstructor.jasm
-new file mode 100644
-index 000000000..cbc6d754b
---- /dev/null
-+++ b/test/hotspot/jtreg/compiler/stringopts/SideEffectBeforeConstructor.jasm
-@@ -0,0 +1,58 @@
-+/*
-+ * Copyright (c) 2022, 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.
-+ */
-+
-+super public class compiler/stringopts/SideEffectBeforeConstructor
-+	version 51:0
-+{
-+  public static Field result:I;
-+
-+  static Method "<clinit>":"()V"
-+	stack 2 locals 0
-+  {
-+		iconst_0;
-+		putstatic	Field result:"I";
-+		return;
-+  }
-+  public Method "<init>":"()V"
-+	stack 1 locals 1
-+  {
-+		aload_0;
-+		invokespecial	Method java/lang/Object."<init>":"()V";
-+		return;
-+  }
-+
-+  public static Method test:"(Ljava/lang/String;)V"
-+	stack 4 locals 1
-+  {
-+		new	class java/lang/StringBuffer;
-+		dup;
-+		getstatic	Field result:"I";
-+		iconst_1;
-+		iadd;
-+		putstatic	Field result:"I";
-+		aload_0;
-+		invokespecial	Method java/lang/StringBuffer."<init>":"(Ljava/lang/String;)V";
-+		invokevirtual	Method java/lang/StringBuffer.toString:"()Ljava/lang/String;";
-+		return;
-+  }
-+}
-diff --git a/test/hotspot/jtreg/compiler/stringopts/TestSideEffectBeforeConstructor.java b/test/hotspot/jtreg/compiler/stringopts/TestSideEffectBeforeConstructor.java
-new file mode 100644
-index 000000000..86c5eca1d
---- /dev/null
-+++ b/test/hotspot/jtreg/compiler/stringopts/TestSideEffectBeforeConstructor.java
-@@ -0,0 +1,49 @@
-+/*
-+ * Copyright (c) 2022, 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 8290705
-+ * @summary Test correctness of the string concatenation optimization with
-+ *          a store between StringBuffer allocation and constructor invocation.
-+ * @compile SideEffectBeforeConstructor.jasm
-+ * @run main/othervm -Xbatch compiler.stringopts.TestSideEffectBeforeConstructor
-+ */
-+
-+package compiler.stringopts;
-+
-+public class TestSideEffectBeforeConstructor {
-+
-+    public static void main(String[] args) {
-+        for (int i = 0; i < 100_000; ++i) {
-+            try {
-+                SideEffectBeforeConstructor.test(null);
-+            } catch (NullPointerException npe) {
-+                // Expected
-+            }
-+        }
-+        if (SideEffectBeforeConstructor.result != 100_000) {
-+            throw new RuntimeException("Unexpected result: " + SideEffectBeforeConstructor.result);
-+        }
-+    }
-+}

G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch

@@ -367,4 +367,4 @@ index 000000000..85b49171c
 --- /dev/null
 +++ b/version.txt
 @@ -0,0 +1 @@
-+11.0.17.0.13
++11.0.18.0.13

fix_X509TrustManagerImpl_symantec_distrust.patch

@@ -1,72 +0,0 @@
-diff --git a/make/data/cacerts/geotrustglobalca b/make/data/cacerts/geotrustglobalca
-new file mode 100644
-index 000000000..7f8bf9a66
---- /dev/null
-+++ b/make/data/cacerts/geotrustglobalca
-@@ -0,0 +1,27 @@
-+Owner: CN=GeoTrust Global CA, O=GeoTrust Inc., C=US
-+Issuer: CN=GeoTrust Global CA, O=GeoTrust Inc., C=US
-+Serial number: 23456
-+Valid from: Tue May 21 04:00:00 GMT 2002 until: Sat May 21 04:00:00 GMT 2022
-+Signature algorithm name: SHA1withRSA
-+Subject Public Key Algorithm: 2048-bit RSA key
-+Version: 3
-+-----BEGIN CERTIFICATE-----
-+MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
-+MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
-+YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
-+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
-+R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
-+9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
-+fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
-+iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
-+1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
-+bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
-+MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
-+ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
-+uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
-+Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
-+tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
-+PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
-+hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
-+5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
-+-----END CERTIFICATE-----
-diff --git a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
-index c131bd493..478cc7235 100644
---- a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
-+++ b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
-@@ -53,12 +53,12 @@ public class VerifyCACerts {
-             + File.separator + "security" + File.separator + "cacerts";
- 
-     // The numbers of certs now.
--    private static final int COUNT = 86;
-+    private static final int COUNT = 87;
- 
-     // SHA-256 of cacerts, can be generated with
-     // shasum -a 256 cacerts | sed -e 's/../&:/g' | tr '[:lower:]' '[:upper:]' | cut -c1-95
-     private static final String CHECKSUM
--            = "89:78:5A:96:F4:B2:68:4C:91:C0:32:2C:ED:2D:6B:3B:26:B8:37:C3:07:DD:9E:50:87:53:53:7A:24:98:97:E0";
-+            = "63:C4:11:7D:BF:C5:05:2B:BF:C2:B4:5A:2C:B6:26:C4:57:76:FB:D4:48:3B:E7:4C:62:B0:A1:7B:4F:07:B1:0C";
- 
-     // map of cert alias to SHA-256 fingerprint
-     @SuppressWarnings("serial")
-@@ -116,7 +116,9 @@ public class VerifyCACerts {
-                     "7E:37:CB:8B:4C:47:09:0C:AB:36:55:1B:A6:F4:5D:B8:40:68:0F:BA:16:6A:95:2D:B1:00:71:7F:43:05:3F:C2");
-             put("digicerthighassuranceevrootca [jdk]",
-                     "74:31:E5:F4:C3:C1:CE:46:90:77:4F:0B:61:E0:54:40:88:3B:A9:A0:1E:D0:0B:A6:AB:D7:80:6E:D3:B1:18:CF");
--            put("geotrustprimaryca [jdk]",
-+	    put("geotrustglobalca [jdk]",
-+                    "FF:85:6A:2D:25:1D:CD:88:D3:66:56:F4:50:12:67:98:CF:AB:AA:DE:40:79:9C:72:2D:E4:D2:B5:DB:36:A7:3A");
-+	    put("geotrustprimaryca [jdk]",
-                     "37:D5:10:06:C5:12:EA:AB:62:64:21:F1:EC:8C:92:01:3F:C5:F8:2A:E9:8E:E5:33:EB:46:19:B8:DE:B4:D0:6C");
-             put("geotrustprimarycag2 [jdk]",
-                     "5E:DB:7A:C4:3B:82:A0:6A:87:61:E8:D7:BE:49:79:EB:F2:61:1F:7D:D7:9B:F9:1C:1C:6B:56:6A:21:9E:D7:66");
-@@ -250,6 +252,8 @@ public class VerifyCACerts {
-             add("addtrustexternalca [jdk]");
-             // Valid until: Sat May 30 10:44:50 GMT 2020
-             add("addtrustqualifiedca [jdk]");
-+	    // Valid until: Sat May 21 04:00:00 GMT 2022
-+            add("geotrustglobalca [jdk]");
-         }
-     };
- 

openjdk-11.spec

@@ -114,7 +114,7 @@
 
 # New Version-String scheme-style defines
 %global majorver 11
-%global securityver 17
+%global securityver 18
 # 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
@@ -130,12 +130,12 @@
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{origin}
 %global minorver        0
-%global buildver        8
+%global buildver        10
 %global patchver	0
 
 %global project		jdk-updates
 %global repo		jdk11u
-%global revision	jdk-11.0.17-ga
+%global revision	jdk-11.0.18-ga
 %global full_revision %{project}-%{repo}-%{revision}
 # priority must be 7 digits in total
 # setting to 1, so debug ones can have 0
@@ -875,8 +875,6 @@ Patch89: downgrade-the-symver-of-memcpy-GLIBC_2.14-on-x86.patch
 
 # 11.0.16
 Patch90: fix_Internal_and_external_code_inconsistency.patch
-Patch91: 8290705_fix_StringConcat_validate_mem_flow_asserts_with_unexpected_userStoreI.patch
-
 
 BuildRequires: elfutils-extra
 BuildRequires: autoconf
@@ -1168,7 +1166,6 @@ pushd %{top_level_dir_name}
 %patch88 -p1
 %patch89 -p1
 %patch90 -p1
-%patch91 -p1
 popd # openjdk
 
 # %patch1000
@@ -1678,6 +1675,11 @@ cjc.mainProgram(arg)
 
 
 %changelog
+* Thu Jan 5 2023 DXwangg <wangjiawei80@huawei.com> - 1:11.0.18.10-0
+- update to 11.0.18+10(GA)
+- modified 8231441-2-AArch64-Initial-SVE-backend-support.patch
+- delete 8290705_fix_StringConcat_validate_mem_flow_asserts_with_unexpected_userStoreI.patch
+
 * Wed Oct 19 2022 DXwangg <wangjiawei80@huawei.com> - 1:11.0.17.8-0
 - update to 11.0.17+8(GA)
 - modified G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch