From ae9288cd161f4015f944b62aaac8ae1254fb2527 Mon Sep 17 00:00:00 2001 From: qiming Date: Mon, 11 Aug 2025 17:35:39 +0800 Subject: [PATCH] add Second-revision-sw_64-support.patch to fix the add-sw_64-support.patch error caused by openjdk upgrade --- Second-revision-sw_64-support.patch | 967 +++++++++++++++++++++++++++ add-sw_64-support.patch | 979 +--------------------------- openjdk-1.8.0.spec | 7 +- 3 files changed, 984 insertions(+), 969 deletions(-) create mode 100644 Second-revision-sw_64-support.patch diff --git a/Second-revision-sw_64-support.patch b/Second-revision-sw_64-support.patch new file mode 100644 index 0000000..8bbb1cd --- /dev/null +++ b/Second-revision-sw_64-support.patch @@ -0,0 +1,967 @@ +From 556786f19197ed0bb82ef7d8c454db2d0d09ccc5 Mon Sep 17 00:00:00 2001 +From: qushukun +Date: Wed, 6 Aug 2025 18:18:32 +0800 +Subject: [PATCH] cqos-perfor-001-add-sw_64-support +diff --git a/jdk/src/share/classes/com/sun/crypto/provider/RSACipher.java b/jdk/src/share/classes/com/sun/crypto/provider/RSACipher.java +index d489036fa..bfe2ae432 100644 +--- a/jdk/src/share/classes/com/sun/crypto/provider/RSACipher.java ++++ b/jdk/src/share/classes/com/sun/crypto/provider/RSACipher.java +@@ -98,7 +98,6 @@ public final class RSACipher extends CipherSpi { + + // cipher parameter for OAEP padding and TLS RSA premaster secret + private AlgorithmParameterSpec spec = null; +- private boolean forTlsPremasterSecret = false; + + // buffer for the data + private byte[] buffer; +@@ -291,7 +290,6 @@ public final class RSACipher extends CipherSpi { + } + + spec = params; +- forTlsPremasterSecret = true; + this.random = random; // for TLS RSA premaster secret + } + int blockType = (mode <= MODE_DECRYPT) ? RSAPadding.PAD_BLOCKTYPE_2 +@@ -383,7 +381,7 @@ public final class RSACipher extends CipherSpi { + byte[] decryptBuffer = RSACore.convert(buffer, 0, bufOfs); + paddingCopy = RSACore.rsa(decryptBuffer, privateKey, false); + result = padding.unpad(paddingCopy); +- if (!forTlsPremasterSecret && result == null) { ++ if (result == null) { + throw new BadPaddingException + ("Padding error in decryption"); + } +@@ -499,12 +497,13 @@ public final class RSACipher extends CipherSpi { + + boolean isTlsRsaPremasterSecret = + algorithm.equals("TlsRsaPremasterSecret"); ++ Exception failover = null; + byte[] encoded = null; + + update(wrappedKey, 0, wrappedKey.length); + try { + if (isTlsRsaPremasterSecret) { +- if (!forTlsPremasterSecret) { ++ if (!(spec instanceof TlsRsaPremasterSecretParameterSpec)) { + throw new IllegalStateException( + "No TlsRsaPremasterSecretParameterSpec specified"); + } +@@ -517,18 +516,22 @@ public final class RSACipher extends CipherSpi { + } + return ConstructKeys.constructKey(encoded, algorithm, type); + +- } catch (BadPaddingException | IllegalBlockSizeException e) { +- // BadPaddingException cannot happen for TLS RSA unwrap. +- // Neither padding error nor server version error is indicated +- // for TLS, but a fake unwrapped value is returned. +- // IllegalBlockSizeException cannot happen in any case, +- // because of the length check above. +- throw new InvalidKeyException("Unwrapping failed", e); ++ } catch (BadPaddingException e) { ++ if (isTlsRsaPremasterSecret) { ++ failover = e; ++ } else { ++ throw new InvalidKeyException("Unwrapping failed", e);} ++ }catch (IllegalBlockSizeException e) { ++ // should not occur, handled with length check above ++ throw new InvalidKeyException("Unwrapping failed", e); + } finally { + if (encoded != null) { + Arrays.fill(encoded, (byte) 0); + } + } ++ // If we reached here, it means TLS failover happened ++ // You can throw the original exception, or handle differently ++ throw new InvalidKeyException("Unwrapping failed", failover); + } + // see JCE spec + protected int engineGetKeySize(Key key) throws InvalidKeyException { + +diff --git a/jdk/make/data/tzdata/asia b/jdk/make/data/tzdata/asia +index 73cccd39a..ea5b46fa2 100644 +--- a/jdk/make/data/tzdata/asia ++++ b/jdk/make/data/tzdata/asia +@@ -678,6 +678,7 @@ Zone Asia/Shanghai 8:05:43 - LMT 1901 + 8:00 PRC C%sT + # Xinjiang time, used by many in western China; represented by Ürümqi / Ürümchi + # / Wulumuqi. (Please use Asia/Shanghai if you prefer Beijing time.) ++# Vostok base in Antarctica matches this since 1970. + Zone Asia/Urumqi 5:50:20 - LMT 1928 + 6:00 - +06 + +@@ -2487,33 +2488,19 @@ Zone Asia/Amman 2:23:44 - LMT 1931 + # effective December 21st, 2018.... + # http://adilet.zan.kz/rus/docs/P1800000817 (russian language). + +-# From Zhanbolat Raimbekov (2024-01-19): +-# Kazakhstan (all parts) switching to UTC+5 on March 1, 2024 +-# https://www.gov.kz/memleket/entities/mti/press/news/details/688998?lang=ru +-# [in Russian] +-# (2024-01-20): https://primeminister.kz/ru/decisions/19012024-20 +-# +-# From Alexander Krivenyshev (2024-01-19): +-# According to a different news and the official web site for the Ministry of +-# Trade and Integration of the Republic of Kazakhstan: +-# https://en.inform.kz/news/kazakhstan-to-switch-to-single-hour-zone-mar-1-54ad0b/ + + # Zone NAME STDOFF RULES FORMAT [UNTIL] + # + # Almaty (formerly Alma-Ata), representing most locations in Kazakhstan +-# This includes Abai/Abay (ISO 3166-2 code KZ-10), Aqmola/Akmola (KZ-11), +-# Almaty (KZ-19), Almaty city (KZ-75), Astana city (KZ-71), +-# East Kazakhstan (KZ-63), Jambyl/Zhambyl (KZ-31), Jetisu/Zhetysu (KZ-33), +-# Karaganda (KZ-35), North Kazakhstan (KZ-59), Pavlodar (KZ-55), +-# Shymkent city (KZ-79), Turkistan (KZ-61), and Ulytau (KZ-62). ++# This includes KZ-AKM, KZ-ALA, KZ-ALM, KZ-AST, KZ-BAY, KZ-VOS, KZ-ZHA, ++# KZ-KAR, KZ-SEV, KZ-PAV, and KZ-YUZ. + Zone Asia/Almaty 5:07:48 - LMT 1924 May 2 # or Alma-Ata + 5:00 - +05 1930 Jun 21 + 6:00 RussiaAsia +06/+07 1991 Mar 31 2:00s + 5:00 RussiaAsia +05/+06 1992 Jan 19 2:00s + 6:00 RussiaAsia +06/+07 2004 Oct 31 2:00s +- 6:00 - +06 2024 Mar 1 0:00 +- 5:00 - +05 +-# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) (KZ-43) ++ 6:00 - +06 ++# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) (KZ-KZY) + Zone Asia/Qyzylorda 4:21:52 - LMT 1924 May 2 + 4:00 - +04 1930 Jun 21 + 5:00 - +05 1981 Apr 1 +@@ -2526,7 +2513,8 @@ Zone Asia/Qyzylorda 4:21:52 - LMT 1924 May 2 + 5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s + 6:00 - +06 2018 Dec 21 0:00 + 5:00 - +05 +-# Qostanay (aka Kostanay, Kustanay) (KZ-39) ++# ++# Qostanay (aka Kostanay, Kustanay) (KZ-KUS) + # The 1991/2 rules are unclear partly because of the 1997 Turgai + # reorganization. + Zone Asia/Qostanay 4:14:28 - LMT 1924 May 2 +@@ -2537,9 +2525,9 @@ Zone Asia/Qostanay 4:14:28 - LMT 1924 May 2 + 5:00 RussiaAsia +05/+06 1991 Mar 31 2:00s + 4:00 RussiaAsia +04/+05 1992 Jan 19 2:00s + 5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s +- 6:00 - +06 2024 Mar 1 0:00 +- 5:00 - +05 +-# Aqtöbe (aka Aktobe, formerly Aktyubinsk) (KZ-15) ++ 6:00 - +06 ++ ++# Aqtöbe (aka Aktobe, formerly Aktyubinsk) (KZ-AKT) + Zone Asia/Aqtobe 3:48:40 - LMT 1924 May 2 + 4:00 - +04 1930 Jun 21 + 5:00 - +05 1981 Apr 1 +@@ -2549,7 +2537,7 @@ Zone Asia/Aqtobe 3:48:40 - LMT 1924 May 2 + 4:00 RussiaAsia +04/+05 1992 Jan 19 2:00s + 5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s + 5:00 - +05 +-# Mangghystaū (KZ-47) ++# Mangghystaū (KZ-MAN) + # Aqtau was not founded until 1963, but it represents an inhabited region, + # so include timestamps before 1963. + Zone Asia/Aqtau 3:21:04 - LMT 1924 May 2 +@@ -2561,7 +2549,7 @@ Zone Asia/Aqtau 3:21:04 - LMT 1924 May 2 + 5:00 RussiaAsia +05/+06 1994 Sep 25 2:00s + 4:00 RussiaAsia +04/+05 2004 Oct 31 2:00s + 5:00 - +05 +-# Atyraū (KZ-23) is like Mangghystaū except it switched from ++# Atyraū (KZ-ATY) is like Mangghystaū except it switched from + # +04/+05 to +05/+06 in spring 1999, not fall 1994. + Zone Asia/Atyrau 3:27:44 - LMT 1924 May 2 + 3:00 - +03 1930 Jun 21 +@@ -2572,7 +2560,7 @@ Zone Asia/Atyrau 3:27:44 - LMT 1924 May 2 + 5:00 RussiaAsia +05/+06 1999 Mar 28 2:00s + 4:00 RussiaAsia +04/+05 2004 Oct 31 2:00s + 5:00 - +05 +-# West Kazakhstan (KZ-27) ++# West Kazakhstan (KZ-ZAP) + # From Paul Eggert (2016-03-18): + # The 1989 transition is from USSR act No. 227 (1989-03-14). + Zone Asia/Oral 3:25:24 - LMT 1924 May 2 # or Ural'sk +@@ -3491,30 +3479,20 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 + # From Heba Hamad (2023-03-22): + # ... summer time will begin in Palestine from Saturday 04-29-2023, + # 02:00 AM by 60 minutes forward. +-# From Heba Hemad (2023-10-09): +-# ... winter time will begin in Palestine from Saturday 10-28-2023, +-# 02:00 AM by 60 minutes back. +-# +-# From Heba Hamad (2024-01-25): +-# the summer time for the years 2024,2025 will begin in Palestine +-# from Saturday at 02:00 AM by 60 minutes forward as shown below: +-# year date +-# 2024 2024-04-20 +-# 2025 2025-04-12 +-# +-# From Paul Eggert (2024-01-25): ++# ++# From Paul Eggert (2023-03-22): + # For now, guess that spring and fall transitions will normally + # continue to use 2022's rules, that during DST Palestine will switch + # to standard time at 02:00 the last Saturday before Ramadan and back +-# to DST at 02:00 the second Saturday after Ramadan, and that ++# to DST at 02:00 the first Saturday after Ramadan, and that + # if the normal spring-forward or fall-back transition occurs during + # Ramadan the former is delayed and the latter advanced. + # To implement this, I predicted Ramadan-oriented transition dates for +-# 2026 through 2086 by running the following program under GNU Emacs 29.2, ++# 2023 through 2086 by running the following program under GNU Emacs 28.2, + # with the results integrated by hand into the table below. + # Predictions after 2086 are approximated without Ramadan. + # +-# (let ((islamic-year 1447)) ++# (let ((islamic-year 1444)) + # (require 'cal-islam) + # (while (< islamic-year 1510) + # (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) +@@ -3523,7 +3501,6 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 + # (while (/= saturday (mod (setq a (1- a)) 7))) + # (while (/= saturday (mod b 7)) + # (setq b (1+ b))) +-# (setq b (+ 7 b)) + # (setq a (calendar-gregorian-from-absolute a)) + # (setq b (calendar-gregorian-from-absolute b)) + # (insert +@@ -3574,85 +3551,83 @@ Rule Palestine 2021 only - Oct 29 1:00 0 - + Rule Palestine 2022 only - Mar 27 0:00 1:00 S + Rule Palestine 2022 2035 - Oct Sat<=30 2:00 0 - + Rule Palestine 2023 only - Apr 29 2:00 1:00 S +-Rule Palestine 2024 only - Apr 20 2:00 1:00 S +-Rule Palestine 2025 only - Apr 12 2:00 1:00 S ++Rule Palestine 2024 only - Apr 13 2:00 1:00 S ++Rule Palestine 2025 only - Apr 5 2:00 1:00 S + Rule Palestine 2026 2054 - Mar Sat<=30 2:00 1:00 S + Rule Palestine 2036 only - Oct 18 2:00 0 - + Rule Palestine 2037 only - Oct 10 2:00 0 - + Rule Palestine 2038 only - Sep 25 2:00 0 - +-Rule Palestine 2039 only - Sep 17 2:00 0 - ++Rule Palestine 2039 only - Oct 22 2:00 1:00 S ++Rule Palestine 2039 2067 - Oct Sat<=30 2:00 0 - + Rule Palestine 2040 only - Sep 1 2:00 0 - +-Rule Palestine 2040 only - Oct 20 2:00 1:00 S +-Rule Palestine 2040 2067 - Oct Sat<=30 2:00 0 - ++Rule Palestine 2040 only - Oct 13 2:00 1:00 S + Rule Palestine 2041 only - Aug 24 2:00 0 - +-Rule Palestine 2041 only - Oct 5 2:00 1:00 S ++Rule Palestine 2041 only - Sep 28 2:00 1:00 S + Rule Palestine 2042 only - Aug 16 2:00 0 - +-Rule Palestine 2042 only - Sep 27 2:00 1:00 S ++Rule Palestine 2042 only - Sep 20 2:00 1:00 S + Rule Palestine 2043 only - Aug 1 2:00 0 - +-Rule Palestine 2043 only - Sep 19 2:00 1:00 S ++Rule Palestine 2043 only - Sep 12 2:00 1:00 S + Rule Palestine 2044 only - Jul 23 2:00 0 - +-Rule Palestine 2044 only - Sep 3 2:00 1:00 S ++Rule Palestine 2044 only - Aug 27 2:00 1:00 S + Rule Palestine 2045 only - Jul 15 2:00 0 - +-Rule Palestine 2045 only - Aug 26 2:00 1:00 S ++Rule Palestine 2045 only - Aug 19 2:00 1:00 S + Rule Palestine 2046 only - Jun 30 2:00 0 - +-Rule Palestine 2046 only - Aug 18 2:00 1:00 S ++Rule Palestine 2046 only - Aug 11 2:00 1:00 S + Rule Palestine 2047 only - Jun 22 2:00 0 - +-Rule Palestine 2047 only - Aug 3 2:00 1:00 S ++Rule Palestine 2047 only - Jul 27 2:00 1:00 S + Rule Palestine 2048 only - Jun 6 2:00 0 - +-Rule Palestine 2048 only - Jul 25 2:00 1:00 S ++Rule Palestine 2048 only - Jul 18 2:00 1:00 S + Rule Palestine 2049 only - May 29 2:00 0 - +-Rule Palestine 2049 only - Jul 10 2:00 1:00 S ++Rule Palestine 2049 only - Jul 3 2:00 1:00 S + Rule Palestine 2050 only - May 21 2:00 0 - +-Rule Palestine 2050 only - Jul 2 2:00 1:00 S ++Rule Palestine 2050 only - Jun 25 2:00 1:00 S + Rule Palestine 2051 only - May 6 2:00 0 - +-Rule Palestine 2051 only - Jun 24 2:00 1:00 S ++Rule Palestine 2051 only - Jun 17 2:00 1:00 S + Rule Palestine 2052 only - Apr 27 2:00 0 - +-Rule Palestine 2052 only - Jun 8 2:00 1:00 S ++Rule Palestine 2052 only - Jun 1 2:00 1:00 S + Rule Palestine 2053 only - Apr 12 2:00 0 - +-Rule Palestine 2053 only - May 31 2:00 1:00 S ++Rule Palestine 2053 only - May 24 2:00 1:00 S + Rule Palestine 2054 only - Apr 4 2:00 0 - +-Rule Palestine 2054 only - May 23 2:00 1:00 S +-Rule Palestine 2055 only - May 8 2:00 1:00 S +-Rule Palestine 2056 only - Apr 29 2:00 1:00 S +-Rule Palestine 2057 only - Apr 14 2:00 1:00 S +-Rule Palestine 2058 only - Apr 6 2:00 1:00 S +-Rule Palestine 2059 max - Mar Sat<=30 2:00 1:00 S ++Rule Palestine 2054 only - May 16 2:00 1:00 S ++Rule Palestine 2055 only - May 1 2:00 1:00 S ++Rule Palestine 2056 only - Apr 22 2:00 1:00 S ++Rule Palestine 2057 only - Apr 7 2:00 1:00 S ++Rule Palestine 2058 max - Mar Sat<=30 2:00 1:00 S + Rule Palestine 2068 only - Oct 20 2:00 0 - + Rule Palestine 2069 only - Oct 12 2:00 0 - + Rule Palestine 2070 only - Oct 4 2:00 0 - + Rule Palestine 2071 only - Sep 19 2:00 0 - + Rule Palestine 2072 only - Sep 10 2:00 0 - +-Rule Palestine 2072 only - Oct 22 2:00 1:00 S +-Rule Palestine 2072 max - Oct Sat<=30 2:00 0 - ++Rule Palestine 2072 only - Oct 15 2:00 1:00 S + Rule Palestine 2073 only - Sep 2 2:00 0 - +-Rule Palestine 2073 only - Oct 14 2:00 1:00 S ++Rule Palestine 2073 only - Oct 7 2:00 1:00 S + Rule Palestine 2074 only - Aug 18 2:00 0 - +-Rule Palestine 2074 only - Oct 6 2:00 1:00 S ++Rule Palestine 2074 only - Sep 29 2:00 1:00 S + Rule Palestine 2075 only - Aug 10 2:00 0 - +-Rule Palestine 2075 only - Sep 21 2:00 1:00 S ++Rule Palestine 2075 only - Sep 14 2:00 1:00 S ++Rule Palestine 2075 max - Oct Sat<=30 2:00 0 - + Rule Palestine 2076 only - Jul 25 2:00 0 - +-Rule Palestine 2076 only - Sep 12 2:00 1:00 S ++Rule Palestine 2076 only - Sep 5 2:00 1:00 S + Rule Palestine 2077 only - Jul 17 2:00 0 - +-Rule Palestine 2077 only - Sep 4 2:00 1:00 S ++Rule Palestine 2077 only - Aug 28 2:00 1:00 S + Rule Palestine 2078 only - Jul 9 2:00 0 - +-Rule Palestine 2078 only - Aug 20 2:00 1:00 S ++Rule Palestine 2078 only - Aug 13 2:00 1:00 S + Rule Palestine 2079 only - Jun 24 2:00 0 - +-Rule Palestine 2079 only - Aug 12 2:00 1:00 S ++Rule Palestine 2079 only - Aug 5 2:00 1:00 S + Rule Palestine 2080 only - Jun 15 2:00 0 - +-Rule Palestine 2080 only - Jul 27 2:00 1:00 S ++Rule Palestine 2080 only - Jul 20 2:00 1:00 S + Rule Palestine 2081 only - Jun 7 2:00 0 - +-Rule Palestine 2081 only - Jul 19 2:00 1:00 S ++Rule Palestine 2081 only - Jul 12 2:00 1:00 S + Rule Palestine 2082 only - May 23 2:00 0 - +-Rule Palestine 2082 only - Jul 11 2:00 1:00 S ++Rule Palestine 2082 only - Jul 4 2:00 1:00 S + Rule Palestine 2083 only - May 15 2:00 0 - +-Rule Palestine 2083 only - Jun 26 2:00 1:00 S ++Rule Palestine 2083 only - Jun 19 2:00 1:00 S + Rule Palestine 2084 only - Apr 29 2:00 0 - +-Rule Palestine 2084 only - Jun 17 2:00 1:00 S ++Rule Palestine 2084 only - Jun 10 2:00 1:00 S + Rule Palestine 2085 only - Apr 21 2:00 0 - +-Rule Palestine 2085 only - Jun 9 2:00 1:00 S ++Rule Palestine 2085 only - Jun 2 2:00 1:00 S + Rule Palestine 2086 only - Apr 13 2:00 0 - +-Rule Palestine 2086 only - May 25 2:00 1:00 S +- ++Rule Palestine 2086 only - May 18 2:00 1:00 S + # Zone NAME STDOFF RULES FORMAT [UNTIL] + Zone Asia/Gaza 2:17:52 - LMT 1900 Oct + 2:00 Zion EET/EEST 1948 May 15 +@@ -3679,7 +3654,7 @@ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct + + # Philippines + +-# From Paul Eggert (2024-01-21): ++# From Paul Eggert (2018-11-18): + # The Spanish initially used American (west-of-Greenwich) time. + # It is unknown what time Manila kept when the British occupied it from + # 1762-10-06 through 1764-04; for now assume it kept American time. +@@ -3687,7 +3662,7 @@ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct + # Philippines, issued a proclamation announcing that 1844-12-30 was to + # be immediately followed by 1845-01-01; see R.H. van Gent's + # History of the International Date Line +-# https://webspace.science.uu.nl/~gent0113/idl/idl_philippines.htm ++# https://www.staff.science.uu.nl/~gent0113/idl/idl_philippines.htm + + # From P Chan (2021-05-10): + # Here's a fairly comprehensive article in Japanese: +@@ -4165,8 +4140,7 @@ Zone Asia/Tashkent 4:37:11 - LMT 1924 May 2 + # The English-language name of Vietnam's most populous city is "Ho Chi Minh + # City"; use Ho_Chi_Minh below to avoid a name of more than 14 characters. + +-# From Paul Eggert (2024-01-14) after a 2014 heads-up from Trần Ngọc Quân +-# and a 2024-01-14 heads-up from Đoàn Trần Công Danh: ++# From Paul Eggert (2022-07-27) after a 2014 heads-up from Trần Ngọc Quân: + # Trần Tiến Bình's authoritative book "Lịch Việt Nam: thế kỷ XX-XXI (1901-2100)" + # (Nhà xuất bản Văn Hoá - Thông Tin, Hanoi, 2005), pp 49-50, + # is quoted verbatim in: +@@ -4196,34 +4170,15 @@ Zone Asia/Tashkent 4:37:11 - LMT 1924 May 2 + # + # Trần cites the following sources; it's unclear which supplied the info above. + # +-# Hoàng Xuân Hãn: "Lịch và lịch Việt Nam". Tập san Khoa học Xã hội, +-# No. 9, Paris, February 1982. +-# +-# Lê Thành Lân: "Lịch và niên biểu lịch sử hai mươi thế kỷ (0001-2010)", +-# NXB Thống kê, Hanoi, 2000. +-# +-# Lê Thành Lân: "Lịch hai thế kỷ (1802-2010) và các lịch vĩnh cửu", +-# NXB Thuận Hoá, Huế, 1995. + # +-# Here is the decision for the September 1945 transition: +-# Võ Nguyên Giáp, Việt Nam Dân Quốc Công Báo, No. 1 (1945-09-29), page 13 +-# http://baochi.nlv.gov.vn/baochi/cgi-bin/baochi?a=d&d=JwvzO19450929.2.5&dliv=none +-# It says that on 1945-09-01 at 24:00, Vietnam moved back two hours, to +07. +-# It also mentions a 1945-03-29 decree (by a Japanese Governor-General) +-# to set the time zone to +09, but does not say whether that decree +-# merely legalized an earlier change to +09. ++# Hoàng Xuân Hãn: "Lịch và lịch Việt Nam". Tập san Khoa học Xã hội, ++# No. 9, Paris, February 1982. + # +-# July 1955 transition: +-# Ngô Đình Diệm, Công Báo Việt Nam, No. 92 (1955-07-02), page 1780-1781 +-# Ordinance (Dụ) No. 46 (1955-06-25) +-# http://ddsnext.crl.edu/titles/32341#?c=0&m=29&s=0&cv=4&r=0&xywh=-89%2C342%2C1724%2C1216 +-# It says that on 1955-07-01 at 01:00, South Vietnam moved back 1 hour (to +07). ++# Lê Thành Lân: "Lịch và niên biểu lịch sử hai mươi thế kỷ (0001-2010)", ++# NXB Thống kê, Hanoi, 2000. + # +-# December 1959 transition: +-# Ngô Đình Diệm, Công Báo Việt Nam Cộng Hòa, 1960 part 1 (1960-01-02), page 62 +-# Decree (Sắc lệnh) No. 362-TTP (1959-12-30) +-# http://ddsnext.crl.edu/titles/32341#?c=0&m=138&s=0&cv=793&r=0&xywh=-54%2C1504%2C1705%2C1202 +-# It says that on 1959-12-31 at 23:00, South Vietnam moved forward 1 hour (to +08). ++# Lê Thành Lân: "Lịch hai thế kỷ (1802-2010) và các lịch vĩnh cửu", ++# NXB Thuận Hoá, Huế, 1995. + + + # Zone NAME STDOFF RULES FORMAT [UNTIL] +@@ -4232,9 +4187,9 @@ Zone Asia/Ho_Chi_Minh 7:06:30 - LMT 1906 Jul 1 + 7:06:30 - PLMT 1911 May 1 # Phù Liễn MT + 7:00 - +07 1942 Dec 31 23:00 + 8:00 - +08 1945 Mar 14 23:00 +- 9:00 - +09 1945 Sep 1 24:00 ++ 9:00 - +09 1945 Sep 2 + 7:00 - +07 1947 Apr 1 +- 8:00 - +08 1955 Jul 1 01:00 ++ 8:00 - +08 1955 Jul 1 + 7:00 - +07 1959 Dec 31 23:00 + 8:00 - +08 1975 Jun 13 + 7:00 - +07 +diff --git a/jdk/make/data/tzdata/europe b/jdk/make/data/tzdata/europe +index 43a9f4e1f..ade32d92c 100644 +--- a/jdk/make/data/tzdata/europe ++++ b/jdk/make/data/tzdata/europe +@@ -1005,33 +1005,9 @@ Zone Europe/Sofia 1:33:16 - LMT 1880 + # Czech Republic (Czechia) + # Slovakia + # +-# From Ivan Benovic (2024-01-30): +-# https://www.slov-lex.sk/pravne-predpisy/SK/ZZ/1946/54/ +-# (This is an official link to the Czechoslovak Summer Time Act of +-# March 8, 1946 that authorizes the Czechoslovak government to set the +-# exact dates of change to summer time and back to Central European Time. +-# The act also implicitly confirms Central European Time as the +-# official time zone of Czechoslovakia and currently remains in force +-# in both the Czech Republic and Slovakia.) +-# https://www.psp.cz/eknih/1945pns/tisky/t0216_00.htm +-# (This is a link to the original legislative proposal dating back to +-# February 22, 1946. The accompanying memorandum to the proposal says +-# that an advisory committee on European railroad transportation that +-# met in Brussels in October 1945 decided that the change of time +-# should be carried out in all participating countries in a strictly +-# coordinated manner....) +-# +-# From Paul Eggert (2024-01-30): +-# The source for Czech data is: Kdy začíná a končí letní čas. ++# From Paul Eggert (2018-04-15): ++# The source for Czech data is: Kdy začíná a končí letní čas. 2018-04-15. + # https://kalendar.beda.cz/kdy-zacina-a-konci-letni-cas +-# Its main text disagrees with its quoted sources only in 1918, +-# where the main text says spring and autumn transitions +-# occurred at 02:00 and 03:00 respectively (as usual), +-# whereas the 1918 source "Oznámení o zavedení letního času v roce 1918" +-# says transitions were at 01:00 and 02:00 respectively. +-# As the 1918 source appears to be a humorous piece, and it is +-# unlikely that Prague would have disagreed with its neighbors by an hour, +-# go with the main text for now. + # + # We know of no English-language name for historical Czech winter time; + # abbreviate it as "GMT", as it happened to be GMT. +@@ -1163,23 +1139,6 @@ Zone Atlantic/Faroe -0:27:04 - LMT 1908 Jan 11 # Tórshavn + # 2. The shift *from* DST in 2023 happens as normal, but coincides with the + # shift to UTC-02 normaltime (people will not change their clocks here). + # 3. After this, DST is still observed, but as -02/-01 instead of -03/-02. +-# +-# From Múte Bourup Egede via Jógvan Svabo Samuelsen (2023-03-15): +-# Greenland will not switch to Daylight Saving Time this year, 2023, +-# because the standard time for Greenland will change from UTC -3 to UTC -2. +-# However, Greenland will change to Daylight Saving Time again in 2024 +-# and onwards. +- +-# From Jule Dabars (2023-10-29): +-# https://www.dr.dk/nyheder/seneste/i-nat-skal-uret-stilles-en-time-tilbage-men-foerste-gang-sker-det-ikke-i-groenland +-# with a link to that page: +-# https://naalakkersuisut.gl/Nyheder/2023/10/2710_sommertid +-# ... Ittoqqortoormiit joins the time of Nuuk at March 2024. +-# What would mean that America/Scoresbysund would either be in -01 year round +-# or in -02/-01 like America/Nuuk, but no longer in -01/+00. +-# +-# From Paul Eggert (2023-10-29): +-# For now, assume it will be like America/Nuuk. + + # Rule NAME FROM TO - IN ON AT SAVE LETTER/S + Rule Thule 1991 1992 - Mar lastSun 2:00 1:00 D +@@ -1200,12 +1159,10 @@ Zone America/Danmarkshavn -1:14:40 - LMT 1916 Jul 28 + Zone America/Scoresbysund -1:27:52 - LMT 1916 Jul 28 # Ittoqqortoormiit + -2:00 - -02 1980 Apr 6 2:00 + -2:00 C-Eur -02/-01 1981 Mar 29 +- -1:00 EU -01/+00 2024 Mar 31 +- -2:00 EU -02/-01 ++ -1:00 EU -01/+00 + Zone America/Nuuk -3:26:56 - LMT 1916 Jul 28 # Godthåb + -3:00 - -03 1980 Apr 6 2:00 +- -3:00 EU -03/-02 2023 Mar 26 1:00u +- -2:00 - -02 2023 Oct 29 1:00u ++ -3:00 EU -03/-02 2023 Oct 29 1:00u + -2:00 EU -02/-01 + Zone America/Thule -4:35:08 - LMT 1916 Jul 28 # Pituffik + -4:00 Thule A%sT +@@ -3965,7 +3922,11 @@ Zone Europe/Istanbul 1:55:52 - LMT 1880 + # and not at 3:00 as would have been under EU rules. + # This is why I have set the change to EU rules into May 1996, + # so that the change in March is stil covered by the Ukraine rule. +-# The next change in October 1996 happened under EU rules. ++# The next change in October 1996 happened under EU rules.... ++# TZ database holds three other zones for Ukraine.... I have not yet ++# worked out the consequences for these three zones, as we (me and my ++# US colleague David Cochrane) are still trying to get more ++# information upon these local deviations from Kiev rules. + # + # From Paul Eggert (2022-08-27): + # For now, assume that Ukraine's zones all followed the same rules, +diff --git a/jdk/test/sun/util/calendar/zi/tzdata/asia b/jdk/test/sun/util/calendar/zi/tzdata/asia +index 73cccd39a..ea5b46fa2 100644 +--- a/jdk/test/sun/util/calendar/zi/tzdata/asia ++++ b/jdk/test/sun/util/calendar/zi/tzdata/asia +@@ -678,6 +678,7 @@ Zone Asia/Shanghai 8:05:43 - LMT 1901 + 8:00 PRC C%sT + # Xinjiang time, used by many in western China; represented by Ürümqi / Ürümchi + # / Wulumuqi. (Please use Asia/Shanghai if you prefer Beijing time.) ++# Vostok base in Antarctica matches this since 1970. + Zone Asia/Urumqi 5:50:20 - LMT 1928 + 6:00 - +06 + +@@ -2487,33 +2488,19 @@ Zone Asia/Amman 2:23:44 - LMT 1931 + # effective December 21st, 2018.... + # http://adilet.zan.kz/rus/docs/P1800000817 (russian language). + +-# From Zhanbolat Raimbekov (2024-01-19): +-# Kazakhstan (all parts) switching to UTC+5 on March 1, 2024 +-# https://www.gov.kz/memleket/entities/mti/press/news/details/688998?lang=ru +-# [in Russian] +-# (2024-01-20): https://primeminister.kz/ru/decisions/19012024-20 +-# +-# From Alexander Krivenyshev (2024-01-19): +-# According to a different news and the official web site for the Ministry of +-# Trade and Integration of the Republic of Kazakhstan: +-# https://en.inform.kz/news/kazakhstan-to-switch-to-single-hour-zone-mar-1-54ad0b/ + + # Zone NAME STDOFF RULES FORMAT [UNTIL] + # + # Almaty (formerly Alma-Ata), representing most locations in Kazakhstan +-# This includes Abai/Abay (ISO 3166-2 code KZ-10), Aqmola/Akmola (KZ-11), +-# Almaty (KZ-19), Almaty city (KZ-75), Astana city (KZ-71), +-# East Kazakhstan (KZ-63), Jambyl/Zhambyl (KZ-31), Jetisu/Zhetysu (KZ-33), +-# Karaganda (KZ-35), North Kazakhstan (KZ-59), Pavlodar (KZ-55), +-# Shymkent city (KZ-79), Turkistan (KZ-61), and Ulytau (KZ-62). ++# This includes KZ-AKM, KZ-ALA, KZ-ALM, KZ-AST, KZ-BAY, KZ-VOS, KZ-ZHA, ++# KZ-KAR, KZ-SEV, KZ-PAV, and KZ-YUZ. + Zone Asia/Almaty 5:07:48 - LMT 1924 May 2 # or Alma-Ata + 5:00 - +05 1930 Jun 21 + 6:00 RussiaAsia +06/+07 1991 Mar 31 2:00s + 5:00 RussiaAsia +05/+06 1992 Jan 19 2:00s + 6:00 RussiaAsia +06/+07 2004 Oct 31 2:00s +- 6:00 - +06 2024 Mar 1 0:00 +- 5:00 - +05 +-# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) (KZ-43) ++ 6:00 - +06 ++# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) (KZ-KZY) + Zone Asia/Qyzylorda 4:21:52 - LMT 1924 May 2 + 4:00 - +04 1930 Jun 21 + 5:00 - +05 1981 Apr 1 +@@ -2526,7 +2513,8 @@ Zone Asia/Qyzylorda 4:21:52 - LMT 1924 May 2 + 5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s + 6:00 - +06 2018 Dec 21 0:00 + 5:00 - +05 +-# Qostanay (aka Kostanay, Kustanay) (KZ-39) ++# ++# Qostanay (aka Kostanay, Kustanay) (KZ-KUS) + # The 1991/2 rules are unclear partly because of the 1997 Turgai + # reorganization. + Zone Asia/Qostanay 4:14:28 - LMT 1924 May 2 +@@ -2537,9 +2525,9 @@ Zone Asia/Qostanay 4:14:28 - LMT 1924 May 2 + 5:00 RussiaAsia +05/+06 1991 Mar 31 2:00s + 4:00 RussiaAsia +04/+05 1992 Jan 19 2:00s + 5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s +- 6:00 - +06 2024 Mar 1 0:00 +- 5:00 - +05 +-# Aqtöbe (aka Aktobe, formerly Aktyubinsk) (KZ-15) ++ 6:00 - +06 ++ ++# Aqtöbe (aka Aktobe, formerly Aktyubinsk) (KZ-AKT) + Zone Asia/Aqtobe 3:48:40 - LMT 1924 May 2 + 4:00 - +04 1930 Jun 21 + 5:00 - +05 1981 Apr 1 +@@ -2549,7 +2537,7 @@ Zone Asia/Aqtobe 3:48:40 - LMT 1924 May 2 + 4:00 RussiaAsia +04/+05 1992 Jan 19 2:00s + 5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s + 5:00 - +05 +-# Mangghystaū (KZ-47) ++# Mangghystaū (KZ-MAN) + # Aqtau was not founded until 1963, but it represents an inhabited region, + # so include timestamps before 1963. + Zone Asia/Aqtau 3:21:04 - LMT 1924 May 2 +@@ -2561,7 +2549,7 @@ Zone Asia/Aqtau 3:21:04 - LMT 1924 May 2 + 5:00 RussiaAsia +05/+06 1994 Sep 25 2:00s + 4:00 RussiaAsia +04/+05 2004 Oct 31 2:00s + 5:00 - +05 +-# Atyraū (KZ-23) is like Mangghystaū except it switched from ++# Atyraū (KZ-ATY) is like Mangghystaū except it switched from + # +04/+05 to +05/+06 in spring 1999, not fall 1994. + Zone Asia/Atyrau 3:27:44 - LMT 1924 May 2 + 3:00 - +03 1930 Jun 21 +@@ -2572,7 +2560,7 @@ Zone Asia/Atyrau 3:27:44 - LMT 1924 May 2 + 5:00 RussiaAsia +05/+06 1999 Mar 28 2:00s + 4:00 RussiaAsia +04/+05 2004 Oct 31 2:00s + 5:00 - +05 +-# West Kazakhstan (KZ-27) ++# West Kazakhstan (KZ-ZAP) + # From Paul Eggert (2016-03-18): + # The 1989 transition is from USSR act No. 227 (1989-03-14). + Zone Asia/Oral 3:25:24 - LMT 1924 May 2 # or Ural'sk +@@ -3491,30 +3479,20 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 + # From Heba Hamad (2023-03-22): + # ... summer time will begin in Palestine from Saturday 04-29-2023, + # 02:00 AM by 60 minutes forward. +-# From Heba Hemad (2023-10-09): +-# ... winter time will begin in Palestine from Saturday 10-28-2023, +-# 02:00 AM by 60 minutes back. +-# +-# From Heba Hamad (2024-01-25): +-# the summer time for the years 2024,2025 will begin in Palestine +-# from Saturday at 02:00 AM by 60 minutes forward as shown below: +-# year date +-# 2024 2024-04-20 +-# 2025 2025-04-12 +-# +-# From Paul Eggert (2024-01-25): ++# ++# From Paul Eggert (2023-03-22): + # For now, guess that spring and fall transitions will normally + # continue to use 2022's rules, that during DST Palestine will switch + # to standard time at 02:00 the last Saturday before Ramadan and back +-# to DST at 02:00 the second Saturday after Ramadan, and that ++# to DST at 02:00 the first Saturday after Ramadan, and that + # if the normal spring-forward or fall-back transition occurs during + # Ramadan the former is delayed and the latter advanced. + # To implement this, I predicted Ramadan-oriented transition dates for +-# 2026 through 2086 by running the following program under GNU Emacs 29.2, ++# 2023 through 2086 by running the following program under GNU Emacs 28.2, + # with the results integrated by hand into the table below. + # Predictions after 2086 are approximated without Ramadan. + # +-# (let ((islamic-year 1447)) ++# (let ((islamic-year 1444)) + # (require 'cal-islam) + # (while (< islamic-year 1510) + # (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) +@@ -3523,7 +3501,6 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 + # (while (/= saturday (mod (setq a (1- a)) 7))) + # (while (/= saturday (mod b 7)) + # (setq b (1+ b))) +-# (setq b (+ 7 b)) + # (setq a (calendar-gregorian-from-absolute a)) + # (setq b (calendar-gregorian-from-absolute b)) + # (insert +@@ -3574,85 +3551,83 @@ Rule Palestine 2021 only - Oct 29 1:00 0 - + Rule Palestine 2022 only - Mar 27 0:00 1:00 S + Rule Palestine 2022 2035 - Oct Sat<=30 2:00 0 - + Rule Palestine 2023 only - Apr 29 2:00 1:00 S +-Rule Palestine 2024 only - Apr 20 2:00 1:00 S +-Rule Palestine 2025 only - Apr 12 2:00 1:00 S ++Rule Palestine 2024 only - Apr 13 2:00 1:00 S ++Rule Palestine 2025 only - Apr 5 2:00 1:00 S + Rule Palestine 2026 2054 - Mar Sat<=30 2:00 1:00 S + Rule Palestine 2036 only - Oct 18 2:00 0 - + Rule Palestine 2037 only - Oct 10 2:00 0 - + Rule Palestine 2038 only - Sep 25 2:00 0 - +-Rule Palestine 2039 only - Sep 17 2:00 0 - ++Rule Palestine 2039 only - Oct 22 2:00 1:00 S ++Rule Palestine 2039 2067 - Oct Sat<=30 2:00 0 - + Rule Palestine 2040 only - Sep 1 2:00 0 - +-Rule Palestine 2040 only - Oct 20 2:00 1:00 S +-Rule Palestine 2040 2067 - Oct Sat<=30 2:00 0 - ++Rule Palestine 2040 only - Oct 13 2:00 1:00 S + Rule Palestine 2041 only - Aug 24 2:00 0 - +-Rule Palestine 2041 only - Oct 5 2:00 1:00 S ++Rule Palestine 2041 only - Sep 28 2:00 1:00 S + Rule Palestine 2042 only - Aug 16 2:00 0 - +-Rule Palestine 2042 only - Sep 27 2:00 1:00 S ++Rule Palestine 2042 only - Sep 20 2:00 1:00 S + Rule Palestine 2043 only - Aug 1 2:00 0 - +-Rule Palestine 2043 only - Sep 19 2:00 1:00 S ++Rule Palestine 2043 only - Sep 12 2:00 1:00 S + Rule Palestine 2044 only - Jul 23 2:00 0 - +-Rule Palestine 2044 only - Sep 3 2:00 1:00 S ++Rule Palestine 2044 only - Aug 27 2:00 1:00 S + Rule Palestine 2045 only - Jul 15 2:00 0 - +-Rule Palestine 2045 only - Aug 26 2:00 1:00 S ++Rule Palestine 2045 only - Aug 19 2:00 1:00 S + Rule Palestine 2046 only - Jun 30 2:00 0 - +-Rule Palestine 2046 only - Aug 18 2:00 1:00 S ++Rule Palestine 2046 only - Aug 11 2:00 1:00 S + Rule Palestine 2047 only - Jun 22 2:00 0 - +-Rule Palestine 2047 only - Aug 3 2:00 1:00 S ++Rule Palestine 2047 only - Jul 27 2:00 1:00 S + Rule Palestine 2048 only - Jun 6 2:00 0 - +-Rule Palestine 2048 only - Jul 25 2:00 1:00 S ++Rule Palestine 2048 only - Jul 18 2:00 1:00 S + Rule Palestine 2049 only - May 29 2:00 0 - +-Rule Palestine 2049 only - Jul 10 2:00 1:00 S ++Rule Palestine 2049 only - Jul 3 2:00 1:00 S + Rule Palestine 2050 only - May 21 2:00 0 - +-Rule Palestine 2050 only - Jul 2 2:00 1:00 S ++Rule Palestine 2050 only - Jun 25 2:00 1:00 S + Rule Palestine 2051 only - May 6 2:00 0 - +-Rule Palestine 2051 only - Jun 24 2:00 1:00 S ++Rule Palestine 2051 only - Jun 17 2:00 1:00 S + Rule Palestine 2052 only - Apr 27 2:00 0 - +-Rule Palestine 2052 only - Jun 8 2:00 1:00 S ++Rule Palestine 2052 only - Jun 1 2:00 1:00 S + Rule Palestine 2053 only - Apr 12 2:00 0 - +-Rule Palestine 2053 only - May 31 2:00 1:00 S ++Rule Palestine 2053 only - May 24 2:00 1:00 S + Rule Palestine 2054 only - Apr 4 2:00 0 - +-Rule Palestine 2054 only - May 23 2:00 1:00 S +-Rule Palestine 2055 only - May 8 2:00 1:00 S +-Rule Palestine 2056 only - Apr 29 2:00 1:00 S +-Rule Palestine 2057 only - Apr 14 2:00 1:00 S +-Rule Palestine 2058 only - Apr 6 2:00 1:00 S +-Rule Palestine 2059 max - Mar Sat<=30 2:00 1:00 S ++Rule Palestine 2054 only - May 16 2:00 1:00 S ++Rule Palestine 2055 only - May 1 2:00 1:00 S ++Rule Palestine 2056 only - Apr 22 2:00 1:00 S ++Rule Palestine 2057 only - Apr 7 2:00 1:00 S ++Rule Palestine 2058 max - Mar Sat<=30 2:00 1:00 S + Rule Palestine 2068 only - Oct 20 2:00 0 - + Rule Palestine 2069 only - Oct 12 2:00 0 - + Rule Palestine 2070 only - Oct 4 2:00 0 - + Rule Palestine 2071 only - Sep 19 2:00 0 - + Rule Palestine 2072 only - Sep 10 2:00 0 - +-Rule Palestine 2072 only - Oct 22 2:00 1:00 S +-Rule Palestine 2072 max - Oct Sat<=30 2:00 0 - ++Rule Palestine 2072 only - Oct 15 2:00 1:00 S + Rule Palestine 2073 only - Sep 2 2:00 0 - +-Rule Palestine 2073 only - Oct 14 2:00 1:00 S ++Rule Palestine 2073 only - Oct 7 2:00 1:00 S + Rule Palestine 2074 only - Aug 18 2:00 0 - +-Rule Palestine 2074 only - Oct 6 2:00 1:00 S ++Rule Palestine 2074 only - Sep 29 2:00 1:00 S + Rule Palestine 2075 only - Aug 10 2:00 0 - +-Rule Palestine 2075 only - Sep 21 2:00 1:00 S ++Rule Palestine 2075 only - Sep 14 2:00 1:00 S ++Rule Palestine 2075 max - Oct Sat<=30 2:00 0 - + Rule Palestine 2076 only - Jul 25 2:00 0 - +-Rule Palestine 2076 only - Sep 12 2:00 1:00 S ++Rule Palestine 2076 only - Sep 5 2:00 1:00 S + Rule Palestine 2077 only - Jul 17 2:00 0 - +-Rule Palestine 2077 only - Sep 4 2:00 1:00 S ++Rule Palestine 2077 only - Aug 28 2:00 1:00 S + Rule Palestine 2078 only - Jul 9 2:00 0 - +-Rule Palestine 2078 only - Aug 20 2:00 1:00 S ++Rule Palestine 2078 only - Aug 13 2:00 1:00 S + Rule Palestine 2079 only - Jun 24 2:00 0 - +-Rule Palestine 2079 only - Aug 12 2:00 1:00 S ++Rule Palestine 2079 only - Aug 5 2:00 1:00 S + Rule Palestine 2080 only - Jun 15 2:00 0 - +-Rule Palestine 2080 only - Jul 27 2:00 1:00 S ++Rule Palestine 2080 only - Jul 20 2:00 1:00 S + Rule Palestine 2081 only - Jun 7 2:00 0 - +-Rule Palestine 2081 only - Jul 19 2:00 1:00 S ++Rule Palestine 2081 only - Jul 12 2:00 1:00 S + Rule Palestine 2082 only - May 23 2:00 0 - +-Rule Palestine 2082 only - Jul 11 2:00 1:00 S ++Rule Palestine 2082 only - Jul 4 2:00 1:00 S + Rule Palestine 2083 only - May 15 2:00 0 - +-Rule Palestine 2083 only - Jun 26 2:00 1:00 S ++Rule Palestine 2083 only - Jun 19 2:00 1:00 S + Rule Palestine 2084 only - Apr 29 2:00 0 - +-Rule Palestine 2084 only - Jun 17 2:00 1:00 S ++Rule Palestine 2084 only - Jun 10 2:00 1:00 S + Rule Palestine 2085 only - Apr 21 2:00 0 - +-Rule Palestine 2085 only - Jun 9 2:00 1:00 S ++Rule Palestine 2085 only - Jun 2 2:00 1:00 S + Rule Palestine 2086 only - Apr 13 2:00 0 - +-Rule Palestine 2086 only - May 25 2:00 1:00 S +- ++Rule Palestine 2086 only - May 18 2:00 1:00 S + # Zone NAME STDOFF RULES FORMAT [UNTIL] + Zone Asia/Gaza 2:17:52 - LMT 1900 Oct + 2:00 Zion EET/EEST 1948 May 15 +@@ -3679,7 +3654,7 @@ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct + + # Philippines + +-# From Paul Eggert (2024-01-21): ++# From Paul Eggert (2018-11-18): + # The Spanish initially used American (west-of-Greenwich) time. + # It is unknown what time Manila kept when the British occupied it from + # 1762-10-06 through 1764-04; for now assume it kept American time. +@@ -3687,7 +3662,7 @@ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct + # Philippines, issued a proclamation announcing that 1844-12-30 was to + # be immediately followed by 1845-01-01; see R.H. van Gent's + # History of the International Date Line +-# https://webspace.science.uu.nl/~gent0113/idl/idl_philippines.htm ++# https://www.staff.science.uu.nl/~gent0113/idl/idl_philippines.htm + + # From P Chan (2021-05-10): + # Here's a fairly comprehensive article in Japanese: +@@ -4165,8 +4140,7 @@ Zone Asia/Tashkent 4:37:11 - LMT 1924 May 2 + # The English-language name of Vietnam's most populous city is "Ho Chi Minh + # City"; use Ho_Chi_Minh below to avoid a name of more than 14 characters. + +-# From Paul Eggert (2024-01-14) after a 2014 heads-up from Trần Ngọc Quân +-# and a 2024-01-14 heads-up from Đoàn Trần Công Danh: ++# From Paul Eggert (2022-07-27) after a 2014 heads-up from Trần Ngọc Quân: + # Trần Tiến Bình's authoritative book "Lịch Việt Nam: thế kỷ XX-XXI (1901-2100)" + # (Nhà xuất bản Văn Hoá - Thông Tin, Hanoi, 2005), pp 49-50, + # is quoted verbatim in: +@@ -4196,34 +4170,15 @@ Zone Asia/Tashkent 4:37:11 - LMT 1924 May 2 + # + # Trần cites the following sources; it's unclear which supplied the info above. + # +-# Hoàng Xuân Hãn: "Lịch và lịch Việt Nam". Tập san Khoa học Xã hội, +-# No. 9, Paris, February 1982. +-# +-# Lê Thành Lân: "Lịch và niên biểu lịch sử hai mươi thế kỷ (0001-2010)", +-# NXB Thống kê, Hanoi, 2000. +-# +-# Lê Thành Lân: "Lịch hai thế kỷ (1802-2010) và các lịch vĩnh cửu", +-# NXB Thuận Hoá, Huế, 1995. + # +-# Here is the decision for the September 1945 transition: +-# Võ Nguyên Giáp, Việt Nam Dân Quốc Công Báo, No. 1 (1945-09-29), page 13 +-# http://baochi.nlv.gov.vn/baochi/cgi-bin/baochi?a=d&d=JwvzO19450929.2.5&dliv=none +-# It says that on 1945-09-01 at 24:00, Vietnam moved back two hours, to +07. +-# It also mentions a 1945-03-29 decree (by a Japanese Governor-General) +-# to set the time zone to +09, but does not say whether that decree +-# merely legalized an earlier change to +09. ++# Hoàng Xuân Hãn: "Lịch và lịch Việt Nam". Tập san Khoa học Xã hội, ++# No. 9, Paris, February 1982. + # +-# July 1955 transition: +-# Ngô Đình Diệm, Công Báo Việt Nam, No. 92 (1955-07-02), page 1780-1781 +-# Ordinance (Dụ) No. 46 (1955-06-25) +-# http://ddsnext.crl.edu/titles/32341#?c=0&m=29&s=0&cv=4&r=0&xywh=-89%2C342%2C1724%2C1216 +-# It says that on 1955-07-01 at 01:00, South Vietnam moved back 1 hour (to +07). ++# Lê Thành Lân: "Lịch và niên biểu lịch sử hai mươi thế kỷ (0001-2010)", ++# NXB Thống kê, Hanoi, 2000. + # +-# December 1959 transition: +-# Ngô Đình Diệm, Công Báo Việt Nam Cộng Hòa, 1960 part 1 (1960-01-02), page 62 +-# Decree (Sắc lệnh) No. 362-TTP (1959-12-30) +-# http://ddsnext.crl.edu/titles/32341#?c=0&m=138&s=0&cv=793&r=0&xywh=-54%2C1504%2C1705%2C1202 +-# It says that on 1959-12-31 at 23:00, South Vietnam moved forward 1 hour (to +08). ++# Lê Thành Lân: "Lịch hai thế kỷ (1802-2010) và các lịch vĩnh cửu", ++# NXB Thuận Hoá, Huế, 1995. + + + # Zone NAME STDOFF RULES FORMAT [UNTIL] +@@ -4232,9 +4187,9 @@ Zone Asia/Ho_Chi_Minh 7:06:30 - LMT 1906 Jul 1 + 7:06:30 - PLMT 1911 May 1 # Phù Liễn MT + 7:00 - +07 1942 Dec 31 23:00 + 8:00 - +08 1945 Mar 14 23:00 +- 9:00 - +09 1945 Sep 1 24:00 ++ 9:00 - +09 1945 Sep 2 + 7:00 - +07 1947 Apr 1 +- 8:00 - +08 1955 Jul 1 01:00 ++ 8:00 - +08 1955 Jul 1 + 7:00 - +07 1959 Dec 31 23:00 + 8:00 - +08 1975 Jun 13 + 7:00 - +07 + +diff --git a/jdk/test/sun/util/calendar/zi/tzdata/europe b/jdk/test/sun/util/calendar/zi/tzdata/europe +index 43a9f4e1f..ade32d92c 100644 +--- a/jdk/test/sun/util/calendar/zi/tzdata/europe ++++ b/jdk/test/sun/util/calendar/zi/tzdata/europe +@@ -1005,33 +1005,9 @@ Zone Europe/Sofia 1:33:16 - LMT 1880 + # Czech Republic (Czechia) + # Slovakia + # +-# From Ivan Benovic (2024-01-30): +-# https://www.slov-lex.sk/pravne-predpisy/SK/ZZ/1946/54/ +-# (This is an official link to the Czechoslovak Summer Time Act of +-# March 8, 1946 that authorizes the Czechoslovak government to set the +-# exact dates of change to summer time and back to Central European Time. +-# The act also implicitly confirms Central European Time as the +-# official time zone of Czechoslovakia and currently remains in force +-# in both the Czech Republic and Slovakia.) +-# https://www.psp.cz/eknih/1945pns/tisky/t0216_00.htm +-# (This is a link to the original legislative proposal dating back to +-# February 22, 1946. The accompanying memorandum to the proposal says +-# that an advisory committee on European railroad transportation that +-# met in Brussels in October 1945 decided that the change of time +-# should be carried out in all participating countries in a strictly +-# coordinated manner....) +-# +-# From Paul Eggert (2024-01-30): +-# The source for Czech data is: Kdy začíná a končí letní čas. ++# From Paul Eggert (2018-04-15): ++# The source for Czech data is: Kdy začíná a končí letní čas. 2018-04-15. + # https://kalendar.beda.cz/kdy-zacina-a-konci-letni-cas +-# Its main text disagrees with its quoted sources only in 1918, +-# where the main text says spring and autumn transitions +-# occurred at 02:00 and 03:00 respectively (as usual), +-# whereas the 1918 source "Oznámení o zavedení letního času v roce 1918" +-# says transitions were at 01:00 and 02:00 respectively. +-# As the 1918 source appears to be a humorous piece, and it is +-# unlikely that Prague would have disagreed with its neighbors by an hour, +-# go with the main text for now. + # + # We know of no English-language name for historical Czech winter time; + # abbreviate it as "GMT", as it happened to be GMT. +@@ -1163,23 +1139,6 @@ Zone Atlantic/Faroe -0:27:04 - LMT 1908 Jan 11 # Tórshavn + # 2. The shift *from* DST in 2023 happens as normal, but coincides with the + # shift to UTC-02 normaltime (people will not change their clocks here). + # 3. After this, DST is still observed, but as -02/-01 instead of -03/-02. +-# +-# From Múte Bourup Egede via Jógvan Svabo Samuelsen (2023-03-15): +-# Greenland will not switch to Daylight Saving Time this year, 2023, +-# because the standard time for Greenland will change from UTC -3 to UTC -2. +-# However, Greenland will change to Daylight Saving Time again in 2024 +-# and onwards. +- +-# From Jule Dabars (2023-10-29): +-# https://www.dr.dk/nyheder/seneste/i-nat-skal-uret-stilles-en-time-tilbage-men-foerste-gang-sker-det-ikke-i-groenland +-# with a link to that page: +-# https://naalakkersuisut.gl/Nyheder/2023/10/2710_sommertid +-# ... Ittoqqortoormiit joins the time of Nuuk at March 2024. +-# What would mean that America/Scoresbysund would either be in -01 year round +-# or in -02/-01 like America/Nuuk, but no longer in -01/+00. +-# +-# From Paul Eggert (2023-10-29): +-# For now, assume it will be like America/Nuuk. + + # Rule NAME FROM TO - IN ON AT SAVE LETTER/S + Rule Thule 1991 1992 - Mar lastSun 2:00 1:00 D +@@ -1200,12 +1159,10 @@ Zone America/Danmarkshavn -1:14:40 - LMT 1916 Jul 28 + Zone America/Scoresbysund -1:27:52 - LMT 1916 Jul 28 # Ittoqqortoormiit + -2:00 - -02 1980 Apr 6 2:00 + -2:00 C-Eur -02/-01 1981 Mar 29 +- -1:00 EU -01/+00 2024 Mar 31 +- -2:00 EU -02/-01 ++ -1:00 EU -01/+00 + Zone America/Nuuk -3:26:56 - LMT 1916 Jul 28 # Godthåb + -3:00 - -03 1980 Apr 6 2:00 +- -3:00 EU -03/-02 2023 Mar 26 1:00u +- -2:00 - -02 2023 Oct 29 1:00u ++ -3:00 EU -03/-02 2023 Oct 29 1:00u + -2:00 EU -02/-01 + Zone America/Thule -4:35:08 - LMT 1916 Jul 28 # Pituffik + -4:00 Thule A%sT +@@ -3965,7 +3922,11 @@ Zone Europe/Istanbul 1:55:52 - LMT 1880 + # and not at 3:00 as would have been under EU rules. + # This is why I have set the change to EU rules into May 1996, + # so that the change in March is stil covered by the Ukraine rule. +-# The next change in October 1996 happened under EU rules. ++# The next change in October 1996 happened under EU rules.... ++# TZ database holds three other zones for Ukraine.... I have not yet ++# worked out the consequences for these three zones, as we (me and my ++# US colleague David Cochrane) are still trying to get more ++# information upon these local deviations from Kiev rules. + # + # From Paul Eggert (2022-08-27): + # For now, assume that Ukraine's zones all followed the same rules, +-- +2.43.5 + diff --git a/add-sw_64-support.patch b/add-sw_64-support.patch index 8cb2f17..0968dab 100644 --- a/add-sw_64-support.patch +++ b/add-sw_64-support.patch @@ -71801,451 +71801,8 @@ index b138ed7fa7..66bd061e8b 100644 # or visit www.oracle.com if you need additional information or have any # questions. # --tzdata2024a +-tzdata2025a +tzdata2023c -diff --git a/jdk/make/data/tzdata/asia b/jdk/make/data/tzdata/asia -index c51170c34a..48a348bf95 100644 ---- a/jdk/make/data/tzdata/asia -+++ b/jdk/make/data/tzdata/asia -@@ -678,6 +678,7 @@ Zone Asia/Shanghai 8:05:43 - LMT 1901 - 8:00 PRC C%sT - # Xinjiang time, used by many in western China; represented by Ürümqi / Ürümchi - # / Wulumuqi. (Please use Asia/Shanghai if you prefer Beijing time.) -+# Vostok base in Antarctica matches this since 1970. - Zone Asia/Urumqi 5:50:20 - LMT 1928 - 6:00 - +06 - -@@ -2480,33 +2481,18 @@ Zone Asia/Amman 2:23:44 - LMT 1931 - # effective December 21st, 2018.... - # http://adilet.zan.kz/rus/docs/P1800000817 (russian language). - --# From Zhanbolat Raimbekov (2024-01-19): --# Kazakhstan (all parts) switching to UTC+5 on March 1, 2024 --# https://www.gov.kz/memleket/entities/mti/press/news/details/688998?lang=ru --# [in Russian] --# (2024-01-20): https://primeminister.kz/ru/decisions/19012024-20 --# --# From Alexander Krivenyshev (2024-01-19): --# According to a different news and the official web site for the Ministry of --# Trade and Integration of the Republic of Kazakhstan: --# https://en.inform.kz/news/kazakhstan-to-switch-to-single-hour-zone-mar-1-54ad0b/ -- - # Zone NAME STDOFF RULES FORMAT [UNTIL] - # - # Almaty (formerly Alma-Ata), representing most locations in Kazakhstan --# This includes Abai/Abay (ISO 3166-2 code KZ-10), Aqmola/Akmola (KZ-11), --# Almaty (KZ-19), Almaty city (KZ-75), Astana city (KZ-71), --# East Kazkhstan (KZ-63), Jambyl/Zhambyl (KZ-31), Jetisu/Zhetysu (KZ-33), --# Karaganda (KZ-35), North Kazakhstan (KZ-59), Pavlodar (KZ-55), --# Shyumkent city (KZ-79), Turkistan (KZ-61), and Ulytau (KZ-62). -+# This includes KZ-AKM, KZ-ALA, KZ-ALM, KZ-AST, KZ-BAY, KZ-VOS, KZ-ZHA, -+# KZ-KAR, KZ-SEV, KZ-PAV, and KZ-YUZ. - Zone Asia/Almaty 5:07:48 - LMT 1924 May 2 # or Alma-Ata - 5:00 - +05 1930 Jun 21 - 6:00 RussiaAsia +06/+07 1991 Mar 31 2:00s - 5:00 RussiaAsia +05/+06 1992 Jan 19 2:00s - 6:00 RussiaAsia +06/+07 2004 Oct 31 2:00s -- 6:00 - +06 2024 Mar 1 0:00 -- 5:00 - +05 --# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) (KZ-43) -+ 6:00 - +06 -+# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) (KZ-KZY) - Zone Asia/Qyzylorda 4:21:52 - LMT 1924 May 2 - 4:00 - +04 1930 Jun 21 - 5:00 - +05 1981 Apr 1 -@@ -2519,7 +2505,8 @@ Zone Asia/Qyzylorda 4:21:52 - LMT 1924 May 2 - 5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s - 6:00 - +06 2018 Dec 21 0:00 - 5:00 - +05 --# Qostanay (aka Kostanay, Kustanay) (KZ-39) -+# -+# Qostanay (aka Kostanay, Kustanay) (KZ-KUS) - # The 1991/2 rules are unclear partly because of the 1997 Turgai - # reorganization. - Zone Asia/Qostanay 4:14:28 - LMT 1924 May 2 -@@ -2530,9 +2517,9 @@ Zone Asia/Qostanay 4:14:28 - LMT 1924 May 2 - 5:00 RussiaAsia +05/+06 1991 Mar 31 2:00s - 4:00 RussiaAsia +04/+05 1992 Jan 19 2:00s - 5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s -- 6:00 - +06 2024 Mar 1 0:00 -- 5:00 - +05 --# Aqtöbe (aka Aktobe, formerly Aktyubinsk) (KZ-15) -+ 6:00 - +06 -+ -+# Aqtöbe (aka Aktobe, formerly Aktyubinsk) (KZ-AKT) - Zone Asia/Aqtobe 3:48:40 - LMT 1924 May 2 - 4:00 - +04 1930 Jun 21 - 5:00 - +05 1981 Apr 1 -@@ -2542,7 +2529,7 @@ Zone Asia/Aqtobe 3:48:40 - LMT 1924 May 2 - 4:00 RussiaAsia +04/+05 1992 Jan 19 2:00s - 5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s - 5:00 - +05 --# Mangghystaū (KZ-47) -+# Mangghystaū (KZ-MAN) - # Aqtau was not founded until 1963, but it represents an inhabited region, - # so include timestamps before 1963. - Zone Asia/Aqtau 3:21:04 - LMT 1924 May 2 -@@ -2554,7 +2541,7 @@ Zone Asia/Aqtau 3:21:04 - LMT 1924 May 2 - 5:00 RussiaAsia +05/+06 1994 Sep 25 2:00s - 4:00 RussiaAsia +04/+05 2004 Oct 31 2:00s - 5:00 - +05 --# Atyraū (KZ-23) is like Mangghystaū except it switched from -+# Atyraū (KZ-ATY) is like Mangghystaū except it switched from - # +04/+05 to +05/+06 in spring 1999, not fall 1994. - Zone Asia/Atyrau 3:27:44 - LMT 1924 May 2 - 3:00 - +03 1930 Jun 21 -@@ -2565,7 +2552,7 @@ Zone Asia/Atyrau 3:27:44 - LMT 1924 May 2 - 5:00 RussiaAsia +05/+06 1999 Mar 28 2:00s - 4:00 RussiaAsia +04/+05 2004 Oct 31 2:00s - 5:00 - +05 --# West Kazakhstan (KZ-27) -+# West Kazakhstan (KZ-ZAP) - # From Paul Eggert (2016-03-18): - # The 1989 transition is from USSR act No. 227 (1989-03-14). - Zone Asia/Oral 3:25:24 - LMT 1924 May 2 # or Ural'sk -@@ -3463,30 +3450,20 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 - # From Heba Hamad (2023-03-22): - # ... summer time will begin in Palestine from Saturday 04-29-2023, - # 02:00 AM by 60 minutes forward. --# From Heba Hemad (2023-10-09): --# ... winter time will begin in Palestine from Saturday 10-28-2023, --# 02:00 AM by 60 minutes back. --# --# From Heba Hamad (2024-01-25): --# the summer time for the years 2024,2025 will begin in Palestine --# from Saturday at 02:00 AM by 60 minutes forward as shown below: --# year date --# 2024 2024-04-20 --# 2025 2025-04-12 --# --# From Paul Eggert (2024-01-25): -+# -+# From Paul Eggert (2023-03-22): - # For now, guess that spring and fall transitions will normally - # continue to use 2022's rules, that during DST Palestine will switch - # to standard time at 02:00 the last Saturday before Ramadan and back --# to DST at 02:00 the second Saturday after Ramadan, and that -+# to DST at 02:00 the first Saturday after Ramadan, and that - # if the normal spring-forward or fall-back transition occurs during - # Ramadan the former is delayed and the latter advanced. - # To implement this, I predicted Ramadan-oriented transition dates for --# 2026 through 2086 by running the following program under GNU Emacs 29.2, -+# 2023 through 2086 by running the following program under GNU Emacs 28.2, - # with the results integrated by hand into the table below. - # Predictions after 2086 are approximated without Ramadan. - # --# (let ((islamic-year 1447)) -+# (let ((islamic-year 1444)) - # (require 'cal-islam) - # (while (< islamic-year 1510) - # (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) -@@ -3495,7 +3472,6 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 - # (while (/= saturday (mod (setq a (1- a)) 7))) - # (while (/= saturday (mod b 7)) - # (setq b (1+ b))) --# (setq b (+ 7 b)) - # (setq a (calendar-gregorian-from-absolute a)) - # (setq b (calendar-gregorian-from-absolute b)) - # (insert -@@ -3546,84 +3522,84 @@ Rule Palestine 2021 only - Oct 29 1:00 0 - - Rule Palestine 2022 only - Mar 27 0:00 1:00 S - Rule Palestine 2022 2035 - Oct Sat<=30 2:00 0 - - Rule Palestine 2023 only - Apr 29 2:00 1:00 S --Rule Palestine 2024 only - Apr 20 2:00 1:00 S --Rule Palestine 2025 only - Apr 12 2:00 1:00 S -+Rule Palestine 2024 only - Apr 13 2:00 1:00 S -+Rule Palestine 2025 only - Apr 5 2:00 1:00 S - Rule Palestine 2026 2054 - Mar Sat<=30 2:00 1:00 S - Rule Palestine 2036 only - Oct 18 2:00 0 - - Rule Palestine 2037 only - Oct 10 2:00 0 - - Rule Palestine 2038 only - Sep 25 2:00 0 - - Rule Palestine 2039 only - Sep 17 2:00 0 - -+Rule Palestine 2039 only - Oct 22 2:00 1:00 S -+Rule Palestine 2039 2067 - Oct Sat<=30 2:00 0 - - Rule Palestine 2040 only - Sep 1 2:00 0 - --Rule Palestine 2040 only - Oct 20 2:00 1:00 S --Rule Palestine 2040 2067 - Oct Sat<=30 2:00 0 - -+Rule Palestine 2040 only - Oct 13 2:00 1:00 S - Rule Palestine 2041 only - Aug 24 2:00 0 - --Rule Palestine 2041 only - Oct 5 2:00 1:00 S -+Rule Palestine 2041 only - Sep 28 2:00 1:00 S - Rule Palestine 2042 only - Aug 16 2:00 0 - --Rule Palestine 2042 only - Sep 27 2:00 1:00 S -+Rule Palestine 2042 only - Sep 20 2:00 1:00 S - Rule Palestine 2043 only - Aug 1 2:00 0 - --Rule Palestine 2043 only - Sep 19 2:00 1:00 S -+Rule Palestine 2043 only - Sep 12 2:00 1:00 S - Rule Palestine 2044 only - Jul 23 2:00 0 - --Rule Palestine 2044 only - Sep 3 2:00 1:00 S -+Rule Palestine 2044 only - Aug 27 2:00 1:00 S - Rule Palestine 2045 only - Jul 15 2:00 0 - --Rule Palestine 2045 only - Aug 26 2:00 1:00 S -+Rule Palestine 2045 only - Aug 19 2:00 1:00 S - Rule Palestine 2046 only - Jun 30 2:00 0 - --Rule Palestine 2046 only - Aug 18 2:00 1:00 S -+Rule Palestine 2046 only - Aug 11 2:00 1:00 S - Rule Palestine 2047 only - Jun 22 2:00 0 - --Rule Palestine 2047 only - Aug 3 2:00 1:00 S -+Rule Palestine 2047 only - Jul 27 2:00 1:00 S - Rule Palestine 2048 only - Jun 6 2:00 0 - --Rule Palestine 2048 only - Jul 25 2:00 1:00 S -+Rule Palestine 2048 only - Jul 18 2:00 1:00 S - Rule Palestine 2049 only - May 29 2:00 0 - --Rule Palestine 2049 only - Jul 10 2:00 1:00 S -+Rule Palestine 2049 only - Jul 3 2:00 1:00 S - Rule Palestine 2050 only - May 21 2:00 0 - --Rule Palestine 2050 only - Jul 2 2:00 1:00 S -+Rule Palestine 2050 only - Jun 25 2:00 1:00 S - Rule Palestine 2051 only - May 6 2:00 0 - --Rule Palestine 2051 only - Jun 24 2:00 1:00 S -+Rule Palestine 2051 only - Jun 17 2:00 1:00 S - Rule Palestine 2052 only - Apr 27 2:00 0 - --Rule Palestine 2052 only - Jun 8 2:00 1:00 S -+Rule Palestine 2052 only - Jun 1 2:00 1:00 S - Rule Palestine 2053 only - Apr 12 2:00 0 - --Rule Palestine 2053 only - May 31 2:00 1:00 S -+Rule Palestine 2053 only - May 24 2:00 1:00 S - Rule Palestine 2054 only - Apr 4 2:00 0 - --Rule Palestine 2054 only - May 23 2:00 1:00 S --Rule Palestine 2055 only - May 8 2:00 1:00 S --Rule Palestine 2056 only - Apr 29 2:00 1:00 S --Rule Palestine 2057 only - Apr 14 2:00 1:00 S --Rule Palestine 2058 only - Apr 6 2:00 1:00 S --Rule Palestine 2059 max - Mar Sat<=30 2:00 1:00 S -+Rule Palestine 2054 only - May 16 2:00 1:00 S -+Rule Palestine 2055 only - May 1 2:00 1:00 S -+Rule Palestine 2056 only - Apr 22 2:00 1:00 S -+Rule Palestine 2057 only - Apr 7 2:00 1:00 S -+Rule Palestine 2058 max - Mar Sat<=30 2:00 1:00 S - Rule Palestine 2068 only - Oct 20 2:00 0 - - Rule Palestine 2069 only - Oct 12 2:00 0 - - Rule Palestine 2070 only - Oct 4 2:00 0 - - Rule Palestine 2071 only - Sep 19 2:00 0 - - Rule Palestine 2072 only - Sep 10 2:00 0 - --Rule Palestine 2072 only - Oct 22 2:00 1:00 S --Rule Palestine 2072 max - Oct Sat<=30 2:00 0 - -+Rule Palestine 2072 only - Oct 15 2:00 1:00 S - Rule Palestine 2073 only - Sep 2 2:00 0 - --Rule Palestine 2073 only - Oct 14 2:00 1:00 S -+Rule Palestine 2073 only - Oct 7 2:00 1:00 S - Rule Palestine 2074 only - Aug 18 2:00 0 - --Rule Palestine 2074 only - Oct 6 2:00 1:00 S -+Rule Palestine 2074 only - Sep 29 2:00 1:00 S - Rule Palestine 2075 only - Aug 10 2:00 0 - --Rule Palestine 2075 only - Sep 21 2:00 1:00 S -+Rule Palestine 2075 only - Sep 14 2:00 1:00 S -+Rule Palestine 2075 max - Oct Sat<=30 2:00 0 - - Rule Palestine 2076 only - Jul 25 2:00 0 - --Rule Palestine 2076 only - Sep 12 2:00 1:00 S -+Rule Palestine 2076 only - Sep 5 2:00 1:00 S - Rule Palestine 2077 only - Jul 17 2:00 0 - --Rule Palestine 2077 only - Sep 4 2:00 1:00 S -+Rule Palestine 2077 only - Aug 28 2:00 1:00 S - Rule Palestine 2078 only - Jul 9 2:00 0 - --Rule Palestine 2078 only - Aug 20 2:00 1:00 S -+Rule Palestine 2078 only - Aug 13 2:00 1:00 S - Rule Palestine 2079 only - Jun 24 2:00 0 - --Rule Palestine 2079 only - Aug 12 2:00 1:00 S -+Rule Palestine 2079 only - Aug 5 2:00 1:00 S - Rule Palestine 2080 only - Jun 15 2:00 0 - --Rule Palestine 2080 only - Jul 27 2:00 1:00 S -+Rule Palestine 2080 only - Jul 20 2:00 1:00 S - Rule Palestine 2081 only - Jun 7 2:00 0 - --Rule Palestine 2081 only - Jul 19 2:00 1:00 S -+Rule Palestine 2081 only - Jul 12 2:00 1:00 S - Rule Palestine 2082 only - May 23 2:00 0 - --Rule Palestine 2082 only - Jul 11 2:00 1:00 S -+Rule Palestine 2082 only - Jul 4 2:00 1:00 S - Rule Palestine 2083 only - May 15 2:00 0 - --Rule Palestine 2083 only - Jun 26 2:00 1:00 S -+Rule Palestine 2083 only - Jun 19 2:00 1:00 S - Rule Palestine 2084 only - Apr 29 2:00 0 - --Rule Palestine 2084 only - Jun 17 2:00 1:00 S -+Rule Palestine 2084 only - Jun 10 2:00 1:00 S - Rule Palestine 2085 only - Apr 21 2:00 0 - --Rule Palestine 2085 only - Jun 9 2:00 1:00 S -+Rule Palestine 2085 only - Jun 2 2:00 1:00 S - Rule Palestine 2086 only - Apr 13 2:00 0 - --Rule Palestine 2086 only - May 25 2:00 1:00 S -+Rule Palestine 2086 only - May 18 2:00 1:00 S - - # Zone NAME STDOFF RULES FORMAT [UNTIL] - Zone Asia/Gaza 2:17:52 - LMT 1900 Oct -@@ -3651,7 +3627,7 @@ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct - - # Philippines - --# From Paul Eggert (2024-01-21): -+# From Paul Eggert (2018-11-18): - # The Spanish initially used American (west-of-Greenwich) time. - # It is unknown what time Manila kept when the British occupied it from - # 1762-10-06 through 1764-04; for now assume it kept American time. -@@ -3659,7 +3635,7 @@ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct - # Philippines, issued a proclamation announcing that 1844-12-30 was to - # be immediately followed by 1845-01-01; see R.H. van Gent's - # History of the International Date Line --# https://webspace.science.uu.nl/~gent0113/idl/idl_philippines.htm -+# https://www.staff.science.uu.nl/~gent0113/idl/idl_philippines.htm - # The rest of the data entries are from Shanks & Pottenger. - - # From Jesper Nørgaard Welen (2006-04-26): -@@ -4086,8 +4062,7 @@ Zone Asia/Tashkent 4:37:11 - LMT 1924 May 2 - # The English-language name of Vietnam's most populous city is "Ho Chi Minh - # City"; use Ho_Chi_Minh below to avoid a name of more than 14 characters. - --# From Paul Eggert (2024-01-14) after a 2014 heads-up from Trần Ngọc Quân --# and a 2024-01-14 heads-up from Đoàn Trần Công Danh: -+# From Paul Eggert (2022-07-27) after a 2014 heads-up from Trần Ngọc Quân: - # Trần Tiến Bình's authoritative book "Lịch Việt Nam: thế kỷ XX-XXI (1901-2100)" - # (Nhà xuất bản Văn Hoá - Thông Tin, Hanoi, 2005), pp 49-50, - # is quoted verbatim in: -@@ -4117,35 +4092,14 @@ Zone Asia/Tashkent 4:37:11 - LMT 1924 May 2 - # - # Trần cites the following sources; it's unclear which supplied the info above. - # --# Hoàng Xuân Hãn: "Lịch và lịch Việt Nam". Tập san Khoa học Xã hội, --# No. 9, Paris, February 1982. --# --# Lê Thành Lân: "Lịch và niên biểu lịch sử hai mươi thế kỷ (0001-2010)", --# NXB Thống kê, Hanoi, 2000. -+# Hoàng Xuân Hãn: "Lịch và lịch Việt Nam". Tập san Khoa học Xã hội, -+# No. 9, Paris, February 1982. - # --# Lê Thành Lân: "Lịch hai thế kỷ (1802-2010) và các lịch vĩnh cửu", --# NXB Thuận Hoá, Huế, 1995. -+# Lê Thành Lân: "Lịch và niên biểu lịch sử hai mươi thế kỷ (0001-2010)", -+# NXB Thống kê, Hanoi, 2000. - # --# Here is the decision for the September 1945 transition: --# Võ Nguyên Giáp, Việt Nam Dân Quốc Công Báo, No. 1 (1945-09-29), page 13 --# http://baochi.nlv.gov.vn/baochi/cgi-bin/baochi?a=d&d=JwvzO19450929.2.5&dliv=none --# It says that on 1945-09-01 at 24:00, Vietnam moved back two hours, to +07. --# It also mentions a 1945-03-29 decree (by a Japanese Goveror-General) --# to set the time zone to +09, but does not say whether that decree --# merely legalized an earlier change to +09. --# --# July 1955 transition: --# Ngô Đình Diệm, Công Báo Việt Nam, No. 92 (1955-07-02), page 1780-1781 --# Ordinance (Dụ) No. 46 (1955-06-25) --# http://ddsnext.crl.edu/titles/32341#?c=0&m=29&s=0&cv=4&r=0&xywh=-89%2C342%2C1724%2C1216 --# It says that on 1955-07-01 at 01:00, South Vietnam moved back 1 hour (to +07). --# --# December 1959 transition: --# Ngô Đình Diệm, Công Báo Việt Nam Cộng Hòa, 1960 part 1 (1960-01-02), page 62 --# Decree (Sắc lệnh) No. 362-TTP (1959-12-30) --# http://ddsnext.crl.edu/titles/32341#?c=0&m=138&s=0&cv=793&r=0&xywh=-54%2C1504%2C1705%2C1202 --# It says that on 1959-12-31 at 23:00, South Vietnam moved forward 1 hour (to +08). -- -+# Lê Thành Lân: "Lịch hai thế kỷ (1802-2010) và các lịch vĩnh cửu", -+# NXB Thuận Hoá, Huế, 1995. - - # Zone NAME STDOFF RULES FORMAT [UNTIL] - #STDOFF 7:06:30.13 -@@ -4153,9 +4107,9 @@ Zone Asia/Ho_Chi_Minh 7:06:30 - LMT 1906 Jul 1 - 7:06:30 - PLMT 1911 May 1 # Phù Liễn MT - 7:00 - +07 1942 Dec 31 23:00 - 8:00 - +08 1945 Mar 14 23:00 -- 9:00 - +09 1945 Sep 1 24:00 -+ 9:00 - +09 1945 Sep 2 - 7:00 - +07 1947 Apr 1 -- 8:00 - +08 1955 Jul 1 01:00 -+ 8:00 - +08 1955 Jul 1 - 7:00 - +07 1959 Dec 31 23:00 - 8:00 - +08 1975 Jun 13 - 7:00 - +07 -diff --git a/jdk/make/data/tzdata/europe b/jdk/make/data/tzdata/europe -index 853df30ef8..5a0e516fdd 100644 ---- a/jdk/make/data/tzdata/europe -+++ b/jdk/make/data/tzdata/europe -@@ -1013,34 +1013,9 @@ Zone Europe/Sofia 1:33:16 - LMT 1880 - # Czech Republic (Czechia) - # Slovakia - # --# From Ivan Benovic (2024-01-30): --# https://www.slov-lex.sk/pravne-predpisy/SK/ZZ/1946/54/ --# (This is an official link to the Czechoslovak Summer Time Act of --# March 8, 1946 that authorizes the Czechoslovak government to set the --# exact dates of change to summer time and back to Central European Time. --# The act also implicitly confirms Central European Time as the --# official time zone of Czechoslovakia and currently remains in force --# in both the Czech Republic and Slovakia.) --# https://www.psp.cz/eknih/1945pns/tisky/t0216_00.htm --# (This is a link to the original legislative proposal dating back to --# February 22, 1946. The accompanying memorandum to the proposal says --# that an advisory committee on European railroad transportation that --# met in Brussels in October 1945 decided that the change of time --# should be carried out in all participating countries in a strictly --# coordinated manner....) --# --# From Paul Eggert (2024-01-30): --# The source for Czech data is: Kdy začíná a končí letní čas. -+# From Paul Eggert (2018-04-15): -+# The source for Czech data is: Kdy začíná a končí letní čas. 2018-04-15. - # https://kalendar.beda.cz/kdy-zacina-a-konci-letni-cas --# Its main text disagrees with its quoted sources only in 1918, --# where the main text says spring and autumn transitions --# occurred at 02:00 and 03:00 respectively (as usual), --# whereas the 1918 source "Oznámení o zavedení letního času v roce 1918" --# says transitions were at 01:00 and 02:00 respectively. --# As the 1918 source appears to be a humorous piece, and it is --# unlikely that Prague would have disagreed with its neighbors by an hour, --# go with the main text for now. --# - # We know of no English-language name for historical Czech winter time; - # abbreviate it as "GMT", as it happened to be GMT. - # -@@ -1171,23 +1146,6 @@ Zone Atlantic/Faroe -0:27:04 - LMT 1908 Jan 11 # Tórshavn - # 2. The shift *from* DST in 2023 happens as normal, but coincides with the - # shift to UTC-02 normaltime (people will not change their clocks here). - # 3. After this, DST is still observed, but as -02/-01 instead of -03/-02. --# --# From Múte Bourup Egede via Jógvan Svabo Samuelsen (2023-03-15): --# Greenland will not switch to Daylight Saving Time this year, 2023, --# because the standard time for Greenland will change from UTC -3 to UTC -2. --# However, Greenland will change to Daylight Saving Time again in 2024 --# and onwards. -- --# From a contributor who wishes to remain anonymous for now (2023-10-29): --# https://www.dr.dk/nyheder/seneste/i-nat-skal-uret-stilles-en-time-tilbage-men-foerste-gang-sker-det-ikke-i-groenland --# with a link to that page: --# https://naalakkersuisut.gl/Nyheder/2023/10/2710_sommertid --# ... Ittoqqortoormiit joins the time of Nuuk at March 2024. --# What would mean that America/Scoresbysund would either be in -01 year round --# or in -02/-01 like America/Nuuk, but no longer in -01/+00. --# --# From Paul Eggert (2023-10-29): --# For now, assume it will be like America/Nuuk. - - # Rule NAME FROM TO - IN ON AT SAVE LETTER/S - Rule Thule 1991 1992 - Mar lastSun 2:00 1:00 D -@@ -1208,12 +1166,10 @@ Zone America/Danmarkshavn -1:14:40 - LMT 1916 Jul 28 - Zone America/Scoresbysund -1:27:52 - LMT 1916 Jul 28 # Ittoqqortoormiit - -2:00 - -02 1980 Apr 6 2:00 - -2:00 C-Eur -02/-01 1981 Mar 29 -- -1:00 EU -01/+00 2024 Mar 31 -- -2:00 EU -02/-01 -+ -1:00 EU -01/+00 - Zone America/Nuuk -3:26:56 - LMT 1916 Jul 28 # Godthåb - -3:00 - -03 1980 Apr 6 2:00 -- -3:00 EU -03/-02 2023 Mar 26 1:00u -- -2:00 - -02 2023 Oct 29 1:00u -+ -3:00 EU -03/-02 2023 Oct 29 1:00u - -2:00 EU -02/-01 - Zone America/Thule -4:35:08 - LMT 1916 Jul 28 # Pituffik - -4:00 Thule A%sT -@@ -3778,7 +3734,11 @@ Zone Europe/Istanbul 1:55:52 - LMT 1880 - # and not at 3:00 as would have been under EU rules. - # This is why I have set the change to EU rules into May 1996, - # so that the change in March is stil covered by the Ukraine rule. --# The next change in October 1996 happened under EU rules. -+# The next change in October 1996 happened under EU rules.... -+# TZ database holds three other zones for Ukraine.... I have not yet -+# worked out the consequences for these three zones, as we (me and my -+# US colleague David Cochrane) are still trying to get more -+# information upon these local deviations from Kiev rules. - # - # From Paul Eggert (2022-08-27): - # For now, assume that Ukraine's zones all followed the same rules, diff --git a/jdk/make/data/tzdata/leapseconds b/jdk/make/data/tzdata/leapseconds index 8e7df3de98..89ce8b89cd 100644 --- a/jdk/make/data/tzdata/leapseconds @@ -72271,17 +71828,17 @@ index 8e7df3de98..89ce8b89cd 100644 # Any additional leap seconds will come after this. # This Expires line is commented out for now, # so that pre-2020a zic implementations do not reject this file. --#Expires 2024 Dec 28 00:00:00 +-#Expires 2025 Dec 28 00:00:00 +#Expires 2023 Dec 28 00:00:00 # POSIX timestamps for the data in this file: --#updated 1704708379 (2024-01-08 10:06:19 UTC) --#expires 1735344000 (2024-12-28 00:00:00 UTC) +-#updated 1736208000 (2025-01-07 00:00:00 UTC) +-#expires 1766880000 (2025-12-28 00:00:00 UTC) +#updated 1467936000 (2016-07-08 00:00:00 UTC) +#expires 1703721600 (2023-12-28 00:00:00 UTC) -# Updated through IERS Bulletin C (https://hpiers.obspm.fr/iers/bul/bulc/bulletinc.dat) --# File expires on 28 December 2024 +-# File expires on 28 December 2025 +# Updated through IERS Bulletin C65 +# File expires on: 28 December 2023 diff --git a/jdk/make/data/tzdata/zone.tab b/jdk/make/data/tzdata/zone.tab @@ -72492,77 +72049,6 @@ index 677eb6962f..7351f1d04d 100644 + (const_jargs != NULL) ? JNI_TRUE : JNI_FALSE, + const_cpwildcard, const_javaw, const_ergo_class); } -diff --git a/jdk/src/share/classes/com/sun/crypto/provider/RSACipher.java b/jdk/src/share/classes/com/sun/crypto/provider/RSACipher.java -index c90f7efcbd..e6921467b6 100644 ---- a/jdk/src/share/classes/com/sun/crypto/provider/RSACipher.java -+++ b/jdk/src/share/classes/com/sun/crypto/provider/RSACipher.java -@@ -98,7 +98,6 @@ public final class RSACipher extends CipherSpi { - - // cipher parameter for OAEP padding and TLS RSA premaster secret - private AlgorithmParameterSpec spec = null; -- private boolean forTlsPremasterSecret = false; - - // buffer for the data - private byte[] buffer; -@@ -291,7 +290,6 @@ public final class RSACipher extends CipherSpi { - } - - spec = params; -- forTlsPremasterSecret = true; - this.random = random; // for TLS RSA premaster secret - } - int blockType = (mode <= MODE_DECRYPT) ? RSAPadding.PAD_BLOCKTYPE_2 -@@ -383,7 +381,7 @@ public final class RSACipher extends CipherSpi { - byte[] decryptBuffer = RSACore.convert(buffer, 0, bufOfs); - paddingCopy = RSACore.rsa(decryptBuffer, privateKey, false); - result = padding.unpad(paddingCopy); -- if (result == null && !forTlsPremasterSecret) { -+ if (result == null) { - throw new BadPaddingException - ("Padding error in decryption"); - } -@@ -471,22 +469,26 @@ public final class RSACipher extends CipherSpi { - - boolean isTlsRsaPremasterSecret = - algorithm.equals("TlsRsaPremasterSecret"); -+ Exception failover = null; - byte[] encoded = null; - - update(wrappedKey, 0, wrappedKey.length); - try { - encoded = doFinal(); -- } catch (BadPaddingException | IllegalBlockSizeException e) { -- // BadPaddingException cannot happen for TLS RSA unwrap. -- // In that case, padding error is indicated by returning null. -- // IllegalBlockSizeException cannot happen in any case, -- // because of the length check above. -+ } catch (BadPaddingException e) { -+ if (isTlsRsaPremasterSecret) { -+ failover = e; -+ } else { -+ throw new InvalidKeyException("Unwrapping failed", e); -+ } -+ } catch (IllegalBlockSizeException e) { -+ // should not occur, handled with length check above - throw new InvalidKeyException("Unwrapping failed", e); - } - - try { - if (isTlsRsaPremasterSecret) { -- if (!forTlsPremasterSecret) { -+ if (!(spec instanceof TlsRsaPremasterSecretParameterSpec)) { - throw new IllegalStateException( - "No TlsRsaPremasterSecretParameterSpec specified"); - } -@@ -495,7 +497,7 @@ public final class RSACipher extends CipherSpi { - encoded = KeyUtil.checkTlsPreMasterSecretKey( - ((TlsRsaPremasterSecretParameterSpec) spec).getClientVersion(), - ((TlsRsaPremasterSecretParameterSpec) spec).getServerVersion(), -- random, encoded, encoded == null); -+ random, encoded, (failover != null)); - } - - return ConstructKeys.constructKey(encoded, algorithm, type); diff --git a/jdk/src/share/classes/javax/security/auth/callback/ChoiceCallback.java b/jdk/src/share/classes/javax/security/auth/callback/ChoiceCallback.java index 4310e25dd7..3887f0953d 100644 --- a/jdk/src/share/classes/javax/security/auth/callback/ChoiceCallback.java @@ -73167,7 +72653,7 @@ index bf027918ce..c5483b4851 100644 --- a/jdk/test/java/util/TimeZone/TimeZoneData/VERSION +++ b/jdk/test/java/util/TimeZone/TimeZoneData/VERSION @@ -1 +1 @@ --tzdata2024a +-tzdata2025a +tzdata2023c diff --git a/jdk/test/jdk/jfr/event/os/TestCPUInformation.java b/jdk/test/jdk/jfr/event/os/TestCPUInformation.java index 17c8419cbc..f2ebf79d90 100644 @@ -73219,451 +72705,8 @@ index b138ed7fa7..66bd061e8b 100644 # or visit www.oracle.com if you need additional information or have any # questions. # --tzdata2024a +-tzdata2025a +tzdata2023c -diff --git a/jdk/test/sun/util/calendar/zi/tzdata/asia b/jdk/test/sun/util/calendar/zi/tzdata/asia -index c51170c34a..48a348bf95 100644 ---- a/jdk/test/sun/util/calendar/zi/tzdata/asia -+++ b/jdk/test/sun/util/calendar/zi/tzdata/asia -@@ -678,6 +678,7 @@ Zone Asia/Shanghai 8:05:43 - LMT 1901 - 8:00 PRC C%sT - # Xinjiang time, used by many in western China; represented by Ürümqi / Ürümchi - # / Wulumuqi. (Please use Asia/Shanghai if you prefer Beijing time.) -+# Vostok base in Antarctica matches this since 1970. - Zone Asia/Urumqi 5:50:20 - LMT 1928 - 6:00 - +06 - -@@ -2480,33 +2481,18 @@ Zone Asia/Amman 2:23:44 - LMT 1931 - # effective December 21st, 2018.... - # http://adilet.zan.kz/rus/docs/P1800000817 (russian language). - --# From Zhanbolat Raimbekov (2024-01-19): --# Kazakhstan (all parts) switching to UTC+5 on March 1, 2024 --# https://www.gov.kz/memleket/entities/mti/press/news/details/688998?lang=ru --# [in Russian] --# (2024-01-20): https://primeminister.kz/ru/decisions/19012024-20 --# --# From Alexander Krivenyshev (2024-01-19): --# According to a different news and the official web site for the Ministry of --# Trade and Integration of the Republic of Kazakhstan: --# https://en.inform.kz/news/kazakhstan-to-switch-to-single-hour-zone-mar-1-54ad0b/ -- - # Zone NAME STDOFF RULES FORMAT [UNTIL] - # - # Almaty (formerly Alma-Ata), representing most locations in Kazakhstan --# This includes Abai/Abay (ISO 3166-2 code KZ-10), Aqmola/Akmola (KZ-11), --# Almaty (KZ-19), Almaty city (KZ-75), Astana city (KZ-71), --# East Kazkhstan (KZ-63), Jambyl/Zhambyl (KZ-31), Jetisu/Zhetysu (KZ-33), --# Karaganda (KZ-35), North Kazakhstan (KZ-59), Pavlodar (KZ-55), --# Shyumkent city (KZ-79), Turkistan (KZ-61), and Ulytau (KZ-62). -+# This includes KZ-AKM, KZ-ALA, KZ-ALM, KZ-AST, KZ-BAY, KZ-VOS, KZ-ZHA, -+# KZ-KAR, KZ-SEV, KZ-PAV, and KZ-YUZ. - Zone Asia/Almaty 5:07:48 - LMT 1924 May 2 # or Alma-Ata - 5:00 - +05 1930 Jun 21 - 6:00 RussiaAsia +06/+07 1991 Mar 31 2:00s - 5:00 RussiaAsia +05/+06 1992 Jan 19 2:00s - 6:00 RussiaAsia +06/+07 2004 Oct 31 2:00s -- 6:00 - +06 2024 Mar 1 0:00 -- 5:00 - +05 --# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) (KZ-43) -+ 6:00 - +06 -+# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) (KZ-KZY) - Zone Asia/Qyzylorda 4:21:52 - LMT 1924 May 2 - 4:00 - +04 1930 Jun 21 - 5:00 - +05 1981 Apr 1 -@@ -2519,7 +2505,8 @@ Zone Asia/Qyzylorda 4:21:52 - LMT 1924 May 2 - 5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s - 6:00 - +06 2018 Dec 21 0:00 - 5:00 - +05 --# Qostanay (aka Kostanay, Kustanay) (KZ-39) -+# -+# Qostanay (aka Kostanay, Kustanay) (KZ-KUS) - # The 1991/2 rules are unclear partly because of the 1997 Turgai - # reorganization. - Zone Asia/Qostanay 4:14:28 - LMT 1924 May 2 -@@ -2530,9 +2517,9 @@ Zone Asia/Qostanay 4:14:28 - LMT 1924 May 2 - 5:00 RussiaAsia +05/+06 1991 Mar 31 2:00s - 4:00 RussiaAsia +04/+05 1992 Jan 19 2:00s - 5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s -- 6:00 - +06 2024 Mar 1 0:00 -- 5:00 - +05 --# Aqtöbe (aka Aktobe, formerly Aktyubinsk) (KZ-15) -+ 6:00 - +06 -+ -+# Aqtöbe (aka Aktobe, formerly Aktyubinsk) (KZ-AKT) - Zone Asia/Aqtobe 3:48:40 - LMT 1924 May 2 - 4:00 - +04 1930 Jun 21 - 5:00 - +05 1981 Apr 1 -@@ -2542,7 +2529,7 @@ Zone Asia/Aqtobe 3:48:40 - LMT 1924 May 2 - 4:00 RussiaAsia +04/+05 1992 Jan 19 2:00s - 5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s - 5:00 - +05 --# Mangghystaū (KZ-47) -+# Mangghystaū (KZ-MAN) - # Aqtau was not founded until 1963, but it represents an inhabited region, - # so include timestamps before 1963. - Zone Asia/Aqtau 3:21:04 - LMT 1924 May 2 -@@ -2554,7 +2541,7 @@ Zone Asia/Aqtau 3:21:04 - LMT 1924 May 2 - 5:00 RussiaAsia +05/+06 1994 Sep 25 2:00s - 4:00 RussiaAsia +04/+05 2004 Oct 31 2:00s - 5:00 - +05 --# Atyraū (KZ-23) is like Mangghystaū except it switched from -+# Atyraū (KZ-ATY) is like Mangghystaū except it switched from - # +04/+05 to +05/+06 in spring 1999, not fall 1994. - Zone Asia/Atyrau 3:27:44 - LMT 1924 May 2 - 3:00 - +03 1930 Jun 21 -@@ -2565,7 +2552,7 @@ Zone Asia/Atyrau 3:27:44 - LMT 1924 May 2 - 5:00 RussiaAsia +05/+06 1999 Mar 28 2:00s - 4:00 RussiaAsia +04/+05 2004 Oct 31 2:00s - 5:00 - +05 --# West Kazakhstan (KZ-27) -+# West Kazakhstan (KZ-ZAP) - # From Paul Eggert (2016-03-18): - # The 1989 transition is from USSR act No. 227 (1989-03-14). - Zone Asia/Oral 3:25:24 - LMT 1924 May 2 # or Ural'sk -@@ -3463,30 +3450,20 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 - # From Heba Hamad (2023-03-22): - # ... summer time will begin in Palestine from Saturday 04-29-2023, - # 02:00 AM by 60 minutes forward. --# From Heba Hemad (2023-10-09): --# ... winter time will begin in Palestine from Saturday 10-28-2023, --# 02:00 AM by 60 minutes back. --# --# From Heba Hamad (2024-01-25): --# the summer time for the years 2024,2025 will begin in Palestine --# from Saturday at 02:00 AM by 60 minutes forward as shown below: --# year date --# 2024 2024-04-20 --# 2025 2025-04-12 --# --# From Paul Eggert (2024-01-25): -+# -+# From Paul Eggert (2023-03-22): - # For now, guess that spring and fall transitions will normally - # continue to use 2022's rules, that during DST Palestine will switch - # to standard time at 02:00 the last Saturday before Ramadan and back --# to DST at 02:00 the second Saturday after Ramadan, and that -+# to DST at 02:00 the first Saturday after Ramadan, and that - # if the normal spring-forward or fall-back transition occurs during - # Ramadan the former is delayed and the latter advanced. - # To implement this, I predicted Ramadan-oriented transition dates for --# 2026 through 2086 by running the following program under GNU Emacs 29.2, -+# 2023 through 2086 by running the following program under GNU Emacs 28.2, - # with the results integrated by hand into the table below. - # Predictions after 2086 are approximated without Ramadan. - # --# (let ((islamic-year 1447)) -+# (let ((islamic-year 1444)) - # (require 'cal-islam) - # (while (< islamic-year 1510) - # (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) -@@ -3495,7 +3472,6 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 - # (while (/= saturday (mod (setq a (1- a)) 7))) - # (while (/= saturday (mod b 7)) - # (setq b (1+ b))) --# (setq b (+ 7 b)) - # (setq a (calendar-gregorian-from-absolute a)) - # (setq b (calendar-gregorian-from-absolute b)) - # (insert -@@ -3546,84 +3522,84 @@ Rule Palestine 2021 only - Oct 29 1:00 0 - - Rule Palestine 2022 only - Mar 27 0:00 1:00 S - Rule Palestine 2022 2035 - Oct Sat<=30 2:00 0 - - Rule Palestine 2023 only - Apr 29 2:00 1:00 S --Rule Palestine 2024 only - Apr 20 2:00 1:00 S --Rule Palestine 2025 only - Apr 12 2:00 1:00 S -+Rule Palestine 2024 only - Apr 13 2:00 1:00 S -+Rule Palestine 2025 only - Apr 5 2:00 1:00 S - Rule Palestine 2026 2054 - Mar Sat<=30 2:00 1:00 S - Rule Palestine 2036 only - Oct 18 2:00 0 - - Rule Palestine 2037 only - Oct 10 2:00 0 - - Rule Palestine 2038 only - Sep 25 2:00 0 - - Rule Palestine 2039 only - Sep 17 2:00 0 - -+Rule Palestine 2039 only - Oct 22 2:00 1:00 S -+Rule Palestine 2039 2067 - Oct Sat<=30 2:00 0 - - Rule Palestine 2040 only - Sep 1 2:00 0 - --Rule Palestine 2040 only - Oct 20 2:00 1:00 S --Rule Palestine 2040 2067 - Oct Sat<=30 2:00 0 - -+Rule Palestine 2040 only - Oct 13 2:00 1:00 S - Rule Palestine 2041 only - Aug 24 2:00 0 - --Rule Palestine 2041 only - Oct 5 2:00 1:00 S -+Rule Palestine 2041 only - Sep 28 2:00 1:00 S - Rule Palestine 2042 only - Aug 16 2:00 0 - --Rule Palestine 2042 only - Sep 27 2:00 1:00 S -+Rule Palestine 2042 only - Sep 20 2:00 1:00 S - Rule Palestine 2043 only - Aug 1 2:00 0 - --Rule Palestine 2043 only - Sep 19 2:00 1:00 S -+Rule Palestine 2043 only - Sep 12 2:00 1:00 S - Rule Palestine 2044 only - Jul 23 2:00 0 - --Rule Palestine 2044 only - Sep 3 2:00 1:00 S -+Rule Palestine 2044 only - Aug 27 2:00 1:00 S - Rule Palestine 2045 only - Jul 15 2:00 0 - --Rule Palestine 2045 only - Aug 26 2:00 1:00 S -+Rule Palestine 2045 only - Aug 19 2:00 1:00 S - Rule Palestine 2046 only - Jun 30 2:00 0 - --Rule Palestine 2046 only - Aug 18 2:00 1:00 S -+Rule Palestine 2046 only - Aug 11 2:00 1:00 S - Rule Palestine 2047 only - Jun 22 2:00 0 - --Rule Palestine 2047 only - Aug 3 2:00 1:00 S -+Rule Palestine 2047 only - Jul 27 2:00 1:00 S - Rule Palestine 2048 only - Jun 6 2:00 0 - --Rule Palestine 2048 only - Jul 25 2:00 1:00 S -+Rule Palestine 2048 only - Jul 18 2:00 1:00 S - Rule Palestine 2049 only - May 29 2:00 0 - --Rule Palestine 2049 only - Jul 10 2:00 1:00 S -+Rule Palestine 2049 only - Jul 3 2:00 1:00 S - Rule Palestine 2050 only - May 21 2:00 0 - --Rule Palestine 2050 only - Jul 2 2:00 1:00 S -+Rule Palestine 2050 only - Jun 25 2:00 1:00 S - Rule Palestine 2051 only - May 6 2:00 0 - --Rule Palestine 2051 only - Jun 24 2:00 1:00 S -+Rule Palestine 2051 only - Jun 17 2:00 1:00 S - Rule Palestine 2052 only - Apr 27 2:00 0 - --Rule Palestine 2052 only - Jun 8 2:00 1:00 S -+Rule Palestine 2052 only - Jun 1 2:00 1:00 S - Rule Palestine 2053 only - Apr 12 2:00 0 - --Rule Palestine 2053 only - May 31 2:00 1:00 S -+Rule Palestine 2053 only - May 24 2:00 1:00 S - Rule Palestine 2054 only - Apr 4 2:00 0 - --Rule Palestine 2054 only - May 23 2:00 1:00 S --Rule Palestine 2055 only - May 8 2:00 1:00 S --Rule Palestine 2056 only - Apr 29 2:00 1:00 S --Rule Palestine 2057 only - Apr 14 2:00 1:00 S --Rule Palestine 2058 only - Apr 6 2:00 1:00 S --Rule Palestine 2059 max - Mar Sat<=30 2:00 1:00 S -+Rule Palestine 2054 only - May 16 2:00 1:00 S -+Rule Palestine 2055 only - May 1 2:00 1:00 S -+Rule Palestine 2056 only - Apr 22 2:00 1:00 S -+Rule Palestine 2057 only - Apr 7 2:00 1:00 S -+Rule Palestine 2058 max - Mar Sat<=30 2:00 1:00 S - Rule Palestine 2068 only - Oct 20 2:00 0 - - Rule Palestine 2069 only - Oct 12 2:00 0 - - Rule Palestine 2070 only - Oct 4 2:00 0 - - Rule Palestine 2071 only - Sep 19 2:00 0 - - Rule Palestine 2072 only - Sep 10 2:00 0 - --Rule Palestine 2072 only - Oct 22 2:00 1:00 S --Rule Palestine 2072 max - Oct Sat<=30 2:00 0 - -+Rule Palestine 2072 only - Oct 15 2:00 1:00 S - Rule Palestine 2073 only - Sep 2 2:00 0 - --Rule Palestine 2073 only - Oct 14 2:00 1:00 S -+Rule Palestine 2073 only - Oct 7 2:00 1:00 S - Rule Palestine 2074 only - Aug 18 2:00 0 - --Rule Palestine 2074 only - Oct 6 2:00 1:00 S -+Rule Palestine 2074 only - Sep 29 2:00 1:00 S - Rule Palestine 2075 only - Aug 10 2:00 0 - --Rule Palestine 2075 only - Sep 21 2:00 1:00 S -+Rule Palestine 2075 only - Sep 14 2:00 1:00 S -+Rule Palestine 2075 max - Oct Sat<=30 2:00 0 - - Rule Palestine 2076 only - Jul 25 2:00 0 - --Rule Palestine 2076 only - Sep 12 2:00 1:00 S -+Rule Palestine 2076 only - Sep 5 2:00 1:00 S - Rule Palestine 2077 only - Jul 17 2:00 0 - --Rule Palestine 2077 only - Sep 4 2:00 1:00 S -+Rule Palestine 2077 only - Aug 28 2:00 1:00 S - Rule Palestine 2078 only - Jul 9 2:00 0 - --Rule Palestine 2078 only - Aug 20 2:00 1:00 S -+Rule Palestine 2078 only - Aug 13 2:00 1:00 S - Rule Palestine 2079 only - Jun 24 2:00 0 - --Rule Palestine 2079 only - Aug 12 2:00 1:00 S -+Rule Palestine 2079 only - Aug 5 2:00 1:00 S - Rule Palestine 2080 only - Jun 15 2:00 0 - --Rule Palestine 2080 only - Jul 27 2:00 1:00 S -+Rule Palestine 2080 only - Jul 20 2:00 1:00 S - Rule Palestine 2081 only - Jun 7 2:00 0 - --Rule Palestine 2081 only - Jul 19 2:00 1:00 S -+Rule Palestine 2081 only - Jul 12 2:00 1:00 S - Rule Palestine 2082 only - May 23 2:00 0 - --Rule Palestine 2082 only - Jul 11 2:00 1:00 S -+Rule Palestine 2082 only - Jul 4 2:00 1:00 S - Rule Palestine 2083 only - May 15 2:00 0 - --Rule Palestine 2083 only - Jun 26 2:00 1:00 S -+Rule Palestine 2083 only - Jun 19 2:00 1:00 S - Rule Palestine 2084 only - Apr 29 2:00 0 - --Rule Palestine 2084 only - Jun 17 2:00 1:00 S -+Rule Palestine 2084 only - Jun 10 2:00 1:00 S - Rule Palestine 2085 only - Apr 21 2:00 0 - --Rule Palestine 2085 only - Jun 9 2:00 1:00 S -+Rule Palestine 2085 only - Jun 2 2:00 1:00 S - Rule Palestine 2086 only - Apr 13 2:00 0 - --Rule Palestine 2086 only - May 25 2:00 1:00 S -+Rule Palestine 2086 only - May 18 2:00 1:00 S - - # Zone NAME STDOFF RULES FORMAT [UNTIL] - Zone Asia/Gaza 2:17:52 - LMT 1900 Oct -@@ -3651,7 +3627,7 @@ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct - - # Philippines - --# From Paul Eggert (2024-01-21): -+# From Paul Eggert (2018-11-18): - # The Spanish initially used American (west-of-Greenwich) time. - # It is unknown what time Manila kept when the British occupied it from - # 1762-10-06 through 1764-04; for now assume it kept American time. -@@ -3659,7 +3635,7 @@ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct - # Philippines, issued a proclamation announcing that 1844-12-30 was to - # be immediately followed by 1845-01-01; see R.H. van Gent's - # History of the International Date Line --# https://webspace.science.uu.nl/~gent0113/idl/idl_philippines.htm -+# https://www.staff.science.uu.nl/~gent0113/idl/idl_philippines.htm - # The rest of the data entries are from Shanks & Pottenger. - - # From Jesper Nørgaard Welen (2006-04-26): -@@ -4086,8 +4062,7 @@ Zone Asia/Tashkent 4:37:11 - LMT 1924 May 2 - # The English-language name of Vietnam's most populous city is "Ho Chi Minh - # City"; use Ho_Chi_Minh below to avoid a name of more than 14 characters. - --# From Paul Eggert (2024-01-14) after a 2014 heads-up from Trần Ngọc Quân --# and a 2024-01-14 heads-up from Đoàn Trần Công Danh: -+# From Paul Eggert (2022-07-27) after a 2014 heads-up from Trần Ngọc Quân: - # Trần Tiến Bình's authoritative book "Lịch Việt Nam: thế kỷ XX-XXI (1901-2100)" - # (Nhà xuất bản Văn Hoá - Thông Tin, Hanoi, 2005), pp 49-50, - # is quoted verbatim in: -@@ -4117,35 +4092,14 @@ Zone Asia/Tashkent 4:37:11 - LMT 1924 May 2 - # - # Trần cites the following sources; it's unclear which supplied the info above. - # --# Hoàng Xuân Hãn: "Lịch và lịch Việt Nam". Tập san Khoa học Xã hội, --# No. 9, Paris, February 1982. --# --# Lê Thành Lân: "Lịch và niên biểu lịch sử hai mươi thế kỷ (0001-2010)", --# NXB Thống kê, Hanoi, 2000. -+# Hoàng Xuân Hãn: "Lịch và lịch Việt Nam". Tập san Khoa học Xã hội, -+# No. 9, Paris, February 1982. - # --# Lê Thành Lân: "Lịch hai thế kỷ (1802-2010) và các lịch vĩnh cửu", --# NXB Thuận Hoá, Huế, 1995. -+# Lê Thành Lân: "Lịch và niên biểu lịch sử hai mươi thế kỷ (0001-2010)", -+# NXB Thống kê, Hanoi, 2000. - # --# Here is the decision for the September 1945 transition: --# Võ Nguyên Giáp, Việt Nam Dân Quốc Công Báo, No. 1 (1945-09-29), page 13 --# http://baochi.nlv.gov.vn/baochi/cgi-bin/baochi?a=d&d=JwvzO19450929.2.5&dliv=none --# It says that on 1945-09-01 at 24:00, Vietnam moved back two hours, to +07. --# It also mentions a 1945-03-29 decree (by a Japanese Goveror-General) --# to set the time zone to +09, but does not say whether that decree --# merely legalized an earlier change to +09. --# --# July 1955 transition: --# Ngô Đình Diệm, Công Báo Việt Nam, No. 92 (1955-07-02), page 1780-1781 --# Ordinance (Dụ) No. 46 (1955-06-25) --# http://ddsnext.crl.edu/titles/32341#?c=0&m=29&s=0&cv=4&r=0&xywh=-89%2C342%2C1724%2C1216 --# It says that on 1955-07-01 at 01:00, South Vietnam moved back 1 hour (to +07). --# --# December 1959 transition: --# Ngô Đình Diệm, Công Báo Việt Nam Cộng Hòa, 1960 part 1 (1960-01-02), page 62 --# Decree (Sắc lệnh) No. 362-TTP (1959-12-30) --# http://ddsnext.crl.edu/titles/32341#?c=0&m=138&s=0&cv=793&r=0&xywh=-54%2C1504%2C1705%2C1202 --# It says that on 1959-12-31 at 23:00, South Vietnam moved forward 1 hour (to +08). -- -+# Lê Thành Lân: "Lịch hai thế kỷ (1802-2010) và các lịch vĩnh cửu", -+# NXB Thuận Hoá, Huế, 1995. - - # Zone NAME STDOFF RULES FORMAT [UNTIL] - #STDOFF 7:06:30.13 -@@ -4153,9 +4107,9 @@ Zone Asia/Ho_Chi_Minh 7:06:30 - LMT 1906 Jul 1 - 7:06:30 - PLMT 1911 May 1 # Phù Liễn MT - 7:00 - +07 1942 Dec 31 23:00 - 8:00 - +08 1945 Mar 14 23:00 -- 9:00 - +09 1945 Sep 1 24:00 -+ 9:00 - +09 1945 Sep 2 - 7:00 - +07 1947 Apr 1 -- 8:00 - +08 1955 Jul 1 01:00 -+ 8:00 - +08 1955 Jul 1 - 7:00 - +07 1959 Dec 31 23:00 - 8:00 - +08 1975 Jun 13 - 7:00 - +07 -diff --git a/jdk/test/sun/util/calendar/zi/tzdata/europe b/jdk/test/sun/util/calendar/zi/tzdata/europe -index 853df30ef8..5a0e516fdd 100644 ---- a/jdk/test/sun/util/calendar/zi/tzdata/europe -+++ b/jdk/test/sun/util/calendar/zi/tzdata/europe -@@ -1013,34 +1013,9 @@ Zone Europe/Sofia 1:33:16 - LMT 1880 - # Czech Republic (Czechia) - # Slovakia - # --# From Ivan Benovic (2024-01-30): --# https://www.slov-lex.sk/pravne-predpisy/SK/ZZ/1946/54/ --# (This is an official link to the Czechoslovak Summer Time Act of --# March 8, 1946 that authorizes the Czechoslovak government to set the --# exact dates of change to summer time and back to Central European Time. --# The act also implicitly confirms Central European Time as the --# official time zone of Czechoslovakia and currently remains in force --# in both the Czech Republic and Slovakia.) --# https://www.psp.cz/eknih/1945pns/tisky/t0216_00.htm --# (This is a link to the original legislative proposal dating back to --# February 22, 1946. The accompanying memorandum to the proposal says --# that an advisory committee on European railroad transportation that --# met in Brussels in October 1945 decided that the change of time --# should be carried out in all participating countries in a strictly --# coordinated manner....) --# --# From Paul Eggert (2024-01-30): --# The source for Czech data is: Kdy začíná a končí letní čas. -+# From Paul Eggert (2018-04-15): -+# The source for Czech data is: Kdy začíná a končí letní čas. 2018-04-15. - # https://kalendar.beda.cz/kdy-zacina-a-konci-letni-cas --# Its main text disagrees with its quoted sources only in 1918, --# where the main text says spring and autumn transitions --# occurred at 02:00 and 03:00 respectively (as usual), --# whereas the 1918 source "Oznámení o zavedení letního času v roce 1918" --# says transitions were at 01:00 and 02:00 respectively. --# As the 1918 source appears to be a humorous piece, and it is --# unlikely that Prague would have disagreed with its neighbors by an hour, --# go with the main text for now. --# - # We know of no English-language name for historical Czech winter time; - # abbreviate it as "GMT", as it happened to be GMT. - # -@@ -1171,23 +1146,6 @@ Zone Atlantic/Faroe -0:27:04 - LMT 1908 Jan 11 # Tórshavn - # 2. The shift *from* DST in 2023 happens as normal, but coincides with the - # shift to UTC-02 normaltime (people will not change their clocks here). - # 3. After this, DST is still observed, but as -02/-01 instead of -03/-02. --# --# From Múte Bourup Egede via Jógvan Svabo Samuelsen (2023-03-15): --# Greenland will not switch to Daylight Saving Time this year, 2023, --# because the standard time for Greenland will change from UTC -3 to UTC -2. --# However, Greenland will change to Daylight Saving Time again in 2024 --# and onwards. -- --# From a contributor who wishes to remain anonymous for now (2023-10-29): --# https://www.dr.dk/nyheder/seneste/i-nat-skal-uret-stilles-en-time-tilbage-men-foerste-gang-sker-det-ikke-i-groenland --# with a link to that page: --# https://naalakkersuisut.gl/Nyheder/2023/10/2710_sommertid --# ... Ittoqqortoormiit joins the time of Nuuk at March 2024. --# What would mean that America/Scoresbysund would either be in -01 year round --# or in -02/-01 like America/Nuuk, but no longer in -01/+00. --# --# From Paul Eggert (2023-10-29): --# For now, assume it will be like America/Nuuk. - - # Rule NAME FROM TO - IN ON AT SAVE LETTER/S - Rule Thule 1991 1992 - Mar lastSun 2:00 1:00 D -@@ -1208,12 +1166,10 @@ Zone America/Danmarkshavn -1:14:40 - LMT 1916 Jul 28 - Zone America/Scoresbysund -1:27:52 - LMT 1916 Jul 28 # Ittoqqortoormiit - -2:00 - -02 1980 Apr 6 2:00 - -2:00 C-Eur -02/-01 1981 Mar 29 -- -1:00 EU -01/+00 2024 Mar 31 -- -2:00 EU -02/-01 -+ -1:00 EU -01/+00 - Zone America/Nuuk -3:26:56 - LMT 1916 Jul 28 # Godthåb - -3:00 - -03 1980 Apr 6 2:00 -- -3:00 EU -03/-02 2023 Mar 26 1:00u -- -2:00 - -02 2023 Oct 29 1:00u -+ -3:00 EU -03/-02 2023 Oct 29 1:00u - -2:00 EU -02/-01 - Zone America/Thule -4:35:08 - LMT 1916 Jul 28 # Pituffik - -4:00 Thule A%sT -@@ -3778,7 +3734,11 @@ Zone Europe/Istanbul 1:55:52 - LMT 1880 - # and not at 3:00 as would have been under EU rules. - # This is why I have set the change to EU rules into May 1996, - # so that the change in March is stil covered by the Ukraine rule. --# The next change in October 1996 happened under EU rules. -+# The next change in October 1996 happened under EU rules.... -+# TZ database holds three other zones for Ukraine.... I have not yet -+# worked out the consequences for these three zones, as we (me and my -+# US colleague David Cochrane) are still trying to get more -+# information upon these local deviations from Kiev rules. - # - # From Paul Eggert (2022-08-27): - # For now, assume that Ukraine's zones all followed the same rules, diff --git a/jdk/test/sun/util/calendar/zi/tzdata/leapseconds b/jdk/test/sun/util/calendar/zi/tzdata/leapseconds index 8e7df3de98..89ce8b89cd 100644 --- a/jdk/test/sun/util/calendar/zi/tzdata/leapseconds @@ -73689,17 +72732,17 @@ index 8e7df3de98..89ce8b89cd 100644 # Any additional leap seconds will come after this. # This Expires line is commented out for now, # so that pre-2020a zic implementations do not reject this file. --#Expires 2024 Dec 28 00:00:00 +-#Expires 2025 Dec 28 00:00:00 +#Expires 2023 Dec 28 00:00:00 # POSIX timestamps for the data in this file: --#updated 1704708379 (2024-01-08 10:06:19 UTC) --#expires 1735344000 (2024-12-28 00:00:00 UTC) +-#updated 1736208000 (2025-01-07 00:00:00 UTC) +-#expires 1766880000 (2025-12-28 00:00:00 UTC) +#updated 1467936000 (2016-07-08 00:00:00 UTC) +#expires 1703721600 (2023-12-28 00:00:00 UTC) -# Updated through IERS Bulletin C (https://hpiers.obspm.fr/iers/bul/bulc/bulletinc.dat) --# File expires on 28 December 2024 +-# File expires on 28 December 2025 +# Updated through IERS Bulletin C65 +# File expires on: 28 December 2023 diff --git a/jdk/test/sun/util/calendar/zi/tzdata/zone.tab b/jdk/test/sun/util/calendar/zi/tzdata/zone.tab diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec index a09665b..88b036c 100644 --- a/openjdk-1.8.0.spec +++ b/openjdk-1.8.0.spec @@ -953,7 +953,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 3 +Release: 4 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -1446,6 +1446,7 @@ Patch4000: LoongArch64-support.patch ############################################ Patch6000: add-sw_64-support.patch +Patch6001: Second-revision-sw_64-support.patch ############################################# # @@ -2084,6 +2085,7 @@ pushd %{top_level_dir_name} %ifarch sw_64 %patch6000 -p1 +%patch6001 -p1 %endif %ifarch riscv64 @@ -3054,6 +3056,9 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect %endif %changelog +* Mon Aug 11 2025 ShuKun Qu - 1:1.8.0.462.b08-4 +- add Second-revision-sw_64-support.patch to fix the add-sw_64-support.patch error caused by openjdk upgrade + * Wed Jul 30 2025 neu-mobi -1:1.8.0.462.b08-3 - add Add-testcase-for-jdk.Deoptimization-and-bug-fixes-fo.patch -- Gitee