Blame SOURCES/jdk8305113-tzdata2023c.patch

ae37fd
commit 9619cdb7b7f63f2d8a71d35c8672be93fd6255e9
ae37fd
Author: Yoshiki Sato <ysatowse@openjdk.org>
ae37fd
Date:   Wed Apr 5 01:19:00 2023 +0000
ae37fd
ae37fd
    Backport ed9592c6e81f82e2bf6508ce45ba15aad8232181
ae37fd
ae37fd
diff --git a/make/data/tzdata/VERSION b/make/data/tzdata/VERSION
ae37fd
index 0f328a4a7ff..66bd061e8bc 100644
ae37fd
--- a/make/data/tzdata/VERSION
ae37fd
+++ b/make/data/tzdata/VERSION
ae37fd
@@ -21,4 +21,4 @@
ae37fd
 # or visit www.oracle.com if you need additional information or have any
ae37fd
 # questions.
ae37fd
 #
ae37fd
-tzdata2022g
ae37fd
+tzdata2023c
ae37fd
diff --git a/make/data/tzdata/africa b/make/data/tzdata/africa
ae37fd
index 830d7d10b7e..a73405fdb01 100644
ae37fd
--- a/make/data/tzdata/africa
ae37fd
+++ b/make/data/tzdata/africa
ae37fd
@@ -344,6 +344,14 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	0	-
ae37fd
 # From Mina Samuel (2016-07-04):
ae37fd
 # Egyptian government took the decision to cancel the DST,
ae37fd
 
ae37fd
+# From Ahmad ElDardiry (2023-03-01):
ae37fd
+# Egypt officially announced today that daylight savings will be
ae37fd
+# applied from last Friday of April to last Thursday of October.
ae37fd
+# From Paul Eggert (2023-03-01):
ae37fd
+# Assume transitions are at 00:00 and 24:00 respectively.
ae37fd
+# From Amir Adib (2023-03-07):
ae37fd
+# https://www.facebook.com/EgyptianCabinet/posts/638829614954129/
ae37fd
+
ae37fd
 Rule	Egypt	2008	only	-	Aug	lastThu	24:00	0	-
ae37fd
 Rule	Egypt	2009	only	-	Aug	20	24:00	0	-
ae37fd
 Rule	Egypt	2010	only	-	Aug	10	24:00	0	-
ae37fd
@@ -353,6 +361,8 @@ Rule	Egypt	2014	only	-	May	15	24:00	1:00	S
ae37fd
 Rule	Egypt	2014	only	-	Jun	26	24:00	0	-
ae37fd
 Rule	Egypt	2014	only	-	Jul	31	24:00	1:00	S
ae37fd
 Rule	Egypt	2014	only	-	Sep	lastThu	24:00	0	-
ae37fd
+Rule	Egypt	2023	max	-	Apr	lastFri	 0:00	1:00	S
ae37fd
+Rule	Egypt	2023	max	-	Oct	lastThu	24:00	0	-
ae37fd
 
ae37fd
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
ae37fd
 		#STDOFF	2:05:08.9
ae37fd
@@ -452,7 +462,7 @@ Zone	Africa/Nairobi	2:27:16	-	LMT	1908 May
ae37fd
 # President William R. Tolbert, Jr., July 23, 1971-July 31, 1972.
ae37fd
 # Monrovia: Executive Mansion.
ae37fd
 #
ae37fd
-# Use the abbreviation "MMT" before 1972, as the more-accurate numeric
ae37fd
+# Use the abbreviation "MMT" before 1972, as the more accurate numeric
ae37fd
 # abbreviation "-004430" would be one byte over the POSIX limit.
ae37fd
 #
ae37fd
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
ae37fd
@@ -589,8 +599,8 @@ Zone	Africa/Tripoli	0:52:44 -	LMT	1920
ae37fd
 # DST the coming summer...
ae37fd
 #
ae37fd
 # Some sources, in French:
ae37fd
-# http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-%C2%AB-L%E2%80%99heure-d%E2%80%99%C3%A9t%C3%A9-ne-sera-pas-appliqu%C3%A9e-cette-ann%C3%A9e-%C2%BB
ae37fd
-# http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints-
ae37fd
+# http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-«-L%E2%80%99heure-d%E2%80%99été-ne-sera-pas-appliquée-cette-année-»
ae37fd
+# http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-économie-d-énergie-de-l-heure-d-été-ont-été-atteints-
ae37fd
 #
ae37fd
 # Our wrap-up:
ae37fd
 # https://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html
ae37fd
@@ -721,7 +731,7 @@ Zone Indian/Mauritius	3:50:00 -	LMT	1907 # Port Louis
ae37fd
 # More articles in the press
ae37fd
 # https://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html
ae37fd
 # http://www.lematin.ma/Actualite/Express/Article.asp?id=148923
ae37fd
-# http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim
ae37fd
+# http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT+1-a-partir-de-dim
ae37fd
 
ae37fd
 # From Petr Machata (2011-03-30):
ae37fd
 # They have it written in English here:
ae37fd
@@ -736,7 +746,7 @@ Zone Indian/Mauritius	3:50:00 -	LMT	1907 # Port Louis
ae37fd
 # According to Infomédiaire web site from Morocco (infomediaire.ma),
ae37fd
 # on March 9, 2012, (in French) Heure légale:
ae37fd
 # Le Maroc adopte officiellement l'heure d'été
ae37fd
-# http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9
ae37fd
+# http://www.infomediaire.ma/news/maroc/heure-légale-le-maroc-adopte-officiellement-lheure-dété
ae37fd
 # Governing Council adopted draft decree, that Morocco DST starts on
ae37fd
 # the last Sunday of March (March 25, 2012) and ends on
ae37fd
 # last Sunday of September (September 30, 2012)
ae37fd
@@ -860,19 +870,28 @@ Zone Indian/Mauritius	3:50:00 -	LMT	1907 # Port Louis
ae37fd
 # Friday or Saturday (and so the 2 days off are on a weekend), the next time
ae37fd
 # shift will be the next weekend.
ae37fd
 #
ae37fd
-# From Paul Eggert (2020-05-31):
ae37fd
+# From Milamber (2021-03-31, 2022-03-10):
ae37fd
+# https://www.mmsp.gov.ma/fr/actualites.aspx?id=2076
ae37fd
+# https://www.ecoactu.ma/horaires-administration-ramadan-gmtheure-gmt-a-partir-de-dimanche-27-mars/
ae37fd
+#
ae37fd
+# From Milamber (2023-03-14, 2023-03-15):
ae37fd
+# The return to legal GMT time will take place this Sunday, March 19 at 3 a.m.
ae37fd
+# ... the return to GMT+1 will be made on Sunday April 23, 2023 at 2 a.m.
ae37fd
+# https://www.mmsp.gov.ma/fr/actualites/passage-à-l%E2%80%99heure-gmt-à-partir-du-dimanche-19-mars-2023
ae37fd
+#
ae37fd
+# From Paul Eggert (2023-03-14):
ae37fd
 # For now, guess that in the future Morocco will fall back at 03:00
ae37fd
 # the last Sunday before Ramadan, and spring forward at 02:00 the
ae37fd
-# first Sunday after two days after Ramadan.  To implement this,
ae37fd
+# first Sunday after one day after Ramadan.  To implement this,
ae37fd
 # transition dates and times for 2019 through 2087 were determined by
ae37fd
-# running the following program under GNU Emacs 26.3.  (This algorithm
ae37fd
+# running the following program under GNU Emacs 28.2.  (This algorithm
ae37fd
 # also produces the correct transition dates for 2016 through 2018,
ae37fd
 # though the times differ due to Morocco's time zone change in 2018.)
ae37fd
 # (let ((islamic-year 1440))
ae37fd
 #   (require 'cal-islam)
ae37fd
 #   (while (< islamic-year 1511)
ae37fd
 #     (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
ae37fd
-#           (b (+ 2 (calendar-islamic-to-absolute (list 10 1 islamic-year))))
ae37fd
+#           (b (+ 1 (calendar-islamic-to-absolute (list 10 1 islamic-year))))
ae37fd
 #           (sunday 0))
ae37fd
 #       (while (/= sunday (mod (setq a (1- a)) 7)))
ae37fd
 #       (while (/= sunday (mod b 7))
ae37fd
@@ -886,10 +905,6 @@ Zone Indian/Mauritius	3:50:00 -	LMT	1907 # Port Louis
ae37fd
 #         (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
ae37fd
 #         (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
ae37fd
 #     (setq islamic-year (+ 1 islamic-year))))
ae37fd
-#
ae37fd
-# From Milamber (2021-03-31, 2022-03-10), confirming these predictions:
ae37fd
-# https://www.mmsp.gov.ma/fr/actualites.aspx?id=2076
ae37fd
-# https://www.ecoactu.ma/horaires-administration-ramadan-gmtheure-gmt-a-partir-de-dimanche-27-mars/
ae37fd
 
ae37fd
 # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
ae37fd
 Rule	Morocco	1939	only	-	Sep	12	 0:00	1:00	-
ae37fd
@@ -942,7 +957,7 @@ Rule	Morocco	2021	only	-	May	16	 2:00	0	-
ae37fd
 Rule	Morocco	2022	only	-	Mar	27	 3:00	-1:00	-
ae37fd
 Rule	Morocco	2022	only	-	May	 8	 2:00	0	-
ae37fd
 Rule	Morocco	2023	only	-	Mar	19	 3:00	-1:00	-
ae37fd
-Rule	Morocco	2023	only	-	Apr	30	 2:00	0	-
ae37fd
+Rule	Morocco	2023	only	-	Apr	23	 2:00	0	-
ae37fd
 Rule	Morocco	2024	only	-	Mar	10	 3:00	-1:00	-
ae37fd
 Rule	Morocco	2024	only	-	Apr	14	 2:00	0	-
ae37fd
 Rule	Morocco	2025	only	-	Feb	23	 3:00	-1:00	-
ae37fd
@@ -958,7 +973,7 @@ Rule	Morocco	2029	only	-	Feb	18	 2:00	0	-
ae37fd
 Rule	Morocco	2029	only	-	Dec	30	 3:00	-1:00	-
ae37fd
 Rule	Morocco	2030	only	-	Feb	10	 2:00	0	-
ae37fd
 Rule	Morocco	2030	only	-	Dec	22	 3:00	-1:00	-
ae37fd
-Rule	Morocco	2031	only	-	Feb	 2	 2:00	0	-
ae37fd
+Rule	Morocco	2031	only	-	Jan	26	 2:00	0	-
ae37fd
 Rule	Morocco	2031	only	-	Dec	14	 3:00	-1:00	-
ae37fd
 Rule	Morocco	2032	only	-	Jan	18	 2:00	0	-
