import java-1.8.0-openjdk-1.8.0.362.b09-2.el9_1

2 years ago · aa0824129b
parent 90aab3ff6f
commit aa0824129b
10 changed files with 303 additions and 1663 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
-SOURCES/openjdk-shenandoah-jdk8u-shenandoah-jdk8u352-b08-4curve.tar.xz
+SOURCES/openjdk-shenandoah-jdk8u-shenandoah-jdk8u362-b09-4curve.tar.xz
 SOURCES/tapsets-icedtea-3.15.0.tar.xz
--- a/.java-1.8.0-openjdk.metadata
+++ b/.java-1.8.0-openjdk.metadata
@ -1,2 +1,2 @@
-11e3bf44f3c54d25e2018fc7df16c231daf041c5 SOURCES/openjdk-shenandoah-jdk8u-shenandoah-jdk8u352-b08-4curve.tar.xz
+10817d699dd7c85b03cfbd8eb820e00b19ddcae7 SOURCES/openjdk-shenandoah-jdk8u-shenandoah-jdk8u362-b09-4curve.tar.xz
 7ae2cba67467825b2c2a5fec7aea041865023002 SOURCES/tapsets-icedtea-3.15.0.tar.xz
--- a/SOURCES/NEWS
+++ b/SOURCES/NEWS
@ -3,6 +3,178 @@ Key:
 JDK-X  - https://bugs.openjdk.java.net/browse/JDK-X
 CVE-XXXX-YYYY: https://cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY

