diff --git a/8210473-JEP-345-NUMA-Aware-Memory-Allocation-for-G1.patch b/8210473-JEP-345-NUMA-Aware-Memory-Allocation-for-G1.patch index 8fae6dd6f3299ba7d1b5ac480beb3ee15b165c52..5965562b15d739f491dc23e30ee42d8d6544dd1e 100644 --- a/8210473-JEP-345-NUMA-Aware-Memory-Allocation-for-G1.patch +++ b/8210473-JEP-345-NUMA-Aware-Memory-Allocation-for-G1.patch @@ -208,9 +208,9 @@ index f073aa63a..1323cc0ac 100644 // this is called _after_ the global arguments have been parsed jint os::init_2(void) { -@@ -5520,32 +5613,7 @@ jint os::init_2(void) { - Linux::libc_version(), Linux::libpthread_version()); - +@@ -5634,32 +5634,7 @@ jint os::init_2(void) { + #endif + if (UseNUMA) { - if (!Linux::libnuma_init()) { - UseNUMA = false; diff --git a/8214527-AArch64-ZGC-for-Aarch64.patch b/8214527-AArch64-ZGC-for-Aarch64.patch index c4c8a8670e8035217a707940816b27363669895a..65da560d03511476fd149c2d0dfbcd0dc2c9da45 100644 --- a/8214527-AArch64-ZGC-for-Aarch64.patch +++ b/8214527-AArch64-ZGC-for-Aarch64.patch @@ -16,30 +16,10 @@ diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch6 index ce103dc1c..53cd702b9 100644 --- a/src/hotspot/cpu/aarch64/aarch64.ad +++ b/src/hotspot/cpu/aarch64/aarch64.ad -@@ -957,6 +957,146 @@ reg_class v3_reg( - V3, V3_H +@@ -971,6 +971,126 @@ reg_class v7_reg( + V7, V7_H ); - -+// Class for 128 bit register v4 -+reg_class v4_reg( -+ V4, V4_H -+); -+ -+// Class for 128 bit register v5 -+reg_class v5_reg( -+ V5, V5_H -+); -+ -+// Class for 128 bit register v6 -+reg_class v6_reg( -+ V6, V6_H -+); -+ -+// Class for 128 bit register v7 -+reg_class v7_reg( -+ V7, V7_H -+); -+ + +// Class for 128 bit register v8 +reg_class v8_reg( + V8, V8_H @@ -175,46 +155,10 @@ index ce103dc1c..53cd702b9 100644 //----------SOURCE BLOCK------------------------------------------------------- // This is a block of C++ code which provides values, functions, and -@@ -4761,6 +4906,258 @@ operand vRegD_V3() +@@ -4940,6 +4940,222 @@ operand vRegD_V7() interface(REG_INTER); %} -+operand vRegD_V4() -+%{ -+ constraint(ALLOC_IN_RC(v4_reg)); -+ match(RegD); -+ op_cost(0); -+ format %{ %} -+ interface(REG_INTER); -+%} -+ -+operand vRegD_V5() -+%{ -+ constraint(ALLOC_IN_RC(v5_reg)); -+ match(RegD); -+ op_cost(0); -+ format %{ %} -+ interface(REG_INTER); -+%} -+ -+operand vRegD_V6() -+%{ -+ constraint(ALLOC_IN_RC(v6_reg)); -+ match(RegD); -+ op_cost(0); -+ format %{ %} -+ interface(REG_INTER); -+%} -+ -+operand vRegD_V7() -+%{ -+ constraint(ALLOC_IN_RC(v7_reg)); -+ match(RegD); -+ op_cost(0); -+ format %{ %} -+ interface(REG_INTER); -+%} -+ +operand vRegD_V8() +%{ + constraint(ALLOC_IN_RC(v8_reg)); diff --git a/8295068-SSLEngine-throws-NPE-parsing-Certificate.patch b/8295068-SSLEngine-throws-NPE-parsing-Certificate.patch new file mode 100644 index 0000000000000000000000000000000000000000..c69ccf42d4c01393b6a84500efd504249c39a441 --- /dev/null +++ b/8295068-SSLEngine-throws-NPE-parsing-Certificate.patch @@ -0,0 +1,21 @@ +Subject: [PATCH] JDK-8295068: SSLEngine throws NPE parsing CertificateRequests + +--- + .../share/classes/sun/security/ssl/CertificateRequest.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/java.base/share/classes/sun/security/ssl/CertificateRequest.java b/src/java.base/share/classes/sun/security/ssl/CertificateRequest.java +index 8e8370ba7..504aefb1a 100644 +--- a/src/java.base/share/classes/sun/security/ssl/CertificateRequest.java ++++ b/src/java.base/share/classes/sun/security/ssl/CertificateRequest.java +@@ -135,7 +135,7 @@ final class CertificateRequest { + ArrayList keyTypes = new ArrayList<>(3); + for (byte id : ids) { + ClientCertificateType cct = ClientCertificateType.valueOf(id); +- if (cct.isAvailable) { ++ if (cct != null && cct.isAvailable) { + keyTypes.add(cct.keyAlgorithm); + } + } +-- + diff --git a/G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch b/G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch index d97aa7f01b7c2cb9795c20cd4ad88b0e0bc557e3..94c979bb53ea9b48f4c27f4b120076041fc824d9 100755 --- a/G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch +++ b/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.20.0.13 ++11.0.21.0.13 diff --git a/delete_expired_certificates.patch b/delete_expired_certificates.patch index 94b5636c0652e6a4b47cea939186158da5783e9e..84b2d91ce0ed6d0f4682ba514557cf251e118f2b 100644 --- a/delete_expired_certificates.patch +++ b/delete_expired_certificates.patch @@ -116,7 +116,7 @@ diff --git a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java b/test/jdk/sun index 122a01901..c131bd493 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 { +@@ -47,12 +47,12 @@ public class VerifyCACerts { + File.separator + "security" + File.separator + "cacerts"; // The numbers of certs now. @@ -126,11 +126,11 @@ index 122a01901..c131bd493 100644 // 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 -- = "72:C7:B8:9E:54:94:D2:D9:C0:E5:9F:F7:C3:8C:3B:18:D7:42:23:82:51:F2:AD:A1:14:26:E0:4A:F2:5F:AE:80"; -+ = "38:20:3E:9C:85:F4:5C:F2:4A:F4:1C:FF:DA:AD:DF:A6:1E:B0:E9:8F:D4:C3:B5:AA:F5:54:E2:94:3E:AF:2F:7C"; - +- = "88:72:92:56:FF:E5:A3:E4:39:98:6D:18:0B:BA:CC:0B:66:CB:1D:6D:52:CE:D7:C8:AD:63:B7:F1:5F:02:24:52"; ++ = "F3:7B:BE:30:2F:68:F9:75:82:21:0B:81:E1:26:32:4C:C0:00:32:B0:66:70:8E:A7:36:65:E8:86:6A:72:4E:F8"; // map of cert alias to SHA-256 fingerprint @SuppressWarnings("serial") + private static final Map FINGERPRINT_MAP = new HashMap<>() { @@ -116,8 +116,6 @@ 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]", diff --git a/jdk-updates-jdk11u-jdk-11.0.20-ga.tar.xz b/jdk-updates-jdk11u-jdk-11.0.21-ga.tar.xz similarity index 83% rename from jdk-updates-jdk11u-jdk-11.0.20-ga.tar.xz rename to jdk-updates-jdk11u-jdk-11.0.21-ga.tar.xz index 4b97083fbe022c78ce8c568be1183451cb77a233..687ead166f590deed440470703b5139dafafc2f3 100644 Binary files a/jdk-updates-jdk11u-jdk-11.0.20-ga.tar.xz and b/jdk-updates-jdk11u-jdk-11.0.21-ga.tar.xz differ diff --git a/openjdk-11.spec b/openjdk-11.spec index a08334c2d76bec2b400e02ad693cf1dbd844a291..455db0d50de55c79c818fcec344055d6aad4806a 100644 --- a/openjdk-11.spec +++ b/openjdk-11.spec @@ -118,7 +118,7 @@ # New Version-String scheme-style defines %global majorver 11 -%global securityver 20 +%global securityver 21 # 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 @@ -134,12 +134,12 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 8 +%global buildver 9 %global patchver 0 %global project jdk-updates %global repo jdk11u -%global revision jdk-11.0.20-ga +%global revision jdk-11.0.21-ga %global full_revision %{project}-%{repo}-%{revision} # priority must be 7 digits in total # setting to 1, so debug ones can have 0 @@ -748,7 +748,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: 2 +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 # also included the epoch in their virtual provides. This created a @@ -886,6 +886,8 @@ Patch90: fix_Internal_and_external_code_inconsistency.patch # 11.0.18 Patch91: 8222289-Overhaul-logic-for-reading-writing-constant-pool-entries.patch +# 11.0.21 +Patch92: 8295068-SSLEngine-throws-NPE-parsing-Certificate.patch ############################################ # # riscv64 specific patches @@ -1186,6 +1188,7 @@ pushd %{top_level_dir_name} %patch89 -p1 %patch90 -p1 %patch91 -p1 +%patch92 -p1 %endif popd # openjdk @@ -1696,6 +1699,17 @@ cjc.mainProgram(arg) %changelog +* Mon Oct 23 2023 DXwangg - 1:11.0.21.9-1 +- add 8295068-SSLEngine-throws-NPE-parsing-Certificate.patch + + +* Thu Oct 19 2023 DXwangg - 1:11.0.21.9-0 +- update to 11.0.21+9(GA) +- modified delete_expired_certificates.patch +- modified G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch +- modified 8210473-JEP-345-NUMA-Aware-Memory-Allocation-for-G1.patch +- modified 8214527-AArch64-ZGC-for-Aarch64.patch + * Thu Aug 17 2023 misaka00251 - 1:11.0.20.8-2 - Add riscv64 support (based on bishengjdk riscv branch)