packages/tzdata
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tzdata: upgrade tzdata to 2022g

Browse Source 
upgrade tzdata to 2022g

Signed-off-by: qinyu <qinyu32@huawei.com>
This commit is contained in:
qinyu 2023-01-03 19:49:14 +08:00
parent 5e6c49941b
commit 5ec1b39a6c
16 changed files with 70 additions and 474 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
backport-Fiji-no-longer-observes-DST.patch
View File

@ -1,69 +0,0 @@
From 16a6bdd37ae401e9b1b2c42d69f0d98312aebfc3 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
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

68
backport-Greenland-change-should-affect-only-America-Nuuk.patch
View File

@ -1,68 +0,0 @@
From 4b0bd9e54a56b5bbbac55db184c925a6fab3edd6 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
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

58
backport-Most-of-Greenland-stops-clock-changing-after-March.patch
View File

@ -1,58 +0,0 @@
From 0aa7ed3b4cf7a0ab511e2a7119ec9a9207708162 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 25 Nov 2022 09:44:14 -0800
Subject: [PATCH] Most of Greenland stops clock-changing after March
Reference: https://github.com/eggert/tz/commit/2fb29226487e83979f2b674688f4c1127314986e
Conflict: remove NEWS
* NEWS: Mention this.
* europe (America/Scoresbysund, America/Nuuk):
Add an hour to UTC offset starting 2023-03-25 22:00 Nuuk time.
No DST after that.
---
europe | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/europe b/europe
index 208585d..12b1d12 100644
--- a/europe
+++ b/europe
@@ -1160,7 +1160,19 @@ Zone Atlantic/Faroe -0:27:04 - LMT 1908 Jan 11 # Tórshavn
# "National Park" by Executive Order:
# http://naalakkersuisut.gl/~/media/Nanoq/Files/Attached%20Files/Engelske-tekster/Legislation/Executive%20Order%20National%20Park.rtf
# It is their only National Park.
+
+# 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.
+
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
Rule Thule 1991 1992 - Mar lastSun 2:00 1:00 D
Rule Thule 1991 1992 - Sep lastSun 2:00 0 S
@@ -1180,10 +1192,12 @@ 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
+ -1:00 EU -01/+00 2023 Mar 25 24:00
+ 0:00 - +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
+ -3:00 EU -03/-02 2023 Mar 25 22:00
+ -2:00 - -02
Zone America/Thule -4:35:08 - LMT 1916 Jul 28 # Pituffik
-4:00 Thule A%sT
--
2.33.0

104
backport-Most-of-Mexico-will-no-longer-observe-DST.patch
View File

@ -1,104 +0,0 @@
From 0d76ca3d57e0ae59dca10be3d3585ae92023e05c Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
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

107
backport-The-northern-edge-of-Chihuahua-changes-to-US-rules.patch
View File

@ -1,107 +0,0 @@
From ba23552167353e34113e0158373f52e221eef4bf Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
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

31
bugfix-0001-add-Beijing-timezone.patch
View File

