packages/openjdk-11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!338 Merge master(update to 11.0.24)

Browse Source 
From: @DXwangg 
Reviewed-by: @kuenking111 
Signed-off-by: @kuenking111
This commit is contained in:
openeuler-ci-bot 2024-07-23 03:44:28 +00:00 committed by Gitee
commit a23947f310
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 4627 additions and 4068 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Add-KAE-implementation.patch
View File

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

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

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

8636
LoongArch64-support.patch
View File

File diff suppressed because it is too large Load Diff

8
delete_expired_certificates.patch
View File

@ -120,14 +120,14 @@ index 122a01901..c131bd493 100644
+ File.separator + "security" + File.separator + "cacerts"; + File.separator + "security" + File.separator + "cacerts";
// The numbers of certs now. // The numbers of certs now.
- private static final int COUNT = 108; - private static final int COUNT = 110;
+ private static final int COUNT = 105; + private static final int COUNT = 107;
// SHA-256 of cacerts, can be generated with // SHA-256 of cacerts, can be generated with
// shasum -a 256 cacerts | sed -e 's/../&:/g' | tr '[:lower:]' '[:upper:]' | cut -c1-95 // shasum -a 256 cacerts | sed -e 's/../&:/g' | tr '[:lower:]' '[:upper:]' | cut -c1-95
private static final String CHECKSUM 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"; - = "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";
+ = "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"; + = "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 // map of cert alias to SHA-256 fingerprint
@SuppressWarnings("serial") @SuppressWarnings("serial")

BIN
jdk-updates-jdk11u-jdk-11.0.23-ga.tar.xz → jdk-updates-jdk11u-jdk-11.0.24-ga.tar.xz
View File

Binary file not shown.

45
openjdk-11.spec
View File

