From b2f76564427192de9f4dc75d5fdc6ead30867880 Mon Sep 17 00:00:00 2001 From: qinyu Date: Wed, 30 Nov 2022 16:01:56 +0800 Subject: [PATCH] tzdata: Greenland change should affect only America/Nuuk; The northern edge of Chihuahua changes to US rules Greenland change should affect only America/Nuuk; The northern edge of Chihuahua changes to US rules Signed-off-by: qinyu --- ...ange-should-affect-only-America-Nuuk.patch | 68 +++++++++++ ...dge-of-Chihuahua-changes-to-US-rules.patch | 107 ++++++++++++++++++ tzdata.spec | 10 +- 3 files changed, 184 insertions(+), 1 deletion(-) create mode 100644 backport-Greenland-change-should-affect-only-America-Nuuk.patch create mode 100644 backport-The-northern-edge-of-Chihuahua-changes-to-US-rules.patch diff --git a/backport-Greenland-change-should-affect-only-America-Nuuk.patch b/backport-Greenland-change-should-affect-only-America-Nuuk.patch new file mode 100644 index 0000000..8b31a15 --- /dev/null +++ b/backport-Greenland-change-should-affect-only-America-Nuuk.patch @@ -0,0 +1,68 @@ +From 4b0bd9e54a56b5bbbac55db184c925a6fab3edd6 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Mon, 28 Nov 2022 18:19:02 -0800 +Subject: [PATCH] Greenland change should affect only America/Nuuk + +Reference: https://github.com/eggert/tz/commit/36acd567fbd8df3e085351bec36974fde035e0f0 +Conflict: remove NEWS + +Although the situation is fluid, it seems I likely guessed wrong +about Ittoqqortoormiit in my Greenland changes three days ago. +(Thanks to Jonas Nyrup.) +* NEWS: Mention this. +* europe (America/Scoresbysund): Revert recent change. +--- + europe | 24 +++++++++++++++++------- + 1 file changed, 17 insertions(+), 7 deletions(-) + +diff --git a/europe b/europe +index 12b1d12..122a0b5 100644 +--- a/europe ++++ b/europe +@@ -1161,17 +1161,28 @@ Zone Atlantic/Faroe -0:27:04 - LMT 1908 Jan 11 # Tórshavn + # http://naalakkersuisut.gl/~/media/Nanoq/Files/Attached%20Files/Engelske-tekster/Legislation/Executive%20Order%20National%20Park.rtf + # It is their only National Park. + ++# From Jonas Nyrup (2022-11-24): ++# On last Saturday in October 2023 when DST ends America/Nuuk will switch ++# from -03/-02 to -02/-01 ++# https://sermitsiaq.ag/forslagtidsforskel-danmark-mindskes-sommertid-beholdes ++# ... ++# https://sermitsiaq.ag/groenland-skifte-tidszone-trods-bekymringer ++# + # From Jürgen Appel (2022-11-25): + # https://ina.gl/samlinger/oversigt-over-samlinger/samling/dagsordener/dagsorden.aspx?lang=da&day=24-11-2022 + # If I understand this correctly, from the next planned switch to + # summer time, Greenland will permanently stay at that time, i.e. no + # switch back to winter time in 2023 will occur. + # +-# From Paul Eggert (2022-11-25): +-# For now, assume that this applies simultaneously to Ittoqqortoormiit +-# (currently -01) as well as to Nuuk (currently -03), and that +-# Danmarkshavn and Thule are unaffected since they are not using EU +-# rules anyway and some of the remarks were about EU rules. ++# From Paul Eggert (2022-11-28): ++# The official document in Danish ++# https://naalakkersuisut.gl/-/media/naalakkersuisut/filer/kundgoerelser/2022/11/2511/31_da_inatsisartutlov-om-tidens-bestemmelse.pdf?la=da&hash=A33597D8A38CC7038465241119EF34F3 ++# says standard time for Greenland is -02, that Naalakkersuisut can lay down ++# rules for DST and can require some areas to use a different time zone, ++# and that this all takes effect 2023-03-25 22:00. The abovementioned ++# "bekymringer" URL says the intent is no transition March 25, that ++# Greenland will not go back to winter time in fall 2023, and that ++# only America/Nuuk is affected (though further changes may occur). + + # Rule NAME FROM TO - IN ON AT SAVE LETTER/S + Rule Thule 1991 1992 - Mar lastSun 2:00 1:00 D +@@ -1192,8 +1203,7 @@ 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 2023 Mar 25 24:00 +- 0:00 - +00 ++ -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 25 22:00 +-- +2.33.0 + diff --git a/backport-The-northern-edge-of-Chihuahua-changes-to-US-rules.patch b/backport-The-northern-edge-of-Chihuahua-changes-to-US-rules.patch new file mode 100644 index 0000000..784052a --- /dev/null +++ b/backport-The-northern-edge-of-Chihuahua-changes-to-US-rules.patch @@ -0,0 +1,107 @@ +From ba23552167353e34113e0158373f52e221eef4bf Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Tue, 29 Nov 2022 08:48:19 -0800 +Subject: [PATCH] The northern edge of Chihuahua changes to US rules + +Reference: https://github.com/eggert/tz/commit/b92f566d69a5fdf5b2b394d5343149344325baf7 +Conflict: context; remove NEWS + +(Thanks to Heitor David Pinto.) +* NEWS: Mention this. +* northamerica, zone.tab, zone1970.tab (America/Ciudad_Juarez): +New Zone, which switches to El Paso time tomorrow. +* northamerica (America/Ojinaga): Observe US DST rules from now. +--- + northamerica | 31 +++++++++++++++++++++++++++---- + zone.tab | 3 ++- + zone1970.tab | 3 ++- + 3 files changed, 31 insertions(+), 6 deletions(-) + +diff --git a/northamerica b/northamerica +index 22394cc..9e0841c 100644 +--- a/northamerica ++++ b/northamerica +@@ -2622,6 +2622,14 @@ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20 + # This abolishes DST except where US DST rules are observed, + # and in addition changes all of Chihuahua to -06 with no DST. + ++# From Heitor David Pinto (2022-11-28): ++# Now the northern municipalities want to have the same time zone as the ++# respective neighboring cities in the US, for example Juárez in UTC-7 with ++# DST, matching El Paso, and Ojinaga in UTC-6 with DST, matching Presidio.... ++# the president authorized the publication of the decree for November 29, ++# so the time change would occur on November 30 at 0:00. ++# http://puentelibre.mx/noticia/ciudad_juarez_cambio_horario_noviembre_2022/ ++ + # 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 +@@ -2679,10 +2687,24 @@ Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 7:00u + -6:00 Mexico C%sT 2001 Sep 30 2:00 + -6:00 - CST 2002 Feb 20 + -6:00 Mexico C%sT +-# Chihuahua (near US border) ++# Chihuahua (near US border - western side) + # This includes the municipalities of Janos, Ascensión, Juárez, Guadalupe, +-# Práxedis G Guerrero, Coyame del Sotol, Ojinaga, and Manuel Benavides. +-# (See the 2016-03-12 El Universal source mentioned above.) ++# and Práxedis G Guerrero. ++# http://gaceta.diputados.gob.mx/PDF/65/2a022/nov/20221124-VII.pdf ++Zone America/Ciudad_Juarez -7:05:56 - LMT 1922 Jan 1 7:00u ++ -7:00 - MST 1927 Jun 10 23:00 ++ -6:00 - CST 1930 Nov 15 ++ -7:00 Mexico M%sT 1932 Apr 1 ++ -6:00 - CST 1996 ++ -6:00 Mexico C%sT 1998 ++ -6:00 - CST 1998 Apr Sun>=1 3:00 ++ -7:00 Mexico M%sT 2010 ++ -7:00 US M%sT 2022 Oct 30 2:00 ++ -6:00 - CST 2022 Nov 30 0:00 ++ -7:00 US M%sT ++# Chihuahua (near US border - eastern side) ++# The municipalities of Coyame del Sotol, Ojinaga, and Manuel Benavides. ++# http://gaceta.diputados.gob.mx/PDF/65/2a022/nov/20221124-VII.pdf + Zone America/Ojinaga -6:57:40 - LMT 1922 Jan 1 7:00u + -7:00 - MST 1927 Jun 10 23:00 + -6:00 - CST 1930 Nov 15 +@@ -2692,7 +2714,8 @@ Zone America/Ojinaga -6:57:40 - LMT 1922 Jan 1 7:00u + -6:00 - CST 1998 Apr Sun>=1 3:00 + -7:00 Mexico M%sT 2010 + -7:00 US M%sT 2022 Oct 30 2:00 +- -6:00 - CST ++ -6:00 - CST 2022 Nov 30 0:00 ++ -6:00 US C%sT + # 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 +diff --git a/zone.tab b/zone.tab +index 364055a..fb2c027 100644 +--- a/zone.tab ++++ b/zone.tab +@@ -287,7 +287,8 @@ MX +2540-10019 America/Monterrey Central Time - Durango; Coahuila, Nuevo Leon, T + MX +2550-09730 America/Matamoros Central Time US - Coahuila, Nuevo Leon, Tamaulipas (US border) + MX +2313-10625 America/Mazatlan Mountain Time - Baja California Sur, Nayarit, Sinaloa + MX +2838-10605 America/Chihuahua Mountain Time - Chihuahua (most areas) +-MX +2934-10425 America/Ojinaga Mountain Time US - Chihuahua (US border) ++MX +3144-10629 America/Ciudad_Juarez Chihuahua (US border - west) ++MX +2934-10425 America/Ojinaga Chihuahua (US border - east) + MX +2904-11058 America/Hermosillo Mountain Standard Time - Sonora + MX +3232-11701 America/Tijuana Pacific Time US - Baja California + MX +2048-10515 America/Bahia_Banderas Central Time - Bahia de Banderas +diff --git a/zone1970.tab b/zone1970.tab +index fedbda9..d7788cd 100644 +--- a/zone1970.tab ++++ b/zone1970.tab +@@ -224,7 +224,8 @@ MX +2540-10019 America/Monterrey Central Time - Durango; Coahuila, Nuevo León, + MX +2550-09730 America/Matamoros Central Time US - Coahuila, Nuevo León, Tamaulipas (US border) + MX +2313-10625 America/Mazatlan Mountain Time - Baja California Sur, Nayarit, Sinaloa + MX +2838-10605 America/Chihuahua Mountain Time - Chihuahua (most areas) +-MX +2934-10425 America/Ojinaga Mountain Time US - Chihuahua (US border) ++MX +3144-10629 America/Ciudad_Juarez Chihuahua (US border - west) ++MX +2934-10425 America/Ojinaga Chihuahua (US border - east) + MX +2904-11058 America/Hermosillo Mountain Standard Time - Sonora + MX +3232-11701 America/Tijuana Pacific Time US - Baja California + MX +2048-10515 America/Bahia_Banderas Central Time - Bahía de Banderas +-- +2.33.0 + diff --git a/tzdata.spec b/tzdata.spec index d0d3ee8..ae9be2b 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Name: tzdata Version: 2022e -Release: 3 +Release: 4 Summary: Timezone data License: Public Domain URL: https://www.iana.org/time-zones @@ -12,6 +12,8 @@ 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 Patch6002: backport-Most-of-Greenland-stops-clock-changing-after-March.patch +Patch6003: backport-Greenland-change-should-affect-only-America-Nuuk.patch +Patch6004: backport-The-northern-edge-of-Chihuahua-changes-to-US-rules.patch Patch9000: bugfix-0001-add-Beijing-timezone.patch Patch9001: remove-ROC-timezone.patch @@ -111,6 +113,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Wed Nov 30 2022 qinyu - 2022e-4 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC: Greenland change should affect only America/Nuuk; The northern edge of Chihuahua changes to US rules + * Mon Nov 28 2022 qinyu - 2022e-3 - Type:bugfix - CVE:NA