@ -1,34 +1,35 @@
diff --git a/asia b/asia
index af1b822..5e86ac9 100644
index 199e6ad..f59eda6 100644
--- a/asia
+++ b/asia
@@ -669,6 +669,8 @@ Zone Asia/Urumqi 5:50:20 - LMT 1928
@@ -659,6 +659,9 @@ Zone Asia/Shanghai 8:05:43 - LMT 1901
Zone Asia/Urumqi 5:50:20 - LMT 1928
6:00 - +06
Link Asia/Urumqi Antarctica/Vostok
+# Nowadays, China Standard Time is known as "Beijing Time"
+Zone Asia/Beijing 8:00 PRC C%sT
+
# Hong Kong
# Milne gives 7:36:41.7.
diff --git a/backward b/backward
index 14e4b14..5f2b90e 100644
index 0ae5d74..f25e274 100644
--- a/backward
+++ b/backward
@@ -112,7 +112,7 @@ Link America/Mexico_City Mexico/General
@@ -102,7 +102,7 @@ Link America/Mexico_City Mexico/General
Link Pacific/Auckland NZ
Link Pacific/Chatham NZ-CHAT
Link America/Denver Navajo
Link America/Denver Navajo #= America/Shiprock
-Link Asia/Shanghai PRC
+Link Asia/Beijing PRC
Link Pacific/Kanton Pacific/Enderbury
Link Pacific/Honolulu Pacific/Johnston
Link Pacific/Guadalcanal Pacific/Ponape
Link Europe/Warsaw Poland
Link Europe/Lisbon Portugal
Link Asia/Taipei ROC
diff --git a/zone.tab b/zone.tab
index 4904028..5de73c1 100644
index 6e5adb9..1cb0977 100644
--- a/zone.tab
+++ b/zone.tab
@@ -147,7 +147,8 @@ CL -3327-07040 America/Santiago Chile (most areas)
@@ -143,7 +143,8 @@ CL -3327-07040 America/Santiago Chile (most areas)
CL -5309-07055 America/Punta_Arenas Region of Magallanes
CL -2709-10926 Pacific/Easter Easter Island
CM +0403+00942 Africa/Douala
@ -39,10 +40,10 @@ index 4904028..5de73c1 100644
CO +0436-07405 America/Bogota
CR +0956-08405 America/Costa_Rica
diff --git a/zone1970.tab b/zone1970.tab
index cf9cf20..50fcae7 100644
index a9b36d3..43167cb 100644
--- a/zone1970.tab
+++ b/zone1970.tab
@@ -127,7 +127,8 @@ CK -2114-15946 Pacific/Rarotonga
@@ -123,7 +123,8 @@ CK -2114-15946 Pacific/Rarotonga
CL -3327-07040 America/Santiago Chile (most areas)
CL -5309-07055 America/Punta_Arenas Region of Magallanes
CL -2709-10926 Pacific/Easter Easter Island
@ -53,5 +54,5 @@ index cf9cf20..50fcae7 100644
CO +0436-07405 America/Bogota
CR +0956-08405 America/Costa_Rica
--
2.33.0
2.27.0

26
remove-El_Aaiun-timezone.patch
View File

@ -1,8 +1,8 @@
diff --git a/NEWS b/NEWS
index 8f29039..37eab25 100644
index 7c1b6a7..2df469a 100644
--- a/NEWS
+++ b/NEWS
@@ -2109,9 +2109,9 @@ Release 2016g - 2016-09-13 08:56:38 -0700
@@ -2297,9 +2297,9 @@ Release 2016g - 2016-09-13 08:56:38 -0700
zic no longer generates binary files containing POSIX TZ-like
strings that disagree with the local time type after the last
explicit transition in the data. This fixes a bug with
@ -15,7 +15,7 @@ index 8f29039..37eab25 100644
If the installed localtime and/or posixrules files are symbolic
links, zic now keeps them symbolic links when updating them, for
@@ -3466,9 +3466,6 @@ Release 2013h - 2013-10-25 15:32:32 -0700
@@ -3654,9 +3654,6 @@ Release 2013h - 2013-10-25 15:32:32 -0700
Libya has switched its UT offset back to +02 without DST, instead
of +01 with DST. (Thanks to Even Scharning.)
@ -26,10 +26,10 @@ index 8f29039..37eab25 100644
Acre and (we guess) western Amazonas will switch from UT -04 to -05
diff --git a/africa b/africa
index 7cbd6b0..a246da7 100644
index cfb9283..91b8342 100644
--- a/africa
+++ b/africa
@@ -1121,22 +1121,6 @@ Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
@@ -1064,22 +1064,6 @@ Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
0:00 Morocco +00/+01 2018 Oct 28 3:00
1:00 Morocco +01/+00
@ -49,14 +49,14 @@ index 7cbd6b0..a246da7 100644
- 0:00 Morocco +00/+01 2018 Oct 28 3:00
- 1:00 Morocco +01/+00
-
# Mozambique
#
# Shanks gives 1903-03-01 for the transition to CAT.
# Botswana
# Burundi
# Democratic Republic of the Congo (eastern)
diff --git a/zone.tab b/zone.tab
index 6854afe..364055a 100644
index d2d1d53..4888ca3 100644
--- a/zone.tab
+++ b/zone.tab
@@ -170,7 +170,6 @@ EC -0210-07950 America/Guayaquil Ecuador (mainland)
@@ -166,7 +166,6 @@ EC -0210-07950 America/Guayaquil Ecuador (mainland)
EC -0054-08936 Pacific/Galapagos Galapagos Islands
EE +5925+02445 Europe/Tallinn
EG +3003+03115 Africa/Cairo
@ -65,10 +65,10 @@ index 6854afe..364055a 100644
ES +4024-00341 Europe/Madrid Spain (mainland)
ES +3553-00519 Africa/Ceuta Ceuta, Melilla
diff --git a/zone1970.tab b/zone1970.tab
index 35eb0a6..fedbda9 100644
index 2a19b85..8572d37 100644
--- a/zone1970.tab
+++ b/zone1970.tab
@@ -144,7 +144,6 @@ EC -0210-07950 America/Guayaquil Ecuador (mainland)
@@ -140,7 +140,6 @@ EC -0210-07950 America/Guayaquil Ecuador (mainland)
EC -0054-08936 Pacific/Galapagos Galápagos Islands
EE +5925+02445 Europe/Tallinn
EG +3003+03115 Africa/Cairo
@ -77,5 +77,5 @@ index 35eb0a6..fedbda9 100644
ES +3553-00519 Africa/Ceuta Ceuta, Melilla
ES +2806-01524 Atlantic/Canary Canary Islands
--
2.33.0
2.27.0

