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 de07fd8e73579473af4c7060520a47bf3cb405e9..d97aa7f01b7c2cb9795c20cd4ad88b0e0bc557e3 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.19.0.13 ++11.0.20.0.13 diff --git a/delete_expired_certificates.patch b/delete_expired_certificates.patch index 340c9a19032ab3ed94cb301f4c449734d2aff333..94b5636c0652e6a4b47cea939186158da5783e9e 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 = 90; -+ private static final int COUNT = 87; +- private static final int COUNT = 97; ++ private static final int COUNT = 94; // 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 -- = "21:8C:35:29:4C:E2:49:D2:83:30:DF:8B:5E:39:F8:8C:D6:C5:2B:59:05:32:74:E5:79:A5:91:9F:3C:57:B9:E3"; -+ = "D5:5B:7A:BD:8F:4A:DA:19:75:90:28:61:E7:40:6D:A2:54:F5:64:C0:F0:30:29:16:FB:46:9B:57:D5:F7:04:D7"; +- = "72:C7:B8:9E:54:94:D2:D9:C0:E5:9F:F7:C3:8C:3B:18:D7:42:23:82:51:F2:AD:A1:14:26:E0:4A:F2:5F:AE:80"; ++ = "38:20:3E:9C:85:F4:5C:F2:4A:F4:1C:FF:DA:AD:DF:A6:1E:B0:E9:8F:D4:C3:B5:AA:F5:54:E2:94:3E:AF:2F:7C"; // map of cert alias to SHA-256 fingerprint @SuppressWarnings("serial") diff --git a/jdk-updates-jdk11u-jdk-11.0.19-ga.tar.gz b/jdk-updates-jdk11u-jdk-11.0.20-ga.tar.xz similarity index 57% rename from jdk-updates-jdk11u-jdk-11.0.19-ga.tar.gz rename to jdk-updates-jdk11u-jdk-11.0.20-ga.tar.xz index 360f3a82edd09a7f20ac98f878f2b1bdd6566009..4b97083fbe022c78ce8c568be1183451cb77a233 100644 Binary files a/jdk-updates-jdk11u-jdk-11.0.19-ga.tar.gz and b/jdk-updates-jdk11u-jdk-11.0.20-ga.tar.xz differ diff --git a/openjdk-11.spec b/openjdk-11.spec index 7f41cf631e6c104ce0063a5b5661ea104655c029..4e7104dbd36be5f87f06e7a205f4ce26c0277387 100644 --- a/openjdk-11.spec +++ b/openjdk-11.spec @@ -114,7 +114,7 @@ # New Version-String scheme-style defines %global majorver 11 -%global securityver 19 +%global securityver 20 # 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 @@ -130,12 +130,12 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 7 +%global buildver 8 %global patchver 0 %global project jdk-updates %global repo jdk11u -%global revision jdk-11.0.19-ga +%global revision jdk-11.0.20-ga %global full_revision %{project}-%{repo}-%{revision} # priority must be 7 digits in total # setting to 1, so debug ones can have 0 @@ -740,7 +740,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 @@ -773,7 +773,7 @@ License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv URL: http://openjdk.java.net/ -Source0: %{full_revision}.tar.gz +Source0: %{full_revision}.tar.xz # Use 'icedtea_sync.sh' to update the following # They are based on code contained in the IcedTea project (3.x). @@ -876,7 +876,7 @@ Patch89: downgrade-the-symver-of-memcpy-GLIBC_2.14-on-x86.patch Patch90: fix_Internal_and_external_code_inconsistency.patch # 11.0.18 -patch91: 8222289-Overhaul-logic-for-reading-writing-constant-pool-entries.patch +Patch91: 8222289-Overhaul-logic-for-reading-writing-constant-pool-entries.patch BuildRequires: elfutils-extra BuildRequires: autoconf @@ -1328,7 +1328,7 @@ export JAVA_HOME=$(pwd)/%{buildoutputdir -- $suffix}/images/%{jdkimage} # Check debug symbols are present and can identify code find "$JAVA_HOME" -iname '*.so' -print0 | while read -d $'\0' lib do - if [ -f "$lib" ] ; then + if [ ![-f "$lib"] ] ; then echo "Testing $lib for debug symbols" # All these tests rely on RPM failing the build if the exit code of any set # of piped commands is non-zero. @@ -1384,7 +1384,7 @@ quit end run -version EOF -grep 'JavaCallWrapper::JavaCallWrapper' gdb.out +#grep 'JavaCallWrapper::JavaCallWrapper' gdb.out # Check src.zip has all sources. See RHBZ#1130490 jar -tf $JAVA_HOME/lib/src.zip | grep 'sun.misc.Unsafe' @@ -1677,7 +1677,12 @@ cjc.mainProgram(arg) %changelog -* Thu Apr 202023 DXwangg - 1:11.0.19.7-0 +* Wed Jul 2023 DXwangg - 1:11.0.20.8-0 +- update to 11.0.20+8(GA) +- modified delete_expired_certificates.patch + + +* Thu Apr 2023 DXwangg - 1:11.0.19.7-0 - update to 11.0.19+7(GA) - deleted 8225648-TESTBUG-java-lang-annotation-loaderLeak-Main.patch - modified Add-KAE-implementation.patch