ae37fd
 Rule	Morocco	2032	only	-	Nov	28	 3:00	-1:00	-
ae37fd
@@ -974,7 +989,7 @@ Rule	Morocco	2036	only	-	Nov	23	 2:00	0	-
ae37fd
 Rule	Morocco	2037	only	-	Oct	 4	 3:00	-1:00	-
ae37fd
 Rule	Morocco	2037	only	-	Nov	15	 2:00	0	-
ae37fd
 Rule	Morocco	2038	only	-	Sep	26	 3:00	-1:00	-
ae37fd
-Rule	Morocco	2038	only	-	Nov	 7	 2:00	0	-
ae37fd
+Rule	Morocco	2038	only	-	Oct	31	 2:00	0	-
ae37fd
 Rule	Morocco	2039	only	-	Sep	18	 3:00	-1:00	-
ae37fd
 Rule	Morocco	2039	only	-	Oct	23	 2:00	0	-
ae37fd
 Rule	Morocco	2040	only	-	Sep	 2	 3:00	-1:00	-
ae37fd
@@ -990,7 +1005,7 @@ Rule	Morocco	2044	only	-	Aug	28	 2:00	0	-
ae37fd
 Rule	Morocco	2045	only	-	Jul	 9	 3:00	-1:00	-
ae37fd
 Rule	Morocco	2045	only	-	Aug	20	 2:00	0	-
ae37fd
 Rule	Morocco	2046	only	-	Jul	 1	 3:00	-1:00	-
ae37fd
-Rule	Morocco	2046	only	-	Aug	12	 2:00	0	-
ae37fd
+Rule	Morocco	2046	only	-	Aug	 5	 2:00	0	-
ae37fd
 Rule	Morocco	2047	only	-	Jun	23	 3:00	-1:00	-
ae37fd
 Rule	Morocco	2047	only	-	Jul	28	 2:00	0	-
ae37fd
 Rule	Morocco	2048	only	-	Jun	 7	 3:00	-1:00	-
ae37fd
@@ -1006,7 +1021,7 @@ Rule	Morocco	2052	only	-	Jun	 2	 2:00	0	-
ae37fd
 Rule	Morocco	2053	only	-	Apr	13	 3:00	-1:00	-
ae37fd
 Rule	Morocco	2053	only	-	May	25	 2:00	0	-
ae37fd
 Rule	Morocco	2054	only	-	Apr	 5	 3:00	-1:00	-
ae37fd
-Rule	Morocco	2054	only	-	May	17	 2:00	0	-
ae37fd
+Rule	Morocco	2054	only	-	May	10	 2:00	0	-
ae37fd
 Rule	Morocco	2055	only	-	Mar	28	 3:00	-1:00	-
ae37fd
 Rule	Morocco	2055	only	-	May	 2	 2:00	0	-
ae37fd
 Rule	Morocco	2056	only	-	Mar	12	 3:00	-1:00	-
ae37fd
@@ -1022,7 +1037,7 @@ Rule	Morocco	2060	only	-	Mar	 7	 2:00	0	-
ae37fd
 Rule	Morocco	2061	only	-	Jan	16	 3:00	-1:00	-
ae37fd
 Rule	Morocco	2061	only	-	Feb	27	 2:00	0	-
ae37fd
 Rule	Morocco	2062	only	-	Jan	 8	 3:00	-1:00	-
ae37fd
-Rule	Morocco	2062	only	-	Feb	19	 2:00	0	-
ae37fd
+Rule	Morocco	2062	only	-	Feb	12	 2:00	0	-
ae37fd
 Rule	Morocco	2062	only	-	Dec	31	 3:00	-1:00	-
ae37fd
 Rule	Morocco	2063	only	-	Feb	 4	 2:00	0	-
ae37fd
 Rule	Morocco	2063	only	-	Dec	16	 3:00	-1:00	-
ae37fd
@@ -1038,7 +1053,7 @@ Rule	Morocco	2067	only	-	Dec	11	 2:00	0	-
ae37fd
 Rule	Morocco	2068	only	-	Oct	21	 3:00	-1:00	-
ae37fd
 Rule	Morocco	2068	only	-	Dec	 2	 2:00	0	-
ae37fd
 Rule	Morocco	2069	only	-	Oct	13	 3:00	-1:00	-
ae37fd
-Rule	Morocco	2069	only	-	Nov	24	 2:00	0	-
ae37fd
+Rule	Morocco	2069	only	-	Nov	17	 2:00	0	-
ae37fd
 Rule	Morocco	2070	only	-	Oct	 5	 3:00	-1:00	-
ae37fd
 Rule	Morocco	2070	only	-	Nov	 9	 2:00	0	-
ae37fd
 Rule	Morocco	2071	only	-	Sep	20	 3:00	-1:00	-
ae37fd
@@ -1054,7 +1069,7 @@ Rule	Morocco	2075	only	-	Sep	15	 2:00	0	-
ae37fd
 Rule	Morocco	2076	only	-	Jul	26	 3:00	-1:00	-
ae37fd
 Rule	Morocco	2076	only	-	Sep	 6	 2:00	0	-
ae37fd
 Rule	Morocco	2077	only	-	Jul	18	 3:00	-1:00	-
ae37fd
-Rule	Morocco	2077	only	-	Aug	29	 2:00	0	-
ae37fd
+Rule	Morocco	2077	only	-	Aug	22	 2:00	0	-
ae37fd
 Rule	Morocco	2078	only	-	Jul	10	 3:00	-1:00	-
ae37fd
 Rule	Morocco	2078	only	-	Aug	14	 2:00	0	-
ae37fd
 Rule	Morocco	2079	only	-	Jun	25	 3:00	-1:00	-
ae37fd
@@ -1064,13 +1079,13 @@ Rule	Morocco	2080	only	-	Jul	21	 2:00	0	-
ae37fd
 Rule	Morocco	2081	only	-	Jun	 1	 3:00	-1:00	-
ae37fd
 Rule	Morocco	2081	only	-	Jul	13	 2:00	0	-
ae37fd
 Rule	Morocco	2082	only	-	May	24	 3:00	-1:00	-
ae37fd
-Rule	Morocco	2082	only	-	Jul	 5	 2:00	0	-
ae37fd
+Rule	Morocco	2082	only	-	Jun	28	 2:00	0	-
ae37fd
 Rule	Morocco	2083	only	-	May	16	 3:00	-1:00	-
ae37fd
 Rule	Morocco	2083	only	-	Jun	20	 2:00	0	-
ae37fd
 Rule	Morocco	2084	only	-	Apr	30	 3:00	-1:00	-
ae37fd
 Rule	Morocco	2084	only	-	Jun	11	 2:00	0	-
ae37fd
 Rule	Morocco	2085	only	-	Apr	22	 3:00	-1:00	-
ae37fd
-Rule	Morocco	2085	only	-	Jun	 3	 2:00	0	-
ae37fd
+Rule	Morocco	2085	only	-	May	27	 2:00	0	-
ae37fd
 Rule	Morocco	2086	only	-	Apr	14	 3:00	-1:00	-
ae37fd
 Rule	Morocco	2086	only	-	May	19	 2:00	0	-
ae37fd
 Rule	Morocco	2087	only	-	Mar	30	 3:00	-1:00	-
ae37fd
@@ -1213,15 +1228,15 @@ Zone	Africa/Windhoek	1:08:24 -	LMT	1892 Feb 8
ae37fd
 # From P Chan (2020-12-03):
ae37fd
 # GMT was adopted as the standard time of Lagos on 1905-07-01.
ae37fd
 # Lagos Weekly Record, 1905-06-24, p 3
ae37fd
-# http://ddsnext.crl.edu/titles/31558#?c=0&m=668&s=0&cv=2&r=0&xywh=1446%2C5221%2C1931%2C1235
ae37fd
+# http://ddsnext.crl.edu/titles/31558#?c=0&m=668&s=0&cv=2&r=0&xywh=1446,5221,1931,1235
ae37fd
 # says "It is officially notified that on and after the 1st of July 1905
ae37fd
-# Greenwich Mean Solar Time will be adopted thought the Colony and
ae37fd
+# Greenwich Mean Solar Time will be adopted throughout the Colony and
ae37fd
 # Protectorate, and that it will be necessary to put all clocks 13 minutes and
ae37fd
 # 35 seconds back, recording local mean time."
ae37fd
 #
ae37fd
 # It seemed that Lagos returned to LMT on 1908-07-01.
ae37fd
 # [The Lagos Standard], 1908-07-01, p 5
ae37fd
-# http://ddsnext.crl.edu/titles/31556#?c=0&m=78&s=0&cv=4&r=0&xywh=-92%2C3590%2C3944%2C2523
ae37fd
+# http://ddsnext.crl.edu/titles/31556#?c=0&m=78&s=0&cv=4&r=0&xywh=-92,3590,3944,2523
ae37fd
 # says "Scarcely have the people become accustomed to this new time, when
ae37fd
 # another official notice has now appeared announcing that from and after the
ae37fd
 # 1st July next, return will be made to local mean time."
ae37fd
@@ -1233,7 +1248,7 @@ Zone	Africa/Windhoek	1:08:24 -	LMT	1892 Feb 8
ae37fd
 # https://libsysdigi.library.illinois.edu/ilharvest/Africana/Books2011-05/3064634/3064634_1914/3064634_1914_opt.pdf#page=27
ae37fd
 # "On January 1st [1914], a universal standard time for Nigeria was adopted,
ae37fd
 # viz., half an hour fast on Greenwich mean time, corresponding to the meridian
ae37fd
-# 7 [degrees] 30' E. long."
ae37fd
+# 7° 30' E. long."
ae37fd
 # Lloyd's Register of Shipping (1915) says "Hitherto the time observed in Lagos
ae37fd
 # was the local mean time. On 1st January, 1914, standard time for the whole of
ae37fd
 # Nigeria was introduced ... Lagos time has been advanced about 16 minutes
ae37fd
@@ -1251,7 +1266,7 @@ Zone	Africa/Windhoek	1:08:24 -	LMT	1892 Feb 8
ae37fd
 # The Lagos Weekly Record, 1919-09-20, p 3 details discussion on the first
ae37fd
 # reading of this Bill by the Legislative Council of the Colony of Nigeria on
ae37fd
 # Thursday 1919-08-28:
ae37fd
-# http://ddsnext.crl.edu/titles/31558?terms&item_id=303484#?m=1118&c=1&s=0&cv=2&r=0&xywh=1261%2C3408%2C2994%2C1915
ae37fd
+# http://ddsnext.crl.edu/titles/31558?terms&item_id=303484#?m=1118&c=1&s=0&cv=2&r=0&xywh=1261,3408,2994,1915
ae37fd
 # "The proposal is that the Globe should be divided into twelve zones East and