8
remove-Israel-timezone.patch
View File

@ -1,15 +1,15 @@
diff --git a/backward b/backward
index 1a1bada..fbf61fd 100644
index ee85679..ec60286 100644
--- a/backward
+++ b/backward
@@ -100,7 +100,6 @@ Link Etc/GMT Greenwich
@@ -91,7 +91,6 @@ Link Etc/GMT Greenwich
Link Asia/Hong_Kong Hongkong
Link Africa/Abidjan Iceland
Link Africa/Abidjan Iceland #= Atlantic/Reykjavik
Link Asia/Tehran Iran
-Link Asia/Jerusalem Israel
Link America/Jamaica Jamaica
Link Asia/Tokyo Japan
Link Pacific/Kwajalein Kwajalein
--
2.33.0
2.27.0

8
remove-ROC-timezone.patch
View File

@ -1,9 +1,9 @@
diff --git a/backward b/backward
index 5f2b90e..bc31848 100644
index f25e274..fd0b622 100644
--- a/backward
+++ b/backward
@@ -121,7 +121,6 @@ Link Pacific/Port_Moresby Pacific/Truk
Link Pacific/Port_Moresby Pacific/Yap
@@ -105,7 +105,6 @@ Link America/Denver Navajo #= America/Shiprock
Link Asia/Beijing PRC
Link Europe/Warsaw Poland
Link Europe/Lisbon Portugal
-Link Asia/Taipei ROC
@ -11,5 +11,5 @@ index 5f2b90e..bc31848 100644
Link Asia/Singapore Singapore
Link Europe/Istanbul Turkey
--
2.33.0
2.27.0

38
rename-Macau-to-Macao.patch
View File

