From e9cbc8f981b7e87f1007d41b1268a507a7f4c8b1 Mon Sep 17 00:00:00 2001 From: Noah Date: Sat, 27 Mar 2021 12:31:45 +0800 Subject: [PATCH] I3DU4U: fix VerifyCerts.java testcase bug --- fix_VerifyCerts.java_testcase_bug.patch | 30 +++++++++++++++++++++++++ java-1.8.0-openjdk.spec | 7 +++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 fix_VerifyCerts.java_testcase_bug.patch diff --git a/fix_VerifyCerts.java_testcase_bug.patch b/fix_VerifyCerts.java_testcase_bug.patch new file mode 100644 index 0000000..7c389bd --- /dev/null +++ b/fix_VerifyCerts.java_testcase_bug.patch @@ -0,0 +1,30 @@ +diff --git a/jdk/test/sun/security/lib/cacerts/VerifyCACerts.java b/jdk/test/sun/security/lib/cacerts/VerifyCACerts.java +index 8d59c6af..29d4f0f9 100644 +--- a/jdk/test/sun/security/lib/cacerts/VerifyCACerts.java ++++ b/jdk/test/sun/security/lib/cacerts/VerifyCACerts.java +@@ -52,7 +52,7 @@ public class VerifyCACerts { + + File.separator + "security" + File.separator + "cacerts"; + + // The numbers of certs now. +- private static final int COUNT = 95; ++ private static final int COUNT = 90; + + // SHA-256 of cacerts, can be generated with + // shasum -a 256 cacerts | sed -e 's/../&:/g' | tr '[:lower:]' '[:upper:]' | cut -c1-95 +@@ -126,16 +126,6 @@ public class VerifyCACerts { + "A4:31:0D:50:AF:18:A6:44:71:90:37:2A:86:AF:AF:8B:95:1F:FB:43:1D:83:7F:1E:56:88:B4:59:71:ED:15:57"); + put("thawteprimaryrootcag3 [jdk]", + "4B:03:F4:58:07:AD:70:F2:1B:FC:2C:AE:71:C9:FD:E4:60:4C:06:4C:F5:FF:B6:86:BA:E5:DB:AA:D7:FD:D3:4C"); +- put("thawtepremiumserverca [jdk]", +- "3F:9F:27:D5:83:20:4B:9E:09:C8:A3:D2:06:6C:4B:57:D3:A2:47:9C:36:93:65:08:80:50:56:98:10:5D:BC:E9"); +- put("verisigntsaca [jdk]", +- "CB:6B:05:D9:E8:E5:7C:D8:82:B1:0B:4D:B7:0D:E4:BB:1D:E4:2B:A4:8A:7B:D0:31:8B:63:5B:F6:E7:78:1A:9D"); +- put("verisignclass2g2ca [jdk]", +- "3A:43:E2:20:FE:7F:3E:A9:65:3D:1E:21:74:2E:AC:2B:75:C2:0F:D8:98:03:05:BC:50:2C:AF:8C:2D:9B:41:A1"); +- put("verisignclass3ca [jdk]", +- "A4:B6:B3:99:6F:C2:F3:06:B3:FD:86:81:BD:63:41:3D:8C:50:09:CC:4F:A3:29:C2:CC:F0:E2:FA:1B:14:03:05"); +- put("verisignclass3g2ca [jdk]", +- "83:CE:3C:12:29:68:8A:59:3D:48:5F:81:97:3C:0F:91:95:43:1E:DA:37:CC:5E:36:43:0E:79:C7:A8:88:63:8B"); + put("verisignuniversalrootca [jdk]", + "23:99:56:11:27:A5:71:25:DE:8C:EF:EA:61:0D:DF:2F:A0:78:B5:C8:06:7F:4E:82:82:90:BF:B8:60:E8:4B:3C"); + put("verisignclass3g3ca [jdk]", diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 33df699..a947e31 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -921,7 +921,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 8 +Release: 9 # 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 @@ -1089,6 +1089,7 @@ Patch159: C1-typos-repair.patch Patch160: 8214418-half-closed-SSLEngine-status-may-cause-appli.patch Patch161: 8259886-Improve-SSL-session-cache-performance-and-sc.patch Patch162: 8214535-support-Jmap-parallel.patch +Patch163: fix_VerifyCerts.java_testcase_bug.patch ############################################# # @@ -1526,6 +1527,7 @@ pushd %{top_level_dir_name} %patch160 -p1 %patch161 -p1 %patch162 -p1 +%patch163 -p1 popd @@ -2142,6 +2144,9 @@ require "copy_jdk_configs.lua" %endif %changelog +* Sat Mar 27 2021 Noah - 1:1.8.0.282-b08.9 +- add fix_VerifyCerts.java_testcase_bug.patch + * Fri Mar 19 2021 kuenking111 - 1:1.8.0.282-b08.8 - add 8214535-support-Jmap-parallel.patch -- Gitee