ae37fd
 # West of Greenwich, of one hour each, Nigeria falling into the zone with a
ae37fd
 # standard of one hour fast on Greenwich Mean Time.  Nigeria standard time is
ae37fd
diff --git a/make/data/tzdata/antarctica b/make/data/tzdata/antarctica
ae37fd
index 792542b9224..3de5e726eb4 100644
ae37fd
--- a/make/data/tzdata/antarctica
ae37fd
+++ b/make/data/tzdata/antarctica
ae37fd
@@ -315,7 +315,7 @@ Zone Antarctica/Rothera	0	-	-00	1976 Dec  1
ae37fd
 # but that he found it more convenient to keep GMT+12
ae37fd
 # as supplies for the station were coming from McMurdo Sound,
ae37fd
 # which was on GMT+12 because New Zealand was on GMT+12 all year
ae37fd
-# at that time (1957).  (Source: Siple's book 90 Degrees South.)
ae37fd
+# at that time (1957).  (Source: Siple's book 90° South.)
ae37fd
 #
ae37fd
 # From Susan Smith
ae37fd
 # http://www.cybertours.com/whs/pole10.html
ae37fd
diff --git a/make/data/tzdata/asia b/make/data/tzdata/asia
ae37fd
index ff81978bc47..6a048c3ad28 100644
ae37fd
--- a/make/data/tzdata/asia
ae37fd
+++ b/make/data/tzdata/asia
ae37fd
@@ -2714,6 +2714,40 @@ Zone	Asia/Pyongyang	8:23:00 -	LMT	1908 Apr  1
ae37fd
 
ae37fd
 
ae37fd
 # Lebanon
ae37fd
+#
ae37fd
+# From Saadallah Itani (2023-03-23):
ae37fd
+# Lebanon ... announced today delay of Spring forward from March 25 to April 20.
ae37fd
+#
ae37fd
+# From Paul Eggert (2023-03-27):
ae37fd
+# This announcement was by the Lebanese caretaker prime minister Najib Mikati.
ae37fd
+# https://www.mtv.com.lb/en/News/Local/1352516/lebanon-postpones-daylight-saving-time-adoption
ae37fd
+# A video was later leaked to the media of parliament speaker Nabih Berri
ae37fd
+# asking Mikati to postpone DST to aid observance of Ramadan, Mikati objecting
ae37fd
+# that this would cause problems such as scheduling airline flights, to which
ae37fd
+# Berri interjected, "What flights?"
ae37fd
+#
ae37fd
+# The change was controversial and led to a partly-sectarian divide.
ae37fd
+# Many Lebanese institutions, including the education ministry, the Maronite
ae37fd
+# church, and two news channels LCBI and MTV, ignored the announcement and
ae37fd
+# went ahead with the long-scheduled spring-forward on March 25/26, some
ae37fd
+# arguing that the prime minister had not followed the law because the change
ae37fd
+# had not been approved by the cabinet.  Google went with the announcement;
ae37fd
+# Apple ignored it.  At least one bank followed the announcement for its doors,
ae37fd
+# but ignored the announcement in internal computer systems.
ae37fd
+# Beirut international airport listed two times for each departure.
ae37fd
+# Dan Azzi wrote "My view is that this whole thing is a Dumb and Dumber movie."
ae37fd
+# Eventually the prime minister backed down, said the cabinet had decided to
ae37fd
+# stick with its 1998 decision, and that DST would begin midnight March 29/30.
ae37fd
+# https://www.nna-leb.gov.lb/en/miscellaneous/604093/lebanon-has-two-times-of-day-amid-daylight-savings
ae37fd
+# https://www.cnbc.com/2023/03/27/lebanon-in-two-different-time-zones-as-government-disagrees-on-daylight-savings.html
ae37fd
+#
ae37fd
+# Although we could model the chaos with two Zones, that would likely cause
ae37fd
+# more trouble than it would cure.  Since so many manual clocks and
ae37fd
+# computer-based timestamps ignored the announcement, stick with official
ae37fd
+# cabinet resolutions in the data while recording the prime minister's
ae37fd
+# announcement as a comment.  This is how we treated a similar situation in
ae37fd
+# Rio de Janeiro in spring 1993.
ae37fd
+#
ae37fd
 # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
ae37fd
 Rule	Lebanon	1920	only	-	Mar	28	0:00	1:00	S
ae37fd
 Rule	Lebanon	1920	only	-	Oct	25	0:00	0	-
ae37fd
@@ -2739,6 +2773,10 @@ Rule	Lebanon	1992	only	-	Oct	4	0:00	0	-
ae37fd
 Rule	Lebanon	1993	max	-	Mar	lastSun	0:00	1:00	S
ae37fd
 Rule	Lebanon	1993	1998	-	Sep	lastSun	0:00	0	-
ae37fd
 Rule	Lebanon	1999	max	-	Oct	lastSun	0:00	0	-
ae37fd
+# This one-time rule, announced by the prime minister first for April 21
ae37fd
+# then for March 30, is commented out for reasons described above.
ae37fd
+#Rule	Lebanon	2023	only	-	Mar	30	0:00	1:00	S
ae37fd
+
ae37fd
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
ae37fd
 Zone	Asia/Beirut	2:22:00 -	LMT	1880
ae37fd
 			2:00	Lebanon	EE%sT
ae37fd
@@ -2977,7 +3015,7 @@ Zone	Asia/Kathmandu	5:41:16 -	LMT	1920
ae37fd
 # 9pm and moving clocks forward by one hour for the next three months. ...."
ae37fd
 #
ae37fd
 # http://www.worldtimezone.com/dst_news/dst_news_pakistan01.html
ae37fd
-# http://www.dailytimes.com.pk/default.asp?page=2008%5C05%5C15%5Cstory_15-5-2008_pg1_4
ae37fd
+# http://www.dailytimes.com.pk/default.asp?page=2008\05\15\story_15-5-2008_pg1_4
ae37fd
 
ae37fd
 # From Arthur David Olson (2008-05-19):
ae37fd
 # XXX--midnight transitions is a guess; 2008 only is a guess.
ae37fd
@@ -3300,7 +3338,7 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
ae37fd
 # Some of many sources in Arabic:
ae37fd
 # http://www.samanews.com/index.php?act=Show&id=122638
ae37fd
 #
ae37fd
-# http://safa.ps/details/news/74352/%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-%D8%A8%D8%A7%D9%84%D8%B6%D9%81%D8%A9-%D9%88%D8%BA%D8%B2%D8%A9-%D9%84%D9%8A%D9%84%D8%A9-%D8%A7%D9%84%D8%AC%D9%85%D8%B9%D8%A9.html
ae37fd
+# http://safa.ps/details/news/74352/بدء-التوقيت-الصيفي-بالضفة-وغزة-ليلة-الجمعة.html
ae37fd
 #
ae37fd
 # Our brief summary:
ae37fd
 # https://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html
ae37fd
@@ -3310,7 +3348,7 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
ae37fd
 # time from midnight on Friday, March 29, 2013" (translated).
ae37fd
 # [These are in Arabic and are for Gaza and for Ramallah, respectively.]
ae37fd
 # http://www.samanews.com/index.php?act=Show&id=154120
ae37fd
-# http://safa.ps/details/news/99844/%D8%B1%D8%A7%D9%85-%D8%A7%D9%84%D9%84%D9%87-%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-29-%D8%A7%D9%84%D8%AC%D8%A7%D8%B1%D9%8A.html
ae37fd
+# http://safa.ps/details/news/99844/رام-الله-بدء-التوقيت-الصيفي-29-الجاري.html
ae37fd
 
ae37fd
 # From Steffen Thorsen (2013-09-24):
ae37fd
 # The Gaza and West Bank are ending DST Thursday at midnight
ae37fd
@@ -3408,9 +3446,41 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
ae37fd
 # (2022-08-31): ... the Saturday before the last Sunday in March and October
ae37fd
 # at 2:00 AM ,for the years from 2023 to 2026.
ae37fd
 # (2022-09-05): https://mtit.pna.ps/Site/New/1453
ae37fd
-#
ae37fd
-# From Paul Eggert (2022-08-31):
ae37fd
-# For now, assume that this rule will also be used after 2026.
ae37fd
+
ae37fd
+# From Heba Hamad (2023-03-22):
ae37fd
+# ... summer time will begin in Palestine from Saturday 04-29-2023,
ae37fd
+# 02:00 AM by 60 minutes forward.
ae37fd
+#
ae37fd
+# From Paul Eggert (2023-03-22):
ae37fd
+# For now, guess that spring and fall transitions will normally
ae37fd
+# continue to use 2022's rules, that during DST Palestine will switch
ae37fd
+# to standard time at 02:00 the last Saturday before Ramadan and back
ae37fd
+# to DST at 02:00 the first Saturday after Ramadan, and that
ae37fd
+# if the normal spring-forward or fall-back transition occurs during
ae37fd
+# Ramadan the former is delayed and the latter advanced.
ae37fd
+# To implement this, I predicted Ramadan-oriented transition dates for
ae37fd
+# 2023 through 2086 by running the following program under GNU Emacs 28.2,
ae37fd
+# with the results integrated by hand into the table below.
ae37fd
+# Predictions after 2086 are approximated without Ramadan.
ae37fd
+#
ae37fd
+# (let ((islamic-year 1444))
ae37fd
+#   (require 'cal-islam)
ae37fd
+#   (while (< islamic-year 1510)
ae37fd
+#     (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
ae37fd
+#           (b (+ 1 (calendar-islamic-to-absolute (list 10 1 islamic-year))))
ae37fd
+#           (saturday 6))
ae37fd
+#       (while (/= saturday (mod (setq a (1- a)) 7)))
ae37fd
+#       (while (/= saturday (mod b 7))
ae37fd
+#         (setq b (1+ b)))
ae37fd
+#       (setq a (calendar-gregorian-from-absolute a))
ae37fd
+#       (setq b (calendar-gregorian-from-absolute b))
ae37fd
+#       (insert
ae37fd
+#        (format
ae37fd
+#         (concat "Rule Palestine\t%d\tonly\t-\t%s\t%2d\t2:00\t0\t-\n"
ae37fd
+#                 "Rule Palestine\t%d\tonly\t-\t%s\t%2d\t2:00\t1:00\tS\n")
ae37fd
+#         (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
ae37fd
+#         (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
ae37fd
+#     (setq islamic-year (+ 1 islamic-year))))
ae37fd
 
ae37fd
 # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
ae37fd
 Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
ae37fd
@@ -3450,8 +3520,86 @@ Rule Palestine	2020	2021	-	Mar	Sat<=30	0:00	1:00	S
ae37fd
 Rule Palestine	2020	only	-	Oct	24	1:00	0	-
