I54WQX: upgrade to jdk8u332-ga
This commit is contained in:
kuenking111
parent
193da8d7ff
commit
50b2ba1086
@ -18,7 +18,7 @@ index fb0fef636..a6ef2d3a6 100644
|
||||
+++ b/jdk/src/solaris/classes/java/io/UnixFileSystem.java
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
|
||||
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
@ -59,7 +59,7 @@ index caa47f80c..1844a662a 100644
|
||||
+++ b/jdk/src/windows/classes/java/io/WinNTFileSystem.java
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
|
||||
+ * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
@ -70,8 +70,8 @@ index caa47f80c..1844a662a 100644
|
||||
private final char semicolon;
|
||||
+ private final String userDir;
|
||||
|
||||
public WinNTFileSystem() {
|
||||
slash = AccessController.doPrivileged(
|
||||
// Whether to enable alternative data streams (ADS) by suppressing
|
||||
// checking the path for invalid characters, in particular ":".
|
||||
@@ -47,6 +48,8 @@ class WinNTFileSystem extends FileSystem {
|
||||
semicolon = AccessController.doPrivileged(
|
||||
new GetPropertyAction("path.separator")).charAt(0);
|
||||
|
||||
@ -125,7 +125,7 @@ index 00000000..9b614024
|
||||
--- /dev/null
|
||||
+++ b/version.txt
|
||||
@@ -0,0 +1 @@
|
||||
+8.292.8.0.13
|
||||
+8.332.9.0.13
|
||||
--
|
||||
2.23.0
|
||||
|
||||
|
||||
27
fix-make-bugs-when-git-and-hg-not-exist.patch
Normal file
27
fix-make-bugs-when-git-and-hg-not-exist.patch
Normal file
@ -0,0 +1,27 @@
|
||||
From a447db8644fe785db481a425fe3efa62cb11122f Mon Sep 17 00:00:00 2001
|
||||
Date: Mon, 25 Apr 2022 17:12:39 +0800
|
||||
Subject: [PATCH] Fix make bugs when git and hg not exist
|
||||
|
||||
---
|
||||
make/common/MakeBase.gmk | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
|
||||
index 2ba3d04..c97a42a 100644
|
||||
--- a/make/common/MakeBase.gmk
|
||||
+++ b/make/common/MakeBase.gmk
|
||||
@@ -318,9 +318,9 @@ SCM_TIP_FILECMD := $(PRINTF) "$(SCM):%s" \
|
||||
# Emit the scm:id pair to $@
|
||||
define GetSourceTips
|
||||
$(CD) $(SRC_ROOT) ; \
|
||||
- if [ -d $(SCM_DIR) -a "$(SCM_VERSION)" != "" ] ; then \
|
||||
+ if [ -d "$(SCM_DIR)" -a "$(SCM_VERSION)" != "" ] ; then \
|
||||
$(ID_COMMAND) >> $@ ; \
|
||||
- elif [ -f $(SCM_TIP_FILENAME) ] ; then \
|
||||
+ elif [ -f "$(SCM_TIP_FILENAME)" ] ; then \
|
||||
$(SCM_TIP_FILECMD) >> $@ ; \
|
||||
fi;
|
||||
$(PRINTF) "\n" >> $@
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
Binary file not shown.
@ -146,13 +146,13 @@
|
||||
%global origin_nice OpenJDK
|
||||
%global top_level_dir_name %{origin}
|
||||
%global repo jdk8u
|
||||
%global revision jdk8u322-b06
|
||||
%global revision jdk8u332-b09
|
||||
%global full_revision %{repo}-%{revision}
|
||||
# Define IcedTea version used for SystemTap tapsets and desktop files
|
||||
%global icedteaver 3.15.0
|
||||
|
||||
%global updatever 322
|
||||
%global buildver b06
|
||||
%global updatever 332
|
||||
%global buildver b09
|
||||
# priority must be 7 digits in total. The expression is workarounding tip
|
||||
%global priority 1800%{updatever}
|
||||
|
||||
@ -916,7 +916,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r
|
||||
|
||||
Name: java-%{javaver}-%{origin}
|
||||
Version: %{javaver}.%{updatever}.%{buildver}
|
||||
Release: 4
|
||||
Release: 0
|
||||
# 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
|
||||
@ -1030,8 +1030,6 @@ Patch115: 8243670.patch
|
||||
Patch118: Fix-LineBuffer-vappend-when-buffer-too-small.patch
|
||||
Patch121: Remove-unused-GenericTaskQueueSet-T-F-tasks.patch
|
||||
Patch122: optimize-jmap-F-dump-xxx.patch
|
||||
Patch123: recreate-.java_pid-file-when-deleted-for-attach-mechanism.patch
|
||||
Patch124: Support-Git-commit-ID-in-the-SOURCE-field-of-the-release.patch
|
||||
Patch125: Extend-CDS-to-support-app-class-metadata-sharing.patch
|
||||
Patch127: add-DumpSharedSpace-guarantee-when-create-anonymous-classes.patch
|
||||
|
||||
@ -1099,13 +1097,11 @@ Patch202: Fix-RSACipher-memory-usage.patch
|
||||
Patch203: fix-lock-ordering-issue-when-calling-JVMTI-GetLoaded.patch
|
||||
Patch204: 8069191.patch
|
||||
Patch205: fix_g1uncommit_ygc_expand_crash.patch
|
||||
Patch206: 8167014-jdeps-failed-with-Missing-message-warn-skippen-entry.patch
|
||||
Patch207: fix_bug_in_keypairgenerator.patch
|
||||
Patch208: C1-assert-is_virtual-failed-type-check.patch
|
||||
Patch209: 8197387-Run-the-jcmd-tool-as-the-root-user-to-access.patch
|
||||
Patch210: create-jfr-dump-file-with-pid-or-timestamp-if-specif.patch
|
||||
Patch212: enhance-the-TimeZone-s-path-solution-on-Euler.patch
|
||||
Patch213: fix-wrong-commitID-in-release-file.patch
|
||||
Patch214: fix-appcds-s-option-AppCDSLockFile.patch
|
||||
Patch215: PS-introduce-UsePSRelaxedForwardee-to-enable-using-r.patch
|
||||
Patch216: Parallel-Full-GC-for-G1.patch
|
||||
@ -1136,6 +1132,8 @@ Patch239: print-fd-and-file-path-when-a-zip-invalid-loc-header.patch
|
||||
Patch240: 8207011-Remove-uses-of-the-register-storage-class-specifier.patch
|
||||
Patch241: 8268819-SA-Remove-libthread_db-dependency-on-Linux.patch
|
||||
|
||||
# 8u332
|
||||
Patch242: fix-make-bugs-when-git-and-hg-not-exist.patch
|
||||
#############################################
|
||||
#
|
||||
# Upstreamable patches
|
||||
@ -1522,8 +1520,6 @@ pushd %{top_level_dir_name}
|
||||
%patch118 -p1
|
||||
%patch121 -p1
|
||||
%patch122 -p1
|
||||
%patch123 -p1
|
||||
%patch124 -p1
|
||||
%patch125 -p1
|
||||
%patch127 -p1
|
||||
%patch133 -p1
|
||||
@ -1582,13 +1578,11 @@ pushd %{top_level_dir_name}
|
||||
%patch203 -p1
|
||||
%patch204 -p1
|
||||
%patch205 -p1
|
||||
%patch206 -p1
|
||||
%patch207 -p1
|
||||
%patch208 -p1
|
||||
%patch209 -p1
|
||||
%patch210 -p1
|
||||
%patch212 -p1
|
||||
%patch213 -p1
|
||||
%patch214 -p1
|
||||
%patch215 -p1
|
||||
%patch216 -p1
|
||||
@ -1614,6 +1608,7 @@ pushd %{top_level_dir_name}
|
||||
%patch239 -p1
|
||||
%patch240 -p1
|
||||
%patch241 -p1
|
||||
%patch242 -p1
|
||||
popd
|
||||
|
||||
# System library fixes
|
||||
@ -2231,6 +2226,16 @@ require "copy_jdk_configs.lua"
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Apr 27 2022 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.332-b09.0
|
||||
- deleted Support-Git-commit-ID-in-the-SOURCE-field-of-the-release.patch
|
||||
- deleted 8167014-jdeps-failed-with-Missing-message-warn-skippen-entry.patch
|
||||
- deleted fix-wrong-commitID-in-release-file.patch
|
||||
- deleted recreate-.java_pid-file-when-deleted-for-attach-mechanism.patch
|
||||
- modified update-cacerts-and-VerifyCACerts.java-test.patch
|
||||
- modified 8194154.patch
|
||||
- modified add-missing-test-case.patch
|
||||
- add fix-make-bugs-when-git-and-hg-not-exist.patch
|
||||
|
||||
* Wed Mar 2 2022 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.322-b06.4
|
||||
- add 8268819-SA-Remove-libthread_db-dependency-on-Linux.patch
|
||||
|
||||
|
||||
@ -3,6 +3,8 @@ From: zhangyipeng <zhangyipeng7@huawei.com>
|
||||
Date: Tue, 20 Apr 2021 10:40:35 +0800
|
||||
Subject: [PATCH] [Huawei]update cacerts and VerifyCACerts.java test
|
||||
|
||||
Offering: Cloud Compiler JDK
|
||||
|
||||
Signed-off-by: Wang Kun <wangkun49@huawei.com>
|
||||
---
|
||||
jdk/make/data/cacerts/addtrustexternalca | 32 -----------------
|
||||
@ -10,6 +12,7 @@ Signed-off-by: Wang Kun <wangkun49@huawei.com>
|
||||
jdk/make/data/cacerts/luxtrustglobalrootca | 28 ---------------
|
||||
jdk/make/data/cacerts/quovadisrootca | 41 ----------------------
|
||||
jdk/make/data/cacerts/utnuserfirstobjectca | 33 -----------------
|
||||
jdk/make/data/cacerts/geotrustglobalca | 27 -------------------
|
||||
.../sun/security/lib/cacerts/VerifyCACerts.java | 29 ++-------------------
|
||||
8 files changed, 3 insertions(+), 192 deletions(-)
|
||||
delete mode 100644 jdk/make/data/cacerts/addtrustexternalca
|
||||
@ -19,6 +22,7 @@ Signed-off-by: Wang Kun <wangkun49@huawei.com>
|
||||
delete mode 100644 jdk/make/data/cacerts/thawtepremiumserverca
|
||||
delete mode 100644 jdk/make/data/cacerts/utnuserfirstobjectca
|
||||
delete mode 100644 jdk/make/data/cacerts/verisigntsaca
|
||||
delete mode 100644 jdk/make/data/cacerts/geotrustglobalca
|
||||
|
||||
diff --git a/jdk/make/data/cacerts/addtrustexternalca b/jdk/make/data/cacerts/addtrustexternalca
|
||||
deleted file mode 100644
|
||||
@ -216,6 +220,39 @@ index 80a0b5c..0000000
|
||||
-81OtbLUrohKqGU8J2l7nk8aOFAj+8DCAGKCGhU3IfdeLA/5u1fedFqySLKAj5ZyR
|
||||
-Uh+U3xeUc8OzwcFxBSAAeL0TUh2oPs0AH8g=
|
||||
------END CERTIFICATE-----
|
||||
diff --git a/jdk/make/data/cacerts/geotrustglobalca b/jdk/make/data/cacerts/geotrustglobalca
|
||||
deleted file mode 100644
|
||||
index 7f8bf9a6..00000000
|
||||
--- a/jdk/make/data/cacerts/geotrustglobalca
|
||||
+++ /dev/null
|
||||
@@ -1,27 +0,0 @@
|
||||
-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/jdk/test/sun/security/lib/cacerts/VerifyCACerts.java b/jdk/test/sun/security/lib/cacerts/VerifyCACerts.java
|
||||
index dd107fc..791ddb6 100644
|
||||
--- a/jdk/test/sun/security/lib/cacerts/VerifyCACerts.java
|
||||
@ -225,13 +262,13 @@ index dd107fc..791ddb6 100644
|
||||
|
||||
// The numbers of certs now.
|
||||
- private static final int COUNT = 89;
|
||||
+ private static final int COUNT = 84;
|
||||
+ private static final int COUNT = 83;
|
||||
|
||||
// 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
|
||||
- = "CC:AD:BB:49:70:97:3F:42:AD:73:91:A0:A2:C4:B8:AA:D1:95:59:F3:B3:22:09:2A:1F:2C:AB:04:47:08:EF:AA";
|
||||
+ = "D3:05:21:64:FA:D7:CD:29:E8:CB:57:E7:47:ED:79:9B:47:D8:0E:75:2D:CA:83:BB:86:AF:D9:43:FD:3E:17:85";
|
||||
+ = "2D:04:88:6C:52:53:54:EB:38:2D:BC:E0:AF:B7:82:F4:9E:32:A8:1A:1B:A3:AE:CF:25:CB:C2:F6:0F:4E:E1:20";
|
||||
|
||||
// map of cert alias to SHA-256 fingerprint
|
||||
@SuppressWarnings("serial")
|
||||
@ -248,6 +285,15 @@ index dd107fc..791ddb6 100644
|
||||
put("baltimorecybertrustca [jdk]",
|
||||
"16:AF:57:A9:F6:76:B0:AB:12:60:95:AA:5E:BA:DE:F2:2A:B3:11:19:D6:44:AC:95:CD:4B:93:DB:F3:F2:6A:EB");
|
||||
put("digicertglobalrootca [jdk]",
|
||||
@@ -111,8 +111,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]",
|
||||
"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("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]",
|
||||
@@ -163,10 +147,6 @@ public class VerifyCACerts {
|
||||
"5D:56:49:9B:E4:D2:E0:8B:CF:CA:D0:8A:3E:38:72:3D:50:50:3B:DE:70:69:48:E4:2F:55:60:30:19:E5:28:AE");
|
||||
put("letsencryptisrgx1 [jdk]",
|
||||
@ -259,7 +305,7 @@ index dd107fc..791ddb6 100644
|
||||
put("quovadisrootca1g3 [jdk]",
|
||||
"8A:86:6F:D1:B2:76:B5:7E:57:8E:92:1C:65:82:8A:2B:ED:58:E9:F2:F2:88:05:41:34:B7:F1:F4:BF:C9:CC:74");
|
||||
put("quovadisrootca2 [jdk]",
|
||||
@@ -267,20 +247,7 @@ public class VerifyCACerts {
|
||||
@@ -267,22 +247,7 @@ public class VerifyCACerts {
|
||||
// Exception list to 90 days expiry policy
|
||||
// No error will be reported if certificate in this list expires
|
||||
@SuppressWarnings("serial")
|
||||
@ -275,6 +321,8 @@ index dd107fc..791ddb6 100644
|
||||
- add("luxtrustglobalrootca [jdk]");
|
||||
- // Valid until: Wed Mar 17 11:33:33 PDT 2021
|
||||
- add("quovadisrootca [jdk]");
|
||||
- // Valid until: Sat May 21 04:00:00 GMT 2022
|
||||
- add("geotrustglobalca [jdk]");
|
||||
- }
|
||||
- };
|
||||
+ private static final HashSet<String> EXPIRY_EXC_ENTRIES = new HashSet<String>();
|
||||
@ -282,5 +330,4 @@ index dd107fc..791ddb6 100644
|
||||
// Ninety days in milliseconds
|
||||
private static final long NINETY_DAYS = 7776000000L;
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
2.19.0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user