diff --git a/Add-KAE-implementation.patch b/Add-KAE-implementation.patch index db5193ad1e4cc9000d4ab544cacccf47b1e0404b..f91f5ba9473c880f53e1e6ccdcce569b01e723f4 100644 --- a/Add-KAE-implementation.patch +++ b/Add-KAE-implementation.patch @@ -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 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 e395c0b7210708ddc2baa7dbc7fb96600f5e8cf5..8d4548aad36df00f937ee2babb039206bb059a35 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.22.0.13 ++11.0.24.0.13 diff --git a/delete_expired_certificates.patch b/delete_expired_certificates.patch index 69ce39e728041cec66eef29bf8f97ade08eb2971..3e654b7774f145bca6cee0a764b16d15dd779cde 100644 --- a/delete_expired_certificates.patch +++ b/delete_expired_certificates.patch @@ -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") diff --git a/jdk-updates-jdk11u-jdk-11.0.23-ga.tar.xz b/jdk-updates-jdk11u-jdk-11.0.24-ga.tar.xz similarity index 59% rename from jdk-updates-jdk11u-jdk-11.0.23-ga.tar.xz rename to jdk-updates-jdk11u-jdk-11.0.24-ga.tar.xz index ae09ff42921b1f26560d79dff229356386bcf525..c3b680936f71b4b5745b63aeccf1de5513b3e85a 100644 Binary files a/jdk-updates-jdk11u-jdk-11.0.23-ga.tar.xz and b/jdk-updates-jdk11u-jdk-11.0.24-ga.tar.xz differ diff --git a/openjdk-11.spec b/openjdk-11.spec index f5b800d0f65bc2a900e85e3be5c620f419b81678..900dde961473b4f099ebc650b2aca41a8b3593cf 100644 --- a/openjdk-11.spec +++ b/openjdk-11.spec @@ -121,7 +121,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 @@ -137,12 +137,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 @@ -753,7 +753,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: 1 +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 @@ -1726,6 +1726,12 @@ cjc.mainProgram(arg) %changelog +* Thu July 18 2024 DXwangg - 1.11.0.24.8-0 +- update to 11.0.24+8(GA) +- modify delete_expired_certificates.patch +- modify G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch +- modify Add-KAE-implementation.patch + * Mon Apr 29 2024 huangjie - 1:11.0.23.9-0 - modify delete_expired_certificates.patch