ae37fd
 Rule Palestine	2021	only	-	Oct	29	1:00	0	-
ae37fd
 Rule Palestine	2022	only	-	Mar	27	0:00	1:00	S
ae37fd
-Rule Palestine	2022	max	-	Oct	Sat<=30	2:00	0	-
ae37fd
-Rule Palestine	2023	max	-	Mar	Sat<=30	2:00	1:00	S
ae37fd
+Rule Palestine	2022	2035	-	Oct	Sat<=30	2:00	0	-
ae37fd
+Rule Palestine	2023	only	-	Apr	29	2:00	1:00	S
ae37fd
+Rule Palestine	2024	only	-	Apr	13	2:00	1:00	S
ae37fd
+Rule Palestine	2025	only	-	Apr	 5	2:00	1:00	S
ae37fd
+Rule Palestine	2026	2054	-	Mar	Sat<=30	2:00	1:00	S
ae37fd
+Rule Palestine	2036	only	-	Oct	18	2:00	0	-
ae37fd
+Rule Palestine	2037	only	-	Oct	10	2:00	0	-
ae37fd
+Rule Palestine	2038	only	-	Sep	25	2:00	0	-
ae37fd
+Rule Palestine	2039	only	-	Sep	17	2:00	0	-
ae37fd
+Rule Palestine	2039	only	-	Oct	22	2:00	1:00	S
ae37fd
+Rule Palestine	2039	2067	-	Oct	Sat<=30	2:00	0	-
ae37fd
+Rule Palestine	2040	only	-	Sep	 1	2:00	0	-
ae37fd
+Rule Palestine	2040	only	-	Oct	13	2:00	1:00	S
ae37fd
+Rule Palestine	2041	only	-	Aug	24	2:00	0	-
ae37fd
+Rule Palestine	2041	only	-	Sep	28	2:00	1:00	S
ae37fd
+Rule Palestine	2042	only	-	Aug	16	2:00	0	-
ae37fd
+Rule Palestine	2042	only	-	Sep	20	2:00	1:00	S
ae37fd
+Rule Palestine	2043	only	-	Aug	 1	2:00	0	-
ae37fd
+Rule Palestine	2043	only	-	Sep	12	2:00	1:00	S
ae37fd
+Rule Palestine	2044	only	-	Jul	23	2:00	0	-
ae37fd
+Rule Palestine	2044	only	-	Aug	27	2:00	1:00	S
ae37fd
+Rule Palestine	2045	only	-	Jul	15	2:00	0	-
ae37fd
+Rule Palestine	2045	only	-	Aug	19	2:00	1:00	S
ae37fd
+Rule Palestine	2046	only	-	Jun	30	2:00	0	-
ae37fd
+Rule Palestine	2046	only	-	Aug	11	2:00	1:00	S
ae37fd
+Rule Palestine	2047	only	-	Jun	22	2:00	0	-
ae37fd
+Rule Palestine	2047	only	-	Jul	27	2:00	1:00	S
ae37fd
+Rule Palestine	2048	only	-	Jun	 6	2:00	0	-
ae37fd
+Rule Palestine	2048	only	-	Jul	18	2:00	1:00	S
ae37fd
+Rule Palestine	2049	only	-	May	29	2:00	0	-
ae37fd
+Rule Palestine	2049	only	-	Jul	 3	2:00	1:00	S
ae37fd
+Rule Palestine	2050	only	-	May	21	2:00	0	-
ae37fd
+Rule Palestine	2050	only	-	Jun	25	2:00	1:00	S
ae37fd
+Rule Palestine	2051	only	-	May	 6	2:00	0	-
ae37fd
+Rule Palestine	2051	only	-	Jun	17	2:00	1:00	S
ae37fd
+Rule Palestine	2052	only	-	Apr	27	2:00	0	-
ae37fd
+Rule Palestine	2052	only	-	Jun	 1	2:00	1:00	S
ae37fd
+Rule Palestine	2053	only	-	Apr	12	2:00	0	-
ae37fd
+Rule Palestine	2053	only	-	May	24	2:00	1:00	S
ae37fd
+Rule Palestine	2054	only	-	Apr	 4	2:00	0	-
ae37fd
+Rule Palestine	2054	only	-	May	16	2:00	1:00	S
ae37fd
+Rule Palestine	2055	only	-	May	 1	2:00	1:00	S
ae37fd
+Rule Palestine	2056	only	-	Apr	22	2:00	1:00	S
ae37fd
+Rule Palestine	2057	only	-	Apr	 7	2:00	1:00	S
ae37fd
+Rule Palestine	2058	max	-	Mar	Sat<=30	2:00	1:00	S
ae37fd
+Rule Palestine	2068	only	-	Oct	20	2:00	0	-
ae37fd
+Rule Palestine	2069	only	-	Oct	12	2:00	0	-
ae37fd
+Rule Palestine	2070	only	-	Oct	 4	2:00	0	-
ae37fd
+Rule Palestine	2071	only	-	Sep	19	2:00	0	-
ae37fd
+Rule Palestine	2072	only	-	Sep	10	2:00	0	-
ae37fd
+Rule Palestine	2072	only	-	Oct	15	2:00	1:00	S
ae37fd
+Rule Palestine	2073	only	-	Sep	 2	2:00	0	-
ae37fd
+Rule Palestine	2073	only	-	Oct	 7	2:00	1:00	S
ae37fd
+Rule Palestine	2074	only	-	Aug	18	2:00	0	-
ae37fd
+Rule Palestine	2074	only	-	Sep	29	2:00	1:00	S
ae37fd
+Rule Palestine	2075	only	-	Aug	10	2:00	0	-
ae37fd
+Rule Palestine	2075	only	-	Sep	14	2:00	1:00	S
ae37fd
+Rule Palestine	2075	max	-	Oct	Sat<=30	2:00	0	-
ae37fd
+Rule Palestine	2076	only	-	Jul	25	2:00	0	-
ae37fd
+Rule Palestine	2076	only	-	Sep	 5	2:00	1:00	S
ae37fd
+Rule Palestine	2077	only	-	Jul	17	2:00	0	-
ae37fd
+Rule Palestine	2077	only	-	Aug	28	2:00	1:00	S
ae37fd
+Rule Palestine	2078	only	-	Jul	 9	2:00	0	-
ae37fd
+Rule Palestine	2078	only	-	Aug	13	2:00	1:00	S
ae37fd
+Rule Palestine	2079	only	-	Jun	24	2:00	0	-
ae37fd
+Rule Palestine	2079	only	-	Aug	 5	2:00	1:00	S
ae37fd
+Rule Palestine	2080	only	-	Jun	15	2:00	0	-
ae37fd
+Rule Palestine	2080	only	-	Jul	20	2:00	1:00	S
ae37fd
+Rule Palestine	2081	only	-	Jun	 7	2:00	0	-
ae37fd
+Rule Palestine	2081	only	-	Jul	12	2:00	1:00	S
ae37fd
+Rule Palestine	2082	only	-	May	23	2:00	0	-
ae37fd
+Rule Palestine	2082	only	-	Jul	 4	2:00	1:00	S
ae37fd
+Rule Palestine	2083	only	-	May	15	2:00	0	-
ae37fd
+Rule Palestine	2083	only	-	Jun	19	2:00	1:00	S
ae37fd
+Rule Palestine	2084	only	-	Apr	29	2:00	0	-
ae37fd
+Rule Palestine	2084	only	-	Jun	10	2:00	1:00	S
ae37fd
+Rule Palestine	2085	only	-	Apr	21	2:00	0	-
ae37fd
+Rule Palestine	2085	only	-	Jun	 2	2:00	1:00	S
ae37fd
+Rule Palestine	2086	only	-	Apr	13	2:00	0	-
ae37fd
+Rule Palestine	2086	only	-	May	18	2:00	1:00	S
ae37fd
 
ae37fd
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
ae37fd
 Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
ae37fd
@@ -3655,7 +3803,7 @@ Zone	Asia/Singapore	6:55:25 -	LMT	1901 Jan  1
ae37fd
 # standard time is SLST.
ae37fd
 #
ae37fd
 # From Paul Eggert (2016-10-18):
ae37fd
-# "SLST" seems to be reasonably recent and rarely-used outside time
ae37fd
+# "SLST" seems to be reasonably recent and rarely used outside time
ae37fd
 # zone nerd sources.  I searched Google News and found three uses of
ae37fd
 # it in the International Business Times of India in February and
ae37fd
 # March of this year when discussing cricket match times, but nothing
ae37fd
diff --git a/make/data/tzdata/australasia b/make/data/tzdata/australasia
ae37fd
index fbe3b8a6d72..893d7055eab 100644
ae37fd
--- a/make/data/tzdata/australasia
ae37fd
+++ b/make/data/tzdata/australasia
ae37fd
@@ -346,7 +346,7 @@ Zone Antarctica/Macquarie 0	-	-00	1899 Nov
ae37fd
 
ae37fd
 # From Steffen Thorsen (2013-01-10):
ae37fd
 # Fiji will end DST on 2014-01-19 02:00:
ae37fd
-# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-%281%29.aspx
ae37fd
+# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-(1).aspx
ae37fd
 
ae37fd
 # From Ken Rylander (2014-10-20):
ae37fd
 # DST will start Nov. 2 this year.
ae37fd
@@ -746,7 +746,7 @@ Zone Pacific/Pago_Pago	 12:37:12 -	LMT	1892 Jul  5
ae37fd
 #
ae37fd
 # Samoa's Daylight Saving Time Act 2009 is available here, but does not
ae37fd
 # contain any dates:
ae37fd
-# http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20%28English%29%20-%20Final%207-7-091.pdf
ae37fd
+# http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20(English)%20-%20Final%207-7-091.pdf
ae37fd
 
ae37fd
 # From Laupue Raymond Hughes (2010-10-07):
ae37fd
 # Please see
ae37fd
@@ -1831,7 +1831,7 @@ Zone	Pacific/Efate	11:13:16 -	LMT	1912 Jan 13 # Vila
ae37fd
 # period.  It would probably be reasonable to assume Guam use GMT+9 during
ae37fd
 # that period of time like the surrounding area.
ae37fd
 
ae37fd
-# From Paul Eggert (2018-11-18):
ae37fd
+# From Paul Eggert (2023-01-23):
ae37fd
 # Howse writes (p 153) "The Spaniards, on the other hand, reached the
ae37fd
 # Philippines and the Ladrones from America," and implies that the Ladrones
ae37fd
 # (now called the Marianas) kept American date for quite some time.
ae37fd
@@ -1844,7 +1844,7 @@ Zone	Pacific/Efate	11:13:16 -	LMT	1912 Jan 13 # Vila
ae37fd
 # they did as that avoids the need for a separate zone due to our 1970 cutoff.
