From 4c24c2261d9a11523f941501fccce9dc90f5cc56 Mon Sep 17 00:00:00 2001 From: qinyu Date: Tue, 1 Nov 2022 16:02:03 +0800 Subject: [PATCH] tzdata: Fiji & most of Mexico will no longer observe DST Fiji & most of Mexico will no longer observe DST Signed-off-by: qinyu --- backport-Fiji-no-longer-observes-DST.patch | 69 ++++++++++++ ...of-Mexico-will-no-longer-observe-DST.patch | 104 ++++++++++++++++++ tzdata.spec | 11 +- 3 files changed, 183 insertions(+), 1 deletion(-) create mode 100644 backport-Fiji-no-longer-observes-DST.patch create mode 100644 backport-Most-of-Mexico-will-no-longer-observe-DST.patch diff --git a/backport-Fiji-no-longer-observes-DST.patch b/backport-Fiji-no-longer-observes-DST.patch new file mode 100644 index 0000000..fd31b35 --- /dev/null +++ b/backport-Fiji-no-longer-observes-DST.patch @@ -0,0 +1,69 @@ +From 16a6bdd37ae401e9b1b2c42d69f0d98312aebfc3 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Thu, 27 Oct 2022 09:51:13 -0700 +Subject: [PATCH] Fiji no longer observes DST + +Reference: https://github.com/eggert/tz/commit/918650731803579659fa6b5eedf3f80310afc59f +Conflict: NEWS context + +* NEWS: Mention this (thanks to Shalvin Narayan). +* australasia (Fiji): Remove our incorrect guess for spring 2022 +on. For now, guess no DST indefinitely. +--- + NEWS | 10 ++++++++++ + australasia | 12 ++++++++---- + 2 files changed, 18 insertions(+), 4 deletions(-) + +diff --git a/NEWS b/NEWS +index 37eab25..82040a2 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,5 +1,15 @@ + News for the tz database + ++Unreleased, experimental changes ++ ++ Briefly: ++ Fiji no longer observes DST. ++ ++ Changes to future timestamps. ++ ++ Fiji will not observe DST in 2022/3. (Thanks to Shalvin Narayan.) ++ For now, assume DST is suspended indefinitely. ++ + Release 2022e - 2022-10-11 11:13:02 -0700 + + Briefly: +diff --git a/australasia b/australasia +index d6d1171..800c31b 100644 +--- a/australasia ++++ b/australasia +@@ -393,8 +393,14 @@ Zone Antarctica/Macquarie 0 - -00 1899 Nov + # concerned shifting arrival and departure times, which may look like a simple + # thing but requires some significant logistical adjustments domestically and + # internationally." +-# Assume for now that DST will resume with the recent pre-2020 rules for the +-# 2022/2023 season. ++ ++# From Shalvin Narayan (2022-10-27): ++# Please note that there will not be any daylight savings time change ++# in Fiji for 2022-2023.... ++# https://www.facebook.com/FijianGovernment/posts/pfbid0mmWVTYmTibn66ybpFda75pDcf34SSpoSaskJW5gXwaKo5Sgc7273Q4fXWc6kQV6Hl ++# ++# From Paul Eggert (2022-10-27): ++# For now, assume DST is suspended indefinitely. + + # Rule NAME FROM TO - IN ON AT SAVE LETTER/S + Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 - +@@ -409,8 +415,6 @@ Rule Fiji 2014 2018 - Nov Sun>=1 2:00 1:00 - + Rule Fiji 2015 2021 - Jan Sun>=12 3:00 0 - + Rule Fiji 2019 only - Nov Sun>=8 2:00 1:00 - + Rule Fiji 2020 only - Dec 20 2:00 1:00 - +-Rule Fiji 2022 max - Nov Sun>=8 2:00 1:00 - +-Rule Fiji 2023 max - Jan Sun>=12 3:00 0 - + # Zone NAME STDOFF RULES FORMAT [UNTIL] + Zone Pacific/Fiji 11:55:44 - LMT 1915 Oct 26 # Suva + 12:00 Fiji +12/+13 +-- +2.33.0 + diff --git a/backport-Most-of-Mexico-will-no-longer-observe-DST.patch b/backport-Most-of-Mexico-will-no-longer-observe-DST.patch new file mode 100644 index 0000000..dcce2f8 --- /dev/null +++ b/backport-Most-of-Mexico-will-no-longer-observe-DST.patch @@ -0,0 +1,104 @@ +From 0d76ca3d57e0ae59dca10be3d3585ae92023e05c Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Fri, 28 Oct 2022 17:57:48 -0700 +Subject: [PATCH] Most of Mexico will no longer observe DST + +Reference: https://github.com/eggert/tz/commit/2050724fa1144bacb0d35c7cd9b862da858406c4 +Conflict: NEWS context + +Also, Chihuahua moves to year-round -06. +* NEWS: Mention this. +* northamerica (Mexico): No DST after 2022. +(America/Ojinaga, America/Chihuahua): Switch from -07 to -06 +on 2022-10-30 02:00. +--- + NEWS | 9 +++++++++ + northamerica | 20 ++++++++++++++++---- + 2 files changed, 25 insertions(+), 4 deletions(-) + +diff --git a/NEWS b/NEWS +index 82040a2..ae19b08 100644 +--- a/NEWS ++++ b/NEWS +@@ -3,10 +3,19 @@ News for the tz database + Unreleased, experimental changes + + Briefly: ++ Mexico will no longer observe DST except near the US border. ++ Chihuahua moves to year-round -06 on 2022-10-30. + Fiji no longer observes DST. + + Changes to future timestamps. + ++ Mexico will no longer observe DST after 2022, except for areas ++ near the US border that continue to observe US DST rules. ++ On 2022-10-30 at 02:00 the Mexican state of Chihuahua moves ++ from -07 (-06 with DST) to year-round -06, thus not changing ++ its clocks that day. The new law states that Chihuahua ++ near the US border no longer observes US DST. ++ + Fiji will not observe DST in 2022/3. (Thanks to Shalvin Narayan.) + For now, assume DST is suspended indefinitely. + +diff --git a/northamerica b/northamerica +index da84f35..22394cc 100644 +--- a/northamerica ++++ b/northamerica +@@ -2616,6 +2616,12 @@ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20 + # 5- The islands, reefs and keys shall take their timezone from the + # longitude they are located at. + ++# From Paul Eggert (2022-10-28): ++# The new Mexican law was published today: ++# https://www.dof.gob.mx/nota_detalle.php?codigo=5670045&fecha=28/10/2022 ++# This abolishes DST except where US DST rules are observed, ++# and in addition changes all of Chihuahua to -06 with no DST. ++ + # Rule NAME FROM TO - IN ON AT SAVE LETTER/S + Rule Mexico 1931 only - May 1 23:00 1:00 D + Rule Mexico 1931 only - Oct 1 0:00 0 S +@@ -2631,8 +2637,8 @@ Rule Mexico 1996 2000 - Apr Sun>=1 2:00 1:00 D + Rule Mexico 1996 2000 - Oct lastSun 2:00 0 S + Rule Mexico 2001 only - May Sun>=1 2:00 1:00 D + Rule Mexico 2001 only - Sep lastSun 2:00 0 S +-Rule Mexico 2002 max - Apr Sun>=1 2:00 1:00 D +-Rule Mexico 2002 max - Oct lastSun 2:00 0 S ++Rule Mexico 2002 2022 - Apr Sun>=1 2:00 1:00 D ++Rule Mexico 2002 2022 - Oct lastSun 2:00 0 S + # Zone NAME STDOFF RULES FORMAT [UNTIL] + # Quintana Roo; represented by Cancún + Zone America/Cancun -5:47:04 - LMT 1922 Jan 1 6:00u +@@ -2685,7 +2691,8 @@ Zone America/Ojinaga -6:57:40 - LMT 1922 Jan 1 7:00u + -6:00 Mexico C%sT 1998 + -6:00 - CST 1998 Apr Sun>=1 3:00 + -7:00 Mexico M%sT 2010 +- -7:00 US M%sT ++ -7:00 US M%sT 2022 Oct 30 2:00 ++ -6:00 - CST + # Chihuahua (away from US border) + Zone America/Chihuahua -7:04:20 - LMT 1922 Jan 1 7:00u + -7:00 - MST 1927 Jun 10 23:00 +@@ -2694,7 +2701,8 @@ Zone America/Chihuahua -7:04:20 - LMT 1922 Jan 1 7:00u + -6:00 - CST 1996 + -6:00 Mexico C%sT 1998 + -6:00 - CST 1998 Apr Sun>=1 3:00 +- -7:00 Mexico M%sT ++ -7:00 Mexico M%sT 2022 Oct 30 2:00 ++ -6:00 - CST + # Sonora + Zone America/Hermosillo -7:23:52 - LMT 1922 Jan 1 7:00u + -7:00 - MST 1927 Jun 10 23:00 +@@ -2792,6 +2800,10 @@ Zone America/Tijuana -7:48:04 - LMT 1922 Jan 1 7:00u + # http://dof.gob.mx/nota_detalle.php?codigo=5127480&fecha=06/01/2010 + # It has been moved to the 'backward' file. + # ++# From Paul Eggert (2022-10-28): ++# Today's new law states that the entire state of Baja California ++# follows US DST rules, which agrees with simplifications noted above. ++# + # + # Revillagigedo Is + # no information +-- +2.33.0 + diff --git a/tzdata.spec b/tzdata.spec index 7a3c20b..a4ec077 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Name: tzdata Version: 2022e -Release: 1 +Release: 2 Summary: Timezone data License: Public Domain URL: https://www.iana.org/time-zones @@ -9,6 +9,9 @@ Source1: https://data.iana.org/time-zones/releases/tzcode%{version}.tar.gz Source2: javazic.tar.gz Source3: javazic-1.8-37392f2f5d59.tar.xz +Patch6000: backport-Fiji-no-longer-observes-DST.patch +Patch6001: backport-Most-of-Mexico-will-no-longer-observe-DST.patch + Patch9000: bugfix-0001-add-Beijing-timezone.patch Patch9001: remove-ROC-timezone.patch Patch9002: rename-Macau-to-Macao.patch @@ -107,6 +110,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Tue Nov 1 2022 qinyu - 2022e-2 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC: Fiji & most of Mexico will no longer observe DST + * Tue Oct 18 2022 qinyu - 2022e-1 - Type:bugfix - CVE:NA