Merge master(update to 11.0.24)

This commit is contained in:
DXwangg 2024-07-22 16:51:22 +08:00
commit 6d449c4ece
6 changed files with 4609 additions and 4062 deletions

View File

@ -158,8 +158,8 @@ index 6672d26a5..c3e8ceb35 100644
+JDKOPT_DETECT_KAE
JDKOPT_DETECT_INTREE_EC
JDKOPT_ENABLE_DISABLE_FAILURE_HANDLER
JDKOPT_ENABLE_DISABLE_GENERATE_CLASSLIST
LIB_TESTS_ENABLE_DISABLE_FAILURE_HANDLER
diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
index 9d64b31bf..e20eafa60 100644
--- a/make/autoconf/jdk-options.m4

View File

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

File diff suppressed because it is too large Load Diff

View File

@ -120,14 +120,14 @@ index 122a01901..c131bd493 100644
+ File.separator + "security" + File.separator + "cacerts";
// The numbers of certs now.
- private static final int COUNT = 108;
+ private static final int COUNT = 105;
- private static final int COUNT = 110;
+ private static final int COUNT = 107;
// 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
- = "81:D4:84:F6:92:78:A4:82:25:06:DC:42:25:C9:5D:6C:63:E4:99:CE:BC:ED:66:B3:8C:BA:E6:BA:6B:34:0F:01";
+ = "2F:05:4C:2D:16:ED:2B:56:D6:07:03:A9:49:C4:A2:E6:16:2C:0D:92:FD:C8:6C:28:DF:77:26:A9:E7:D8:12:47";
- = "C1:68:B4:AC:51:BF:B5:C6:FD:20:69:17:E1:AF:E4:5B:01:9B:AA:3F:C3:9A:80:A8:51:53:74:2C:A2:04:B0:FF";
+ = "D5:F6:74:0F:13:CF:6D:35:5E:10:04:C3:1B:57:C4:F4:A0:49:9A:26:38:89:53:C3:71:10:60:9D:48:20:E7:DE";
// map of cert alias to SHA-256 fingerprint
@SuppressWarnings("serial")

View File

@ -125,7 +125,7 @@
# New Version-String scheme-style defines
%global majorver 11
%global securityver 23
%global securityver 24
# 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
@ -146,12 +146,12 @@
%global origin_nice OpenJDK
%global top_level_dir_name %{origin}
%global minorver 0
%global buildver 9
%global buildver 8
%global patchver 0
%global project jdk-updates
%global repo jdk11u
%global revision jdk-11.0.23-ga
%global revision jdk-11.0.24-ga
%global full_revision %{project}-%{repo}-%{revision}
# priority must be 7 digits in total
# setting to 1, so debug ones can have 0
@ -762,7 +762,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
Name: java-%{javaver}-%{origin}
Version: %{newjavaver}.%{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
@ -1715,6 +1715,15 @@ cjc.mainProgram(arg)
%changelog
* Thu July 18 2024 DXwangg <wangjiawei80@huawei.com> - 1.11.0.24.8-0
- update to 11.0.24+8(GA)
* Thu Jun 20 2024 aoqi <aoqi@loongson.cn> - 1.11.0.23.9-6
- update LoongArch64 port to 11.0.23
* Tue Jun 18 2024 neu-mobi <liuyulong35@huawei.com> - 1.11.0.23.9-5
- fix potential compilation errors
* Sat Jun 15 2024 neu-mobi <liuyulong35@huawei.com> - 1.11.0.23.9-4
- Collate patches and merge patches related to ZGC
@ -1730,7 +1739,7 @@ cjc.mainProgram(arg)
* Thu Apr 18 2024 huangjie <huangjie150@huawei.com> - 1:11.0.23.9-0
- modified 8224675-Late-GC-barrier-insertion-for-ZGC.patch
- modified delete_expired_certificates.patch
- modified delete_expired_certificates.patch
* Wed Mar 13 2024 jiahua.yu <jiahua.yu@shingroup.cn> - 1:11.0.22.7-3
- init support for arch ppc64le
@ -1752,7 +1761,7 @@ cjc.mainProgram(arg)
* Thu Oct 19 2023 DXwangg <wangjiawei80@huawei.com> - 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 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