diff --git a/8224675-Late-GC-barrier-insertion-for-ZGC.patch b/8224675-Late-GC-barrier-insertion-for-ZGC.patch index 95dc4c9534025966ef3685ce9256373b8bcb7e46..50e15d1eb5affe295e471492566ff76974cabbb4 100644 --- a/8224675-Late-GC-barrier-insertion-for-ZGC.patch +++ b/8224675-Late-GC-barrier-insertion-for-ZGC.patch @@ -2812,7 +2812,7 @@ index 5454d1350..d7eb3996b 100644 --- a/src/hotspot/share/opto/loopnode.cpp +++ b/src/hotspot/share/opto/loopnode.cpp @@ -3017,9 +3018,7 @@ void PhaseIdealLoop::build_and_optimize() { - build_loop_late( visited, worklist, nstack ); + if (C->failing()) { return; } if (_verify_only) { - // restore major progress flag diff --git a/delete_expired_certificates.patch b/delete_expired_certificates.patch index b57ab696789bca351152ccb85a9f269834ef5805..69ce39e728041cec66eef29bf8f97ade08eb2971 100644 --- a/delete_expired_certificates.patch +++ b/delete_expired_certificates.patch @@ -120,14 +120,15 @@ index 122a01901..c131bd493 100644 + File.separator + "security" + File.separator + "cacerts"; // The numbers of certs now. -- private static final int COUNT = 106; -+ private static final int COUNT = 103; +- private static final int COUNT = 108; ++ private static final int COUNT = 105; // 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 -- = "61:5F:6D:C5:9C:A3:8A:65:3F:CB:F9:F5:26:04:23:F4:53:A6:8C:B3:8B:2B:0A:F0:66:7D:9E:67:B9:4D:AC:B7"; -+ = "AC:5D:D0:F5:D4:E9:7B:8E:69:B9:E3:6C:08:44:0D:CB:63:83:D5:A0:D4:DE:4F:17:4F:D3:83:6D:99:26:94:59"; +- = "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"; + // map of cert alias to SHA-256 fingerprint @SuppressWarnings("serial") private static final Map FINGERPRINT_MAP = new HashMap<>() { diff --git a/jdk-updates-jdk11u-jdk-11.0.22-ga.tar.xz b/jdk-updates-jdk11u-jdk-11.0.22-ga.tar.xz deleted file mode 100644 index 78684a6b6786cdb8bb6da27dfcda3fed126946db..0000000000000000000000000000000000000000 Binary files a/jdk-updates-jdk11u-jdk-11.0.22-ga.tar.xz and /dev/null differ diff --git a/jdk-updates-jdk11u-jdk-11.0.23-ga.tar.xz b/jdk-updates-jdk11u-jdk-11.0.23-ga.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..921bdb22895680fb23af8e04daff21e532027915 Binary files /dev/null and b/jdk-updates-jdk11u-jdk-11.0.23-ga.tar.xz differ diff --git a/openjdk-11.spec b/openjdk-11.spec index 4a05f178e6438c085a7b630acb2c00b5c6c00314..37893e3cebb371dee16840785b0141f47188dd18 100644 --- a/openjdk-11.spec +++ b/openjdk-11.spec @@ -55,6 +55,7 @@ %global aarch64 aarch64 %global riscv64 riscv64 +%global ppc64le ppc64le # By default, we build a debug build during main build on JIT architectures %if %{with slowdebug} @@ -116,12 +117,15 @@ %ifarch %{riscv64} %global archinstall riscv64 %endif +%ifarch %{ppc64le} +%global archinstall ppc64le +%endif %global with_systemtap 1 # New Version-String scheme-style defines %global majorver 11 -%global securityver 22 +%global securityver 23 # 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 +141,12 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 7 +%global buildver 9 %global patchver 0 %global project jdk-updates %global repo jdk11u -%global revision jdk-11.0.22-ga +%global revision jdk-11.0.23-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 +757,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: 2 +Release: 1 # 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 @@ -1139,7 +1143,7 @@ fi pushd %{top_level_dir_name} # OpenJDK patches -%ifnarch loongarch64 +%ifnarch loongarch64 ppc64le %ifarch riscv64 %patch2000 -p1 %else @@ -1298,7 +1302,7 @@ bash ../configure \ --with-version-build=%{buildver} \ --with-version-pre="" \ --with-version-opt="" \ -%ifnarch loongarch64 +%ifnarch loongarch64 ppc64le --with-vendor-version-string="%{vendor_version_string}" \ --with-vendor-name="Bisheng" \ %endif @@ -1721,6 +1725,16 @@ cjc.mainProgram(arg) %changelog +* Mon Apr 29 2024 huangjie - 1:11.0.23.9-1 +- modified delete_expired_certificates.patch + +* Thu Apr 18 2024 huangjie - 1:11.0.23.9-0 +- modified 8224675-Late-GC-barrier-insertion-for-ZGC.patch +- modified delete_expired_certificates.patch + +* Wed Mar 13 2024 jiahua.yu - 1:11.0.22.7-3 +- init support for arch ppc64le + * Mon Feb 26 2024 misaka00251 - 1:11.0.22.7-2 - Fix build on riscv64