git: 7da23e6521d1 - stable/12 - contrib/tzdata: import tzdata 2023c

From: Philip Paeps <philip_at_FreeBSD.org>
Date: Wed, 29 Mar 2023 01:20:28 UTC
The branch stable/12 has been updated by philip:

URL: https://cgit.FreeBSD.org/src/commit/?id=7da23e6521d171845311817bac904f252a3b4478

commit 7da23e6521d171845311817bac904f252a3b4478
Author:     Philip Paeps <philip@FreeBSD.org>
AuthorDate: 2023-03-29 01:09:54 +0000
Commit:     Philip Paeps <philip@FreeBSD.org>
CommitDate: 2023-03-29 01:20:06 +0000

    contrib/tzdata: import tzdata 2023c
    
    Changes: https://github.com/eggert/tz/blob/2023c/NEWS
    
    The tzdata 2023c release reverts all changes made in 2023b other than
    commentary, as that appears to be the best of a bad set of short-notice
    choices for modeling this week's daylight saving chaos in Lebanon.
    
    (cherry picked from commit 9fbeeb6e38310b4f42a14c4b043bbee82c5e4752)
---
 contrib/tzdata/NEWS    | 13 +++++++++----
 contrib/tzdata/asia    | 40 +++++++++++++++++++++++++++++++++++-----
 contrib/tzdata/version |  2 +-
 3 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/contrib/tzdata/NEWS b/contrib/tzdata/NEWS
index 9b235a293962..b54538aa4a82 100644
--- a/contrib/tzdata/NEWS
+++ b/contrib/tzdata/NEWS
@@ -1,14 +1,19 @@
 News for the tz database
 
-Release 2023b - 2023-03-23 19:50:38 -0700
+Release 2023c - 2023-03-28 12:42:14 -0700
 
-  Briefly:
-    Lebanon delays the start of DST this year.
+  Changes to past and future timestamps
+
+    Model Lebanon's DST chaos by reverting data to tzdb 2023a.
+    (Thanks to Rany Hany for the heads-up.)
+
+
+Release 2023b - 2023-03-23 19:50:38 -0700
 
   Changes to future timestamps
 
     This year Lebanon springs forward April 20/21 not March 25/26.
-    (Thanks to Saadallah Itani.)
+    (Thanks to Saadallah Itani.)  [This was reverted in 2023c.]
 
 
 Release 2023a - 2023-03-22 12:39:33 -0700
diff --git a/contrib/tzdata/asia b/contrib/tzdata/asia
index dd06a5fd21fe..a29a4dc0c4de 100644
--- a/contrib/tzdata/asia
+++ b/contrib/tzdata/asia
@@ -2693,9 +2693,37 @@ Zone	Asia/Pyongyang	8:23:00 -	LMT	1908 Apr  1
 # Lebanon
 #
 # From Saadallah Itani (2023-03-23):
-# Lebanon too announced today delay of Spring forward from March 25 to April 20.
-# From Paul Eggert (2023-03-23):
+# Lebanon ... announced today delay of Spring forward from March 25 to April 20.
+#
+# From Paul Eggert (2023-03-27):
+# This announcement was by the Lebanese caretaker prime minister Najib Mikati.
 # https://www.mtv.com.lb/en/News/Local/1352516/lebanon-postpones-daylight-saving-time-adoption
+# A video was later leaked to the media of parliament speaker Nabih Berri
+# asking Mikati to postpone DST to aid observance of Ramadan, Mikati objecting
+# that this would cause problems such as scheduling airline flights, to which
+# Berri interjected, "What flights?"
+#
+# The change was controversial and led to a partly-sectarian divide.
+# Many Lebanese institutions, including the education ministry, the Maronite
+# church, and two news channels LCBI and MTV, ignored the announcement and
+# went ahead with the long-scheduled spring-forward on March 25/26, some
+# arguing that the prime minister had not followed the law because the change
+# had not been approved by the cabinet.  Google went with the announcement;
+# Apple ignored it.  At least one bank followed the announcement for its doors,
+# but ignored the announcement in internal computer systems.
+# Beirut international airport listed two times for each departure.
+# Dan Azzi wrote "My view is that this whole thing is a Dumb and Dumber movie."
+# Eventually the prime minister backed down, said the cabinet had decided to
+# stick with its 1998 decision, and that DST would begin midnight March 29/30.
+# https://www.nna-leb.gov.lb/en/miscellaneous/604093/lebanon-has-two-times-of-day-amid-daylight-savings
+# https://www.cnbc.com/2023/03/27/lebanon-in-two-different-time-zones-as-government-disagrees-on-daylight-savings.html
+#
+# Although we could model the chaos with two Zones, that would likely cause
+# more trouble than it would cure.  Since so many manual clocks and
+# computer-based timestamps ignored the announcement, stick with official
+# cabinet resolutions in the data while recording the prime minister's
+# announcement as a comment.  This is how we treated a similar situation in
+# Rio de Janeiro in spring 1993.
 #
 # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
 Rule	Lebanon	1920	only	-	Mar	28	0:00	1:00	S
@@ -2719,11 +2747,13 @@ Rule	Lebanon	1988	only	-	Jun	1	0:00	1:00	S
 Rule	Lebanon	1989	only	-	May	10	0:00	1:00	S
 Rule	Lebanon	1990	1992	-	May	1	0:00	1:00	S
 Rule	Lebanon	1992	only	-	Oct	4	0:00	0	-
-Rule	Lebanon	1993	2022	-	Mar	lastSun	0:00	1:00	S
+Rule	Lebanon	1993	max	-	Mar	lastSun	0:00	1:00	S
 Rule	Lebanon	1993	1998	-	Sep	lastSun	0:00	0	-
 Rule	Lebanon	1999	max	-	Oct	lastSun	0:00	0	-
-Rule	Lebanon	2023	only	-	Apr	21	0:00	1:00	S
-Rule	Lebanon	2024	max	-	Mar	lastSun	0:00	1:00	S
+# This one-time rule, announced by the prime minister first for April 21
+# then for March 30, is commented out for reasons described above.
+#Rule	Lebanon	2023	only	-	Mar	30	0:00	1:00	S
+
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Beirut	2:22:00 -	LMT	1880
 			2:00	Lebanon	EE%sT
diff --git a/contrib/tzdata/version b/contrib/tzdata/version
index 74a7fa8ae9e6..7daa77e00d99 100644
--- a/contrib/tzdata/version
+++ b/contrib/tzdata/version
@@ -1 +1 @@
-2023b
+2023c