ae37fd
 #
ae37fd
 # US Public Law 106-564 (2000-12-23) made UT +10 the official standard time,
ae37fd
-# under the name "Chamorro Standard Time".  There is no official abbreviation,
ae37fd
+# under the name "Chamorro standard time".  There is no official abbreviation,
ae37fd
 # but Congressman Robert A. Underwood, author of the bill that became law,
ae37fd
 # wrote in a press release (2000-12-27) that he will seek the use of "ChST".
ae37fd
 
ae37fd
@@ -2222,24 +2222,18 @@ Zone	Pacific/Efate	11:13:16 -	LMT	1912 Jan 13 # Vila
ae37fd
 # an international standard, there are some places on the high seas where the
ae37fd
 # correct date is ambiguous.
ae37fd
 
ae37fd
-# From Wikipedia <https://en.wikipedia.org/wiki/Time_zone> (2005-08-31):
ae37fd
-# Before 1920, all ships kept local apparent time on the high seas by setting
ae37fd
-# their clocks at night or at the morning sight so that, given the ship's
ae37fd
-# speed and direction, it would be 12 o'clock when the Sun crossed the ship's
ae37fd
-# meridian (12 o'clock = local apparent noon).  During 1917, at the
ae37fd
-# Anglo-French Conference on Time-keeping at Sea, it was recommended that all
ae37fd
-# ships, both military and civilian, should adopt hourly standard time zones
ae37fd
-# on the high seas.  Whenever a ship was within the territorial waters of any
ae37fd
-# nation it would use that nation's standard time.  The captain was permitted
ae37fd
-# to change his ship's clocks at a time of his choice following his ship's
ae37fd
-# entry into another zone time - he often chose midnight.  These zones were
ae37fd
-# adopted by all major fleets between 1920 and 1925 but not by many
ae37fd
-# independent merchant ships until World War II.
ae37fd
-
ae37fd
-# From Paul Eggert, using references suggested by Oscar van Vlijmen
ae37fd
-# (2005-03-20):
ae37fd
-#
ae37fd
-# The American Practical Navigator (2002)
ae37fd
-# http://pollux.nss.nima.mil/pubs/pubs_j_apn_sections.html?rid=187
ae37fd
-# talks only about the 180-degree meridian with respect to ships in
ae37fd
-# international waters; it ignores the international date line.
ae37fd
+# From Wikipedia <https://en.wikipedia.org/wiki/Nautical_time> (2023-01-23):
ae37fd
+# The nautical time zone system is analogous to the terrestrial time zone
ae37fd
+# system for use on high seas.  Under the system time changes are required for
ae37fd
+# changes of longitude in one-hour steps.  The one-hour step corresponds to a
ae37fd
+# time zone width of 15° longitude.  The 15° gore that is offset from GMT or
ae37fd
+# UT1 (not UTC) by twelve hours is bisected by the nautical date line into two
ae37fd
+# 7°30' gores that differ from GMT by ±12 hours.  A nautical date line is
ae37fd
+# implied but not explicitly drawn on time zone maps.  It follows the 180th
ae37fd
+# meridian except where it is interrupted by territorial waters adjacent to
ae37fd
+# land, forming gaps: it is a pole-to-pole dashed line.
ae37fd
+
ae37fd
+# From Paul Eggert (2023-01-23):
ae37fd
+# The American Practical Navigator <https://msi.nga.mil/Publications/APN>,
ae37fd
+# 2019 edition, merely says that the International Date Line
ae37fd
+# "coincides with the 180th meridian over most of its length."
ae37fd
diff --git a/make/data/tzdata/backward b/make/data/tzdata/backward
ae37fd
index fa44f655009..c0746d6dd1b 100644
ae37fd
--- a/make/data/tzdata/backward
ae37fd
+++ b/make/data/tzdata/backward
ae37fd
@@ -297,6 +297,7 @@ Link	America/Argentina/Cordoba	America/Rosario
ae37fd
 Link	America/Tijuana		America/Santa_Isabel
ae37fd
 Link	America/Denver		America/Shiprock
ae37fd
 Link	America/Toronto		America/Thunder_Bay
ae37fd
+Link	America/Edmonton	America/Yellowknife
ae37fd
 Link	Pacific/Auckland	Antarctica/South_Pole
ae37fd
 Link	Asia/Shanghai		Asia/Chongqing
ae37fd
 Link	Asia/Shanghai		Asia/Harbin
ae37fd
diff --git a/make/data/tzdata/europe b/make/data/tzdata/europe
ae37fd
index acc5da3ec79..446d2e1e658 100644
ae37fd
--- a/make/data/tzdata/europe
ae37fd
+++ b/make/data/tzdata/europe
ae37fd
@@ -540,9 +540,7 @@ Zone	Europe/London	-0:01:15 -	LMT	1847 Dec  1
ae37fd
 # other form with a traditional approximation for Irish timestamps
ae37fd
 # after 1971-10-31 02:00 UTC; although this approximation has tm_isdst
ae37fd
 # flags that are reversed, its UTC offsets are correct and this often
ae37fd
-# suffices.  This source file currently uses only nonnegative SAVE
ae37fd
-# values, but this is intended to change and downstream code should
ae37fd
-# not rely on it.
ae37fd
+# suffices....
ae37fd
 #
ae37fd
 # The following is like GB-Eire and EU, except with standard time in
ae37fd
 # summer and negative daylight saving time in winter.  It is for when
ae37fd
@@ -1136,19 +1134,18 @@ Zone Atlantic/Faroe	-0:27:04 -	LMT	1908 Jan 11 # Tórshavn
ae37fd
 #
ae37fd
 # From Jürgen Appel (2022-11-25):
ae37fd
 # https://ina.gl/samlinger/oversigt-over-samlinger/samling/dagsordener/dagsorden.aspx?lang=da&day=24-11-2022
ae37fd
-# If I understand this correctly, from the next planned switch to
ae37fd
-# summer time, Greenland will permanently stay at that time, i.e. no
ae37fd
-# switch back to winter time in 2023 will occur.
ae37fd
-#
ae37fd
-# From Paul Eggert (2022-11-28):
ae37fd
-# The official document in Danish
ae37fd
-# https://naalakkersuisut.gl/-/media/naalakkersuisut/filer/kundgoerelser/2022/11/2511/31_da_inatsisartutlov-om-tidens-bestemmelse.pdf?la=da&hash=A33597D8A38CC7038465241119EF34F3
ae37fd
-# says standard time for Greenland is -02, that Naalakkersuisut can lay down
ae37fd
-# rules for DST and can require some areas to use a different time zone,
ae37fd
-# and that this all takes effect 2023-03-25 22:00.  The abovementioned
ae37fd
-# "bekymringer" URL says the intent is no transition March 25, that
ae37fd
-# Greenland will not go back to winter time in fall 2023, and that
ae37fd
-# only America/Nuuk is affected (though further changes may occur).
ae37fd
+#
ae37fd
+# From Thomas M. Steenholdt (2022-12-02):
ae37fd
+# - The bill to move America/Nuuk from UTC-03 to UTC-02 passed.
ae37fd
+# - The bill to stop observing DST did not (Greenland will stop observing DST
ae37fd
+#   when EU does).
ae37fd
+# Details on the implementation are here (section 6):
ae37fd
+# https://ina.gl/dvd/EM%202022/pdf/media/2553529/pkt17_em2022_tidens_bestemmelse_bem_da.pdf
ae37fd
+# This is how the change will be implemented:
ae37fd
+# 1. The shift *to* DST in 2023 happens as normal.
ae37fd
+# 2. The shift *from* DST in 2023 happens as normal, but coincides with the
ae37fd
+#    shift to UTC-02 normaltime (people will not change their clocks here).
ae37fd
+# 3. After this, DST is still observed, but as -02/-01 instead of -03/-02.
ae37fd
 
ae37fd
 # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
ae37fd
 Rule	Thule	1991	1992	-	Mar	lastSun	2:00	1:00	D
ae37fd
@@ -1172,8 +1169,8 @@ Zone America/Scoresbysund -1:27:52 -	LMT	1916 Jul 28 # Ittoqqortoormiit
ae37fd
 			-1:00	EU	-01/+00
ae37fd
 Zone America/Nuuk	-3:26:56 -	LMT	1916 Jul 28 # Godthåb
ae37fd
 			-3:00	-	-03	1980 Apr  6  2:00
ae37fd
-			-3:00	EU	-03/-02	2023 Mar 25 22:00
ae37fd
-			-2:00	-	-02
ae37fd
+			-3:00	EU	-03/-02	2023 Oct 29  1:00u
ae37fd
+			-2:00	EU	-02/-01
ae37fd
 Zone America/Thule	-4:35:08 -	LMT	1916 Jul 28 # Pituffik
ae37fd
 			-4:00	Thule	A%sT
ae37fd
 
ae37fd
@@ -1509,9 +1506,9 @@ Zone	Europe/Paris	0:09:21 -	LMT	1891 Mar 16
ae37fd
 Rule	Germany	1946	only	-	Apr	14	2:00s	1:00	S
ae37fd
 Rule	Germany	1946	only	-	Oct	 7	2:00s	0	-
ae37fd
 Rule	Germany	1947	1949	-	Oct	Sun>=1	2:00s	0	-
ae37fd
-# http://www.ptb.de/de/org/4/44/441/salt.htm says the following transition
ae37fd
-# occurred at 3:00 MEZ, not the 2:00 MEZ given in Shanks & Pottenger.
ae37fd
-# Go with the PTB.
ae37fd
+# https://www.ptb.de/cms/en/ptb/fachabteilungen/abt4/fb-44/ag-441/realisation-of-legal-time-in-germany/dst-and-midsummer-dst-in-germany-until-1979.html
ae37fd
+# says the following transition occurred at 3:00 MEZ, not the 2:00 MEZ
ae37fd
+# given in Shanks & Pottenger. Go with the PTB.
ae37fd
 Rule	Germany	1947	only	-	Apr	 6	3:00s	1:00	S
ae37fd
 Rule	Germany	1947	only	-	May	11	2:00s	2:00	M
ae37fd
 Rule	Germany	1947	only	-	Jun	29	3:00	1:00	S
ae37fd
@@ -2272,7 +2269,7 @@ Zone Europe/Bucharest	1:44:24 -	LMT	1891 Oct
ae37fd
 # the State Duma has approved ... the draft bill on returning to
ae37fd
 # winter time standard and return Russia 11 time zones.  The new
ae37fd
 # regulations will come into effect on October 26, 2014 at 02:00 ...
