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 94c979bb53ea9b48f4c27f4b120076041fc824d9..e395c0b7210708ddc2baa7dbc7fb96600f5e8cf5 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.21.0.13 ++11.0.22.0.13 diff --git a/delete_expired_certificates.patch b/delete_expired_certificates.patch index 84b2d91ce0ed6d0f4682ba514557cf251e118f2b..b57ab696789bca351152ccb85a9f269834ef5805 100644 --- a/delete_expired_certificates.patch +++ b/delete_expired_certificates.patch @@ -120,18 +120,18 @@ index 122a01901..c131bd493 100644 + File.separator + "security" + File.separator + "cacerts"; // The numbers of certs now. -- private static final int COUNT = 97; -+ private static final int COUNT = 94; +- private static final int COUNT = 106; ++ private static final int COUNT = 103; // 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 -- = "88:72:92:56:FF:E5:A3:E4:39:98:6D:18:0B:BA:CC:0B:66:CB:1D:6D:52:CE:D7:C8:AD:63:B7:F1:5F:02:24:52"; -+ = "F3:7B:BE:30:2F:68:F9:75:82:21:0B:81:E1:26:32:4C:C0:00:32:B0:66:70:8E:A7:36:65:E8:86:6A:72:4E:F8"; +- = "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"; // map of cert alias to SHA-256 fingerprint @SuppressWarnings("serial") private static final Map FINGERPRINT_MAP = new HashMap<>() { -@@ -116,8 +116,6 @@ public class VerifyCACerts { +@@ -109,8 +109,6 @@ public class VerifyCACerts { "7E:37:CB:8B:4C:47:09:0C:AB:36:55:1B:A6:F4:5D:B8:40:68:0F:BA:16:6A:95:2D:B1:00:71:7F:43:05:3F:C2"); put("digicerthighassuranceevrootca [jdk]", "74:31:E5:F4:C3:C1:CE:46:90:77:4F:0B:61:E0:54:40:88:3B:A9:A0:1E:D0:0B:A6:AB:D7:80:6E:D3:B1:18:CF"); @@ -140,10 +140,10 @@ index 122a01901..c131bd493 100644 put("geotrustprimaryca [jdk]", "37:D5:10:06:C5:12:EA:AB:62:64:21:F1:EC:8C:92:01:3F:C5:F8:2A:E9:8E:E5:33:EB:46:19:B8:DE:B4:D0:6C"); put("geotrustprimarycag2 [jdk]", -@@ -150,10 +148,6 @@ public class VerifyCACerts { - "5D:56:49:9B:E4:D2:E0:8B:CF:CA:D0:8A:3E:38:72:3D:50:50:3B:DE:70:69:48:E4:2F:55:60:30:19:E5:28:AE"); - put("letsencryptisrgx1 [jdk]", +@@ -145,10 +143,6 @@ public class VerifyCACerts { "96:BC:EC:06:26:49:76:F3:74:60:77:9A:CF:28:C5:A7:CF:E8:A3:C0:AA:E1:1A:8F:FC:EE:05:C0:BD:DF:08:C6"); + put("letsencryptisrgx2 [jdk]", + "69:72:9B:8E:15:A8:6E:FC:17:7A:57:AF:B7:17:1D:FC:64:AD:D2:8C:2F:CA:8C:F1:50:7E:34:45:3C:CB:14:70"); - put("luxtrustglobalrootca [jdk]", - "A1:B2:DB:EB:64:E7:06:C6:16:9E:3C:41:18:B2:3B:AA:09:01:8A:84:27:66:6D:8B:F0:E2:88:91:EC:05:19:50"); - put("quovadisrootca [jdk]", @@ -151,7 +151,7 @@ index 122a01901..c131bd493 100644 put("quovadisrootca1g3 [jdk]", "8A:86:6F:D1:B2:76:B5:7E:57:8E:92:1C:65:82:8A:2B:ED:58:E9:F2:F2:88:05:41:34:B7:F1:F4:BF:C9:CC:74"); put("quovadisrootca2 [jdk]", -@@ -256,12 +250,6 @@ public class VerifyCACerts { +@@ -282,12 +276,6 @@ public class VerifyCACerts { add("addtrustexternalca [jdk]"); // Valid until: Sat May 30 10:44:50 GMT 2020 add("addtrustqualifiedca [jdk]"); diff --git a/jdk-updates-jdk11u-jdk-11.0.21-ga.tar.xz b/jdk-updates-jdk11u-jdk-11.0.21-ga.tar.xz deleted file mode 100644 index 687ead166f590deed440470703b5139dafafc2f3..0000000000000000000000000000000000000000 Binary files a/jdk-updates-jdk11u-jdk-11.0.21-ga.tar.xz and /dev/null differ diff --git a/jdk-updates-jdk11u-jdk-11.0.22-ga.tar.xz b/jdk-updates-jdk11u-jdk-11.0.22-ga.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..78684a6b6786cdb8bb6da27dfcda3fed126946db Binary files /dev/null and b/jdk-updates-jdk11u-jdk-11.0.22-ga.tar.xz differ diff --git a/openjdk-11.spec b/openjdk-11.spec index 455db0d50de55c79c818fcec344055d6aad4806a..720b4d76e7179a06ba5867015d3f2b9c82245b8e 100644 --- a/openjdk-11.spec +++ b/openjdk-11.spec @@ -118,7 +118,7 @@ # New Version-String scheme-style defines %global majorver 11 -%global securityver 21 +%global securityver 22 # 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 @@ -134,12 +134,12 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 9 +%global buildver 7 %global patchver 0 %global project jdk-updates %global repo jdk11u -%global revision jdk-11.0.21-ga +%global revision jdk-11.0.22-ga %global full_revision %{project}-%{repo}-%{revision} # priority must be 7 digits in total # setting to 1, so debug ones can have 0 @@ -748,7 +748,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 @@ -1699,10 +1699,14 @@ cjc.mainProgram(arg) %changelog +* Wed Jan 17 2024 DXwangg - 1:11.0.22.7-0 +- update to 11.0.22+7(GA) +- modified delete_expired_certificates.patch +- modified G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch + * Mon Oct 23 2023 DXwangg - 1:11.0.21.9-1 - add 8295068-SSLEngine-throws-NPE-parsing-Certificate.patch - * Thu Oct 19 2023 DXwangg - 1:11.0.21.9-0 - update to 11.0.21+9(GA) - modified delete_expired_certificates.patch