@ -1,8 +1,8 @@
diff --git a/NEWS b/NEWS
index bce987a..8f29039 100644
index 701e490..7c1b6a7 100644
--- a/NEWS
+++ b/NEWS
@@ -1149,9 +1149,9 @@ Release 2018f - 2018-10-18 00:14:18 -0700
@@ -1337,9 +1337,9 @@ Release 2018f - 2018-10-18 00:14:18 -0700
April 10. Its DST transitions in 1986/91 were at 02:00, not 00:00.
(Thanks to P Chan.)
@ -15,7 +15,7 @@ index bce987a..8f29039 100644
observed DST in 1942/79, not 1961/80, and there were several
errors for transition times and dates. (Thanks to P Chan.)
@@ -1356,7 +1356,7 @@ Release 2018d - 2018-03-22 07:05:46 -0700
@@ -1544,7 +1544,7 @@ Release 2018d - 2018-03-22 07:05:46 -0700
This transition was at 00:00 according to the new UT offset, not
according to the old one. Also assume that Cape Verde switched on
the same date as the rest, not in 1907. This affects
@ -24,7 +24,7 @@ index bce987a..8f29039 100644
Atlantic/Cape_Verde, Atlantic/Madeira, and Europe/Lisbon.
(Thanks to Michael Deckers.)
@@ -1846,7 +1846,7 @@ Release 2017a - 2017-02-28 00:05:36 -0800
@@ -2034,7 +2034,7 @@ Release 2017a - 2017-02-28 00:05:36 -0800
(Atlantic Standard Time had not been standardized yet). Use "AWT"
and "APT" instead of the invented abbreviations "CAWT" and "CAPT".
@ -34,10 +34,10 @@ index bce987a..8f29039 100644
invented abbreviation "JCST" for Japan and Korea before 1938.
diff --git a/asia b/asia
index 5e86ac9..b910f21 100644
index f59eda6..c656cd4 100644
--- a/asia
+++ b/asia
@@ -994,12 +994,12 @@ Zone Asia/Taipei 8:06:00 - LMT 1896 Jan 1
@@ -984,12 +984,12 @@ Zone Asia/Taipei 8:06:00 - LMT 1896 Jan 1
9:00 - JST 1945 Sep 21 1:00
8:00 Taiwan C%sT
@ -52,7 +52,7 @@ index 5e86ac9..b910f21 100644
# Chinese and Portuguese. The term "HORÁRIO DE VERÃO" can be used for
# searching decrees about summer time.
# * Archives of Macao
@@ -1008,13 +1008,13 @@ Zone Asia/Taipei 8:06:00 - LMT 1896 Jan 1
@@ -998,13 +998,13 @@ Zone Asia/Taipei 8:06:00 - LMT 1896 Jan 1
# * The Macao Meteorological and Geophysical Bureau have a page listing the
# summer time history. But it is not complete and has some mistakes.
# http://www.smg.gov.mo/smg/geophysics/e_t_Summer%20Time.htm
@ -68,7 +68,7 @@ index 5e86ac9..b910f21 100644
#
# From LegisMac, here is a list of decrees that changed the time ...
# [Decree Gazette-no. date; titles omitted in this quotation]
@@ -1093,43 +1093,43 @@ Zone Asia/Taipei 8:06:00 - LMT 1896 Jan 1
@@ -1083,43 +1083,43 @@ Zone Asia/Taipei 8:06:00 - LMT 1896 Jan 1
# between GMT+9 and GMT+10. Also in 1965 and 1965 the DST ended at 2:30am.
# From Paul Eggert (2018-05-10):
@ -144,19 +144,19 @@ index 5e86ac9..b910f21 100644
###############################################################################
diff --git a/backward b/backward
index bc31848..1a1bada 100644
index fd0b622..ee85679 100644
--- a/backward
+++ b/backward
@@ -45,7 +45,6 @@ Link Asia/Dhaka Asia/Dacca
Link Asia/Shanghai Asia/Harbin
Link Asia/Urumqi Asia/Kashgar
@@ -302,7 +302,6 @@ Link Asia/Dhaka Asia/Dacca
# Istanbul is in both continents.
Link Europe/Istanbul Asia/Istanbul
Link Asia/Kathmandu Asia/Katmandu
-Link Asia/Macau Asia/Macao
Link Asia/Yangon Asia/Rangoon
Link Asia/Ho_Chi_Minh Asia/Saigon
Link Asia/Jerusalem Asia/Tel_Aviv
Link Asia/Thimphu Asia/Thimbu
diff --git a/iso3166.tab b/iso3166.tab
index a4ff61a..1c53cc0 100644
index 911af5e..e3ccb11 100644
--- a/iso3166.tab
+++ b/iso3166.tab
@@ -170,7 +170,7 @@ MK North Macedonia
@ -198,10 +198,10 @@ index 66968e8..ba7c3b0 100644
# Use ISO 3166 alpha-2 country codes for remaining names that are countries.
# This is more systematic, and avoids collisions (e.g., Malta and Moldova).
diff --git a/zone.tab b/zone.tab
index 5de73c1..6854afe 100644
index 1cb0977..d2d1d53 100644
--- a/zone.tab
+++ b/zone.tab
@@ -272,7 +272,7 @@ MM +1647+09610 Asia/Yangon
@@ -268,7 +268,7 @@ MM +1647+09610 Asia/Yangon
MN +4755+10653 Asia/Ulaanbaatar Mongolia (most areas)
MN +4801+09139 Asia/Hovd Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
MN +4804+11430 Asia/Choibalsan Dornod, Sukhbaatar
@ -211,10 +211,10 @@ index 5de73c1..6854afe 100644
MQ +1436-06105 America/Martinique
MR +1806-01557 Africa/Nouakchott
diff --git a/zone1970.tab b/zone1970.tab
index 50fcae7..35eb0a6 100644
index 43167cb..2a19b85 100644
--- a/zone1970.tab
+++ b/zone1970.tab
@@ -213,7 +213,7 @@ MM,CC +1647+09610 Asia/Yangon
@@ -209,7 +209,7 @@ MM,CC +1647+09610 Asia/Yangon
MN +4755+10653 Asia/Ulaanbaatar Mongolia (most areas)
MN +4801+09139 Asia/Hovd Bayan-Ölgii, Govi-Altai, Hovd, Uvs, Zavkhan
MN +4804+11430 Asia/Choibalsan Dornod, Sükhbaatar
@ -224,5 +224,5 @@ index 50fcae7..35eb0a6 100644
MT +3554+01431 Europe/Malta
MU -2010+05730 Indian/Mauritius
--
2.33.0
2.27.0