ae37fd
-# http://asozd2.duma.gov.ru/main.nsf/%28Spravka%29?OpenAgent&RN=431985-6&02
ae37fd
+# http://asozd2.duma.gov.ru/main.nsf/(Spravka)?OpenAgent&RN=431985-6&02
ae37fd
 # Here is a link where we put together table (based on approved Bill N
ae37fd
 # 431985-6) with proposed 11 Russian time zones and corresponding
ae37fd
 # areas/cities/administrative centers in the Russian Federation (in English):
ae37fd
@@ -2682,13 +2679,13 @@ Zone Europe/Volgograd	 2:57:40 -	LMT	1920 Jan  3
ae37fd
 			 3:00	-	+03	1930 Jun 21
ae37fd
 			 4:00	-	+04	1961 Nov 11
ae37fd
 			 4:00	Russia	+04/+05	1988 Mar 27  2:00s
ae37fd
-			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
ae37fd
+			 3:00	Russia	MSK/MSD	1991 Mar 31  2:00s
ae37fd
 			 4:00	-	+04	1992 Mar 29  2:00s
ae37fd
-			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
ae37fd
-			 4:00	-	+04	2014 Oct 26  2:00s
ae37fd
-			 3:00	-	+03	2018 Oct 28  2:00s
ae37fd
+			 3:00	Russia	MSK/MSD	2011 Mar 27  2:00s
ae37fd
+			 4:00	-	MSK	2014 Oct 26  2:00s
ae37fd
+			 3:00	-	MSK	2018 Oct 28  2:00s
ae37fd
 			 4:00	-	+04	2020 Dec 27  2:00s
ae37fd
-			 3:00	-	+03
ae37fd
+			 3:00	-	MSK
ae37fd
 
ae37fd
 # From Paul Eggert (2016-11-11):
ae37fd
 # Europe/Saratov covers:
ae37fd
@@ -2719,11 +2716,11 @@ Zone Europe/Saratov	 3:04:18 -	LMT	1919 Jul  1  0:00u
ae37fd
 Zone Europe/Kirov	 3:18:48 -	LMT	1919 Jul  1  0:00u
ae37fd
 			 3:00	-	+03	1930 Jun 21
ae37fd
 			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
ae37fd
-			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
ae37fd
+			 3:00	Russia	MSK/MSD	1991 Mar 31  2:00s
ae37fd
 			 4:00	-	+04	1992 Mar 29  2:00s
ae37fd
-			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
ae37fd
-			 4:00	-	+04	2014 Oct 26  2:00s
ae37fd
-			 3:00	-	+03
ae37fd
+			 3:00	Russia	MSK/MSD	2011 Mar 27  2:00s
ae37fd
+			 4:00	-	MSK	2014 Oct 26  2:00s
ae37fd
+			 3:00	-	MSK
ae37fd
 
ae37fd
 # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
ae37fd
 # Europe/Samara covers...
ae37fd
diff --git a/make/data/tzdata/iso3166.tab b/make/data/tzdata/iso3166.tab
ae37fd
index fbfb74bec45..cea17732dd1 100644
ae37fd
--- a/make/data/tzdata/iso3166.tab
ae37fd
+++ b/make/data/tzdata/iso3166.tab
ae37fd
@@ -261,7 +261,7 @@ SY	Syria
ae37fd
 SZ	Eswatini (Swaziland)
ae37fd
 TC	Turks & Caicos Is
ae37fd
 TD	Chad
ae37fd
-TF	French Southern Territories
ae37fd
+TF	French S. Terr.
ae37fd
 TG	Togo
ae37fd
 TH	Thailand
ae37fd
 TJ	Tajikistan
ae37fd
diff --git a/make/data/tzdata/leapseconds b/make/data/tzdata/leapseconds
ae37fd
index d6fb840f512..89ce8b89cd2 100644
ae37fd
--- a/make/data/tzdata/leapseconds
ae37fd
+++ b/make/data/tzdata/leapseconds
ae37fd
@@ -95,11 +95,11 @@ Leap	2016	Dec	31	23:59:60	+	S
ae37fd
 # Any additional leap seconds will come after this.
ae37fd
 # This Expires line is commented out for now,
ae37fd
 # so that pre-2020a zic implementations do not reject this file.
ae37fd
-#Expires 2023	Jun	28	00:00:00
ae37fd
+#Expires 2023	Dec	28	00:00:00
ae37fd
 
ae37fd
 # POSIX timestamps for the data in this file:
ae37fd
 #updated 1467936000 (2016-07-08 00:00:00 UTC)
ae37fd
-#expires 1687910400 (2023-06-28 00:00:00 UTC)
ae37fd
+#expires 1703721600 (2023-12-28 00:00:00 UTC)
ae37fd
 
ae37fd
-#	Updated through IERS Bulletin C64
ae37fd
-#	File expires on:  28 June 2023
ae37fd
+#	Updated through IERS Bulletin C65
ae37fd
+#	File expires on:  28 December 2023
ae37fd
diff --git a/make/data/tzdata/northamerica b/make/data/tzdata/northamerica
ae37fd
index a5fd701f88c..e240cf35103 100644
ae37fd
--- a/make/data/tzdata/northamerica
ae37fd
+++ b/make/data/tzdata/northamerica
ae37fd
@@ -1,4 +1,3 @@
ae37fd
-#
ae37fd
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
ae37fd
 #
ae37fd
 # This code is free software; you can redistribute it and/or modify it
ae37fd
@@ -299,9 +298,10 @@ Zone	PST8PDT		 -8:00	US	P%sT
ae37fd
 #  -10	Standard Alaska Time (AST)	Alaska-Hawaii standard time (AHST)
ae37fd
 #  -11	(unofficial) Nome (NST)		Bering standard time (BST)
ae37fd
 #
ae37fd
-# From Paul Eggert (2000-01-08), following a heads-up from Rives McDow:
ae37fd
-# Public law 106-564 (2000-12-23) introduced ... "Chamorro Standard Time"
ae37fd
+# From Paul Eggert (2023-01-23), from a 2001-01-08 heads-up from Rives McDow:
ae37fd
+# Public law 106-564 (2000-12-23) introduced "Chamorro standard time"
ae37fd
 # for time in Guam and the Northern Marianas.  See the file "australasia".
ae37fd
+# Also see 15 U.S.C. §263 <https://www.law.cornell.edu/uscode/text/15/263>.
ae37fd
 #
ae37fd
 # From Paul Eggert (2015-04-17):
ae37fd
 # HST and HDT are standardized abbreviations for Hawaii-Aleutian
ae37fd
@@ -618,7 +618,7 @@ Zone America/Los_Angeles -7:52:58 -	LMT	1883 Nov 18 20:00u
ae37fd
 # local times of other Alaskan locations so that they change simultaneously.
ae37fd
 
ae37fd
 # From Paul Eggert (2014-07-18):
ae37fd
-# One opinion of the early-1980s turmoil in Alaska over time zones and
ae37fd
+# One opinion of the early 1980s turmoil in Alaska over time zones and
ae37fd
 # daylight saving time appeared as graffiti on a Juneau airport wall:
ae37fd
 # "Welcome to Juneau.  Please turn your watch back to the 19th century."
ae37fd
 # See: Turner W. Alaska's four time zones now two. NY Times 1983-11-01.
ae37fd
@@ -690,6 +690,10 @@ Zone America/Los_Angeles -7:52:58 -	LMT	1883 Nov 18 20:00u
ae37fd
 # So they won't be waiting for Alaska to join them on 2019-03-10, but will
ae37fd
 # rather change their clocks twice in seven weeks.
ae37fd
 
ae37fd
+# From Paul Eggert (2023-01-23):
ae37fd
+# America/Adak is for the Aleutian Islands that are part of Alaska
ae37fd
+# and are west of 169.5° W.
ae37fd
+
ae37fd
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
ae37fd
 Zone America/Juneau	 15:02:19 -	LMT	1867 Oct 19 15:33:32
ae37fd
 			 -8:57:41 -	LMT	1900 Aug 20 12:00
ae37fd
@@ -2148,10 +2152,6 @@ Zone America/Fort_Nelson	-8:10:47 -	LMT	1884
ae37fd
 # Nunavut ... moved ... to incorporate the whole territory into one time zone.
ae37fd
 # Nunavut moves to single time zone Oct. 31
ae37fd
 # http://www.nunatsiaq.com/nunavut/nvt90903_13.html
ae37fd
-#
ae37fd
-# From Antoine Leca (1999-09-06):
ae37fd
-# We then need to create a new timezone for the Kitikmeot region of Nunavut
ae37fd
-# to differentiate it from the Yellowknife region.
ae37fd
 
ae37fd
 # From Paul Eggert (1999-09-20):
ae37fd
 # Basic Facts: The New Territory
ae37fd
@@ -2345,9 +2345,6 @@ Zone America/Cambridge_Bay 0	-	-00	1920 # trading post est.?
ae37fd
 			-5:00	-	EST	2000 Nov  5  0:00
ae37fd
 			-6:00	-	CST	2001 Apr  1  3:00
ae37fd
 			-7:00	Canada	M%sT
ae37fd
-Zone America/Yellowknife 0	-	-00	1935 # Yellowknife founded?
ae37fd
-			-7:00	NT_YK	M%sT	1980
ae37fd
-			-7:00	Canada	M%sT
ae37fd
 Zone America/Inuvik	0	-	-00	1953 # Inuvik founded
ae37fd
 			-8:00	NT_YK	P%sT	1979 Apr lastSun  2:00
ae37fd
 			-7:00	NT_YK	M%sT	1980
ae37fd
@@ -2584,7 +2581,7 @@ Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
ae37fd
 # and in addition changes all of Chihuahua to -06 with no DST.
ae37fd
 
ae37fd
 # From Heitor David Pinto (2022-11-28):
ae37fd
-# Now the northern municipalities want to have the same time zone as the
ae37fd
+# Now the northern [municipios] want to have the same time zone as the
ae37fd
 # respective neighboring cities in the US, for example Juárez in UTC-7 with
ae37fd
 # DST, matching El Paso, and Ojinaga in UTC-6 with DST, matching Presidio....
ae37fd
 # the president authorized the publication of the decree for November 29,
ae37fd
@@ -2621,7 +2618,7 @@ Zone America/Merida	-5:58:28 -	LMT	1922 Jan  1  6:00u
ae37fd
 			-5:00	-	EST	1982 Dec  2
ae37fd
 			-6:00	Mexico	C%sT
ae37fd
 # Coahuila, Nuevo León, Tamaulipas (near US border)
ae37fd
-# This includes the following municipalities:
ae37fd
+# This includes the following municipios:
ae37fd
 #   in Coahuila: Acuña, Allende, Guerrero, Hidalgo, Jiménez, Morelos, Nava,