+New in release OpenJDK 8u362 (2023-01-17):
+===========================================
+Live versions of these release notes can be found at:
+  * https://bit.ly/openjdk8u362
+  * https://builds.shipilev.net/backports-monitor/release-notes-openjdk8u362.html
+
+* CVEs
+  - CVE-2023-21830
+  - CVE-2023-21843
+* Security fixes
+  - JDK-8285021: Improve CORBA communication
+  - JDK-8286496: Improve Thread labels
+  - JDK-8288516: Enhance font creation
+  - JDK-8289350: Better media supports
+  - JDK-8293554: Enhanced DH Key Exchanges
+  - JDK-8293598: Enhance InetAddress address handling
+  - JDK-8293717: Objective view of ObjectView
+  - JDK-8293734: Improve BMP image handling
+  - JDK-8293742: Better Banking of Sounds
+  - JDK-8295687: Better BMP bounds
+* Other changes
+  - JDK-6885993: Named Thread: introduce print() and print_on(outputStream* st) methods
+  - JDK-7124218: [TEST_BUG] [macosx] Space should select cell in the JTable
+  - JDK-8054066: com/sun/jdi/DoubleAgentTest.java fails with timeout
+  - JDK-8067941: [TESTBUG] Fix tests for OS with 64K page size.
+  - JDK-8071530: Update OS detection code to reflect Windows 10 version change
+  - JDK-8073464: GC workers do not have thread names
+  - JDK-8079255: [TEST_BUG] [macosx] Test closed/java/awt/Robot/RobotWheelTest/RobotWheelTest fails for Mac only
+  - JDK-8129827: [TEST_BUG] Test java/awt/Robot/RobotWheelTest/RobotWheelTest.java fails
+  - JDK-8148005: One byte may be corrupted by get_datetime_string()
+  - JDK-8159599: [TEST_BUG] java/awt/Modal/ModalInternalFrameTest/ModalInternalFrameTest.java
+  - JDK-8159720: Failure of C2 compilation with tiered prevents some C1 compilations
+  - JDK-8195607: sun/security/pkcs11/Secmod/TestNssDbSqlite.java failed with "NSS initialization failed" on NSS 3.34.1
+  - JDK-8197859: VS2017 Complains about UINTPTR_MAX definition in globalDefinitions_VisCPP.hpp
+  - JDK-8206456: [TESTBUG] docker jtreg tests fail on systems without cpuset.effective_cpus / cpuset.effective_mems
+  - JDK-8221529: [TESTBUG] Docker tests use old/deprecated image on AArch64
+  - JDK-8224506: [TESTBUG] TestDockerMemoryMetrics.java fails with exitValue = 137
+  - JDK-8233551: [TESTBUG] SelectEditTableCell.java fails on MacOS
+  - JDK-8241086: Test runtime/NMT/HugeArenaTracking.java is failing on 32bit Windows
+  - JDK-8253702: BigSur version number reported as 10.16, should be 11.nn
+  - JDK-8255559: Leak File Descriptors Because of ResolverLocalFilesystem#engineResolveURI()
+  - JDK-8265527: tools/javac/diags/CheckExamples.java fails after JDK-8078024 8u backport
+  - JDK-8269039: Disable SHA-1 Signed JARs
+  - JDK-8269850: Most JDK releases report macOS version 12 as 10.16 instead of 12.0
+  - JDK-8270344: Session resumption errors
+  - JDK-8271459: C2: Missing NegativeArraySizeException when creating StringBuilder with negative capacity
+  - JDK-8273176: handle latest VS2019 in abstract_vm_version
+  - JDK-8274563: jfr/event/oldobject/TestClassLoaderLeak.java fails when GC cycles are not happening
+  - JDK-8274840: Update OS detection code to recognize Windows 11
+  - JDK-8275887: jarsigner prints invalid digest/signature algorithm warnings if keysize is weak/disabled
+  - JDK-8280890: Cannot use '-Djava.system.class.loader' with class loader in signed JAR
+  - JDK-8283277: ISO 4217 Amendment 171 Update
+  - JDK-8283903: GetContainerCpuLoad does not return the correct result in share mode
+  - JDK-8284389: Improve stability of GHA Pre-submit testing by caching cygwin installer
+  - JDK-8284622: Update versions of some Github Actions used in JDK workflow
+  - JDK-8286582: Build fails on macos aarch64 when using --with-zlib=bundled
+  - JDK-8288928: Incorrect GPL header in pnglibconf.h (backport of JDK-8185041)
+  - JDK-8289549: ISO 4217 Amendment 172 Update
+  - JDK-8292762: Remove .jcheck directories from jdk8u subcomponents
+  - JDK-8293181: Bump update version of OpenJDK: 8u362
+  - JDK-8293461: Add a test for JDK-8290832
+  - JDK-8293828: JFR: jfr/event/oldobject/TestClassLoaderLeak.java still fails when GC cycles are not happening
+  - JDK-8294307: ISO 4217 Amendment 173 Update
+  - JDK-8294357: (tz) Update Timezone Data to 2022d
+  - JDK-8294863: Enable partial tier1 testing in GHA for JDK8
+  - JDK-8295164: JDK 8 jdi tests should not use tasklist command on Windows
+  - JDK-8295173: (tz) Update Timezone Data to 2022e
+  - JDK-8295288: Some vm_flags tests associate with a wrong BugID
+  - JDK-8295714: GHA ::set-output is deprecated and will be removed
+  - JDK-8295723: security/infra/wycheproof/RunWycheproof.java fails with Assertion Error
+  - JDK-8295915: Problemlist compiler/rtm failures specific to 8u
+  - JDK-8295950: Enable langtools/tier1 in GHA for 8u
+  - JDK-8296108: (tz) Update Timezone Data to 2022f
+  - JDK-8296239: ISO 4217 Amendment 174 Update
+  - JDK-8296555: Enable hotspot/tier1 for 64-bit builds in GHA for 8u
+  - JDK-8296715: CLDR v42 update for tzdata 2022f
+  - JDK-8296959: Fix hotspot shell tests of 8u on multilib systems
+  - JDK-8297141: Fix hotspot/test/runtime/SharedArchiveFile/DefaultUseWithClient.java for 8u
+  - JDK-8297804: (tz) Update Timezone Data to 2022g
+  - JDK-8299439: java/text/Format/NumberFormat/CurrencyFormat.java fails for hr_HR
+  - JDK-8299483: ProblemList java/text/Format/NumberFormat/CurrencyFormat.java
+  - JDK-8300178: JDK-8286496 causes build failure on older GCC
+  - JDK-8300225: JDK-8288516 causes build failure on Windows + VS2010
+
+Notes on individual issues:
+===========================
+
+client-libs/javax.imageio:
+
+JDK-8295687: Better BMP bounds
+==============================
+Loading a linked ICC profile within a BMP image is now disabled by
+default. To re-enable it, set the new system property
+`sun.imageio.bmp.enabledLinkedProfiles` to `true`.  This new property
+replaces the old property,
+`sun.imageio.plugins.bmp.disableLinkedProfiles`.
+
+client-libs/javax.sound:
+
+JDK-8293742: Better Banking of Sounds
+=====================================
+Previously, the SoundbankReader implementation,
+`com.sun.media.sound.JARSoundbankReader`, would download a JAR
+soundbank from a URL.  This behaviour is now disabled by default. To
+re-enable it, set the new system property `jdk.sound.jarsoundbank` to
+`true`.
+
+hotspot/runtime:
+
+JDK-8274840: Release Now Recognises Windows 11
+==============================================
+This release now correctly sets the `os.name` property to `Windows
+11`, as would be expected.
+
+other-libs/corba:idl:
+
+JDK-8285021: Improve CORBA communication
+========================================
+The JDK's CORBA implementation now refuses by default to deserialize
+objects, unless they have the "IOR:" prefix.  The previous behaviour
+can be re-enabled by setting the new property
+`com.sun.CORBA.ORBAllowDeserializeObject` to `true`.
+
+security-libs/java.security:
+
+JDK-8269039: Disabled SHA-1 Signed JARs
+=======================================
+JARs signed with SHA-1 algorithms are now restricted by default and
+treated as if they were unsigned. This applies to the algorithms used
+to digest, sign, and optionally timestamp the JAR. It also applies to
+the signature and digest algorithms of the certificates in the
+certificate chain of the code signer and the Timestamp Authority, and
+any CRLs or OCSP responses that are used to verify if those
+certificates have been revoked. These restrictions also apply to
+signed JCE providers.
+
+To reduce the compatibility risk for JARs that have been previously
+timestamped, there is one exception to this policy:
+
+- Any JAR signed with SHA-1 algorithms and timestamped prior to
+  January 01, 2019 will not be restricted.
+
+This exception may be removed in a future JDK release. To determine if
+your signed JARs are affected by this change, run:
+
+$ jarsigner -verify -verbose -certs`
+
+on the signed JAR, and look for instances of "SHA1" or "SHA-1" and
+"disabled" and a warning that the JAR will be treated as unsigned in
+the output.
+
+For example:
+
+   Signed by "CN="Signer""
+   Digest algorithm: SHA-1 (disabled)
+   Signature algorithm: SHA1withRSA (disabled), 2048-bit key
+
+   WARNING: The jar will be treated as unsigned, because it is signed with a weak algorithm that is now disabled by the security property:
+
+   jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, DSA keySize < 1024, SHA1 denyAfter 2019-01-01
+
+JARs affected by these new restrictions should be replaced or
+re-signed with stronger algorithms.
+
+Users can, *at their own risk*, remove these restrictions by modifying
+the `java.security` configuration file (or override it by using the
+`java.security.properties` system property) and removing "SHA1 usage
+SignedJAR & denyAfter 2019-01-01" from the
+`jdk.certpath.disabledAlgorithms` security property and "SHA1
+denyAfter 2019-01-01" from the `jdk.jar.disabledAlgorithms` security
+property.
+
 New in release OpenJDK 8u352 (2022-10-18):
 ===========================================
 Live versions of these release notes can be found at:
@ -108,6 +280,19 @@ change might only impact existing code that would depend on
 PhantomReference being enqueued rather than when the referent be freed
 from the heap.

+core-libs/java.net:
+
+JDK-8286918: Better HttpServer service
+======================================
+The HttpServer can be optionally configured with a maximum connection
+limit by setting the jdk.httpserver.maxConnections system property. A
+value of 0 or a negative integer is ignored and considered to
+represent no connection limit. In the case of a positive integer
+value, any newly accepted connections will be first checked against
+the current count of established connections and, if the configured
+limit has been reached, then the newly accepted connection will be
+closed immediately.
+
 security-libs/javax.net.ssl:

 JDK-8282859: Enable TLSv1.3 by Default on JDK 8 for Client Roles
@ -158,7 +343,7 @@ or:

 SSLParameters params = sslSocket.getSSLParameters();
 params.setProtocols(new String[] {"TLSv1.2"});
-slsSocket.setSSLParameters(params);
+sslSocket.setSSLParameters(params);

 New in release OpenJDK 8u345 (2022-08-01):
 ===========================================
@ -189,7 +374,7 @@ versions of OpenJDK 8.  As a result, we have reverted this change in
 New in release OpenJDK 8u342 (2022-07-19):
 ===========================================
 Live versions of these release notes can be found at:
-  * https://bitly.com/openjdk8u342
+  * https://bit.ly/openjdk8u342
  * https://builds.shipilev.net/backports-monitor/release-notes-openjdk8u342.txt

 * Security fixes
@ -369,7 +554,7 @@ Live versions of these release notes can be found at:
 New in release OpenJDK 8u322 (2022-01-18):
 ===========================================
 Live versions of these release notes can be found at:
-  * https://bitly.com/openjdk8u322
+  * https://bit.ly/openjdk8u322
  * https://builds.shipilev.net/backports-monitor/release-notes-openjdk8u322.txt

 * Security fixes
--- a/SOURCES/TestTranslations.java
+++ b/SOURCES/TestTranslations.java
@ -30,7 +30,7 @@ import java.util.TimeZone;

 public class TestTranslations {

-    private static Map<Locale,String[]> KYIV;
+    private static Map<Locale,String[]> KYIV, CIUDAD_JUAREZ;

    static {
        Map<Locale,String[]> map = new HashMap<Locale,String[]>();
@ -44,6 +44,18 @@ public class TestTranslations {
                                               "Osteurop\u00e4ische Sommerzeit", "OESZ", "OESZ",
                                               "Osteurop\u00e4ische Zeit", "OEZ", "OEZ"});
        KYIV = Collections.unmodifiableMap(map);
+
+        map = new HashMap<Locale,String[]>();
+        map.put(Locale.US, new String[] { "Mountain Standard Time", "MST", "MST",
+                                          "Mountain Daylight Time", "MDT", "MDT",
+                                          "Mountain Time", "MT", "MT"});
+        map.put(Locale.FRANCE, new String[] { "Heure normale des Rocheuses", "UTC\u221207:00", "MST",
+                                              "Heure avanc\u00e9e des Rocheuses", "UTC\u221206:00", "MDT",
+                                              "Rocheuses", "UTC\u221207:00", "MT"});
+        map.put(Locale.GERMANY, new String[] { "Rocky Mountains Normalzeit", "GMT-07:00", "MST",
+                                               "Rocky Mountains Sommerzeit", "GMT-06:00", "MDT",
+                                               "Zeitzone Mountain", "GMT-07:00", "MT"});
+        CIUDAD_JUAREZ = Collections.unmodifiableMap(map);
    }


@ -53,7 +65,6 @@ public class TestTranslations {
            System.exit(1);
        }

-        String localeProvider = args[0];
        System.out.println("Checking sanity of full zone string set...");
        boolean invalid = Arrays.stream(Locale.getAvailableLocales())
            .peek(l -> System.out.println("Locale: " + l))
@ -68,9 +79,18 @@ public class TestTranslations {
            System.exit(2);
        }

-        for (Locale l : KYIV.keySet()) {
-            String[] expected = KYIV.get(l);
-            for (String id : new String[] { "Europe/Kiev", "Europe/Kyiv", "Europe/Uzhgorod", "Europe/Zaporozhye" }) {
+        String localeProvider = args[0];
+        testZone(localeProvider, KYIV,
+                 new String[] { "Europe/Kiev", "Europe/Kyiv", "Europe/Uzhgorod", "Europe/Zaporozhye" });
+        testZone(localeProvider, CIUDAD_JUAREZ,
+                 new String[] { "America/Cambridge_Bay", "America/Ciudad_Juarez" });
+    }
+
+    private static void testZone(String localeProvider, Map<Locale,String[]> exp, String[] ids) {
+        for (Locale l : exp.keySet()) {
+            String[] expected = exp.get(l);
+            System.out.printf("Expected values for %s are %s\n", l, Arrays.toString(expected));
+            for (String id : ids) {
                String expectedShortStd = null;
                String expectedShortDST = null;
                String expectedShortGen = null;
--- a/SOURCES/jdk8195607-pr3776-rh1760437-nss_sqlite_db_config.patch
+++ b/SOURCES/jdk8195607-pr3776-rh1760437-nss_sqlite_db_config.patch
@ -1,125 +0,0 @@
-# HG changeset patch
-# User mbalao
-# Date 1529971845 -28800
-#      Tue Jun 26 08:10:45 2018 +0800
-# Node ID e9c20b7250cd98d16a67f2a30b34284c2caa01dc
-# Parent  9f1aa2e38d90dd60522237d7414af6bdcf03c4ff
-8195607, PR3776: sun/security/pkcs11/Secmod/TestNssDbSqlite.java failed with "NSS initialization failed" on NSS 3.34.1
-Reviewed-by: valeriep, weijun
-
-diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/Secmod.java openjdk/jdk/src/share/classes/sun/security/pkcs11/Secmod.java
--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/Secmod.java
-+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/Secmod.java
-@@ -197,7 +197,7 @@
- 
-         if (configDir != null) {
-             String configDirPath = null;
-            String sqlPrefix = "sql:/";
-+            String sqlPrefix = "sql:";
-             if (!configDir.startsWith(sqlPrefix)) {
-                 configDirPath = configDir;
-             } else {
-diff --git openjdk.orig/jdk/src/share/native/sun/security/pkcs11/j2secmod.c openjdk/jdk/src/share/native/sun/security/pkcs11/j2secmod.c
--- openjdk.orig/jdk/src/share/native/sun/security/pkcs11/j2secmod.c
-+++ openjdk/jdk/src/share/native/sun/security/pkcs11/j2secmod.c
-@@ -69,9 +69,14 @@
-     int res = 0;
-     FPTR_Initialize initialize =
-         (FPTR_Initialize)findFunction(env, jHandle, "NSS_Initialize");
-+    #ifdef SECMOD_DEBUG
-+    FPTR_GetError getError =
-+        (FPTR_GetError)findFunction(env, jHandle, "PORT_GetError");
-+    #endif // SECMOD_DEBUG
-     unsigned int flags = 0x00;
-     const char *configDir = NULL;
-     const char *functionName = NULL;
-+    const char *configFile = NULL;
- 
-     /* If we cannot initialize, exit now */
-     if (initialize == NULL) {
-@@ -97,13 +102,18 @@
-         flags = 0x20; // NSS_INIT_OPTIMIZESPACE flag
-     }
- 
-+    configFile = "secmod.db";
-+    if (configDir != NULL && strncmp("sql:", configDir, 4U) == 0) {
-+        configFile = "pkcs11.txt";
-+    }
-+
-     /*
-      * If the NSS_Init function is requested then call NSS_Initialize to
-      * open the Cert, Key and Security Module databases, read only.
-      */
-     if (strcmp("NSS_Init", functionName) == 0) {
-         flags = flags | 0x01; // NSS_INIT_READONLY flag
-        res = initialize(configDir, "", "", "secmod.db", flags);
-+        res = initialize(configDir, "", "", configFile, flags);
- 
-     /*
-      * If the NSS_InitReadWrite function is requested then call
-@@ -111,7 +121,7 @@
-      * read/write.
-      */
-     } else if (strcmp("NSS_InitReadWrite", functionName) == 0) {
-        res = initialize(configDir, "", "", "secmod.db", flags);
-+        res = initialize(configDir, "", "", configFile, flags);
- 
-     /*
-      * If the NSS_NoDB_Init function is requested then call
-@@ -137,6 +147,13 @@
-         (*env)->ReleaseStringUTFChars(env, jConfigDir, configDir);
-     }
-     dprintf1("-res: %d\n", res);
-+    #ifdef SECMOD_DEBUG
-+    if (res == -1) {
-+        if (getError != NULL) {
-+            dprintf1("-NSS error: %d\n", getError());
-+        }
-+    }
-+    #endif // SECMOD_DEBUG
- 
-     return (res == 0) ? JNI_TRUE : JNI_FALSE;
- }
-diff --git openjdk.orig/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.h openjdk/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.h
--- openjdk.orig/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.h
-+++ openjdk/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.h
-@@ -34,6 +34,10 @@
-         const char *certPrefix, const char *keyPrefix,
-         const char *secmodName, unsigned int flags);
- 
-+#ifdef SECMOD_DEBUG
-+typedef int (*FPTR_GetError)(void);
-+#endif //SECMOD_DEBUG
-+
- // in secmod.h
- //extern SECMODModule *SECMOD_LoadModule(char *moduleSpec,SECMODModule *parent,
- //                                                      PRBool recurse);
-diff --git openjdk.orig/jdk/test/sun/security/pkcs11/Secmod/pkcs11.txt openjdk/jdk/test/sun/security/pkcs11/Secmod/pkcs11.txt
-new file mode 100644
--- /dev/null
-+++ openjdk/jdk/test/sun/security/pkcs11/Secmod/pkcs11.txt
-@@ -0,0 +1,4 @@
-+library=
-+name=NSS Internal PKCS #11 Module
-+parameters=configdir='sql:./tmpdb' certPrefix='' keyPrefix='' secmod='' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' 
-+NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30})
-diff --git openjdk.orig/jdk/test/sun/security/pkcs11/SecmodTest.java openjdk/jdk/test/sun/security/pkcs11/SecmodTest.java
--- openjdk.orig/jdk/test/sun/security/pkcs11/SecmodTest.java
-+++ openjdk/jdk/test/sun/security/pkcs11/SecmodTest.java
-@@ -55,7 +55,7 @@
- 
-         DBDIR = System.getProperty("test.classes", ".") + SEP + "tmpdb";
-         if (useSqlite) {
-            System.setProperty("pkcs11test.nss.db", "sql:/" + DBDIR);
-+            System.setProperty("pkcs11test.nss.db", "sql:" + DBDIR);
-         } else {
-             System.setProperty("pkcs11test.nss.db", DBDIR);
-         }
-@@ -67,6 +67,7 @@
-         if (useSqlite) {
-             copyFile("key4.db", BASE, DBDIR);
-             copyFile("cert9.db", BASE, DBDIR);
-+            copyFile("pkcs11.txt", BASE, DBDIR);
-         } else {
-             copyFile("secmod.db", BASE, DBDIR);
-             copyFile("key3.db", BASE, DBDIR);
--- a/SOURCES/jdk8294357-tzdata2022d.patch
+++ b/SOURCES/jdk8294357-tzdata2022d.patch
@ -1,506 +0,0 @@
-commit 8589b1229cffb9a0ab00baf62ce2d4376d31b055
-Author: Andrew John Hughes <andrew@openjdk.org>
-Date:   Fri Oct 14 22:55:39 2022 +0100
-
-    Backport f67b4de8a07b8158be1dfb5b09cdb4cc5b7ac93b
-
-diff --git a/jdk/make/data/tzdata/VERSION b/jdk/make/data/tzdata/VERSION
-index decb8716b22..889d0e6dad7 100644
--- a/jdk/make/data/tzdata/VERSION
-+++ b/jdk/make/data/tzdata/VERSION
-@@ -21,4 +21,4 @@
- # or visit www.oracle.com if you need additional information or have any
- # questions.
- #
-tzdata2022c
-+tzdata2022d
-diff --git a/jdk/make/data/tzdata/asia b/jdk/make/data/tzdata/asia
-index 6cb6d2c57cf..1dc7d34f88e 100644
--- a/jdk/make/data/tzdata/asia
-+++ b/jdk/make/data/tzdata/asia
-@@ -3398,10 +3398,6 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
- # The winter time in 2015 started on October 23 at 01:00.
- # https://wafa.ps/ar_page.aspx?id=CgpCdYa670694628582aCgpCdY
- # http://www.palestinecabinet.gov.ps/portal/meeting/details/27583
-#
-# From Paul Eggert (2019-04-10):
-# For now, guess spring-ahead transitions are at 00:00 on the Saturday
-# preceding March's last Sunday (i.e., Sat>=24).
- 
- # From P Chan (2021-10-18):
- # http://wafa.ps/Pages/Details/34701
-@@ -3418,6 +3414,18 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
- # From Heba Hamad (2022-03-10):
- # summer time will begin in Palestine from Sunday 03-27-2022, 00:00 AM.
- 
-+# From Heba Hamad (2022-08-30):
-+# winter time will begin in Palestine from Saturday 10-29, 02:00 AM by
-+# 60 minutes backwards.  Also the state of Palestine adopted the summer
-+# and winter time for the years: 2023,2024,2025,2026 ...
-+# https://mm.icann.org/pipermail/tz/attachments/20220830/9f024566/Time-0001.pdf
-+# (2022-08-31): ... the Saturday before the last Sunday in March and October
-+# at 2:00 AM ,for the years from 2023 to 2026.
-+# (2022-09-05): https://mtit.pna.ps/Site/New/1453
-+#
-+# From Paul Eggert (2022-08-31):
-+# For now, assume that this rule will also be used after 2026.
-+
- # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
- Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
- Rule EgyptAsia	1957	1958	-	Oct	 1	0:00	0	-
-@@ -3448,14 +3456,16 @@ Rule Palestine	2013	only	-	Sep	27	0:00	0	-
- Rule Palestine	2014	only	-	Oct	24	0:00	0	-
- Rule Palestine	2015	only	-	Mar	28	0:00	1:00	S
- Rule Palestine	2015	only	-	Oct	23	1:00	0	-
-Rule Palestine	2016	2018	-	Mar	Sat>=24	1:00	1:00	S
-Rule Palestine	2016	2018	-	Oct	Sat>=24	1:00	0	-
-+Rule Palestine	2016	2018	-	Mar	Sat<=30	1:00	1:00	S
-+Rule Palestine	2016	2018	-	Oct	Sat<=30	1:00	0	-
- Rule Palestine	2019	only	-	Mar	29	0:00	1:00	S
-Rule Palestine	2019	only	-	Oct	Sat>=24	0:00	0	-
-Rule Palestine	2020	2021	-	Mar	Sat>=24	0:00	1:00	S
-+Rule Palestine	2019	only	-	Oct	Sat<=30	0:00	0	-
-+Rule Palestine	2020	2021	-	Mar	Sat<=30	0:00	1:00	S
- Rule Palestine	2020	only	-	Oct	24	1:00	0	-
-Rule Palestine	2021	max	-	Oct	Fri>=23	1:00	0	-
-Rule Palestine	2022	max	-	Mar	Sun>=25	0:00	1:00	S
-+Rule Palestine	2021	only	-	Oct	29	1:00	0	-
-+Rule Palestine	2022	only	-	Mar	27	0:00	1:00	S
-+Rule Palestine	2022	max	-	Oct	Sat<=30	2:00	0	-
-+Rule Palestine	2023	max	-	Mar	Sat<=30	2:00	1:00	S
- 
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
- Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
-diff --git a/jdk/make/data/tzdata/backward b/jdk/make/data/tzdata/backward
-index d4a29e8cf29..7765d99aedf 100644
--- a/jdk/make/data/tzdata/backward
-+++ b/jdk/make/data/tzdata/backward
-@@ -113,6 +113,8 @@ Link	Etc/UTC			Etc/UCT
- Link	Europe/London		Europe/Belfast
- Link	Europe/Kyiv		Europe/Kiev
- Link	Europe/Chisinau		Europe/Tiraspol
-+Link	Europe/Kyiv		Europe/Uzhgorod
-+Link	Europe/Kyiv		Europe/Zaporozhye
- Link	Europe/London		GB
- Link	Europe/London		GB-Eire
- Link	Etc/GMT			GMT+0
-diff --git a/jdk/make/data/tzdata/europe b/jdk/make/data/tzdata/europe
-index f7eb7a387aa..9e0a538f86d 100644
--- a/jdk/make/data/tzdata/europe
-+++ b/jdk/make/data/tzdata/europe
-@@ -2638,10 +2638,14 @@ Zone Europe/Simferopol	 2:16:24 -	LMT	1880
- # From Alexander Krivenyshev (2014-03-17):
- # time change at 2:00 (2am) on March 30, 2014
- # https://vz.ru/news/2014/3/17/677464.html
-# From Paul Eggert (2014-03-30):
-# Simferopol and Sevastopol reportedly changed their central town clocks
-# late the previous day, but this appears to have been ceremonial
-# and the discrepancies are small enough to not worry about.
-+# From Tim Parenti (2022-07-01), per Paul Eggert (2014-03-30):
-+# The clocks at the railway station in Simferopol were put forward from 22:00
-+# to 24:00 the previous day in a "symbolic ceremony"; however, per
-+# contemporaneous news reports, "ordinary Crimeans [made] the daylight savings
-+# time switch at 2am" on Sunday.
-+# https://www.business-standard.com/article/pti-stories/crimea-to-set-clocks-to-russia-time-114033000014_1.html
-+# https://www.reuters.com/article/us-ukraine-crisis-crimea-time/crimea-switches-to-moscow-time-amid-incorporation-frenzy-idUKBREA2S0LT20140329
-+# https://www.bbc.com/news/av/world-europe-26806583
- 			 2:00	EU	EE%sT	2014 Mar 30  2:00
- 			 4:00	-	MSK	2014 Oct 26  2:00s
- 			 3:00	-	MSK
-@@ -3774,8 +3778,8 @@ Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
- # US colleague David Cochrane) are still trying to get more
- # information upon these local deviations from Kiev rules.
- #
-# From Paul Eggert (2022-02-08):
-# For now, assume that Ukraine's other three zones followed the same rules,
-+# From Paul Eggert (2022-08-27):
-+# For now, assume that Ukraine's zones all followed the same rules,
- # except that Crimea switched to Moscow time in 1994 as described elsewhere.
- 
- # From Igor Karpov, who works for the Ukrainian Ministry of Justice,
-@@ -3845,21 +3849,7 @@ Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
- # * Ukrainian Government's Resolution of 20.03.1992, No. 139.
- # http://www.uazakon.com/documents/date_8u/pg_grcasa.htm
- 
-# From Paul Eggert (2022-04-12):
-# As is usual in tzdb, Ukrainian zones use the most common English spellings.
-# In particular, tzdb's name Europe/Kyiv uses the most common spelling in
-# English for Ukraine's capital.  Although tzdb's former name was Europe/Kiev,
-# "Kyiv" is now more common due to widespread reporting of the current conflict.
-# Conversely, tzdb continues to use the names Europe/Uzhgorod and
-# Europe/Zaporozhye; this is similar to tzdb's use of Europe/Prague, which is
-# certainly wrong as a transliteration of the Czech "Praha".
-# English-language spelling of Ukrainian names is in flux, and
-# some day "Uzhhorod" or "Zaporizhzhia" may become substantially more
-# common in English; in the meantime, do not change these
-# English spellings as that means less disruption for our users.
-
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-# This represents most of Ukraine.  See above for the spelling of "Kyiv".
- Zone Europe/Kyiv	2:02:04 -	LMT	1880
- 			2:02:04	-	KMT	1924 May  2 # Kyiv Mean Time
- 			2:00	-	EET	1930 Jun 21
-@@ -3869,34 +3859,6 @@ Zone Europe/Kyiv	2:02:04 -	LMT	1880
- 			2:00	1:00	EEST	1991 Sep 29  3:00
- 			2:00	C-Eur	EE%sT	1996 May 13
- 			2:00	EU	EE%sT
-# Transcarpathia used CET 1990/1991.
-# "Uzhhorod" is the transliteration of the Rusyn/Ukrainian pronunciation, but
-# "Uzhgorod" is more common in English.
-Zone Europe/Uzhgorod	1:29:12 -	LMT	1890 Oct
-			1:00	-	CET	1940
-			1:00	C-Eur	CE%sT	1944 Oct
-			1:00	1:00	CEST	1944 Oct 26
-			1:00	-	CET	1945 Jun 29
-			3:00	Russia	MSK/MSD	1990
-			3:00	-	MSK	1990 Jul  1  2:00
-			1:00	-	CET	1991 Mar 31  3:00
-			2:00	-	EET	1992 Mar 20
-			2:00	C-Eur	EE%sT	1996 May 13
-			2:00	EU	EE%sT
-# Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
-# "Zaporizhzhia" is the transliteration of the Ukrainian name, but
-# "Zaporozh'ye" is more common in English.  Use the common English
-# spelling, except omit the apostrophe as it is not allowed in
-# portable Posix file names.
-Zone Europe/Zaporozhye	2:20:40 -	LMT	1880
-			2:20	-	+0220	1924 May  2
-			2:00	-	EET	1930 Jun 21
-			3:00	-	MSK	1941 Aug 25
-			1:00	C-Eur	CE%sT	1943 Oct 25
-			3:00	Russia	MSK/MSD	1991 Mar 31  2:00
-			2:00	E-Eur	EE%sT	1992 Mar 20
-			2:00	C-Eur	EE%sT	1996 May 13
-			2:00	EU	EE%sT
- 
- # Vatican City
- # See Europe/Rome.
-diff --git a/jdk/make/data/tzdata/southamerica b/jdk/make/data/tzdata/southamerica
-index 13ec081c7e0..3c0e0e2061c 100644
--- a/jdk/make/data/tzdata/southamerica
-+++ b/jdk/make/data/tzdata/southamerica
-@@ -1332,8 +1332,14 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
- # for America/Santiago will start on midnight of September 11th;
- # and will end on April 1st, 2023. Magallanes region (America/Punta_Arenas)
- # will keep UTC -3 "indefinitely"...  This is because on September 4th
-# we will have a voting whether to approve a new Constitution....
-# https://www.interior.gob.cl/noticias/2022/08/09/comunicado-el-proximo-sabado-10-de-septiembre-los-relojes-se-deben-adelantar-una-hora/
-+# we will have a voting whether to approve a new Constitution.
-+#
-+# From Eduardo Romero Urra (2022-08-17):
-+# https://www.diariooficial.interior.gob.cl/publicaciones/2022/08/13/43327/01/2172567.pdf
-+#
-+# From Paul Eggert (2022-08-17):
-+# Although the presidential decree stops at fall 2026, assume that
-+# similar DST rules will continue thereafter.
- 
- # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
- Rule	Chile	1927	1931	-	Sep	 1	0:00	1:00	-
-diff --git a/jdk/make/data/tzdata/zone.tab b/jdk/make/data/tzdata/zone.tab
-index 51b65fa273c..ee025196e50 100644
--- a/jdk/make/data/tzdata/zone.tab
-+++ b/jdk/make/data/tzdata/zone.tab
-@@ -424,8 +424,6 @@ TV	-0831+17913	Pacific/Funafuti
- TW	+2503+12130	Asia/Taipei
- TZ	-0648+03917	Africa/Dar_es_Salaam
- UA	+5026+03031	Europe/Kyiv	Ukraine (most areas)
-UA	+4837+02218	Europe/Uzhgorod	Transcarpathia
-UA	+4750+03510	Europe/Zaporozhye	Zaporozhye and east Lugansk
- UG	+0019+03225	Africa/Kampala
- UM	+2813-17722	Pacific/Midway	Midway Islands
- UM	+1917+16637	Pacific/Wake	Wake Island
-diff --git a/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java b/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java
-index 43bddd5859a..4b84cda3067 100644
--- a/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java
-+++ b/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java
-@@ -573,12 +573,8 @@ public final class ZoneInfoFile {
-                     // we can then pass in the dom = -1, dow > 0 into ZoneInfo
-                     //
-                     // hacking, assume the >=24 is the result of ZRB optimization for
-                    // "last", it works for now. From tzdata2020d this hacking
-                    // will not work for Asia/Gaza and Asia/Hebron which follow
-                    // Palestine DST rules.
-                    if (dom < 0 || dom >= 24 &&
-                                   !(zoneId.equals("Asia/Gaza") ||
-                                     zoneId.equals("Asia/Hebron"))) {
-+                    // "last", it works for now.
-+                    if (dom < 0 || dom >= 24) {
-                         params[1] = -1;
-                         params[2] = toCalendarDOW[dow];
-                     } else {
-@@ -600,7 +596,6 @@ public final class ZoneInfoFile {
-                     params[7] = 0;
-                 } else {
-                     // hacking: see comment above
-                    // No need of hacking for Asia/Gaza and Asia/Hebron from tz2021e
-                     if (dom < 0 || dom >= 24) {
-                         params[6] = -1;
-                         params[7] = toCalendarDOW[dow];
-diff --git a/jdk/test/java/util/TimeZone/TimeZoneData/VERSION b/jdk/test/java/util/TimeZone/TimeZoneData/VERSION
-index c32bee39fba..71470168456 100644
--- a/jdk/test/java/util/TimeZone/TimeZoneData/VERSION
-+++ b/jdk/test/java/util/TimeZone/TimeZoneData/VERSION
-@@ -1 +1 @@
-tzdata2022c
-+tzdata2022d
-diff --git a/jdk/test/java/util/TimeZone/TimeZoneData/aliases.txt b/jdk/test/java/util/TimeZone/TimeZoneData/aliases.txt
-index a5e6428a3f5..e3ce742f887 100644
--- a/jdk/test/java/util/TimeZone/TimeZoneData/aliases.txt
-+++ b/jdk/test/java/util/TimeZone/TimeZoneData/aliases.txt
-@@ -183,6 +183,8 @@ Link	Etc/UTC			Etc/UCT
- Link	Europe/London		Europe/Belfast
- Link	Europe/Kyiv		Europe/Kiev
- Link	Europe/Chisinau		Europe/Tiraspol
-+Link	Europe/Kyiv		Europe/Uzhgorod
-+Link	Europe/Kyiv		Europe/Zaporozhye
- Link	Europe/London		GB
- Link	Europe/London		GB-Eire
- Link	Etc/GMT			GMT+0
-diff --git a/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt b/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt
-index fc148537f1f..b3823958ae4 100644
--- a/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt
-+++ b/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt
-@@ -163,11 +163,9 @@ Europe/Simferopol MSK
- Europe/Sofia EET EEST
- Europe/Tallinn EET EEST
- Europe/Tirane CET CEST
-Europe/Uzhgorod EET EEST
- Europe/Vienna CET CEST
- Europe/Vilnius EET EEST
- Europe/Warsaw CET CEST
-Europe/Zaporozhye EET EEST
- Europe/Zurich CET CEST
- HST HST
- MET MET MEST
-diff --git a/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java b/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java
-index 3aad69f8118..c682531d4bd 100644
--- a/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java
-+++ b/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java
-@@ -173,10 +173,19 @@ public class TestZoneInfo310 {
-              * Temporary ignoring the failing TimeZones which are having zone
-              * rules defined till year 2037 and/or above and have negative DST
-              * save time in IANA tzdata. This bug is tracked via JDK-8223388.
-+             *
-+             * Tehran/Iran rule has rules beyond 2037, in which javazic assumes
-+             * to be the last year. Thus javazic's rule is based on year 2037
-+             * (Mar 20th/Sep 20th are the cutover dates), while the real rule
-+             * has year 2087 where Mar 21st/Sep 21st are the cutover dates.
-              */
-            if (zid.equals("Africa/Casablanca") || zid.equals("Africa/El_Aaiun")
-                || zid.equals("Asia/Tehran") || zid.equals("Iran")) {
-                continue;
-+            if (zid.equals("Africa/Casablanca") || // uses "Morocco" rule
-+                zid.equals("Africa/El_Aaiun") || // uses "Morocco" rule
-+                zid.equals("Asia/Tehran") || // last rule mismatch
-+                zid.equals("Asia/Gaza") || // uses "Palestine" rule
-+                zid.equals("Asia/Hebron") || // uses "Palestine" rule
-+                zid.equals("Iran")) { // last rule mismatch
-+                    continue;
-             }
-             if (! zi.equalsTo(ziOLD)) {
-                 System.out.println(zi.diffsTo(ziOLD));
-diff --git a/jdk/test/sun/util/calendar/zi/tzdata/VERSION b/jdk/test/sun/util/calendar/zi/tzdata/VERSION
-index decb8716b22..889d0e6dad7 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/VERSION
-+++ b/jdk/test/sun/util/calendar/zi/tzdata/VERSION
-@@ -21,4 +21,4 @@
- # or visit www.oracle.com if you need additional information or have any
- # questions.
- #
-tzdata2022c
-+tzdata2022d
-diff --git a/jdk/test/sun/util/calendar/zi/tzdata/asia b/jdk/test/sun/util/calendar/zi/tzdata/asia
-index 6cb6d2c57cf..1dc7d34f88e 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/asia
-+++ b/jdk/test/sun/util/calendar/zi/tzdata/asia
-@@ -3398,10 +3398,6 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
- # The winter time in 2015 started on October 23 at 01:00.
- # https://wafa.ps/ar_page.aspx?id=CgpCdYa670694628582aCgpCdY
- # http://www.palestinecabinet.gov.ps/portal/meeting/details/27583
-#
-# From Paul Eggert (2019-04-10):
-# For now, guess spring-ahead transitions are at 00:00 on the Saturday
-# preceding March's last Sunday (i.e., Sat>=24).
- 
- # From P Chan (2021-10-18):
- # http://wafa.ps/Pages/Details/34701
-@@ -3418,6 +3414,18 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
- # From Heba Hamad (2022-03-10):
- # summer time will begin in Palestine from Sunday 03-27-2022, 00:00 AM.
- 
-+# From Heba Hamad (2022-08-30):
-+# winter time will begin in Palestine from Saturday 10-29, 02:00 AM by
-+# 60 minutes backwards.  Also the state of Palestine adopted the summer
-+# and winter time for the years: 2023,2024,2025,2026 ...
-+# https://mm.icann.org/pipermail/tz/attachments/20220830/9f024566/Time-0001.pdf
-+# (2022-08-31): ... the Saturday before the last Sunday in March and October
-+# at 2:00 AM ,for the years from 2023 to 2026.
-+# (2022-09-05): https://mtit.pna.ps/Site/New/1453
-+#
-+# From Paul Eggert (2022-08-31):
-+# For now, assume that this rule will also be used after 2026.
-+
- # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
- Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
- Rule EgyptAsia	1957	1958	-	Oct	 1	0:00	0	-
-@@ -3448,14 +3456,16 @@ Rule Palestine	2013	only	-	Sep	27	0:00	0	-
- Rule Palestine	2014	only	-	Oct	24	0:00	0	-
- Rule Palestine	2015	only	-	Mar	28	0:00	1:00	S
- Rule Palestine	2015	only	-	Oct	23	1:00	0	-
-Rule Palestine	2016	2018	-	Mar	Sat>=24	1:00	1:00	S
-Rule Palestine	2016	2018	-	Oct	Sat>=24	1:00	0	-
-+Rule Palestine	2016	2018	-	Mar	Sat<=30	1:00	1:00	S
-+Rule Palestine	2016	2018	-	Oct	Sat<=30	1:00	0	-
- Rule Palestine	2019	only	-	Mar	29	0:00	1:00	S
-Rule Palestine	2019	only	-	Oct	Sat>=24	0:00	0	-
-Rule Palestine	2020	2021	-	Mar	Sat>=24	0:00	1:00	S
-+Rule Palestine	2019	only	-	Oct	Sat<=30	0:00	0	-
-+Rule Palestine	2020	2021	-	Mar	Sat<=30	0:00	1:00	S
- Rule Palestine	2020	only	-	Oct	24	1:00	0	-
-Rule Palestine	2021	max	-	Oct	Fri>=23	1:00	0	-
-Rule Palestine	2022	max	-	Mar	Sun>=25	0:00	1:00	S
-+Rule Palestine	2021	only	-	Oct	29	1:00	0	-
-+Rule Palestine	2022	only	-	Mar	27	0:00	1:00	S
-+Rule Palestine	2022	max	-	Oct	Sat<=30	2:00	0	-
-+Rule Palestine	2023	max	-	Mar	Sat<=30	2:00	1:00	S
- 
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
- Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
-diff --git a/jdk/test/sun/util/calendar/zi/tzdata/backward b/jdk/test/sun/util/calendar/zi/tzdata/backward
-index d4a29e8cf29..7765d99aedf 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/backward
-+++ b/jdk/test/sun/util/calendar/zi/tzdata/backward
-@@ -113,6 +113,8 @@ Link	Etc/UTC			Etc/UCT
- Link	Europe/London		Europe/Belfast
- Link	Europe/Kyiv		Europe/Kiev
- Link	Europe/Chisinau		Europe/Tiraspol
-+Link	Europe/Kyiv		Europe/Uzhgorod
-+Link	Europe/Kyiv		Europe/Zaporozhye
- Link	Europe/London		GB
- Link	Europe/London		GB-Eire
- Link	Etc/GMT			GMT+0
-diff --git a/jdk/test/sun/util/calendar/zi/tzdata/europe b/jdk/test/sun/util/calendar/zi/tzdata/europe
-index f7eb7a387aa..9e0a538f86d 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/europe
-+++ b/jdk/test/sun/util/calendar/zi/tzdata/europe
-@@ -2638,10 +2638,14 @@ Zone Europe/Simferopol	 2:16:24 -	LMT	1880
- # From Alexander Krivenyshev (2014-03-17):
- # time change at 2:00 (2am) on March 30, 2014
- # https://vz.ru/news/2014/3/17/677464.html
-# From Paul Eggert (2014-03-30):
-# Simferopol and Sevastopol reportedly changed their central town clocks
-# late the previous day, but this appears to have been ceremonial
-# and the discrepancies are small enough to not worry about.
-+# From Tim Parenti (2022-07-01), per Paul Eggert (2014-03-30):
-+# The clocks at the railway station in Simferopol were put forward from 22:00
-+# to 24:00 the previous day in a "symbolic ceremony"; however, per
-+# contemporaneous news reports, "ordinary Crimeans [made] the daylight savings
-+# time switch at 2am" on Sunday.
-+# https://www.business-standard.com/article/pti-stories/crimea-to-set-clocks-to-russia-time-114033000014_1.html
-+# https://www.reuters.com/article/us-ukraine-crisis-crimea-time/crimea-switches-to-moscow-time-amid-incorporation-frenzy-idUKBREA2S0LT20140329
-+# https://www.bbc.com/news/av/world-europe-26806583
- 			 2:00	EU	EE%sT	2014 Mar 30  2:00
- 			 4:00	-	MSK	2014 Oct 26  2:00s
- 			 3:00	-	MSK
-@@ -3774,8 +3778,8 @@ Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
- # US colleague David Cochrane) are still trying to get more
- # information upon these local deviations from Kiev rules.
- #
-# From Paul Eggert (2022-02-08):
-# For now, assume that Ukraine's other three zones followed the same rules,
-+# From Paul Eggert (2022-08-27):
-+# For now, assume that Ukraine's zones all followed the same rules,
- # except that Crimea switched to Moscow time in 1994 as described elsewhere.
- 
- # From Igor Karpov, who works for the Ukrainian Ministry of Justice,
-@@ -3845,21 +3849,7 @@ Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
- # * Ukrainian Government's Resolution of 20.03.1992, No. 139.
- # http://www.uazakon.com/documents/date_8u/pg_grcasa.htm
- 
-# From Paul Eggert (2022-04-12):
-# As is usual in tzdb, Ukrainian zones use the most common English spellings.
-# In particular, tzdb's name Europe/Kyiv uses the most common spelling in
-# English for Ukraine's capital.  Although tzdb's former name was Europe/Kiev,
-# "Kyiv" is now more common due to widespread reporting of the current conflict.
-# Conversely, tzdb continues to use the names Europe/Uzhgorod and
-# Europe/Zaporozhye; this is similar to tzdb's use of Europe/Prague, which is
-# certainly wrong as a transliteration of the Czech "Praha".
-# English-language spelling of Ukrainian names is in flux, and
-# some day "Uzhhorod" or "Zaporizhzhia" may become substantially more
-# common in English; in the meantime, do not change these
-# English spellings as that means less disruption for our users.
-
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-# This represents most of Ukraine.  See above for the spelling of "Kyiv".
- Zone Europe/Kyiv	2:02:04 -	LMT	1880
- 			2:02:04	-	KMT	1924 May  2 # Kyiv Mean Time
- 			2:00	-	EET	1930 Jun 21
-@@ -3869,34 +3859,6 @@ Zone Europe/Kyiv	2:02:04 -	LMT	1880
- 			2:00	1:00	EEST	1991 Sep 29  3:00
- 			2:00	C-Eur	EE%sT	1996 May 13
- 			2:00	EU	EE%sT
-# Transcarpathia used CET 1990/1991.
-# "Uzhhorod" is the transliteration of the Rusyn/Ukrainian pronunciation, but
-# "Uzhgorod" is more common in English.
-Zone Europe/Uzhgorod	1:29:12 -	LMT	1890 Oct
-			1:00	-	CET	1940
-			1:00	C-Eur	CE%sT	1944 Oct
-			1:00	1:00	CEST	1944 Oct 26
-			1:00	-	CET	1945 Jun 29
-			3:00	Russia	MSK/MSD	1990
-			3:00	-	MSK	1990 Jul  1  2:00
-			1:00	-	CET	1991 Mar 31  3:00
-			2:00	-	EET	1992 Mar 20
-			2:00	C-Eur	EE%sT	1996 May 13
-			2:00	EU	EE%sT
-# Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
-# "Zaporizhzhia" is the transliteration of the Ukrainian name, but
-# "Zaporozh'ye" is more common in English.  Use the common English
-# spelling, except omit the apostrophe as it is not allowed in
-# portable Posix file names.
-Zone Europe/Zaporozhye	2:20:40 -	LMT	1880
-			2:20	-	+0220	1924 May  2
-			2:00	-	EET	1930 Jun 21
-			3:00	-	MSK	1941 Aug 25
-			1:00	C-Eur	CE%sT	1943 Oct 25
-			3:00	Russia	MSK/MSD	1991 Mar 31  2:00
-			2:00	E-Eur	EE%sT	1992 Mar 20
-			2:00	C-Eur	EE%sT	1996 May 13
-			2:00	EU	EE%sT
- 
- # Vatican City
- # See Europe/Rome.
-diff --git a/jdk/test/sun/util/calendar/zi/tzdata/southamerica b/jdk/test/sun/util/calendar/zi/tzdata/southamerica
-index 13ec081c7e0..3c0e0e2061c 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/southamerica
-+++ b/jdk/test/sun/util/calendar/zi/tzdata/southamerica
-@@ -1332,8 +1332,14 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
- # for America/Santiago will start on midnight of September 11th;
- # and will end on April 1st, 2023. Magallanes region (America/Punta_Arenas)
- # will keep UTC -3 "indefinitely"...  This is because on September 4th
-# we will have a voting whether to approve a new Constitution....
-# https://www.interior.gob.cl/noticias/2022/08/09/comunicado-el-proximo-sabado-10-de-septiembre-los-relojes-se-deben-adelantar-una-hora/
-+# we will have a voting whether to approve a new Constitution.
-+#
-+# From Eduardo Romero Urra (2022-08-17):
-+# https://www.diariooficial.interior.gob.cl/publicaciones/2022/08/13/43327/01/2172567.pdf
-+#
-+# From Paul Eggert (2022-08-17):
-+# Although the presidential decree stops at fall 2026, assume that
-+# similar DST rules will continue thereafter.
- 
- # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
- Rule	Chile	1927	1931	-	Sep	 1	0:00	1:00	-
-diff --git a/jdk/test/sun/util/calendar/zi/tzdata/zone.tab b/jdk/test/sun/util/calendar/zi/tzdata/zone.tab
-index 51b65fa273c..ee025196e50 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/zone.tab
-+++ b/jdk/test/sun/util/calendar/zi/tzdata/zone.tab
-@@ -424,8 +424,6 @@ TV	-0831+17913	Pacific/Funafuti
- TW	+2503+12130	Asia/Taipei
- TZ	-0648+03917	Africa/Dar_es_Salaam
- UA	+5026+03031	Europe/Kyiv	Ukraine (most areas)
-UA	+4837+02218	Europe/Uzhgorod	Transcarpathia
-UA	+4750+03510	Europe/Zaporozhye	Zaporozhye and east Lugansk
- UG	+0019+03225	Africa/Kampala
- UM	+2813-17722	Pacific/Midway	Midway Islands
- UM	+1917+16637	Pacific/Wake	Wake Island
--- a/SOURCES/jdk8295173-tzdata2022e.patch
+++ b/SOURCES/jdk8295173-tzdata2022e.patch
@ -1,813 +0,0 @@
-commit 44ea8322b2f62e3d8139a78923e3bf017e535989
-Author: Andrew John Hughes <andrew@openjdk.org>
-Date:   Sun Oct 16 03:02:37 2022 +0100
-
-    Backport 21407dec0156301871a83328615e4d975c4287c4
-
-diff --git a/jdk/make/data/tzdata/VERSION b/jdk/make/data/tzdata/VERSION
-index 889d0e6dad7..b8cb36e69f4 100644
--- a/jdk/make/data/tzdata/VERSION
-+++ b/jdk/make/data/tzdata/VERSION
-@@ -21,4 +21,4 @@
- # or visit www.oracle.com if you need additional information or have any
- # questions.
- #
-tzdata2022d
-+tzdata2022e
-diff --git a/jdk/make/data/tzdata/asia b/jdk/make/data/tzdata/asia
-index 1dc7d34f88e..f1771e42a71 100644
--- a/jdk/make/data/tzdata/asia
-+++ b/jdk/make/data/tzdata/asia
-@@ -2254,6 +2254,17 @@ Zone	Asia/Tokyo	9:18:59	-	LMT	1887 Dec 31 15:00u
- # From the Arabic version, it seems to say it would be at midnight
- # (assume 24:00) on the last Thursday in February, starting from 2022.
- 
-+# From Issam Al-Zuwairi (2022-10-05):
-+# The Council of Ministers in Jordan decided Wednesday 5th October 2022,
-+# that daylight saving time (DST) will be throughout the year....
-+#
-+# From Brian Inglis (2022-10-06):
-+# https://petra.gov.jo/Include/InnerPage.jsp?ID=45567&lang=en&name=en_news
-+#
-+# From Paul Eggert (2022-10-05):
-+# Like Syria, model this as a transition from EEST +03 (DST) to plain +03
-+# (non-DST) at the point where DST would otherwise have ended.
-+
- # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
- Rule	Jordan	1973	only	-	Jun	6	0:00	1:00	S
- Rule	Jordan	1973	1975	-	Oct	1	0:00	0	-
-@@ -2285,11 +2296,12 @@ Rule	Jordan	2005	only	-	Sep	lastFri	0:00s	0	-
- Rule	Jordan	2006	2011	-	Oct	lastFri	0:00s	0	-
- Rule	Jordan	2013	only	-	Dec	20	0:00	0	-
- Rule	Jordan	2014	2021	-	Mar	lastThu	24:00	1:00	S
-Rule	Jordan	2014	max	-	Oct	lastFri	0:00s	0	-
-Rule	Jordan	2022	max	-	Feb	lastThu	24:00	1:00	S
-+Rule	Jordan	2014	2022	-	Oct	lastFri	0:00s	0	-
-+Rule	Jordan	2022	only	-	Feb	lastThu	24:00	1:00	S
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
- Zone	Asia/Amman	2:23:44 -	LMT	1931
-			2:00	Jordan	EE%sT
-+			2:00	Jordan	EE%sT	2022 Oct 28 0:00s
-+			3:00	-	+03
- 
- 
- # Kazakhstan
-@@ -3838,19 +3850,27 @@ Rule	Syria	2007	only	-	Nov	 Fri>=1	0:00	0	-
- # Our brief summary:
- # https://www.timeanddate.com/news/time/syria-dst-2012.html
- 
-# From Arthur David Olson (2012-03-27):
-# Assume last Friday in March going forward XXX.
-+# From Steffen Thorsen (2022-10-05):
-+# Syria is adopting year-round DST, starting this autumn....
-+# From https://www.enabbaladi.net/archives/607812
-+# "This [the decision] came after the weekly government meeting today,
-+# Tuesday 4 October ..."
-+#
-+# From Paul Eggert (2022-10-05):
-+# Like Jordan, model this as a transition from EEST +03 (DST) to plain +03
-+# (non-DST) at the point where DST would otherwise have ended.
- 
- Rule	Syria	2008	only	-	Apr	Fri>=1	0:00	1:00	S
- Rule	Syria	2008	only	-	Nov	1	0:00	0	-
- Rule	Syria	2009	only	-	Mar	lastFri	0:00	1:00	S
- Rule	Syria	2010	2011	-	Apr	Fri>=1	0:00	1:00	S
-Rule	Syria	2012	max	-	Mar	lastFri	0:00	1:00	S
-Rule	Syria	2009	max	-	Oct	lastFri	0:00	0	-
-+Rule	Syria	2012	2022	-	Mar	lastFri	0:00	1:00	S
-+Rule	Syria	2009	2022	-	Oct	lastFri	0:00	0	-
- 
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
- Zone	Asia/Damascus	2:25:12 -	LMT	1920 # Dimashq
-			2:00	Syria	EE%sT
-+			2:00	Syria	EE%sT	2022 Oct 28 0:00
-+			3:00	-	+03
- 
- # Tajikistan
- # From Shanks & Pottenger.
-diff --git a/jdk/make/data/tzdata/europe b/jdk/make/data/tzdata/europe
-index 9e0a538f86d..930cede4cf4 100644
--- a/jdk/make/data/tzdata/europe
-+++ b/jdk/make/data/tzdata/europe
-@@ -3417,7 +3417,7 @@ Zone	Europe/Madrid	-0:14:44 -	LMT	1901 Jan  1  0:00u
- 			 0:00	Spain	WE%sT	1940 Mar 16 23:00
- 			 1:00	Spain	CE%sT	1979
- 			 1:00	EU	CE%sT
-Zone	Africa/Ceuta	-0:21:16 -	LMT	1900 Dec 31 23:38:44
-+Zone	Africa/Ceuta	-0:21:16 -	LMT	1901 Jan  1  0:00u
- 			 0:00	-	WET	1918 May  6 23:00
- 			 0:00	1:00	WEST	1918 Oct  7 23:00
- 			 0:00	-	WET	1924
-diff --git a/jdk/make/data/tzdata/northamerica b/jdk/make/data/tzdata/northamerica
-index 114cef14cce..ce4ee74582c 100644
--- a/jdk/make/data/tzdata/northamerica
-+++ b/jdk/make/data/tzdata/northamerica
-@@ -462,7 +462,7 @@ Rule	Chicago	1922	1966	-	Apr	lastSun	2:00	1:00	D
- Rule	Chicago	1922	1954	-	Sep	lastSun	2:00	0	S
- Rule	Chicago	1955	1966	-	Oct	lastSun	2:00	0	S
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Chicago	-5:50:36 -	LMT	1883 Nov 18 12:09:24
-+Zone America/Chicago	-5:50:36 -	LMT	1883 Nov 18 18:00u
- 			-6:00	US	C%sT	1920
- 			-6:00	Chicago	C%sT	1936 Mar  1  2:00
- 			-5:00	-	EST	1936 Nov 15  2:00
-@@ -471,7 +471,7 @@ Zone America/Chicago	-5:50:36 -	LMT	1883 Nov 18 12:09:24
- 			-6:00	Chicago	C%sT	1967
- 			-6:00	US	C%sT
- # Oliver County, ND switched from mountain to central time on 1992-10-25.
-Zone America/North_Dakota/Center -6:45:12 - LMT	1883 Nov 18 12:14:48
-+Zone America/North_Dakota/Center -6:45:12 - LMT	1883 Nov 18 19:00u
- 			-7:00	US	M%sT	1992 Oct 25  2:00
- 			-6:00	US	C%sT
- # Morton County, ND, switched from mountain to central time on
-@@ -481,7 +481,7 @@ Zone America/North_Dakota/Center -6:45:12 - LMT	1883 Nov 18 12:14:48
- # Jones, Mellette, and Todd Counties in South Dakota;
- # but in practice these other counties were already observing central time.
- # See <http://www.epa.gov/fedrgstr/EPA-IMPACT/2003/October/Day-28/i27056.htm>.
-Zone America/North_Dakota/New_Salem -6:45:39 - LMT	1883 Nov 18 12:14:21
-+Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 19:00u
- 			-7:00	US	M%sT	2003 Oct 26  2:00
- 			-6:00	US	C%sT
- 
-@@ -498,7 +498,7 @@ Zone America/North_Dakota/New_Salem -6:45:39 - LMT	1883 Nov 18 12:14:21
- # largest city in Mercer County).  Google Maps places Beulah's city hall
- # at 47° 15' 51" N, 101° 46' 40" W, which yields an offset of 6h47'07".
- 
-Zone America/North_Dakota/Beulah -6:47:07 - LMT	1883 Nov 18 12:12:53
-+Zone America/North_Dakota/Beulah -6:47:07 - LMT	1883 Nov 18 19:00u
- 			-7:00	US	M%sT	2010 Nov  7  2:00
- 			-6:00	US	C%sT
- 
-@@ -530,7 +530,7 @@ Rule	Denver	1921	only	-	May	22	2:00	0	S
- Rule	Denver	1965	1966	-	Apr	lastSun	2:00	1:00	D
- Rule	Denver	1965	1966	-	Oct	lastSun	2:00	0	S
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Denver	-6:59:56 -	LMT	1883 Nov 18 12:00:04
-+Zone America/Denver	-6:59:56 -	LMT	1883 Nov 18 19:00u
- 			-7:00	US	M%sT	1920
- 			-7:00	Denver	M%sT	1942
- 			-7:00	US	M%sT	1946
-@@ -583,7 +583,7 @@ Rule	CA	1950	1966	-	Apr	lastSun	1:00	1:00	D
- Rule	CA	1950	1961	-	Sep	lastSun	2:00	0	S
- Rule	CA	1962	1966	-	Oct	lastSun	2:00	0	S
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Los_Angeles -7:52:58 -	LMT	1883 Nov 18 12:07:02
-+Zone America/Los_Angeles -7:52:58 -	LMT	1883 Nov 18 20:00u
- 			-8:00	US	P%sT	1946
- 			-8:00	CA	P%sT	1967
- 			-8:00	US	P%sT
-@@ -845,7 +845,7 @@ Zone Pacific/Honolulu	-10:31:26 -	LMT	1896 Jan 13 12:00
- # Go with the Arizona State Library instead.
- 
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Phoenix	-7:28:18 -	LMT	1883 Nov 18 11:31:42
-+Zone America/Phoenix	-7:28:18 -	LMT	1883 Nov 18 19:00u
- 			-7:00	US	M%sT	1944 Jan  1  0:01
- 			-7:00	-	MST	1944 Apr  1  0:01
- 			-7:00	US	M%sT	1944 Oct  1  0:01
-@@ -873,7 +873,7 @@ Link America/Phoenix America/Creston
- # switched four weeks late in 1974.
- #
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Boise	-7:44:49 -	LMT	1883 Nov 18 12:15:11
-+Zone America/Boise	-7:44:49 -	LMT	1883 Nov 18 20:00u
- 			-8:00	US	P%sT	1923 May 13  2:00
- 			-7:00	US	M%sT	1974
- 			-7:00	-	MST	1974 Feb  3  2:00
-@@ -945,7 +945,7 @@ Rule Indianapolis 1941	only	-	Jun	22	2:00	1:00	D
- Rule Indianapolis 1941	1954	-	Sep	lastSun	2:00	0	S
- Rule Indianapolis 1946	1954	-	Apr	lastSun	2:00	1:00	D
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Indiana/Indianapolis -5:44:38 - LMT	1883 Nov 18 12:15:22
-+Zone America/Indiana/Indianapolis -5:44:38 - LMT 1883 Nov 18 18:00u
- 			-6:00	US	C%sT	1920
- 			-6:00 Indianapolis C%sT	1942
- 			-6:00	US	C%sT	1946
-@@ -965,7 +965,7 @@ Rule	Marengo	1951	only	-	Sep	lastSun	2:00	0	S
- Rule	Marengo	1954	1960	-	Apr	lastSun	2:00	1:00	D
- Rule	Marengo	1954	1960	-	Sep	lastSun	2:00	0	S
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Indiana/Marengo -5:45:23 -	LMT	1883 Nov 18 12:14:37
-+Zone America/Indiana/Marengo -5:45:23 -	LMT	1883 Nov 18 18:00u
- 			-6:00	US	C%sT	1951
- 			-6:00	Marengo	C%sT	1961 Apr 30  2:00
- 			-5:00	-	EST	1969
-@@ -989,7 +989,7 @@ Rule Vincennes	1960	only	-	Oct	lastSun	2:00	0	S
- Rule Vincennes	1961	only	-	Sep	lastSun	2:00	0	S
- Rule Vincennes	1962	1963	-	Oct	lastSun	2:00	0	S
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Indiana/Vincennes -5:50:07 - LMT	1883 Nov 18 12:09:53
-+Zone America/Indiana/Vincennes -5:50:07 - LMT	1883 Nov 18 18:00u
- 			-6:00	US	C%sT	1946
- 			-6:00 Vincennes	C%sT	1964 Apr 26  2:00
- 			-5:00	-	EST	1969
-@@ -1009,7 +1009,7 @@ Rule Perry	1955	1960	-	Sep	lastSun	2:00	0	S
- Rule Perry	1956	1963	-	Apr	lastSun	2:00	1:00	D
- Rule Perry	1961	1963	-	Oct	lastSun	2:00	0	S
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Indiana/Tell_City -5:47:03 - LMT	1883 Nov 18 12:12:57
-+Zone America/Indiana/Tell_City -5:47:03 - LMT	1883 Nov 18 18:00u
- 			-6:00	US	C%sT	1946
- 			-6:00 Perry	C%sT	1964 Apr 26  2:00
- 			-5:00	-	EST	1967 Oct 29  2:00
-@@ -1026,7 +1026,7 @@ Rule	Pike	1955	1960	-	Sep	lastSun	2:00	0	S
- Rule	Pike	1956	1964	-	Apr	lastSun	2:00	1:00	D
- Rule	Pike	1961	1964	-	Oct	lastSun	2:00	0	S
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Indiana/Petersburg -5:49:07 - LMT	1883 Nov 18 12:10:53
-+Zone America/Indiana/Petersburg -5:49:07 - LMT	1883 Nov 18 18:00u
- 			-6:00	US	C%sT	1955
- 			-6:00	Pike	C%sT	1965 Apr 25  2:00
- 			-5:00	-	EST	1966 Oct 30  2:00
-@@ -1048,7 +1048,7 @@ Rule	Starke	1955	1956	-	Oct	lastSun	2:00	0	S
- Rule	Starke	1957	1958	-	Sep	lastSun	2:00	0	S
- Rule	Starke	1959	1961	-	Oct	lastSun	2:00	0	S
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Indiana/Knox -5:46:30 -	LMT	1883 Nov 18 12:13:30
-+Zone America/Indiana/Knox -5:46:30 -	LMT	1883 Nov 18 18:00u
- 			-6:00	US	C%sT	1947
- 			-6:00	Starke	C%sT	1962 Apr 29  2:00
- 			-5:00	-	EST	1963 Oct 27  2:00
-@@ -1064,7 +1064,7 @@ Rule	Pulaski	1946	1954	-	Sep	lastSun	2:00	0	S
- Rule	Pulaski	1955	1956	-	Oct	lastSun	2:00	0	S
- Rule	Pulaski	1957	1960	-	Sep	lastSun	2:00	0	S
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Indiana/Winamac -5:46:25 - LMT	1883 Nov 18 12:13:35
-+Zone America/Indiana/Winamac -5:46:25 - LMT	1883 Nov 18 18:00u
- 			-6:00	US	C%sT	1946
- 			-6:00	Pulaski	C%sT	1961 Apr 30  2:00
- 			-5:00	-	EST	1969
-@@ -1075,7 +1075,7 @@ Zone America/Indiana/Winamac -5:46:25 - LMT	1883 Nov 18 12:13:35
- #
- # Switzerland County, Indiana, did not observe DST from 1973 through 2005.
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Indiana/Vevay -5:40:16 -	LMT	1883 Nov 18 12:19:44
-+Zone America/Indiana/Vevay -5:40:16 -	LMT	1883 Nov 18 18:00u
- 			-6:00	US	C%sT	1954 Apr 25  2:00
- 			-5:00	-	EST	1969
- 			-5:00	US	E%sT	1973
-@@ -1111,7 +1111,7 @@ Rule Louisville	1950	1961	-	Apr	lastSun	2:00	1:00	D
- Rule Louisville	1950	1955	-	Sep	lastSun	2:00	0	S
- Rule Louisville	1956	1961	-	Oct	lastSun	2:00	0	S
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Kentucky/Louisville -5:43:02 -	LMT	1883 Nov 18 12:16:58
-+Zone America/Kentucky/Louisville -5:43:02 - LMT	1883 Nov 18 18:00u
- 			-6:00	US	C%sT	1921
- 			-6:00 Louisville C%sT	1942
- 			-6:00	US	C%sT	1946
-@@ -1145,7 +1145,7 @@ Zone America/Kentucky/Louisville -5:43:02 -	LMT	1883 Nov 18 12:16:58
- # Federal Register 65, 160 (2000-08-17), pp 50154-50158.
- # https://www.gpo.gov/fdsys/pkg/FR-2000-08-17/html/00-20854.htm
- #
-Zone America/Kentucky/Monticello -5:39:24 - LMT	1883 Nov 18 12:20:36
-+Zone America/Kentucky/Monticello -5:39:24 - LMT	1883 Nov 18 18:00u
- 			-6:00	US	C%sT	1946
- 			-6:00	-	CST	1968
- 			-6:00	US	C%sT	2000 Oct 29  2:00
-@@ -2640,6 +2640,8 @@ Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
- #    longitude they are located at.
- 
- # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
-+Rule	Mexico	1931	only	-	May	1	23:00	1:00	D
-+Rule	Mexico	1931	only	-	Oct	1	0:00	0	S
- Rule	Mexico	1939	only	-	Feb	5	0:00	1:00	D
- Rule	Mexico	1939	only	-	Jun	25	0:00	0	S
- Rule	Mexico	1940	only	-	Dec	9	0:00	1:00	D
-@@ -2656,13 +2658,13 @@ Rule	Mexico	2002	max	-	Apr	Sun>=1	2:00	1:00	D
- Rule	Mexico	2002	max	-	Oct	lastSun	2:00	0	S
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
- # Quintana Roo; represented by Cancún
-Zone America/Cancun	-5:47:04 -	LMT	1922 Jan  1  0:12:56
-+Zone America/Cancun	-5:47:04 -	LMT	1922 Jan  1  6:00u
- 			-6:00	-	CST	1981 Dec 23
- 			-5:00	Mexico	E%sT	1998 Aug  2  2:00
- 			-6:00	Mexico	C%sT	2015 Feb  1  2:00
- 			-5:00	-	EST
- # Campeche, Yucatán; represented by Mérida
-Zone America/Merida	-5:58:28 -	LMT	1922 Jan  1  0:01:32
-+Zone America/Merida	-5:58:28 -	LMT	1922 Jan  1  6:00u
- 			-6:00	-	CST	1981 Dec 23
- 			-5:00	-	EST	1982 Dec  2
- 			-6:00	Mexico	C%sT
-@@ -2676,23 +2678,21 @@ Zone America/Merida	-5:58:28 -	LMT	1922 Jan  1  0:01:32
- # See: Inicia mañana Horario de Verano en zona fronteriza, El Universal,
- # 2016-03-12
- # http://www.eluniversal.com.mx/articulo/estados/2016/03/12/inicia-manana-horario-de-verano-en-zona-fronteriza
-Zone America/Matamoros	-6:40:00 -	LMT	1921 Dec 31 23:20:00
-+Zone America/Matamoros	-6:30:00 -	LMT	1922 Jan  1  6:00u
- 			-6:00	-	CST	1988
- 			-6:00	US	C%sT	1989
- 			-6:00	Mexico	C%sT	2010
- 			-6:00	US	C%sT
- # Durango; Coahuila, Nuevo León, Tamaulipas (away from US border)
-Zone America/Monterrey	-6:41:16 -	LMT	1921 Dec 31 23:18:44
-+Zone America/Monterrey	-6:41:16 -	LMT	1922 Jan  1  6:00u
- 			-6:00	-	CST	1988
- 			-6:00	US	C%sT	1989
- 			-6:00	Mexico	C%sT
- # Central Mexico
-Zone America/Mexico_City -6:36:36 -	LMT	1922 Jan  1  0:23:24
-+Zone America/Mexico_City -6:36:36 -	LMT	1922 Jan  1  7:00u
- 			-7:00	-	MST	1927 Jun 10 23:00
- 			-6:00	-	CST	1930 Nov 15
-			-7:00	-	MST	1931 May  1 23:00
-			-6:00	-	CST	1931 Oct
-			-7:00	-	MST	1932 Apr  1
-+			-7:00	Mexico	M%sT	1932 Apr  1
- 			-6:00	Mexico	C%sT	2001 Sep 30  2:00
- 			-6:00	-	CST	2002 Feb 20
- 			-6:00	Mexico	C%sT
-@@ -2700,35 +2700,29 @@ Zone America/Mexico_City -6:36:36 -	LMT	1922 Jan  1  0:23:24
- # This includes the municipalities of Janos, Ascensión, Juárez, Guadalupe,
- # Práxedis G Guerrero, Coyame del Sotol, Ojinaga, and Manuel Benavides.
- # (See the 2016-03-12 El Universal source mentioned above.)
-Zone America/Ojinaga	-6:57:40 -	LMT	1922 Jan  1  0:02:20
-+Zone America/Ojinaga	-6:57:40 -	LMT	1922 Jan  1  7:00u
- 			-7:00	-	MST	1927 Jun 10 23:00
- 			-6:00	-	CST	1930 Nov 15
-			-7:00	-	MST	1931 May  1 23:00
-			-6:00	-	CST	1931 Oct
-			-7:00	-	MST	1932 Apr  1
-+			-7:00	Mexico	M%sT	1932 Apr  1
- 			-6:00	-	CST	1996
- 			-6:00	Mexico	C%sT	1998
- 			-6:00	-	CST	1998 Apr Sun>=1  3:00
- 			-7:00	Mexico	M%sT	2010
- 			-7:00	US	M%sT
- # Chihuahua (away from US border)
-Zone America/Chihuahua	-7:04:20 -	LMT	1921 Dec 31 23:55:40
-+Zone America/Chihuahua	-7:04:20 -	LMT	1922 Jan  1  7:00u
- 			-7:00	-	MST	1927 Jun 10 23:00
- 			-6:00	-	CST	1930 Nov 15
-			-7:00	-	MST	1931 May  1 23:00
-			-6:00	-	CST	1931 Oct
-			-7:00	-	MST	1932 Apr  1
-+			-7:00	Mexico	M%sT	1932 Apr  1
- 			-6:00	-	CST	1996
- 			-6:00	Mexico	C%sT	1998
- 			-6:00	-	CST	1998 Apr Sun>=1  3:00
- 			-7:00	Mexico	M%sT
- # Sonora
-Zone America/Hermosillo	-7:23:52 -	LMT	1921 Dec 31 23:36:08
-+Zone America/Hermosillo	-7:23:52 -	LMT	1922 Jan  1  7:00u
- 			-7:00	-	MST	1927 Jun 10 23:00
- 			-6:00	-	CST	1930 Nov 15
-			-7:00	-	MST	1931 May  1 23:00
-			-6:00	-	CST	1931 Oct
-			-7:00	-	MST	1932 Apr  1
-+			-7:00	Mexico	M%sT	1932 Apr  1
- 			-6:00	-	CST	1942 Apr 24
- 			-7:00	-	MST	1949 Jan 14
- 			-8:00	-	PST	1970
-@@ -2763,24 +2757,20 @@ Zone America/Hermosillo	-7:23:52 -	LMT	1921 Dec 31 23:36:08
- # Use "Bahia_Banderas" to keep the name to fourteen characters.
- 
- # Mazatlán
-Zone America/Mazatlan	-7:05:40 -	LMT	1921 Dec 31 23:54:20
-+Zone America/Mazatlan	-7:05:40 -	LMT	1922 Jan  1  7:00u
- 			-7:00	-	MST	1927 Jun 10 23:00
- 			-6:00	-	CST	1930 Nov 15
-			-7:00	-	MST	1931 May  1 23:00
-			-6:00	-	CST	1931 Oct
-			-7:00	-	MST	1932 Apr  1
-+			-7:00	Mexico	M%sT	1932 Apr  1
- 			-6:00	-	CST	1942 Apr 24
- 			-7:00	-	MST	1949 Jan 14
- 			-8:00	-	PST	1970
- 			-7:00	Mexico	M%sT
- 
- # Bahía de Banderas
-Zone America/Bahia_Banderas	-7:01:00 -	LMT	1921 Dec 31 23:59:00
-+Zone America/Bahia_Banderas -7:01:00 -	LMT	1922 Jan  1  7:00u
- 			-7:00	-	MST	1927 Jun 10 23:00
- 			-6:00	-	CST	1930 Nov 15
-			-7:00	-	MST	1931 May  1 23:00
-			-6:00	-	CST	1931 Oct
-			-7:00	-	MST	1932 Apr  1
-+			-7:00	Mexico	M%sT	1932 Apr  1
- 			-6:00	-	CST	1942 Apr 24
- 			-7:00	-	MST	1949 Jan 14
- 			-8:00	-	PST	1970
-@@ -2788,7 +2778,7 @@ Zone America/Bahia_Banderas	-7:01:00 -	LMT	1921 Dec 31 23:59:00
- 			-6:00	Mexico	C%sT
- 
- # Baja California
-Zone America/Tijuana	-7:48:04 -	LMT	1922 Jan  1  0:11:56
-+Zone America/Tijuana	-7:48:04 -	LMT	1922 Jan  1  7:00u
- 			-7:00	-	MST	1924
- 			-8:00	-	PST	1927 Jun 10 23:00
- 			-7:00	-	MST	1930 Nov 15
-diff --git a/jdk/test/java/util/TimeZone/TimeZoneData/VERSION b/jdk/test/java/util/TimeZone/TimeZoneData/VERSION
-index 71470168456..0cad939008f 100644
--- a/jdk/test/java/util/TimeZone/TimeZoneData/VERSION
-+++ b/jdk/test/java/util/TimeZone/TimeZoneData/VERSION
-@@ -1 +1 @@
-tzdata2022d
-+tzdata2022e
-diff --git a/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt b/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt
-index b3823958ae4..2f2786f1c69 100644
--- a/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt
-+++ b/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt
-@@ -97,9 +97,7 @@ America/Winnipeg CST CDT
- America/Yakutat AKST AKDT
- America/Yellowknife MST MDT
- Antarctica/Macquarie AEST AEDT
-Asia/Amman EET EEST
- Asia/Beirut EET EEST
-Asia/Damascus EET EEST
- Asia/Famagusta EET EEST
- Asia/Gaza EET EEST
- Asia/Hebron EET EEST
-diff --git a/jdk/test/sun/util/calendar/zi/tzdata/VERSION b/jdk/test/sun/util/calendar/zi/tzdata/VERSION
-index 889d0e6dad7..b8cb36e69f4 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/VERSION
-+++ b/jdk/test/sun/util/calendar/zi/tzdata/VERSION
-@@ -21,4 +21,4 @@
- # or visit www.oracle.com if you need additional information or have any
- # questions.
- #
-tzdata2022d
-+tzdata2022e
-diff --git a/jdk/test/sun/util/calendar/zi/tzdata/asia b/jdk/test/sun/util/calendar/zi/tzdata/asia
-index 1dc7d34f88e..f1771e42a71 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/asia
-+++ b/jdk/test/sun/util/calendar/zi/tzdata/asia
-@@ -2254,6 +2254,17 @@ Zone	Asia/Tokyo	9:18:59	-	LMT	1887 Dec 31 15:00u
- # From the Arabic version, it seems to say it would be at midnight
- # (assume 24:00) on the last Thursday in February, starting from 2022.
- 
-+# From Issam Al-Zuwairi (2022-10-05):
-+# The Council of Ministers in Jordan decided Wednesday 5th October 2022,
-+# that daylight saving time (DST) will be throughout the year....
-+#
-+# From Brian Inglis (2022-10-06):
-+# https://petra.gov.jo/Include/InnerPage.jsp?ID=45567&lang=en&name=en_news
-+#
-+# From Paul Eggert (2022-10-05):
-+# Like Syria, model this as a transition from EEST +03 (DST) to plain +03
-+# (non-DST) at the point where DST would otherwise have ended.
-+
- # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
- Rule	Jordan	1973	only	-	Jun	6	0:00	1:00	S
- Rule	Jordan	1973	1975	-	Oct	1	0:00	0	-
-@@ -2285,11 +2296,12 @@ Rule	Jordan	2005	only	-	Sep	lastFri	0:00s	0	-
- Rule	Jordan	2006	2011	-	Oct	lastFri	0:00s	0	-
- Rule	Jordan	2013	only	-	Dec	20	0:00	0	-
- Rule	Jordan	2014	2021	-	Mar	lastThu	24:00	1:00	S
-Rule	Jordan	2014	max	-	Oct	lastFri	0:00s	0	-
-Rule	Jordan	2022	max	-	Feb	lastThu	24:00	1:00	S
-+Rule	Jordan	2014	2022	-	Oct	lastFri	0:00s	0	-
-+Rule	Jordan	2022	only	-	Feb	lastThu	24:00	1:00	S
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
- Zone	Asia/Amman	2:23:44 -	LMT	1931
-			2:00	Jordan	EE%sT
-+			2:00	Jordan	EE%sT	2022 Oct 28 0:00s
-+			3:00	-	+03
- 
- 
- # Kazakhstan
-@@ -3838,19 +3850,27 @@ Rule	Syria	2007	only	-	Nov	 Fri>=1	0:00	0	-
- # Our brief summary:
- # https://www.timeanddate.com/news/time/syria-dst-2012.html
- 
-# From Arthur David Olson (2012-03-27):
-# Assume last Friday in March going forward XXX.
-+# From Steffen Thorsen (2022-10-05):
-+# Syria is adopting year-round DST, starting this autumn....
-+# From https://www.enabbaladi.net/archives/607812
-+# "This [the decision] came after the weekly government meeting today,
-+# Tuesday 4 October ..."
-+#
-+# From Paul Eggert (2022-10-05):
-+# Like Jordan, model this as a transition from EEST +03 (DST) to plain +03
-+# (non-DST) at the point where DST would otherwise have ended.
- 
- Rule	Syria	2008	only	-	Apr	Fri>=1	0:00	1:00	S
- Rule	Syria	2008	only	-	Nov	1	0:00	0	-
- Rule	Syria	2009	only	-	Mar	lastFri	0:00	1:00	S
- Rule	Syria	2010	2011	-	Apr	Fri>=1	0:00	1:00	S
-Rule	Syria	2012	max	-	Mar	lastFri	0:00	1:00	S
-Rule	Syria	2009	max	-	Oct	lastFri	0:00	0	-
-+Rule	Syria	2012	2022	-	Mar	lastFri	0:00	1:00	S
-+Rule	Syria	2009	2022	-	Oct	lastFri	0:00	0	-
- 
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
- Zone	Asia/Damascus	2:25:12 -	LMT	1920 # Dimashq
-			2:00	Syria	EE%sT
-+			2:00	Syria	EE%sT	2022 Oct 28 0:00
-+			3:00	-	+03
- 
- # Tajikistan
- # From Shanks & Pottenger.
-diff --git a/jdk/test/sun/util/calendar/zi/tzdata/europe b/jdk/test/sun/util/calendar/zi/tzdata/europe
-index 9e0a538f86d..930cede4cf4 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/europe
-+++ b/jdk/test/sun/util/calendar/zi/tzdata/europe
-@@ -3417,7 +3417,7 @@ Zone	Europe/Madrid	-0:14:44 -	LMT	1901 Jan  1  0:00u
- 			 0:00	Spain	WE%sT	1940 Mar 16 23:00
- 			 1:00	Spain	CE%sT	1979
- 			 1:00	EU	CE%sT
-Zone	Africa/Ceuta	-0:21:16 -	LMT	1900 Dec 31 23:38:44
-+Zone	Africa/Ceuta	-0:21:16 -	LMT	1901 Jan  1  0:00u
- 			 0:00	-	WET	1918 May  6 23:00
- 			 0:00	1:00	WEST	1918 Oct  7 23:00
- 			 0:00	-	WET	1924
-diff --git a/jdk/test/sun/util/calendar/zi/tzdata/northamerica b/jdk/test/sun/util/calendar/zi/tzdata/northamerica
-index 114cef14cce..ce4ee74582c 100644
--- a/jdk/test/sun/util/calendar/zi/tzdata/northamerica
-+++ b/jdk/test/sun/util/calendar/zi/tzdata/northamerica
-@@ -462,7 +462,7 @@ Rule	Chicago	1922	1966	-	Apr	lastSun	2:00	1:00	D
- Rule	Chicago	1922	1954	-	Sep	lastSun	2:00	0	S
- Rule	Chicago	1955	1966	-	Oct	lastSun	2:00	0	S
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Chicago	-5:50:36 -	LMT	1883 Nov 18 12:09:24
-+Zone America/Chicago	-5:50:36 -	LMT	1883 Nov 18 18:00u
- 			-6:00	US	C%sT	1920
- 			-6:00	Chicago	C%sT	1936 Mar  1  2:00
- 			-5:00	-	EST	1936 Nov 15  2:00
-@@ -471,7 +471,7 @@ Zone America/Chicago	-5:50:36 -	LMT	1883 Nov 18 12:09:24
- 			-6:00	Chicago	C%sT	1967
- 			-6:00	US	C%sT
- # Oliver County, ND switched from mountain to central time on 1992-10-25.
-Zone America/North_Dakota/Center -6:45:12 - LMT	1883 Nov 18 12:14:48
-+Zone America/North_Dakota/Center -6:45:12 - LMT	1883 Nov 18 19:00u
- 			-7:00	US	M%sT	1992 Oct 25  2:00
- 			-6:00	US	C%sT
- # Morton County, ND, switched from mountain to central time on
-@@ -481,7 +481,7 @@ Zone America/North_Dakota/Center -6:45:12 - LMT	1883 Nov 18 12:14:48
- # Jones, Mellette, and Todd Counties in South Dakota;
- # but in practice these other counties were already observing central time.
- # See <http://www.epa.gov/fedrgstr/EPA-IMPACT/2003/October/Day-28/i27056.htm>.
-Zone America/North_Dakota/New_Salem -6:45:39 - LMT	1883 Nov 18 12:14:21
-+Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 19:00u
- 			-7:00	US	M%sT	2003 Oct 26  2:00
- 			-6:00	US	C%sT
- 
-@@ -498,7 +498,7 @@ Zone America/North_Dakota/New_Salem -6:45:39 - LMT	1883 Nov 18 12:14:21
- # largest city in Mercer County).  Google Maps places Beulah's city hall
- # at 47° 15' 51" N, 101° 46' 40" W, which yields an offset of 6h47'07".
- 
-Zone America/North_Dakota/Beulah -6:47:07 - LMT	1883 Nov 18 12:12:53
-+Zone America/North_Dakota/Beulah -6:47:07 - LMT	1883 Nov 18 19:00u
- 			-7:00	US	M%sT	2010 Nov  7  2:00
- 			-6:00	US	C%sT
- 
-@@ -530,7 +530,7 @@ Rule	Denver	1921	only	-	May	22	2:00	0	S
- Rule	Denver	1965	1966	-	Apr	lastSun	2:00	1:00	D
- Rule	Denver	1965	1966	-	Oct	lastSun	2:00	0	S
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Denver	-6:59:56 -	LMT	1883 Nov 18 12:00:04
-+Zone America/Denver	-6:59:56 -	LMT	1883 Nov 18 19:00u
- 			-7:00	US	M%sT	1920
- 			-7:00	Denver	M%sT	1942
- 			-7:00	US	M%sT	1946
-@@ -583,7 +583,7 @@ Rule	CA	1950	1966	-	Apr	lastSun	1:00	1:00	D
- Rule	CA	1950	1961	-	Sep	lastSun	2:00	0	S
- Rule	CA	1962	1966	-	Oct	lastSun	2:00	0	S
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Los_Angeles -7:52:58 -	LMT	1883 Nov 18 12:07:02
-+Zone America/Los_Angeles -7:52:58 -	LMT	1883 Nov 18 20:00u
- 			-8:00	US	P%sT	1946
- 			-8:00	CA	P%sT	1967
- 			-8:00	US	P%sT
-@@ -845,7 +845,7 @@ Zone Pacific/Honolulu	-10:31:26 -	LMT	1896 Jan 13 12:00
- # Go with the Arizona State Library instead.
- 
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Phoenix	-7:28:18 -	LMT	1883 Nov 18 11:31:42
-+Zone America/Phoenix	-7:28:18 -	LMT	1883 Nov 18 19:00u
- 			-7:00	US	M%sT	1944 Jan  1  0:01
- 			-7:00	-	MST	1944 Apr  1  0:01
- 			-7:00	US	M%sT	1944 Oct  1  0:01
-@@ -873,7 +873,7 @@ Link America/Phoenix America/Creston
- # switched four weeks late in 1974.
- #
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Boise	-7:44:49 -	LMT	1883 Nov 18 12:15:11
-+Zone America/Boise	-7:44:49 -	LMT	1883 Nov 18 20:00u
- 			-8:00	US	P%sT	1923 May 13  2:00
- 			-7:00	US	M%sT	1974
- 			-7:00	-	MST	1974 Feb  3  2:00
-@@ -945,7 +945,7 @@ Rule Indianapolis 1941	only	-	Jun	22	2:00	1:00	D
- Rule Indianapolis 1941	1954	-	Sep	lastSun	2:00	0	S
- Rule Indianapolis 1946	1954	-	Apr	lastSun	2:00	1:00	D
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Indiana/Indianapolis -5:44:38 - LMT	1883 Nov 18 12:15:22
-+Zone America/Indiana/Indianapolis -5:44:38 - LMT 1883 Nov 18 18:00u
- 			-6:00	US	C%sT	1920
- 			-6:00 Indianapolis C%sT	1942
- 			-6:00	US	C%sT	1946
-@@ -965,7 +965,7 @@ Rule	Marengo	1951	only	-	Sep	lastSun	2:00	0	S
- Rule	Marengo	1954	1960	-	Apr	lastSun	2:00	1:00	D
- Rule	Marengo	1954	1960	-	Sep	lastSun	2:00	0	S
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Indiana/Marengo -5:45:23 -	LMT	1883 Nov 18 12:14:37
-+Zone America/Indiana/Marengo -5:45:23 -	LMT	1883 Nov 18 18:00u
- 			-6:00	US	C%sT	1951
- 			-6:00	Marengo	C%sT	1961 Apr 30  2:00
- 			-5:00	-	EST	1969
-@@ -989,7 +989,7 @@ Rule Vincennes	1960	only	-	Oct	lastSun	2:00	0	S
- Rule Vincennes	1961	only	-	Sep	lastSun	2:00	0	S
- Rule Vincennes	1962	1963	-	Oct	lastSun	2:00	0	S
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Indiana/Vincennes -5:50:07 - LMT	1883 Nov 18 12:09:53
-+Zone America/Indiana/Vincennes -5:50:07 - LMT	1883 Nov 18 18:00u
- 			-6:00	US	C%sT	1946
- 			-6:00 Vincennes	C%sT	1964 Apr 26  2:00
- 			-5:00	-	EST	1969
-@@ -1009,7 +1009,7 @@ Rule Perry	1955	1960	-	Sep	lastSun	2:00	0	S
- Rule Perry	1956	1963	-	Apr	lastSun	2:00	1:00	D
- Rule Perry	1961	1963	-	Oct	lastSun	2:00	0	S
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Indiana/Tell_City -5:47:03 - LMT	1883 Nov 18 12:12:57
-+Zone America/Indiana/Tell_City -5:47:03 - LMT	1883 Nov 18 18:00u
- 			-6:00	US	C%sT	1946
- 			-6:00 Perry	C%sT	1964 Apr 26  2:00
- 			-5:00	-	EST	1967 Oct 29  2:00
-@@ -1026,7 +1026,7 @@ Rule	Pike	1955	1960	-	Sep	lastSun	2:00	0	S
- Rule	Pike	1956	1964	-	Apr	lastSun	2:00	1:00	D
- Rule	Pike	1961	1964	-	Oct	lastSun	2:00	0	S
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Indiana/Petersburg -5:49:07 - LMT	1883 Nov 18 12:10:53
-+Zone America/Indiana/Petersburg -5:49:07 - LMT	1883 Nov 18 18:00u
- 			-6:00	US	C%sT	1955
- 			-6:00	Pike	C%sT	1965 Apr 25  2:00
- 			-5:00	-	EST	1966 Oct 30  2:00
-@@ -1048,7 +1048,7 @@ Rule	Starke	1955	1956	-	Oct	lastSun	2:00	0	S
- Rule	Starke	1957	1958	-	Sep	lastSun	2:00	0	S
- Rule	Starke	1959	1961	-	Oct	lastSun	2:00	0	S
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Indiana/Knox -5:46:30 -	LMT	1883 Nov 18 12:13:30
-+Zone America/Indiana/Knox -5:46:30 -	LMT	1883 Nov 18 18:00u
- 			-6:00	US	C%sT	1947
- 			-6:00	Starke	C%sT	1962 Apr 29  2:00
- 			-5:00	-	EST	1963 Oct 27  2:00
-@@ -1064,7 +1064,7 @@ Rule	Pulaski	1946	1954	-	Sep	lastSun	2:00	0	S
- Rule	Pulaski	1955	1956	-	Oct	lastSun	2:00	0	S
- Rule	Pulaski	1957	1960	-	Sep	lastSun	2:00	0	S
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Indiana/Winamac -5:46:25 - LMT	1883 Nov 18 12:13:35
-+Zone America/Indiana/Winamac -5:46:25 - LMT	1883 Nov 18 18:00u
- 			-6:00	US	C%sT	1946
- 			-6:00	Pulaski	C%sT	1961 Apr 30  2:00
- 			-5:00	-	EST	1969
-@@ -1075,7 +1075,7 @@ Zone America/Indiana/Winamac -5:46:25 - LMT	1883 Nov 18 12:13:35
- #
- # Switzerland County, Indiana, did not observe DST from 1973 through 2005.
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Indiana/Vevay -5:40:16 -	LMT	1883 Nov 18 12:19:44
-+Zone America/Indiana/Vevay -5:40:16 -	LMT	1883 Nov 18 18:00u
- 			-6:00	US	C%sT	1954 Apr 25  2:00
- 			-5:00	-	EST	1969
- 			-5:00	US	E%sT	1973
-@@ -1111,7 +1111,7 @@ Rule Louisville	1950	1961	-	Apr	lastSun	2:00	1:00	D
- Rule Louisville	1950	1955	-	Sep	lastSun	2:00	0	S
- Rule Louisville	1956	1961	-	Oct	lastSun	2:00	0	S
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Kentucky/Louisville -5:43:02 -	LMT	1883 Nov 18 12:16:58
-+Zone America/Kentucky/Louisville -5:43:02 - LMT	1883 Nov 18 18:00u
- 			-6:00	US	C%sT	1921
- 			-6:00 Louisville C%sT	1942
- 			-6:00	US	C%sT	1946
-@@ -1145,7 +1145,7 @@ Zone America/Kentucky/Louisville -5:43:02 -	LMT	1883 Nov 18 12:16:58
- # Federal Register 65, 160 (2000-08-17), pp 50154-50158.
- # https://www.gpo.gov/fdsys/pkg/FR-2000-08-17/html/00-20854.htm
- #
-Zone America/Kentucky/Monticello -5:39:24 - LMT	1883 Nov 18 12:20:36
-+Zone America/Kentucky/Monticello -5:39:24 - LMT	1883 Nov 18 18:00u
- 			-6:00	US	C%sT	1946
- 			-6:00	-	CST	1968
- 			-6:00	US	C%sT	2000 Oct 29  2:00
-@@ -2640,6 +2640,8 @@ Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
- #    longitude they are located at.
- 
- # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
-+Rule	Mexico	1931	only	-	May	1	23:00	1:00	D
-+Rule	Mexico	1931	only	-	Oct	1	0:00	0	S
- Rule	Mexico	1939	only	-	Feb	5	0:00	1:00	D
- Rule	Mexico	1939	only	-	Jun	25	0:00	0	S
- Rule	Mexico	1940	only	-	Dec	9	0:00	1:00	D
-@@ -2656,13 +2658,13 @@ Rule	Mexico	2002	max	-	Apr	Sun>=1	2:00	1:00	D
- Rule	Mexico	2002	max	-	Oct	lastSun	2:00	0	S
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
- # Quintana Roo; represented by Cancún
-Zone America/Cancun	-5:47:04 -	LMT	1922 Jan  1  0:12:56
-+Zone America/Cancun	-5:47:04 -	LMT	1922 Jan  1  6:00u
- 			-6:00	-	CST	1981 Dec 23
- 			-5:00	Mexico	E%sT	1998 Aug  2  2:00
- 			-6:00	Mexico	C%sT	2015 Feb  1  2:00
- 			-5:00	-	EST
- # Campeche, Yucatán; represented by Mérida
-Zone America/Merida	-5:58:28 -	LMT	1922 Jan  1  0:01:32
-+Zone America/Merida	-5:58:28 -	LMT	1922 Jan  1  6:00u
- 			-6:00	-	CST	1981 Dec 23
- 			-5:00	-	EST	1982 Dec  2
- 			-6:00	Mexico	C%sT
-@@ -2676,23 +2678,21 @@ Zone America/Merida	-5:58:28 -	LMT	1922 Jan  1  0:01:32
- # See: Inicia mañana Horario de Verano en zona fronteriza, El Universal,
- # 2016-03-12
- # http://www.eluniversal.com.mx/articulo/estados/2016/03/12/inicia-manana-horario-de-verano-en-zona-fronteriza
-Zone America/Matamoros	-6:40:00 -	LMT	1921 Dec 31 23:20:00
-+Zone America/Matamoros	-6:30:00 -	LMT	1922 Jan  1  6:00u
- 			-6:00	-	CST	1988
- 			-6:00	US	C%sT	1989
- 			-6:00	Mexico	C%sT	2010
- 			-6:00	US	C%sT
- # Durango; Coahuila, Nuevo León, Tamaulipas (away from US border)
-Zone America/Monterrey	-6:41:16 -	LMT	1921 Dec 31 23:18:44
-+Zone America/Monterrey	-6:41:16 -	LMT	1922 Jan  1  6:00u
- 			-6:00	-	CST	1988
- 			-6:00	US	C%sT	1989
- 			-6:00	Mexico	C%sT
- # Central Mexico
-Zone America/Mexico_City -6:36:36 -	LMT	1922 Jan  1  0:23:24
-+Zone America/Mexico_City -6:36:36 -	LMT	1922 Jan  1  7:00u
- 			-7:00	-	MST	1927 Jun 10 23:00
- 			-6:00	-	CST	1930 Nov 15
-			-7:00	-	MST	1931 May  1 23:00
-			-6:00	-	CST	1931 Oct
-			-7:00	-	MST	1932 Apr  1
-+			-7:00	Mexico	M%sT	1932 Apr  1
- 			-6:00	Mexico	C%sT	2001 Sep 30  2:00
- 			-6:00	-	CST	2002 Feb 20
- 			-6:00	Mexico	C%sT
-@@ -2700,35 +2700,29 @@ Zone America/Mexico_City -6:36:36 -	LMT	1922 Jan  1  0:23:24
- # This includes the municipalities of Janos, Ascensión, Juárez, Guadalupe,
- # Práxedis G Guerrero, Coyame del Sotol, Ojinaga, and Manuel Benavides.
- # (See the 2016-03-12 El Universal source mentioned above.)
-Zone America/Ojinaga	-6:57:40 -	LMT	1922 Jan  1  0:02:20
-+Zone America/Ojinaga	-6:57:40 -	LMT	1922 Jan  1  7:00u
- 			-7:00	-	MST	1927 Jun 10 23:00
- 			-6:00	-	CST	1930 Nov 15
-			-7:00	-	MST	1931 May  1 23:00
-			-6:00	-	CST	1931 Oct
-			-7:00	-	MST	1932 Apr  1
-+			-7:00	Mexico	M%sT	1932 Apr  1
- 			-6:00	-	CST	1996
- 			-6:00	Mexico	C%sT	1998
- 			-6:00	-	CST	1998 Apr Sun>=1  3:00
- 			-7:00	Mexico	M%sT	2010
- 			-7:00	US	M%sT
- # Chihuahua (away from US border)
-Zone America/Chihuahua	-7:04:20 -	LMT	1921 Dec 31 23:55:40
-+Zone America/Chihuahua	-7:04:20 -	LMT	1922 Jan  1  7:00u
- 			-7:00	-	MST	1927 Jun 10 23:00
- 			-6:00	-	CST	1930 Nov 15
-			-7:00	-	MST	1931 May  1 23:00
-			-6:00	-	CST	1931 Oct
-			-7:00	-	MST	1932 Apr  1
-+			-7:00	Mexico	M%sT	1932 Apr  1
- 			-6:00	-	CST	1996
- 			-6:00	Mexico	C%sT	1998
- 			-6:00	-	CST	1998 Apr Sun>=1  3:00
- 			-7:00	Mexico	M%sT
- # Sonora
-Zone America/Hermosillo	-7:23:52 -	LMT	1921 Dec 31 23:36:08
-+Zone America/Hermosillo	-7:23:52 -	LMT	1922 Jan  1  7:00u
- 			-7:00	-	MST	1927 Jun 10 23:00
- 			-6:00	-	CST	1930 Nov 15
-			-7:00	-	MST	1931 May  1 23:00
-			-6:00	-	CST	1931 Oct
-			-7:00	-	MST	1932 Apr  1
-+			-7:00	Mexico	M%sT	1932 Apr  1
- 			-6:00	-	CST	1942 Apr 24
- 			-7:00	-	MST	1949 Jan 14
- 			-8:00	-	PST	1970
-@@ -2763,24 +2757,20 @@ Zone America/Hermosillo	-7:23:52 -	LMT	1921 Dec 31 23:36:08
- # Use "Bahia_Banderas" to keep the name to fourteen characters.
- 
- # Mazatlán
-Zone America/Mazatlan	-7:05:40 -	LMT	1921 Dec 31 23:54:20
-+Zone America/Mazatlan	-7:05:40 -	LMT	1922 Jan  1  7:00u
- 			-7:00	-	MST	1927 Jun 10 23:00
- 			-6:00	-	CST	1930 Nov 15
-			-7:00	-	MST	1931 May  1 23:00
-			-6:00	-	CST	1931 Oct
-			-7:00	-	MST	1932 Apr  1
-+			-7:00	Mexico	M%sT	1932 Apr  1
- 			-6:00	-	CST	1942 Apr 24
- 			-7:00	-	MST	1949 Jan 14
- 			-8:00	-	PST	1970
- 			-7:00	Mexico	M%sT
- 
- # Bahía de Banderas
-Zone America/Bahia_Banderas	-7:01:00 -	LMT	1921 Dec 31 23:59:00
-+Zone America/Bahia_Banderas -7:01:00 -	LMT	1922 Jan  1  7:00u
- 			-7:00	-	MST	1927 Jun 10 23:00
- 			-6:00	-	CST	1930 Nov 15
-			-7:00	-	MST	1931 May  1 23:00
-			-6:00	-	CST	1931 Oct
-			-7:00	-	MST	1932 Apr  1
-+			-7:00	Mexico	M%sT	1932 Apr  1
- 			-6:00	-	CST	1942 Apr 24
- 			-7:00	-	MST	1949 Jan 14
- 			-8:00	-	PST	1970
-@@ -2788,7 +2778,7 @@ Zone America/Bahia_Banderas	-7:01:00 -	LMT	1921 Dec 31 23:59:00
- 			-6:00	Mexico	C%sT
- 
- # Baja California
-Zone America/Tijuana	-7:48:04 -	LMT	1922 Jan  1  0:11:56
-+Zone America/Tijuana	-7:48:04 -	LMT	1922 Jan  1  7:00u
- 			-7:00	-	MST	1924
- 			-8:00	-	PST	1927 Jun 10 23:00
- 			-7:00	-	MST	1930 Nov 15
--- a/SOURCES/pr2888-rh2055274-support_system_cacerts-8139f2361c2.patch
+++ b/SOURCES/pr2888-rh2055274-support_system_cacerts-8139f2361c2.patch
@ -1,5 +1,5 @@
 diff --git a/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java b/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java
-index e7b4763db53..e8ec8467e6a 100644
+index e7b4763db53..0005e56f528 100644
 --- a/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java
 +++ b/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java
@@ -31,6 +31,7 @@ import java.security.*;
@ -19,16 +19,17 @@ index e7b4763db53..e8ec8467e6a 100644
      */
     private static final class TrustStoreDescriptor {
         private static final String fileSep = File.separator;
-@@ -76,7 +77,7 @@ final class TrustStoreManager {
+@@ -76,7 +77,8 @@ final class TrustStoreManager {
                 GetPropertyAction.privilegedGetProperty("java.home") +
                 fileSep + "lib" + fileSep + "security";
         private static final String defaultStore =
 -                defaultStorePath + fileSep + "cacerts";
-+            KeyStoreUtil.getCacertsKeyStoreFile().getPath();
+                AccessController.doPrivileged((PrivilegedAction<String>) () ->
+                        KeyStoreUtil.getCacertsKeyStorePath());
         private static final String jsseDefaultStore =
                 defaultStorePath + fileSep + "jssecacerts";
 
-@@ -139,6 +140,10 @@ final class TrustStoreManager {
+@@ -139,6 +141,10 @@ final class TrustStoreManager {
                     String storePropPassword = System.getProperty(
                             "javax.net.ssl.trustStorePassword", "");
 
@ -39,117 +40,56 @@ index e7b4763db53..e8ec8467e6a 100644
                     String temporaryName = "";
                     File temporaryFile = null;
                     long temporaryTime = 0L;
-@@ -146,21 +151,22 @@ final class TrustStoreManager {
-                         String[] fileNames =
-                                 new String[] {storePropName, defaultStore};
-                         for (String fileName : fileNames) {
-                            File f = new File(fileName);
-                            if (f.isFile() && f.canRead()) {
-                                temporaryName = fileName;;
-                                temporaryFile = f;
-                                temporaryTime = f.lastModified();
-
-                                break;
-                            }
-
-                            // Not break, the file is inaccessible.
-                            if (SSLLogger.isOn &&
-+                            if (fileName != null && !"".equals(fileName)) {
-+                                File f = new File(fileName);
-+                                if (f.isFile() && f.canRead()) {
-+                                    temporaryName = fileName;;
-+                                    temporaryFile = f;
-+                                    temporaryTime = f.lastModified();
-+
-+                                    break;
-+                                }
-+                                // Not break, the file is inaccessible.
-+                                if (SSLLogger.isOn &&
+@@ -160,7 +166,7 @@ final class TrustStoreManager {
                                     SSLLogger.isOn("trustmanager")) {
-                                SSLLogger.fine(
-                                        "Inaccessible trust store: " +
+                                 SSLLogger.fine(
+                                         "Inaccessible trust store: " +
 -                                        storePropName);
-+                                    SSLLogger.fine(
-+                                            "Inaccessible trust store: " +
 +                                        fileName);
-+                                }
                             }
                         }
                     } else {
 diff --git a/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java b/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
-index fcc77786da1..f554f83a8b4 100644
+index fcc77786da1..3a4388964cc 100644
 --- a/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
 +++ b/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
-@@ -33,7 +33,10 @@ import java.io.InputStreamReader;
- 
- import java.net.URL;
- 
-+import java.security.AccessController;
- import java.security.KeyStore;
-+import java.security.PrivilegedAction;
-+import java.security.Security;
+@@ -41,6 +41,8 @@ import java.text.Collator;
+ import java.util.Locale;
+ import java.util.ResourceBundle;
 
- import java.security.cert.X509Certificate;
- import java.text.Collator;
-@@ -54,6 +57,33 @@ public class KeyStoreUtil {
+import sun.security.util.SecurityProperties;
+
+ /**
+  * <p> This class provides several utilities to <code>KeyStore</code>.
+  *
+@@ -54,6 +56,8 @@ public class KeyStoreUtil {
 
     private static final String JKS = "jks";
 
-+    private static final String PROP_NAME = "security.systemCACerts";
-+
-+    /**
-+     * Returns the value of the security property propName, which can be overridden
-+     * by a system property of the same name
-+     *
-+     * @param  propName the name of the system or security property
-+     * @return the value of the system or security property
-+     */
-+    @SuppressWarnings("removal")
-+    public static String privilegedGetOverridable(String propName) {
-+        if (System.getSecurityManager() == null) {
-+            return getOverridableProperty(propName);
-+        } else {
-+            return AccessController.doPrivileged((PrivilegedAction<String>) () -> getOverridableProperty(propName));
-+        }
-+    }
-+
-+    private static String getOverridableProperty(String propName) {
-+        String val = System.getProperty(propName);
-+        if (val == null) {
-+            return Security.getProperty(propName);
-+        } else {
-+            return val;
-+        }
-+    }
+    private static final String SYSTEM_CA_CERTS_PROP = "security.systemCACerts";
 +
     /**
      * Returns true if the certificate is self-signed, false otherwise.
      */
-@@ -96,20 +126,38 @@ public class KeyStoreUtil {
+@@ -96,16 +100,30 @@ public class KeyStoreUtil {
         }
     }
 
 +    /**
 +     * Returns the path to the cacerts DB
 +     */
-+    public static File getCacertsKeyStoreFile()
+    public static String getCacertsKeyStorePath()
 +    {
-+        String sep = File.separator;
-+        File file = null;
-+        /* Check system cacerts DB first, preferring system property over security property */
-+        String systemDB = privilegedGetOverridable(PROP_NAME);
-+        if (systemDB != null && !"".equals(systemDB)) {
-+            file = new File(systemDB);
-+        }
-+        if (file == null || !file.exists()) {
-+            file = new File(System.getProperty("java.home") + sep
-+                            + "lib" + sep + "security" + sep
-+                            + "cacerts");
-+        }
-+        if (file.exists()) {
-+            return file;
+        // Check system DB first, preferring system property over security one
+        String systemDB = SecurityProperties
+                .privilegedGetOverridable(SYSTEM_CA_CERTS_PROP);
+        if (systemDB != null && !"".equals(systemDB) &&
+                (new File(systemDB)).isFile()) {
+            return systemDB;
 +        }
-+        return null;
+        String sep = File.separator;
+        return System.getProperty("java.home") + sep
+                + "lib" + sep + "security" + sep + "cacerts";
 +    }
 +
     /**
@ -162,27 +102,21 @@ index fcc77786da1..f554f83a8b4 100644
 -        File file = new File(System.getProperty("java.home") + sep
 -                             + "lib" + sep + "security" + sep
 -                             + "cacerts");
-        if (!file.exists()) {
-            return null;
-        }
-         KeyStore caks = null;
-+        File file = getCacertsKeyStoreFile();
-+        if (file == null) { return null; }
-         try (FileInputStream fis = new FileInputStream(file)) {
-             caks = KeyStore.getInstance(JKS);
-             caks.load(fis, null);
+        File file = new File(getCacertsKeyStorePath());
+         if (!file.exists()) {
+             return null;
+         }
 diff --git a/jdk/src/share/lib/security/java.security-aix b/jdk/src/share/lib/security/java.security-aix
-index bfe0c593adb..093bc09bf95 100644
+index 681a24b905d..ecb8bc43a6c 100644
 --- a/jdk/src/share/lib/security/java.security-aix
 +++ b/jdk/src/share/lib/security/java.security-aix
-@@ -294,6 +294,13 @@ security.overridePropertiesFile=true
+@@ -294,6 +294,12 @@ security.overridePropertiesFile=true
 #
 security.useSystemPropertiesFile=false
 
 +#
 +# Specifies the system certificate store
-+# This property may be disabled using
-+# -Djava.security.disableSystemCACerts=true
+# This property may be disabled using an empty value
 +#
 +security.systemCACerts=${java.home}/lib/security/cacerts
 +
@ -190,17 +124,16 @@ index bfe0c593adb..093bc09bf95 100644
 # Determines the default key and trust manager factory algorithms for
 # the javax.net.ssl package.
 diff --git a/jdk/src/share/lib/security/java.security-linux b/jdk/src/share/lib/security/java.security-linux
-index 9d1c8fe8a8e..16c9281cc1f 100644
+index 789c19a8cba..2546fdec9b2 100644
 --- a/jdk/src/share/lib/security/java.security-linux
 +++ b/jdk/src/share/lib/security/java.security-linux
-@@ -307,6 +307,13 @@ security.overridePropertiesFile=true
+@@ -307,6 +307,12 @@ security.overridePropertiesFile=true
 #
 security.useSystemPropertiesFile=false
 
 +#
 +# Specifies the system certificate store
-+# This property may be disabled using
-+# -Djava.security.disableSystemCACerts=true
+# This property may be disabled using an empty value
 +#
 +security.systemCACerts=${java.home}/lib/security/cacerts
 +
@ -208,17 +141,16 @@ index 9d1c8fe8a8e..16c9281cc1f 100644
 # Determines the default key and trust manager factory algorithms for
 # the javax.net.ssl package.
 diff --git a/jdk/src/share/lib/security/java.security-macosx b/jdk/src/share/lib/security/java.security-macosx
-index 19047c61097..43e034cdeaf 100644
+index d4da666af3b..1a20027c02b 100644
 --- a/jdk/src/share/lib/security/java.security-macosx
 +++ b/jdk/src/share/lib/security/java.security-macosx
-@@ -297,6 +297,13 @@ security.overridePropertiesFile=true
+@@ -297,6 +297,12 @@ security.overridePropertiesFile=true
 #
 security.useSystemPropertiesFile=false
 
 +#
 +# Specifies the system certificate store
-+# This property may be disabled using
-+# -Djava.security.disableSystemCACerts=true
+# This property may be disabled using an empty value
 +#
 +security.systemCACerts=${java.home}/lib/security/cacerts
 +
@ -226,17 +158,16 @@ index 19047c61097..43e034cdeaf 100644
 # Determines the default key and trust manager factory algorithms for
 # the javax.net.ssl package.
 diff --git a/jdk/src/share/lib/security/java.security-solaris b/jdk/src/share/lib/security/java.security-solaris
-index 7eda556ae13..325937e97fb 100644
+index 300132384a1..6299e0a3c7b 100644
 --- a/jdk/src/share/lib/security/java.security-solaris
 +++ b/jdk/src/share/lib/security/java.security-solaris
-@@ -295,6 +295,13 @@ security.overridePropertiesFile=true
+@@ -295,6 +295,12 @@ security.overridePropertiesFile=true
 #
 security.useSystemPropertiesFile=false
 
 +#
 +# Specifies the system certificate store
-+# This property may be disabled using
-+# -Djava.security.disableSystemCACerts=true
+# This property may be disabled using an empty value
 +#
 +security.systemCACerts=${java.home}/lib/security/cacerts
 +
@ -244,17 +175,16 @@ index 7eda556ae13..325937e97fb 100644
 # Determines the default key and trust manager factory algorithms for
 # the javax.net.ssl package.
 diff --git a/jdk/src/share/lib/security/java.security-windows b/jdk/src/share/lib/security/java.security-windows
-index dfa1a669aa9..92ef777e065 100644
+index 64db5a5cd1e..823994f3466 100644
 --- a/jdk/src/share/lib/security/java.security-windows
 +++ b/jdk/src/share/lib/security/java.security-windows
-@@ -297,6 +297,13 @@ security.overridePropertiesFile=true
+@@ -297,6 +297,12 @@ security.overridePropertiesFile=true
 #
 security.useSystemPropertiesFile=false
 
 +#
 +# Specifies the system certificate store
-+# This property may be disabled using
-+# -Djava.security.disableSystemCACerts=true
+# This property may be disabled using an empty value
 +#
 +security.systemCACerts=${java.home}/lib/security/cacerts
 +
--- a/SOURCES/rh1163501-increase_2048_bit_dh_upper_bound_fedora_infrastructure_in_dhparametergenerator.patch
+++ b/SOURCES/rh1163501-increase_2048_bit_dh_upper_bound_fedora_infrastructure_in_dhparametergenerator.patch
@ -1,66 +0,0 @@
-diff --git a/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java b/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
--- openjdk/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
-+++ openjdk/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
-@@ -1,5 +1,6 @@
- /*
-  * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2014 Red Hat Inc.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -61,13 +62,13 @@
- 
-     private static void checkKeySize(int keysize)
-             throws InvalidParameterException {
-        boolean supported = ((keysize == 2048) || (keysize == 3072) ||
-+        boolean supported = ((keysize == 2048) || (keysize == 3072) || (keysize == 4096) ||
-             ((keysize >= 512) && (keysize <= 1024) && ((keysize & 0x3F) == 0)));
- 
-         if (!supported) {
-             throw new InvalidParameterException(
-                     "DH key size must be multiple of 64 and range " +
-                    "from 512 to 1024 (inclusive), or 2048, 3072. " +
-+                    "from 512 to 1024 (inclusive), or 2048, 3072, 4096. " +
-                     "The specific key size " + keysize + " is not supported");
-         }
-     }
-diff --git a/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java b/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
--- openjdk/jdk/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
-+++ openjdk/jdk/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
-@@ -1,5 +1,6 @@
- /*
-  * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2014 Red Hat Inc.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -58,7 +59,7 @@
-      */
-     private enum Sizes {
-         two56(256), three84(384), five12(512), seven68(768), ten24(1024),
-        twenty48(2048);
-+        twenty48(2048), forty96(4096);
- 
-         private final int intSize;
-         private final BigInteger bigIntValue;
-@@ -130,6 +131,19 @@
-         kp = kpg.generateKeyPair();
-         checkKeyPair(kp, Sizes.twenty48, Sizes.five12);
- 
-+        kpg.initialize(Sizes.forty96.getIntSize());
-+        kp = kpg.generateKeyPair();
-+        checkKeyPair(kp, Sizes.forty96, Sizes.twenty48);
-+
-+        publicKey = (DHPublicKey)kp.getPublic();
-+        p = publicKey.getParams().getP();
-+        g = publicKey.getParams().getG();
-+
-+        // test w/ all values specified
-+        kpg.initialize(new DHParameterSpec(p, g, Sizes.ten24.getIntSize()));
-+        kp = kpg.generateKeyPair();
-+        checkKeyPair(kp, Sizes.forty96, Sizes.ten24);
-+
-         System.out.println("OK");
-     }
- 
-
--- a/SPECS/java-1.8.0-openjdk.spec
+++ b/SPECS/java-1.8.0-openjdk.spec
@ -326,7 +326,7 @@
 # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
 %global shenandoah_project      openjdk
 %global shenandoah_repo         shenandoah-jdk8u
-%global openjdk_revision        jdk8u352-b08
+%global openjdk_revision        jdk8u362-b09
 %global shenandoah_revision     shenandoah-%{openjdk_revision}
 # Define old aarch64/jdk8u tree variables for compatibility
 %global project         %{shenandoah_project}
@ -336,6 +336,8 @@
 %global icedteaver      3.15.0
 # Define current Git revision for the FIPS support patches
 %global fipsver 6d1aade0648
+# Define current Git revision for the cacerts patch
+%global cacertsver 8139f2361c2

 # e.g. aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30 -> aarch64-shenandoah-jdk8u212-b04
 %global version_tag     %(VERSION=%{revision}; echo ${VERSION%%-shenandoah-merge*})
@ -1234,9 +1236,8 @@ Provides: jre%{?1} = %{epoch}:%{version}-%{release}
 Requires: ca-certificates
 # Require javapackages-filesystem for ownership of /usr/lib/jvm/ and macros
 Requires: javapackages-filesystem
-# 2022d required as of JDK-8294357
-# Should be bumped to 2022e once available (JDK-8295173)
-Requires: tzdata-java >= 2022d
+# 2022g required as of JDK-8297804
+Requires: tzdata-java >= 2022g
 # for support of kernel stream control
 # libsctp.so.1 is being `dlopen`ed on demand
 Requires: lksctp-tools%{?_isa}
@ -1442,7 +1443,7 @@ Patch1003: rh1582504-rsa_default_for_keytool.patch
 Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch

 # Crypto policy and FIPS support patches
-# Patch is generated from the fips tree at https://github.com/rh-openjdk/jdk11u/tree/fips
+# Patch is generated from the fips tree at https://github.com/rh-openjdk/jdk8u/tree/fips
 # as follows: git diff %%{openjdk_revision} common jdk > fips-8u-$(git show -s --format=%h HEAD).patch
 # Diff is limited to src and make subdirectories to exclude .github changes
 # Fixes currently included:
@ -1472,8 +1473,6 @@ Patch1001: fips-8u-%{fipsver}.patch
 #############################################
 # PR2737: Allow multiple initialization of PKCS11 libraries
 Patch5: pr2737-allow_multiple_pkcs11_library_initialisation_to_be_a_non_critical_error.patch
-# PR2095, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure (sync with IcedTea 2.x)
-Patch504: rh1163501-increase_2048_bit_dh_upper_bound_fedora_infrastructure_in_dhparametergenerator.patch
 # Turn off strict overflow on IndicRearrangementProcessor{,2}.cpp following 8140543: Arrange font actions
 Patch512: rh1649664-awt2dlibraries_compiled_with_no_strict_overflow.patch
 # RH1337583, PR2974: PKCS#10 certificate requests now use CRLF line endings rather than system line endings
@ -1483,8 +1482,10 @@ Patch528: pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_t
 # PR2888: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
 # PR3575, RH1567204: System cacerts database handling should not affect jssecacerts
 # RH2055274: Revert default keystore to JAVA_HOME/jre/lib/security/cacerts in portable builds
-# Must be applied after FIPS patch as it also changes java.security
-Patch539: pr2888-rh2055274-support_system_cacerts.patch
+# Must be applied after the FIPS patch as it also changes java.security
+# Patch is generated from the cacerts tree at https://github.com/rh-openjdk/jdk8u/tree/cacerts
+# as follows: git diff fips > pr2888-rh2055274-support_system_cacerts-$(git show -s --format=%h HEAD).patch
+Patch539: pr2888-rh2055274-support_system_cacerts-%{cacertsver}.patch
 # enable build of speculative store bypass hardened alt-java
 Patch600: rh1750419-redhat_alt_java.patch
 # JDK-8218811: replace open by os::open in hotspot coding
@ -1536,8 +1537,6 @@ Patch202: jdk8035341-allow_using_system_installed_libpng.patch
 # 8042159: Allow using a system-installed lcms2
 Patch203: jdk8042159-allow_using_system_installed_lcms2-root.patch
 Patch204: jdk8042159-allow_using_system_installed_lcms2-jdk.patch
-# JDK-8195607, PR3776, RH1760437: sun/security/pkcs11/Secmod/TestNssDbSqlite.java failed with "NSS initialization failed" on NSS 3.34.1
-Patch580: jdk8195607-pr3776-rh1760437-nss_sqlite_db_config.patch
 # JDK-8257794: Zero: assert(istate->_stack_limit == istate->_thread->last_Java_sp() + 1) failed: wrong on Linux/x86_32
 Patch581: jdk8257794-remove_broken_assert.patch

@ -1550,10 +1549,6 @@ Patch581: jdk8257794-remove_broken_assert.patch
 # able to be removed once that release is out
 # and used by this RPM.
 #############################################
-# JDK-8294357: (tz) Update Timezone Data to 2022d
-Patch2002: jdk8294357-tzdata2022d.patch
-# JDK-8295173: (tz) Update Timezone Data to 2022e
-Patch2003: jdk8295173-tzdata2022e.patch

 #############################################
 #
@ -1623,9 +1618,8 @@ BuildRequires: java-%{buildjdkver}-openjdk-devel >= 1.7.0.151-2.6.11.3
 %ifarch %{zero_arches}
 BuildRequires: libffi-devel
 %endif
-# 2022d required as of JDK-8294357
-# Should be bumped to 2022e once available (JDK-8295173)
-BuildRequires: tzdata-java >= 2022d
+# 2022g required as of JDK-8297804
+BuildRequires: tzdata-java >= 2022g
 # Earlier versions have a bug in tree vectorization on PPC
 BuildRequires: gcc >= 4.8.3-8

@ -1930,7 +1924,6 @@ sh %{SOURCE12}

 # Upstreamable fixes
 %patch502
-%patch504
 %patch512
 %patch523
 %patch528
@ -1938,7 +1931,6 @@ sh %{SOURCE12}
 %patch574
 %patch111
 %patch112
-%patch580
 %patch581
 %patch113

@ -1949,9 +1941,6 @@ pushd %{top_level_dir_name}
 %patch1000 -p1
 # cacerts patch; must follow FIPS patch as it also alters java.security
 %patch539 -p1
-# tzdata updates targetted for 8u362
-%patch2002 -p1
-%patch2003 -p1
 popd

 # RPM-only fixes
@ -2731,6 +2720,32 @@ cjc.mainProgram(args)
 %endif

 %changelog
+* Tue Jan 24 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.362.b09-2
+- Update cacerts patch to fix OPENJDK-1433 SecurityManager issue
+- Update to shenandoah-jdk8u352-b09 (GA)
+- Update release notes for shenandoah-8u352-b09.
+- Resolves: rhbz#2163594
+
+* Fri Jan 13 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.362.b08-2
+- Update to shenandoah-jdk8u352-b08 (GA)
+- Update release notes for shenandoah-8u352-b08.
+- Fix broken links and missing release notes in older releases.
+- Drop RH1163501 patch which is not upstream or in 11, 17 & 19 packages and seems obsolete
+  - Patch was broken by inclusion of "JDK-8293554: Enhanced DH Key Exchanges"
+  - Patch was added for a specific corner case of a 4096-bit DH key on a Fedora host that no longer exists
+  - Fedora now appears to be using RSA and the JDK now supports ECC in preference to large DH keys
+- Resolves: rhbz#2160111
+
+* Wed Jan 11 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.362.b07-0.2.ea
+- Update to shenandoah-jdk8u362-b07 (EA)
+- Update release notes for shenandoah-8u362-b07.
+- Switch to EA mode for 8u362 pre-release builds.
+- Drop JDK-8195607/PR3776/RH1760437 now this is upstream
+- Require tzdata 2022g due to inclusion of JDK-8296108, JDK-8296715 & JDK-8297804
+- Drop tzdata patches for 2022d & 2022e (JDK-8294357 & JDK-8295173) which are now upstream
+- Update TestTranslations.java to test the new America/Ciudad_Juarez zone
+- Resolves: rhbz#2159912
+
 * Sun Oct 16 2022 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.352.b08-2
 - Update to shenandoah-jdk8u352-b08 (GA)
 - Update release notes for shenandoah-8u352-b08.