10
skip-check_web-testcase.patch
View File

@ -10,12 +10,12 @@ fails because the external network cannot be accessed.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index b68f843..abf504e 100644
index afb9d53..b8f32e5 100644
--- a/Makefile
+++ b/Makefile
@@ -769,7 +769,7 @@ tzselect: tzselect.ksh version
check: check_character_set check_white_space check_links \
@@ -785,7 +785,7 @@ tzselect: tzselect.ksh version
check: check_back check_mild
check_mild: check_character_set check_white_space check_links \
check_name_lengths check_slashed_abbrs check_sorted \
- check_tables check_web check_ziguard check_zishrink check_tzs
+ check_tables check_ziguard check_zishrink check_tzs
@ -23,5 +23,5 @@ index b68f843..abf504e 100644
check_character_set: $(ENCHILADA)
test ! '$(UTF8_LOCALE)' || \
--
2.33.0
2.27.0

BIN
tzcode2022e.tar.gz
View File

Binary file not shown.

BIN
tzcode2022g.tar.gz Normal file
View File

Binary file not shown.

17
tzdata.spec
View File

@ -1,6 +1,6 @@
Name: tzdata
Version: 2022e
Release: 5
Version: 2022g
Release: 1
Summary: Timezone data
License: Public Domain
URL: https://www.iana.org/time-zones
@ -9,12 +9,7 @@ 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
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
Patch6005: backport-Much-of-Greenland-still-uses-DST-from-2024-on.patch
Patch6000: backport-Much-of-Greenland-still-uses-DST-from-2024-on.patch
Patch9000: bugfix-0001-add-Beijing-timezone.patch
Patch9001: remove-ROC-timezone.patch
@ -114,6 +109,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
%{_datadir}/javazi-1.8
%changelog
* Tue Jan 3 2023 qinyu<qinyu32@huawei.com> - 2022g-1
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC: upgrade tzdata to 2022g
* Mon Dec 5 2022 qinyu<qinyu32@huawei.com> - 2022e-5
- Type:bugfix
- CVE:NA

BIN
tzdata2022e.tar.gz
View File

Binary file not shown.

BIN
tzdata2022g.tar.gz Normal file
View File

Binary file not shown.