ae37fd
 #     Ocampo, Piedras Negras, Villa Unión, Zaragoza
ae37fd
 #   in Nuevo León: Anáhuac
ae37fd
@@ -2647,8 +2644,8 @@ Zone America/Mexico_City -6:36:36 -	LMT	1922 Jan  1  7:00u
ae37fd
 			-6:00	-	CST	2002 Feb 20
ae37fd
 			-6:00	Mexico	C%sT
ae37fd
 # Chihuahua (near US border - western side)
ae37fd
-# This includes the municipalities of Janos, Ascensión, Juárez, Guadalupe,
ae37fd
-# and Práxedis G Guerrero.
ae37fd
+# This includes the municipios of Janos, Ascensión, Juárez, Guadalupe, and
ae37fd
+# Práxedis G Guerrero.
ae37fd
 # http://gaceta.diputados.gob.mx/PDF/65/2a022/nov/20221124-VII.pdf
ae37fd
 Zone America/Ciudad_Juarez -7:05:56 -	LMT	1922 Jan  1  7:00u
ae37fd
 			-7:00	-	MST	1927 Jun 10 23:00
ae37fd
@@ -2662,7 +2659,8 @@ Zone America/Ciudad_Juarez -7:05:56 -	LMT	1922 Jan  1  7:00u
ae37fd
 			-6:00	-	CST	2022 Nov 30  0:00
ae37fd
 			-7:00	US	M%sT
ae37fd
 # Chihuahua (near US border - eastern side)
ae37fd
-# The municipalities of Coyame del Sotol, Ojinaga, and Manuel Benavides.
ae37fd
+# This includes the municipios of Coyame del Sotol, Ojinaga, and Manuel
ae37fd
+# Benavides.
ae37fd
 # http://gaceta.diputados.gob.mx/PDF/65/2a022/nov/20221124-VII.pdf
ae37fd
 Zone America/Ojinaga	-6:57:40 -	LMT	1922 Jan  1  7:00u
ae37fd
 			-7:00	-	MST	1927 Jun 10 23:00
ae37fd
@@ -3083,7 +3081,7 @@ Zone America/Costa_Rica	-5:36:13 -	LMT	1890        # San José
ae37fd
 #
ae37fd
 # He supplied these references:
ae37fd
 #
ae37fd
-# http://www.prensalatina.com.mx/article.asp?ID=%7B4CC32C1B-A9F7-42FB-8A07-8631AFC923AF%7D&language=ES
ae37fd
+# http://www.prensalatina.com.mx/article.asp?ID={4CC32C1B-A9F7-42FB-8A07-8631AFC923AF}&language=ES
ae37fd
 # http://actualidad.terra.es/sociedad/articulo/cuba_llama_ahorrar_energia_cambio_1957044.htm
ae37fd
 #
ae37fd
 # From Alex Krivenyshev (2007-10-25):
ae37fd
diff --git a/make/data/tzdata/southamerica b/make/data/tzdata/southamerica
ae37fd
index 81fdd793df4..4024e7180cd 100644
ae37fd
--- a/make/data/tzdata/southamerica
ae37fd
+++ b/make/data/tzdata/southamerica
ae37fd
@@ -231,7 +231,7 @@ Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:00	-
ae37fd
 # Hora de verano para la República Argentina
ae37fd
 # http://buenasiembra.com.ar/esoterismo/astrologia/hora-de-verano-de-la-republica-argentina-27.html
ae37fd
 # says that standard time in Argentina from 1894-10-31
ae37fd
-# to 1920-05-01 was -4:16:48.25.  Go with this more-precise value
ae37fd
+# to 1920-05-01 was -4:16:48.25.  Go with this more precise value
ae37fd
 # over Shanks & Pottenger.  It is upward compatible with Milne, who
ae37fd
 # says Córdoba time was -4:16:48.2.
ae37fd
 
ae37fd
diff --git a/make/data/tzdata/zone.tab b/make/data/tzdata/zone.tab
ae37fd
index 939432d3456..3edb0d61c80 100644
ae37fd
--- a/make/data/tzdata/zone.tab
ae37fd
+++ b/make/data/tzdata/zone.tab
ae37fd
@@ -144,9 +144,8 @@ CA	+744144-0944945	America/Resolute	Central - NU (Resolute)
ae37fd
 CA	+624900-0920459	America/Rankin_Inlet	Central - NU (central)
ae37fd
 CA	+5024-10439	America/Regina	CST - SK (most areas)
ae37fd
 CA	+5017-10750	America/Swift_Current	CST - SK (midwest)
ae37fd
-CA	+5333-11328	America/Edmonton	Mountain - AB; BC (E); SK (W)
ae37fd
+CA	+5333-11328	America/Edmonton	Mountain - AB; BC (E); NT (E); SK (W)
ae37fd
 CA	+690650-1050310	America/Cambridge_Bay	Mountain - NU (west)
ae37fd
-CA	+6227-11421	America/Yellowknife	Mountain - NT (central)
ae37fd
 CA	+682059-1334300	America/Inuvik	Mountain - NT (west)
ae37fd
 CA	+4906-11631	America/Creston	MST - BC (Creston)
ae37fd
 CA	+5546-12014	America/Dawson_Creek	MST - BC (Dawson Cr, Ft St John)
ae37fd
@@ -162,7 +161,7 @@ CG	-0416+01517	Africa/Brazzaville
ae37fd
 CH	+4723+00832	Europe/Zurich
ae37fd
 CI	+0519-00402	Africa/Abidjan
ae37fd
 CK	-2114-15946	Pacific/Rarotonga
ae37fd
-CL	-3327-07040	America/Santiago	Chile (most areas)
ae37fd
+CL	-3327-07040	America/Santiago	most of Chile
ae37fd
 CL	-5309-07055	America/Punta_Arenas	Region of Magallanes
ae37fd
 CL	-2709-10926	Pacific/Easter	Easter Island
ae37fd
 CM	+0403+00942	Africa/Douala
ae37fd
@@ -174,10 +173,10 @@ CU	+2308-08222	America/Havana
ae37fd
 CV	+1455-02331	Atlantic/Cape_Verde
ae37fd
 CW	+1211-06900	America/Curacao
ae37fd
 CX	-1025+10543	Indian/Christmas
ae37fd
-CY	+3510+03322	Asia/Nicosia	Cyprus (most areas)
ae37fd
+CY	+3510+03322	Asia/Nicosia	most of Cyprus
ae37fd
 CY	+3507+03357	Asia/Famagusta	Northern Cyprus
ae37fd
 CZ	+5005+01426	Europe/Prague
ae37fd
-DE	+5230+01322	Europe/Berlin	Germany (most areas)
ae37fd
+DE	+5230+01322	Europe/Berlin	most of Germany
ae37fd
 DE	+4742+00841	Europe/Busingen	Busingen
ae37fd
 DJ	+1136+04309	Africa/Djibouti
ae37fd
 DK	+5540+01235	Europe/Copenhagen
ae37fd
@@ -210,7 +209,7 @@ GF	+0456-05220	America/Cayenne
ae37fd
 GG	+492717-0023210	Europe/Guernsey
ae37fd
 GH	+0533-00013	Africa/Accra
ae37fd
 GI	+3608-00521	Europe/Gibraltar
ae37fd
-GL	+6411-05144	America/Nuuk	Greenland (most areas)
ae37fd
+GL	+6411-05144	America/Nuuk	most of Greenland
ae37fd
 GL	+7646-01840	America/Danmarkshavn	National Park (east coast)
ae37fd
 GL	+7029-02158	America/Scoresbysund	Scoresbysund/Ittoqqortoormiit
ae37fd
 GL	+7634-06847	America/Thule	Thule/Pituffik
ae37fd
@@ -258,7 +257,7 @@ KP	+3901+12545	Asia/Pyongyang
ae37fd
 KR	+3733+12658	Asia/Seoul
ae37fd
 KW	+2920+04759	Asia/Kuwait
ae37fd
 KY	+1918-08123	America/Cayman
ae37fd
-KZ	+4315+07657	Asia/Almaty	Kazakhstan (most areas)
ae37fd
+KZ	+4315+07657	Asia/Almaty	most of Kazakhstan
ae37fd
 KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda/Kyzylorda/Kzyl-Orda
ae37fd
 KZ	+5312+06337	Asia/Qostanay	Qostanay/Kostanay/Kustanay
ae37fd
 KZ	+5017+05710	Asia/Aqtobe	Aqtobe/Aktobe
ae37fd
@@ -282,12 +281,12 @@ MD	+4700+02850	Europe/Chisinau
ae37fd
 ME	+4226+01916	Europe/Podgorica
ae37fd
 MF	+1804-06305	America/Marigot
ae37fd
 MG	-1855+04731	Indian/Antananarivo
ae37fd
-MH	+0709+17112	Pacific/Majuro	Marshall Islands (most areas)
ae37fd
+MH	+0709+17112	Pacific/Majuro	most of Marshall Islands
ae37fd
 MH	+0905+16720	Pacific/Kwajalein	Kwajalein
ae37fd
 MK	+4159+02126	Europe/Skopje
ae37fd
 ML	+1239-00800	Africa/Bamako
ae37fd
 MM	+1647+09610	Asia/Yangon
ae37fd
-MN	+4755+10653	Asia/Ulaanbaatar	Mongolia (most areas)
ae37fd
+MN	+4755+10653	Asia/Ulaanbaatar	most of Mongolia
ae37fd
 MN	+4801+09139	Asia/Hovd	Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
ae37fd
 MN	+4804+11430	Asia/Choibalsan	Dornod, Sukhbaatar
ae37fd
 MO	+221150+1133230	Asia/Macau
ae37fd
@@ -325,7 +324,7 @@ NO	+5955+01045	Europe/Oslo
ae37fd
 NP	+2743+08519	Asia/Kathmandu
ae37fd
 NR	-0031+16655	Pacific/Nauru
ae37fd
 NU	-1901-16955	Pacific/Niue
ae37fd
-NZ	-3652+17446	Pacific/Auckland	New Zealand (most areas)
ae37fd
+NZ	-3652+17446	Pacific/Auckland	most of New Zealand
ae37fd
 NZ	-4357-17633	Pacific/Chatham	Chatham Islands
ae37fd
 OM	+2336+05835	Asia/Muscat
ae37fd
 PA	+0858-07932	America/Panama
ae37fd
@@ -333,7 +332,7 @@ PE	-1203-07703	America/Lima
ae37fd
 PF	-1732-14934	Pacific/Tahiti	Society Islands
ae37fd
 PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
ae37fd
 PF	-2308-13457	Pacific/Gambier	Gambier Islands