@ -125,13 +125,18 @@
# New Version-String scheme-style defines # New Version-String scheme-style defines
%global majorver 11 %global majorver 11
%global securityver 23 %global securityver 24
# buildjdkver is usually same as %%{majorver}, # buildjdkver is usually same as %%{majorver},
# but in time of bootstrap of next jdk, it is majorver-1, # but in time of bootstrap of next jdk, it is majorver-1,
# and this it is better to change it here, on single place # and this it is better to change it here, on single place
%global buildjdkver %{majorver} %global buildjdkver %{majorver}
%ifnarch loongarch64 ppc64le
%global vendor_version_string Bisheng %global vendor_version_string Bisheng
%endif
%ifarch loongarch64
%global vendor_version_string Loongson
%endif
# Define IcedTea version used for SystemTap tapsets and desktop file # Define IcedTea version used for SystemTap tapsets and desktop file
%global icedteaver 3.15.0 %global icedteaver 3.15.0
@ -141,12 +146,12 @@
%global origin_nice OpenJDK %global origin_nice OpenJDK
%global top_level_dir_name %{origin} %global top_level_dir_name %{origin}
%global minorver 0 %global minorver 0
%global buildver 9 %global buildver 8
%global patchver 0 %global patchver 0
%global project jdk-updates %global project jdk-updates
%global repo jdk11u %global repo jdk11u
%global revision jdk-11.0.23-ga %global revision jdk-11.0.24-ga
%global full_revision %{project}-%{repo}-%{revision} %global full_revision %{project}-%{repo}-%{revision}
# priority must be 7 digits in total # priority must be 7 digits in total
# setting to 1, so debug ones can have 0 # setting to 1, so debug ones can have 0
@ -757,7 +762,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
Name: java-%{javaver}-%{origin} Name: java-%{javaver}-%{origin}
Version: %{newjavaver}.%{buildver} Version: %{newjavaver}.%{buildver}
Release: 2 Release: 0
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # 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 # 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 # also included the epoch in their virtual provides. This created a
@ -895,7 +900,7 @@ Patch91: 8222289-Overhaul-logic-for-reading-writing-constant-pool-entries.patch
# 11.0.21 # 11.0.21
Patch92: 8295068-SSLEngine-throws-NPE-parsing-Certificate.patch Patch92: 8295068-SSLEngine-throws-NPE-parsing-Certificate.patch
# 11.0.22 # 11.0.23
Patch93: Cache-byte-when-constructing-String-with-duplicate-c.patch Patch93: Cache-byte-when-constructing-String-with-duplicate-c.patch
############################################ ############################################
# #
@ -1282,9 +1287,12 @@ bash ../configure \
--with-version-build=%{buildver} \ --with-version-build=%{buildver} \
--with-version-pre="" \ --with-version-pre="" \
--with-version-opt="" \ --with-version-opt="" \
%ifnarch loongarch64 ppc64le
--with-vendor-version-string="%{vendor_version_string}" \ --with-vendor-version-string="%{vendor_version_string}" \
%ifnarch loongarch64 ppc64le
--with-vendor-name="Bisheng" \ --with-vendor-name="Bisheng" \
%endif
%ifarch loongarch64
--with-vendor-name="Loongson" \
%endif %endif
--with-vendor-url="https://openeuler.org/" \ --with-vendor-url="https://openeuler.org/" \
--with-vendor-bug-url="https://gitee.com/src-openeuler/openjdk-11/issues/" \ --with-vendor-bug-url="https://gitee.com/src-openeuler/openjdk-11/issues/" \
@ -1699,13 +1707,26 @@ require "copy_jdk_configs.lua"
%changelog %changelog
* Sat Jun 15 2024 neu-mobi <liuyulong35@huawei.com> - 1.11.0.23.9-2 * 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 - Collate patches and merge patches related to ZGC
* Wed May 06 2024 zhangxianting <zhangxianting@uniontech.com> - 1:11.0.23.9-1 * Mon Jun 03 2024 songliyang <songliyng@kylinos.cn> - 1:11.0.23.9-3
- fix loongarch vendor error
- fix changelog error
* Wed May 08 2024 zhangxianting <zhangxianting@uniontech.com> - 1:11.0.23.9-2
- recompress the source0 - recompress the source0
* Mon Apr 29 2024 huangjie <huangjie150@huawei.com> - 1:11.0.23.9-0 * Mon Apr 29 2024 huangjie <huangjie150@huawei.com> - 1:11.0.23.9-1
- modified delete_expired_certificates.patch - modified delete_expired_certificates.patch
* Thu Apr 18 2024 huangjie <huangjie150@huawei.com> - 1:11.0.23.9-0 * Thu Apr 18 2024 huangjie <huangjie150@huawei.com> - 1:11.0.23.9-0
@ -1742,15 +1763,15 @@ require "copy_jdk_configs.lua"
* Thu Aug 17 2023 misaka00251 <liuxin@iscas.ac.cn> - 1:11.0.20.8-2 * Thu Aug 17 2023 misaka00251 <liuxin@iscas.ac.cn> - 1:11.0.20.8-2
- Add riscv64 support (based on bishengjdk riscv branch) - Add riscv64 support (based on bishengjdk riscv branch)
* Wed Aug 2023 noah <hedongbo@huawei.com> - 1:11.0.20.8-1 * Wed Aug 16 2023 noah <hedongbo@huawei.com> - 1:11.0.20.8-1
- fix CPUBench kmeans random fails - fix CPUBench kmeans random fails
* Wed Jul 2023 DXwangg <wangjiawei80@huawei.com> - 1:11.0.20.8-0 * Tue Jul 25 2023 DXwangg <wangjiawei80@huawei.com> - 1:11.0.20.8-0
- update to 11.0.20+8(GA) - update to 11.0.20+8(GA)
- modified delete_expired_certificates.patch - modified delete_expired_certificates.patch
* Thu Apr 2023 DXwangg <wangjiawei80@huawei.com> - 1:11.0.19.7-0 * Sun Apr 23 2023 DXwangg <wangjiawei80@huawei.com> - 1:11.0.19.7-0
- update to 11.0.19+7(GA) - update to 11.0.19+7(GA)
- deleted 8225648-TESTBUG-java-lang-annotation-loaderLeak-Main.patch - deleted 8225648-TESTBUG-java-lang-annotation-loaderLeak-Main.patch
- modified Add-KAE-implementation.patch - modified Add-KAE-implementation.patch