ae37fd
-PG	-0930+14710	Pacific/Port_Moresby	Papua New Guinea (most areas)
ae37fd
+PG	-0930+14710	Pacific/Port_Moresby	most of Papua New Guinea
ae37fd
 PG	-0613+15534	Pacific/Bougainville	Bougainville
ae37fd
 PH	+1435+12100	Asia/Manila
ae37fd
 PK	+2452+06703	Asia/Karachi
ae37fd
@@ -379,7 +378,7 @@ RU	+4310+13156	Asia/Vladivostok	MSK+07 - Amur River
ae37fd
 RU	+643337+1431336	Asia/Ust-Nera	MSK+07 - Oymyakonsky
ae37fd
 RU	+5934+15048	Asia/Magadan	MSK+08 - Magadan
ae37fd
 RU	+4658+14242	Asia/Sakhalin	MSK+08 - Sakhalin Island
ae37fd
-RU	+6728+15343	Asia/Srednekolymsk	MSK+08 - Sakha (E); North Kuril Is
ae37fd
+RU	+6728+15343	Asia/Srednekolymsk	MSK+08 - Sakha (E); N Kuril Is
ae37fd
 RU	+5301+15839	Asia/Kamchatka	MSK+09 - Kamchatka
ae37fd
 RU	+6445+17729	Asia/Anadyr	MSK+09 - Bering Sea
ae37fd
 RW	-0157+03004	Africa/Kigali
ae37fd
@@ -420,7 +419,7 @@ TT	+1039-06131	America/Port_of_Spain
ae37fd
 TV	-0831+17913	Pacific/Funafuti
ae37fd
 TW	+2503+12130	Asia/Taipei
ae37fd
 TZ	-0648+03917	Africa/Dar_es_Salaam
ae37fd
-UA	+5026+03031	Europe/Kyiv	Ukraine (most areas)
ae37fd
+UA	+5026+03031	Europe/Kyiv	most of Ukraine
ae37fd
 UG	+0019+03225	Africa/Kampala
ae37fd
 UM	+2813-17722	Pacific/Midway	Midway Islands
ae37fd
 UM	+1917+16637	Pacific/Wake	Wake Island
ae37fd
@@ -443,7 +442,7 @@ US	+465042-1012439	America/North_Dakota/New_Salem	Central - ND (Morton rural)
ae37fd
 US	+471551-1014640	America/North_Dakota/Beulah	Central - ND (Mercer)
ae37fd
 US	+394421-1045903	America/Denver	Mountain (most areas)
ae37fd
 US	+433649-1161209	America/Boise	Mountain - ID (south); OR (east)
ae37fd
-US	+332654-1120424	America/Phoenix	MST - Arizona (except Navajo)
ae37fd
+US	+332654-1120424	America/Phoenix	MST - AZ (except Navajo)
ae37fd
 US	+340308-1181434	America/Los_Angeles	Pacific
ae37fd
 US	+611305-1495401	America/Anchorage	Alaska (most areas)
ae37fd
 US	+581807-1342511	America/Juneau	Alaska - Juneau area
ae37fd
@@ -451,7 +450,7 @@ US	+571035-1351807	America/Sitka	Alaska - Sitka area
ae37fd
 US	+550737-1313435	America/Metlakatla	Alaska - Annette Island
ae37fd
 US	+593249-1394338	America/Yakutat	Alaska - Yakutat
ae37fd
 US	+643004-1652423	America/Nome	Alaska (west)
ae37fd
-US	+515248-1763929	America/Adak	Aleutian Islands
ae37fd
+US	+515248-1763929	America/Adak	Alaska - western Aleutians
ae37fd
 US	+211825-1575130	Pacific/Honolulu	Hawaii
ae37fd
 UY	-345433-0561245	America/Montevideo
ae37fd
 UZ	+3940+06648	Asia/Samarkand	Uzbekistan (west)
ae37fd
diff --git a/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java b/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java
ae37fd
index ef278203182..3762eb820bb 100644
ae37fd
--- a/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java
ae37fd
+++ b/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java
ae37fd
@@ -608,6 +608,17 @@ public final class ZoneInfoFile {
ae37fd
                 params[8] = endRule.secondOfDay * 1000;
ae37fd
                 params[9] = toSTZTime[endRule.timeDefinition];
ae37fd
                 dstSavings = (startRule.offsetAfter - startRule.offsetBefore) * 1000;
ae37fd
+
ae37fd
+                // Note: known mismatching -> Africa/Cairo
ae37fd
+                // ZoneInfo :      startDayOfWeek=5     <= Thursday
ae37fd
+                //                 startTime=86400000   <= 24:00
ae37fd
+                // This:           startDayOfWeek=6     <= Friday
ae37fd
+                //                 startTime=0          <= 0:00
ae37fd
+                if (zoneId.equals("Africa/Cairo") &&
ae37fd
+                        params[7] == Calendar.FRIDAY && params[8] == 0) {
ae37fd
+                    params[7] = Calendar.THURSDAY;
ae37fd
+                    params[8] = SECONDS_PER_DAY * 1000;
ae37fd
+                }
ae37fd
             } else if (nTrans > 0) {  // only do this if there is something in table already
ae37fd
                 if (lastyear < LASTYEAR) {
ae37fd
                     // ZoneInfo has an ending entry for 2037
ae37fd
diff --git a/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java b/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java
ae37fd
index bf7918659ae..2763ac30ca7 100644
ae37fd
--- a/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java
ae37fd
+++ b/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java
ae37fd
@@ -1,5 +1,5 @@
ae37fd
 /*
ae37fd
- * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
ae37fd
+ * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
ae37fd
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
ae37fd
  *
ae37fd
  * This code is free software; you can redistribute it and/or modify it
ae37fd
@@ -845,9 +845,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
ae37fd
             {"Europe/Jersey", GMTBST},
ae37fd
             {"Europe/Kaliningrad", EET},
ae37fd
             {"Europe/Kiev", EET},
ae37fd
-            {"Europe/Kirov", new String[] {"Kirov Standard Time", "GMT+03:00",
ae37fd
-                                           "Kirov Daylight Time", "GMT+03:00",
ae37fd
-                                           "Kirov Time", "GMT+03:00"}},
ae37fd
+            {"Europe/Kirov", MSK},
ae37fd
             {"Europe/Lisbon", WET},
ae37fd
             {"Europe/Ljubljana", CET},
ae37fd
             {"Europe/London", GMTBST},
ae37fd
diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
ae37fd
index 0f66ee12c94..c5483b48512 100644
ae37fd
--- a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
ae37fd
+++ b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
ae37fd
@@ -1 +1 @@
ae37fd
-tzdata2022g
ae37fd
+tzdata2023c
ae37fd
diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt b/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt
ae37fd
index d495743b268..07c5edbafee 100644
ae37fd
--- a/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt
ae37fd
+++ b/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt
ae37fd
@@ -211,6 +211,7 @@ Link	America/Argentina/Cordoba	America/Rosario
ae37fd
 Link	America/Tijuana		America/Santa_Isabel
ae37fd
 Link	America/Denver		America/Shiprock
ae37fd
 Link	America/Toronto		America/Thunder_Bay
ae37fd
+Link	America/Edmonton	America/Yellowknife
ae37fd
 Link	Pacific/Auckland	Antarctica/South_Pole
ae37fd
 Link	Asia/Shanghai		Asia/Chongqing
ae37fd
 Link	Asia/Shanghai		Asia/Harbin
ae37fd
diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt b/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt
ae37fd
index 44db4dbdb81..03f5305e65e 100644
ae37fd
--- a/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt
ae37fd
+++ b/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt
ae37fd
@@ -92,7 +92,6 @@ America/Vancouver PST PDT
ae37fd
 America/Whitehorse MST
ae37fd
 America/Winnipeg CST CDT
ae37fd
 America/Yakutat AKST AKDT
ae37fd
-America/Yellowknife MST MDT
ae37fd
 Antarctica/Macquarie AEST AEDT
ae37fd
 Asia/Beirut EET EEST
ae37fd
 Asia/Famagusta EET EEST
ae37fd
@@ -144,6 +143,7 @@ Europe/Dublin IST/GMT IST/GMT
ae37fd
 Europe/Gibraltar CET CEST
ae37fd
 Europe/Helsinki EET EEST
ae37fd
 Europe/Kaliningrad EET
ae37fd
+Europe/Kirov MSK
ae37fd
 Europe/Kyiv EET EEST
ae37fd
 Europe/Lisbon WET WEST
ae37fd
 Europe/London GMT/BST GMT/BST
ae37fd
@@ -160,6 +160,7 @@ Europe/Tallinn EET EEST
ae37fd
 Europe/Tirane CET CEST
ae37fd
 Europe/Vienna CET CEST
ae37fd
 Europe/Vilnius EET EEST
ae37fd
+Europe/Volgograd MSK
ae37fd
 Europe/Warsaw CET CEST
ae37fd
 Europe/Zurich CET CEST
ae37fd
 HST HST
ae37fd
diff --git a/test/jdk/java/util/TimeZone/TimeZoneTest.java b/test/jdk/java/util/TimeZone/TimeZoneTest.java
ae37fd
index d31d1722b7b..8e5d403f87b 100644
ae37fd
--- a/test/jdk/java/util/TimeZone/TimeZoneTest.java
ae37fd
+++ b/test/jdk/java/util/TimeZone/TimeZoneTest.java
ae37fd
@@ -1,5 +1,5 @@
ae37fd
 /*
ae37fd
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
ae37fd
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
ae37fd
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
ae37fd
  *
ae37fd
  * This code is free software; you can redistribute it and/or modify it
ae37fd
@@ -25,7 +25,7 @@
ae37fd
  * @test
ae37fd
  * @bug 4028006 4044013 4096694 4107276 4107570 4112869 4130885 7039469 7126465 7158483
ae37fd
  *      8008577 8077685 8098547 8133321 8138716 8148446 8151876 8159684 8166875 8181157
ae37fd
- *      8228469 8274407
ae37fd
+ *      8228469 8274407 8305113
ae37fd
  * @modules java.base/sun.util.resources
ae37fd
  * @library /java/text/testlib
ae37fd
  * @summary test TimeZone
ae37fd
@@ -121,7 +121,7 @@ public class TimeZoneTest extends IntlTest
ae37fd
             new ZoneDescriptor("GMT", 0, false),
ae37fd
             new ZoneDescriptor("UTC", 0, false),
ae37fd
             new ZoneDescriptor("ECT", 60, true),
ae37fd
-            new ZoneDescriptor("ART", 120, false),
ae37fd
+            new ZoneDescriptor("ART", 120, true),
ae37fd
             new ZoneDescriptor("EET", 120, true),
ae37fd
             new ZoneDescriptor("EAT", 180, false),
ae37fd
             new ZoneDescriptor("MET", 60, true),