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

!144 tzdata: update tzdata base to 2022e

Browse Source 
From: @chinyu0704 
Reviewed-by: @SuperSix173 
Signed-off-by: @SuperSix173
This commit is contained in:
openeuler-ci-bot 2022-10-18 12:03:51 +00:00 committed by Gitee
commit 56dce1e54d
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
16 changed files with 81 additions and 553 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
backport-Chile-s-DST-is-delayed-by-a-week-in-September-2022.patch
View File

@ -1,34 +0,0 @@
From 711b46f8fc4e8a3d5caf7d4820562d6cdfe9d769 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 9 Aug 2022 07:02:19 -0700
Subject: [PATCH] Chile's DST is delayed by a week in September 2022
Reference:https://github.com/eggert/tz/commit/711b46f8fc4e8a3d5caf7d4820562d6cdfe9d769
Conflict:remove NEWS part; remove comments in southamerica
* southamerica (Chile): Chile's 2022 start this spring is delayed
from 09-04 to 09-11. (Thanks to Juan Correa.) For now, assume
this is a one-off due to the vote on the new constitution.
---
NEWS | 4 ++++
southamerica | 12 +++++++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/southamerica b/southamerica
index 55336a2..9b3abf8 100644
--- a/southamerica
+++ b/southamerica
@@ -1340,7 +1348,9 @@ Rule Chile 2012 2014 - Sep Sun>=2 4:00u 1:00 -
Rule Chile 2016 2018 - May Sun>=9 3:00u 0 -
Rule Chile 2016 2018 - Aug Sun>=9 4:00u 1:00 -
Rule Chile 2019 max - Apr Sun>=2 3:00u 0 -
-Rule Chile 2019 max - Sep Sun>=2 4:00u 1:00 -
+Rule Chile 2019 2021 - Sep Sun>=2 4:00u 1:00 -
+Rule Chile 2022 only - Sep Sun>=9 4:00u 1:00 -
+Rule Chile 2023 max - Sep Sun>=2 4:00u 1:00 -
# IATA SSIM anomalies: (1992-02) says 1992-03-14;
# (1996-09) says 1998-03-08. Ignore these.
# Zone NAME STDOFF RULES FORMAT [UNTIL]
--
2.23.0

179
backport-Iran-will-stop-DST-in-2023.patch
View File

@ -1,179 +0,0 @@
From 66b18d9835dda089d65349c86e7851c4f0746e09 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 10 May 2022 15:39:01 -0700
Subject: [PATCH] Iran will stop DST in 2023
(Thanks to Ali Mirjamali.)
* NEWS: Mention this.
* asia (Iran): Remove post-2022 transitions.
---
asia | 139 ++++-------------------------------------------------------
1 file changed, 8 insertions(+), 131 deletions(-)
diff --git a/asia b/asia
index ca69d36..dd2632a 100644
--- a/asia
+++ b/asia
@@ -1438,63 +1438,6 @@ Zone Asia/Jayapura 9:22:48 - LMT 1932 Nov
#
# From Paul Eggert (2018-11-30):
# Go with Shanks & Pottenger before Sept. 1991, and with Pournader thereafter.
-# I used the following code in GNU Emacs 26.1 to generate the "Rule Iran"
-# lines from 2008 through 2087. Emacs 26.1 uses Ed Reingold's
-# cal-persia implementation of Birashk's approximation, which in the
-# 2008-2087 range disagrees with the astronomical Persian calendar
-# for Persian years 1404 (Gregorian 2025) and 1437 (Gregorian 2058), so
-# the following code special-cases those years. See Table 15.1, page 264, of:
-# Edward M. Reingold and Nachum Dershowitz, Calendrical Calculations:
-# The Ultimate Edition, Cambridge University Press (2018).
-# https://www.cambridge.org/fr/academic/subjects/computer-science/computing-general-interest/calendrical-calculations-ultimate-edition-4th-edition
-# Page 258, footnote 2, of this book says there is some dispute over what will
-# happen in 2091 (and some other years after that), so this code
-# stops in 2087, as 2088 and 2089 agree with the "max" rule below.
-# (cl-loop
-# initially (require 'cal-persia)
-# with first-persian-year = 1387
-# with last-persian-year = 1466
-# ;; Exceptional years in the above range,
-# ;; from Reingold & Dershowitz Table 15.1, page 264:
-# with exceptional-persian-years = '(1404 1437)
-# with range-start = nil
-# for persian-year from first-persian-year to last-persian-year
-# do
-# (let*
-# ((exceptional-year-offset
-# (if (member persian-year exceptional-persian-years) 1 0))
-# (beg-dst-absolute
-# (+ (calendar-persian-to-absolute (list 1 1 persian-year))
-# exceptional-year-offset))
-# (end-dst-absolute
-# (+ (calendar-persian-to-absolute (list 6 30 persian-year))
-# exceptional-year-offset))
-# (next-year-beg-dst-absolute
-# (+ (calendar-persian-to-absolute (list 1 1 (1+ persian-year)))
-# (if (member (1+ persian-year) exceptional-persian-years) 1 0)))
-# (beg-dst (calendar-gregorian-from-absolute beg-dst-absolute))
-# (end-dst (calendar-gregorian-from-absolute end-dst-absolute))
-# (next-year-beg-dst (calendar-gregorian-from-absolute
-# next-year-beg-dst-absolute))
-# (year (calendar-extract-year beg-dst))
-# (range-end (if range-start year "only")))
-# (setq range-start (or range-start year))
-# (when (or (/= (calendar-extract-day beg-dst)
-# (calendar-extract-day next-year-beg-dst))
-# (= persian-year last-persian-year))
-# (insert
-# (format
-# "Rule\tIran\t%d\t%s\t-\t%s\t%2d\t24:00\t1:00\t-\n"
-# range-start range-end
-# (calendar-month-name (calendar-extract-month beg-dst) t)
-# (calendar-extract-day beg-dst)))
-# (insert
-# (format
-# "Rule\tIran\t%d\t%s\t-\t%s\t%2d\t24:00\t0\t-\n"
-# range-start range-end
-# (calendar-month-name (calendar-extract-month end-dst) t)
-# (calendar-extract-day end-dst)))
-# (setq range-start nil))))
#
# From Oscar van Vlijmen (2005-03-30), writing about future
# discrepancies between cal-persia and the Iranian calendar:
@@ -1528,6 +1471,12 @@ Zone Asia/Jayapura 9:22:48 - LMT 1932 Nov
# be changed back to its previous state on the 24 hours of the
# thirtieth day of Shahrivar.
#
+# From Ali Mirjamali (2022-05-10):
+# Official IR News Agency announcement: irna.ir/xjJ3TT
+# Iran Parliament (Majles) official announcement : shorturl.at/fhtIR
+# Highlights: DST will be cancelled for the next Iranian year 1402
+# (i.e 2023-March-21) and forthcoming years.
+#
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
Rule Iran 1978 1980 - Mar 20 24:00 1:00 -
Rule Iran 1978 only - Oct 20 24:00 0 -
@@ -1562,80 +1511,8 @@ Rule Iran 2017 2019 - Mar 21 24:00 1:00 -
Rule Iran 2017 2019 - Sep 21 24:00 0 -
Rule Iran 2020 only - Mar 20 24:00 1:00 -
Rule Iran 2020 only - Sep 20 24:00 0 -
-Rule Iran 2021 2023 - Mar 21 24:00 1:00 -
-Rule Iran 2021 2023 - Sep 21 24:00 0 -
-Rule Iran 2024 only - Mar 20 24:00 1:00 -
-Rule Iran 2024 only - Sep 20 24:00 0 -
-Rule Iran 2025 2027 - Mar 21 24:00 1:00 -
-Rule Iran 2025 2027 - Sep 21 24:00 0 -
-Rule Iran 2028 2029 - Mar 20 24:00 1:00 -
-Rule Iran 2028 2029 - Sep 20 24:00 0 -
-Rule Iran 2030 2031 - Mar 21 24:00 1:00 -
-Rule Iran 2030 2031 - Sep 21 24:00 0 -
-Rule Iran 2032 2033 - Mar 20 24:00 1:00 -
-Rule Iran 2032 2033 - Sep 20 24:00 0 -
-Rule Iran 2034 2035 - Mar 21 24:00 1:00 -
-Rule Iran 2034 2035 - Sep 21 24:00 0 -
-Rule Iran 2036 2037 - Mar 20 24:00 1:00 -
-Rule Iran 2036 2037 - Sep 20 24:00 0 -
-Rule Iran 2038 2039 - Mar 21 24:00 1:00 -
-Rule Iran 2038 2039 - Sep 21 24:00 0 -
-Rule Iran 2040 2041 - Mar 20 24:00 1:00 -
-Rule Iran 2040 2041 - Sep 20 24:00 0 -
-Rule Iran 2042 2043 - Mar 21 24:00 1:00 -
-Rule Iran 2042 2043 - Sep 21 24:00 0 -
-Rule Iran 2044 2045 - Mar 20 24:00 1:00 -
-Rule Iran 2044 2045 - Sep 20 24:00 0 -
-Rule Iran 2046 2047 - Mar 21 24:00 1:00 -
-Rule Iran 2046 2047 - Sep 21 24:00 0 -
-Rule Iran 2048 2049 - Mar 20 24:00 1:00 -
-Rule Iran 2048 2049 - Sep 20 24:00 0 -
-Rule Iran 2050 2051 - Mar 21 24:00 1:00 -
-Rule Iran 2050 2051 - Sep 21 24:00 0 -
-Rule Iran 2052 2053 - Mar 20 24:00 1:00 -
-Rule Iran 2052 2053 - Sep 20 24:00 0 -
-Rule Iran 2054 2055 - Mar 21 24:00 1:00 -
-Rule Iran 2054 2055 - Sep 21 24:00 0 -
-Rule Iran 2056 2057 - Mar 20 24:00 1:00 -
-Rule Iran 2056 2057 - Sep 20 24:00 0 -
-Rule Iran 2058 2059 - Mar 21 24:00 1:00 -
-Rule Iran 2058 2059 - Sep 21 24:00 0 -
-Rule Iran 2060 2062 - Mar 20 24:00 1:00 -
-Rule Iran 2060 2062 - Sep 20 24:00 0 -
-Rule Iran 2063 only - Mar 21 24:00 1:00 -
-Rule Iran 2063 only - Sep 21 24:00 0 -
-Rule Iran 2064 2066 - Mar 20 24:00 1:00 -
-Rule Iran 2064 2066 - Sep 20 24:00 0 -
-Rule Iran 2067 only - Mar 21 24:00 1:00 -
-Rule Iran 2067 only - Sep 21 24:00 0 -
-Rule Iran 2068 2070 - Mar 20 24:00 1:00 -
-Rule Iran 2068 2070 - Sep 20 24:00 0 -
-Rule Iran 2071 only - Mar 21 24:00 1:00 -
-Rule Iran 2071 only - Sep 21 24:00 0 -
-Rule Iran 2072 2074 - Mar 20 24:00 1:00 -
-Rule Iran 2072 2074 - Sep 20 24:00 0 -
-Rule Iran 2075 only - Mar 21 24:00 1:00 -
-Rule Iran 2075 only - Sep 21 24:00 0 -
-Rule Iran 2076 2078 - Mar 20 24:00 1:00 -
-Rule Iran 2076 2078 - Sep 20 24:00 0 -
-Rule Iran 2079 only - Mar 21 24:00 1:00 -
-Rule Iran 2079 only - Sep 21 24:00 0 -
-Rule Iran 2080 2082 - Mar 20 24:00 1:00 -
-Rule Iran 2080 2082 - Sep 20 24:00 0 -
-Rule Iran 2083 only - Mar 21 24:00 1:00 -
-Rule Iran 2083 only - Sep 21 24:00 0 -
-Rule Iran 2084 2086 - Mar 20 24:00 1:00 -
-Rule Iran 2084 2086 - Sep 20 24:00 0 -
-Rule Iran 2087 only - Mar 21 24:00 1:00 -
-Rule Iran 2087 only - Sep 21 24:00 0 -
-#
-# The following rules are approximations starting in the year 2088.
-# These are the best post-2088 approximations available, given the
-# restrictions of a single rule using ordinary Gregorian dates.
-# At some point this table will need to be extended, though quite
-# possibly Iran will change the rules first.
-Rule Iran 2088 max - Mar 20 24:00 1:00 -
-Rule Iran 2088 max - Sep 20 24:00 0 -
+Rule Iran 2021 2022 - Mar 21 24:00 1:00 -
+Rule Iran 2021 2022 - Sep 21 24:00 0 -
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Tehran 3:25:44 - LMT 1916
--
2.23.0

75
backport-Palestine-transitions-are-now-Saturdays-at-02-00.patch
View File

@ -1,75 +0,0 @@
From dd5a45a91d9da0c178de9541334ab6cf05deb2c0 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 30 Aug 2022 12:45:52 -0500
Subject: [PATCH] Palestine transitions are now Saturdays at 02:00
Reference: https://github.com/eggert/tz/commit/c42d108da5a95cd0432bfeeff35498d695d09da8
Conflict: News context
(Thanks to Heba Hamad.)
* NEWS: Mention this.
* asia (Palestine): Mar and Oct Sat>=24 2:00 going forward.
---
NEWS | 11 +++++++++++
asia | 17 +++++++++++++++--
2 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/NEWS b/NEWS
index af39e69..df6b384 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,16 @@
News for the tz database
+ Briefly:
+ Palestine transitions are now Saturdays at 02:00.
+ Simplify three Ukraine zones into one.
+
+ Changes to future timestamps
+
+ Palestine now springs forward and falls back at 02:00 on the first
+ Saturday on or after March 24 and October 24, respectively. This
+ this means 2022 falls back 10-29 at 02:00, not 10-28 at 01:00.
+ (Thanks to Heba Hamad.)
+
Release 2022a - 2022-03-15 23:02:01 -0700
Briefly:
diff --git a/asia b/asia
index 9698cf9..28e130e 100644
--- a/asia
+++ b/asia
@@ -3292,6 +3292,17 @@ Zone Asia/Karachi 4:28:12 - LMT 1907
# From Heba Hamad (2022-03-10):
# summer time will begin in Palestine from Sunday 03-27-2022, 00:00 AM.
+# From Heba Hamad (2022-08-30):
+# winter time will begin in Palestine from Saturday 10-29, 02:00 AM by
+# 60 minutes backwards. Also the state of Palestine adopted the summer
+# and winter time for the years: 2023,2024,2025,2026 ...
+# https://mm.icann.org/pipermail/tz/attachments/20220830/9f024566/Time-0001.pdf
+#
+# From Paul Eggert (2022-08-30):
+# Guess they spring forward on the first Saturday on or after March 24,
+# and fall back on the first Saturday on or after October 24, as this is
+# consistent with the given transitions and with previous date practice.
+
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
Rule EgyptAsia 1957 1958 - Oct 1 0:00 0 -
@@ -3328,8 +3339,10 @@ Rule Palestine 2019 only - Mar 29 0:00 1:00 S
Rule Palestine 2019 only - Oct Sat>=24 0:00 0 -
Rule Palestine 2020 2021 - Mar Sat>=24 0:00 1:00 S
Rule Palestine 2020 only - Oct 24 1:00 0 -
-Rule Palestine 2021 max - Oct Fri>=23 1:00 0 -
-Rule Palestine 2022 max - Mar Sun>=25 0:00 1:00 S
+Rule Palestine 2021 only - Oct 29 1:00 0 -
+Rule Palestine 2022 only - Mar 27 0:00 1:00 S
+Rule Palestine 2022 max - Oct Sat>=24 2:00 0 -
+Rule Palestine 2023 max - Mar Sat>=24 2:00 1:00 S
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
--
2.33.0

75
backport-Tweak-expression-of-Palestine-transition.patch
View File

@ -1,75 +0,0 @@
From 1a0e30a84b2f76663123a4555c2785b450ce06f1 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 31 Aug 2022 16:58:10 -0500
Subject: [PATCH] Tweak expression of Palestine transition
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Reference:https://github.com/eggert/tz/commit/1a0e30a84b2f76663123a4555c2785b450ce06f1
Conflict: NA
* asia (Palestine): Say "Sat<=30" instead of "Sat>=24".
These have equivalent effect, so this does not change the
generated data. “Sat<=30” is a bit closer to the intended
“Saturday before the last Sunday” given by Heba Hamad.
---
asia | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/asia b/asia
index 1a3d8c1..9fbeb71 100644
--- a/asia
+++ b/asia
@@ -3375,10 +3375,6 @@ Zone Asia/Karachi 4:28:12 - LMT 1907
# The winter time in 2015 started on October 23 at 01:00.
# https://wafa.ps/ar_page.aspx?id=CgpCdYa670694628582aCgpCdY
# http://www.palestinecabinet.gov.ps/portal/meeting/details/27583
-#
-# From Paul Eggert (2019-04-10):
-# For now, guess spring-ahead transitions are at 00:00 on the Saturday
-# preceding March's last Sunday (i.e., Sat>=24).
# From P Chan (2021-10-18):
# http://wafa.ps/Pages/Details/34701
@@ -3400,11 +3396,11 @@ Zone Asia/Karachi 4:28:12 - LMT 1907
# 60 minutes backwards. Also the state of Palestine adopted the summer
# and winter time for the years: 2023,2024,2025,2026 ...
# https://mm.icann.org/pipermail/tz/attachments/20220830/9f024566/Time-0001.pdf
+# (2022-08-31): ... the Saturday before the last Sunday in March and October
+# at 2:00 AM ,for the years from 2023 to 2026.
#
-# From Paul Eggert (2022-08-30):
-# Guess they spring forward on the first Saturday on or after March 24,
-# and fall back on the first Saturday on or after October 24, as this is
-# consistent with the given transitions and with previous date practice.
+# From Paul Eggert (2022-08-31):
+# For now, assume that this rule will also be used after 2026.
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
@@ -3436,16 +3432,16 @@ Rule Palestine 2013 only - Sep 27 0:00 0 -
Rule Palestine 2014 only - Oct 24 0:00 0 -
Rule Palestine 2015 only - Mar 28 0:00 1:00 S
Rule Palestine 2015 only - Oct 23 1:00 0 -
-Rule Palestine 2016 2018 - Mar Sat>=24 1:00 1:00 S
-Rule Palestine 2016 2018 - Oct Sat>=24 1:00 0 -
+Rule Palestine 2016 2018 - Mar Sat<=30 1:00 1:00 S
+Rule Palestine 2016 2018 - Oct Sat<=30 1:00 0 -
Rule Palestine 2019 only - Mar 29 0:00 1:00 S
-Rule Palestine 2019 only - Oct Sat>=24 0:00 0 -
-Rule Palestine 2020 2021 - Mar Sat>=24 0:00 1:00 S
+Rule Palestine 2019 only - Oct Sat<=30 0:00 0 -
+Rule Palestine 2020 2021 - Mar Sat<=30 0:00 1:00 S
Rule Palestine 2020 only - Oct 24 1:00 0 -
Rule Palestine 2021 only - Oct 29 1:00 0 -
Rule Palestine 2022 only - Mar 27 0:00 1:00 S
-Rule Palestine 2022 max - Oct Sat>=24 2:00 0 -
-Rule Palestine 2023 max - Mar Sat>=24 2:00 1:00 S
+Rule Palestine 2022 max - Oct Sat<=30 2:00 0 -
+Rule Palestine 2023 max - Mar Sat<=30 2:00 1:00 S
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
--
2.23.0

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

@ -1,10 +1,10 @@
diff --git a/asia b/asia
index 106efad..c631935 100644
index af1b822..5e86ac9 100644
--- a/asia
+++ b/asia
@@ -675,6 +675,8 @@ Zone Asia/Shanghai 8:05:43 - LMT 1901
Zone Asia/Urumqi 5:50:20 - LMT 1928
@@ -669,6 +669,8 @@ 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
@ -12,10 +12,10 @@ index 106efad..c631935 100644
# Hong Kong
diff --git a/backward b/backward
index e13ae52..348f99e 100644
index 14e4b14..5f2b90e 100644
--- a/backward
+++ b/backward
@@ -101,7 +101,7 @@ Link America/Mexico_City Mexico/General
@@ -112,7 +112,7 @@ Link America/Mexico_City Mexico/General
Link Pacific/Auckland NZ
Link Pacific/Chatham NZ-CHAT
Link America/Denver Navajo
@ -23,12 +23,12 @@ index e13ae52..348f99e 100644
+Link Asia/Beijing PRC
Link Pacific/Kanton Pacific/Enderbury
Link Pacific/Honolulu Pacific/Johnston
Link Pacific/Pohnpei Pacific/Ponape
Link Pacific/Guadalcanal Pacific/Ponape
diff --git a/zone.tab b/zone.tab
index 8d056e3..cfd90aa 100644
index 4904028..5de73c1 100644
--- a/zone.tab
+++ b/zone.tab
@@ -145,7 +145,8 @@ CL -3327-07040 America/Santiago Chile (most areas)
@@ -147,7 +147,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,16 +39,19 @@ index 8d056e3..cfd90aa 100644
CO +0436-07405 America/Bogota
CR +0956-08405 America/Costa_Rica
diff --git a/zone1970.tab b/zone1970.tab
index 53ee77e..3d21c92 100644
index cf9cf20..50fcae7 100644
--- a/zone1970.tab
+++ b/zone1970.tab
@@ -137,7 +137,8 @@ CK -2114-15946 Pacific/Rarotonga
@@ -127,7 +127,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
-CN +3114+12128 Asia/Shanghai Beijing Time
+CN +3955+11626 Asia/Beijing China Standard Time
+CN +3114+12128 Asia/Shanghai Shanghai Time
CN +4348+08735 Asia/Urumqi Xinjiang Time
CN,AQ +4348+08735 Asia/Urumqi Xinjiang Time, Vostok
CO +0436-07405 America/Bogota
CR +0956-08405 America/Costa_Rica
--
2.33.0

21
remove-El_Aaiun-timezone.patch
View File

@ -1,8 +1,8 @@
diff --git a/NEWS b/NEWS
index a2db876..22458a3 100644
index 8f29039..37eab25 100644
--- a/NEWS
+++ b/NEWS
@@ -1414,9 +1414,9 @@ Release 2016g - 2016-09-13 08:56:38 -0700
@@ -2109,9 +2109,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 a2db876..22458a3 100644
If the installed localtime and/or posixrules files are symbolic
links, zic now keeps them symbolic links when updating them, for
@@ -2771,9 +2771,6 @@ Release 2013h - 2013-10-25 15:32:32 -0700
@@ -3466,9 +3466,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 a2db876..22458a3 100644
Acre and (we guess) western Amazonas will switch from UT -04 to -05
diff --git a/africa b/africa
index 724744f..3dfd0a7 100644
index 7cbd6b0..a246da7 100644
--- a/africa
+++ b/africa
@@ -1096,22 +1096,6 @@ Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
@@ -1121,22 +1121,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
@ -53,10 +53,10 @@ index 724744f..3dfd0a7 100644
#
# Shanks gives 1903-03-01 for the transition to CAT.
diff --git a/zone.tab b/zone.tab
index 8c28f76..b9def00 100644
index 6854afe..364055a 100644
--- a/zone.tab
+++ b/zone.tab
@@ -168,7 +168,6 @@ EC -0210-07950 America/Guayaquil Ecuador (mainland)
@@ -170,7 +170,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 8c28f76..b9def00 100644
ES +4024-00341 Europe/Madrid Spain (mainland)
ES +3553-00519 Africa/Ceuta Ceuta, Melilla
diff --git a/zone1970.tab b/zone1970.tab
index 169feda..a572064 100644
index 35eb0a6..fedbda9 100644
--- a/zone1970.tab
+++ b/zone1970.tab
@@ -157,7 +157,6 @@ EC -0210-07950 America/Guayaquil Ecuador (mainland)
@@ -144,7 +144,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
@ -76,3 +76,6 @@ index 169feda..a572064 100644
ES +4024-00341 Europe/Madrid Spain (mainland)
ES +3553-00519 Africa/Ceuta Ceuta, Melilla
ES +2806-01524 Atlantic/Canary Canary Islands
--
2.33.0

9
remove-Israel-timezone.patch
View File

@ -1,12 +1,15 @@
diff --git a/backward b/backward
index 601977d..107738c 100644
index 1a1bada..fbf61fd 100644
--- a/backward
+++ b/backward
@@ -89,7 +89,6 @@ Link Etc/GMTGreenwich
@@ -100,7 +100,6 @@ Link Etc/GMT Greenwich
Link Asia/Hong_Kong Hongkong
Link Atlantic/Reykjavik Iceland
Link Africa/Abidjan Iceland
Link Asia/Tehran Iran
-Link Asia/Jerusalem Israel
Link America/Jamaica Jamaica
Link Asia/Tokyo Japan
Link Pacific/Kwajalein Kwajalein
--
2.33.0

9
remove-ROC-timezone.patch
View File

@ -1,12 +1,15 @@
diff --git a/backward b/backward
index 348f99e..d13e811 100644
index 5f2b90e..bc31848 100644
--- a/backward
+++ b/backward
@@ -109,7 +109,6 @@ Link Pacific/Chuuk Pacific/Truk
Link Pacific/Chuuk Pacific/Yap
@@ -121,7 +121,6 @@ Link Pacific/Port_Moresby Pacific/Truk
Link Pacific/Port_Moresby Pacific/Yap
Link Europe/Warsaw Poland
Link Europe/Lisbon Portugal
-Link Asia/Taipei ROC
Link Asia/Seoul ROK
Link Asia/Singapore Singapore
Link Europe/Istanbul Turkey
--
2.33.0

123
remove-country-selection-from-tzselect-steps.patch
View File

@ -1,123 +0,0 @@
diff --git a/tzselect.ksh b/tzselect.ksh
index 18fce27..7784f2e 100644
--- a/tzselect.ksh
+++ b/tzselect.ksh
@@ -51,7 +51,7 @@ say() {
coord=
location_limit=10
-zonetabtype=zone1970
+zonetabtype=zone
usage="Usage: tzselect [--version] [--help] [-c COORD] [-n LIMIT]
Select a timezone interactively.
@@ -398,94 +398,36 @@ while
'`
;;
*)
- # Get list of names of countries in the continent or ocean.
- countries=`$AWK \
+ # Get list of names of timezones in the continent or ocean.
+ tmp_timezones=`$AWK \
-v continent="$continent" \
- -v TZ_COUNTRY_TABLE="$TZ_COUNTRY_TABLE" \
'
BEGIN { FS = "\t" }
/^#/ { next }
$3 ~ ("^" continent "/") {
- ncc = split($1, cc, /,/)
+ ncc = split($3, cc, /,/)
for (i = 1; i <= ncc; i++)
if (!cc_seen[cc[i]]++) cc_list[++ccs] = cc[i]
}
END {
- while (getline <TZ_COUNTRY_TABLE) {
- if ($0 !~ /^#/) cc_name[$1] = $2
- }
for (i = 1; i <= ccs; i++) {
- country = cc_list[i]
- if (cc_name[country]) {
- country = cc_name[country]
- }
- print country
+ print cc_list[i]
}
}
' <"$TZ_ZONE_TABLE" | sort -f`
+ timezones=[]
+ index=0
+ for item in $tmp_timezones; do
+ timezones[$index]=`echo $item | awk -F '/' '{print $2}'`
+ index=$(($index+1))
+ done
- # If there's more than one country, ask the user which one.
- case $countries in
- *"$newline"*)
- echo >&2 'Please select a country' \
- 'whose clocks agree with yours.'
- doselect $countries
- country=$select_result;;
- *)
- country=$countries
- esac
-
-
- # Get list of timezones in the country.
- regions=`$AWK \
- -v country="$country" \
- -v TZ_COUNTRY_TABLE="$TZ_COUNTRY_TABLE" \
- '
- BEGIN {
- FS = "\t"
- cc = country
- while (getline <TZ_COUNTRY_TABLE) {
- if ($0 !~ /^#/ && country == $2) {
- cc = $1
- break
- }
- }
- }
- /^#/ { next }
- $1 ~ cc { print $4 }
- ' <"$TZ_ZONE_TABLE"`
-
-
- # If there's more than one region, ask the user which one.
- case $regions in
- *"$newline"*)
- echo >&2 'Please select one of the following timezones.'
- doselect $regions
- region=$select_result;;
- *)
- region=$regions
- esac
-
- # Determine TZ from country and region.
- TZ=`$AWK \
- -v country="$country" \
- -v region="$region" \
- -v TZ_COUNTRY_TABLE="$TZ_COUNTRY_TABLE" \
- '
- BEGIN {
- FS = "\t"
- cc = country
- while (getline <TZ_COUNTRY_TABLE) {
- if ($0 !~ /^#/ && country == $2) {
- cc = $1
- break
- }
- }
- }
- /^#/ { next }
- $1 ~ cc && $4 == region { print $3 }
- ' <"$TZ_ZONE_TABLE"`
+ echo >&2 'Please select a timezone' \
+ 'whose clocks agree with yours.'
+ doselect ${timezones[@]}
+ timezone=$select_result
+ TZ=$continent/$timezone
esac
# Make sure the corresponding zoneinfo file exists.

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

@ -1,8 +1,8 @@
diff --git a/NEWS b/NEWS
index 321e090..a2db876 100644
index bce987a..8f29039 100644
--- a/NEWS
+++ b/NEWS
@@ -454,9 +454,9 @@ Release 2018f - 2018-10-18 00:14:18 -0700
@@ -1149,9 +1149,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 321e090..a2db876 100644
observed DST in 1942/79, not 1961/80, and there were several
errors for transition times and dates. (Thanks to P Chan.)
@@ -661,7 +661,7 @@ Release 2018d - 2018-03-22 07:05:46 -0700
@@ -1356,7 +1356,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 321e090..a2db876 100644
Atlantic/Cape_Verde, Atlantic/Madeira, and Europe/Lisbon.
(Thanks to Michael Deckers.)
@@ -1151,7 +1151,7 @@ Release 2017a - 2017-02-28 00:05:36 -0800
@@ -1846,7 +1846,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 321e090..a2db876 100644
invented abbreviation "JCST" for Japan and Korea before 1938.
diff --git a/asia b/asia
index c631935..225ffb1 100644
index 5e86ac9..b910f21 100644
--- a/asia
+++ b/asia
@@ -999,12 +999,12 @@ Zone Asia/Taipei 8:06:00 - LMT 1896 Jan 1
@@ -994,12 +994,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 c631935..225ffb1 100644
# Chinese and Portuguese. The term "HORÁRIO DE VERÃO" can be used for
# searching decrees about summer time.
# * Archives of Macao
@@ -1013,13 +1013,13 @@ Zone Asia/Taipei 8:06:00 - LMT 1896 Jan 1
@@ -1008,13 +1008,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 c631935..225ffb1 100644
#
# From LegisMac, here is a list of decrees that changed the time ...
# [Decree Gazette-no. date; titles omitted in this quotation]
@@ -1098,43 +1098,43 @@ Zone Asia/Taipei 8:06:00 - LMT 1896 Jan 1
@@ -1093,43 +1093,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,10 +144,10 @@ index c631935..225ffb1 100644
###############################################################################
diff --git a/backward b/backward
index d13e811..601977d 100644
index bc31848..1a1bada 100644
--- a/backward
+++ b/backward
@@ -38,7 +38,6 @@ Link Asia/Dhaka Asia/Dacca
@@ -45,7 +45,6 @@ Link Asia/Dhaka Asia/Dacca
Link Asia/Shanghai Asia/Harbin
Link Asia/Urumqi Asia/Kashgar
Link Asia/Kathmandu Asia/Katmandu
@ -169,10 +169,10 @@ index a4ff61a..1c53cc0 100644
MQ Martinique
MR Mauritania
diff --git a/tz-link.html b/tz-link.html
index 1f893f6..7c5cb0a 100644
index d3b3766..6dba4f6 100644
--- a/tz-link.html
+++ b/tz-link.html
@@ -831,9 +831,9 @@ Chile's official time (in Spanish)</a>.</dd>
@@ -872,9 +872,9 @@ Chile's official time (in Spanish)</a>.</dd>
<dd>The Hong Kong Observatory maintains a
<a href="https://www.hko.gov.hk/en/gts/time/Summertime.htm">history of
summer time in Hong Kong</a>,
@ -185,7 +185,7 @@ index 1f893f6..7c5cb0a 100644
<dt>Czech Republic</dt>
<dd><a href="https://kalendar.beda.cz/kdy-zacina-a-konci-letni-cas"
diff --git a/zishrink.awk b/zishrink.awk
index 4e187ac..a41382c 100644
index 66968e8..ba7c3b0 100644
--- a/zishrink.awk
+++ b/zishrink.awk
@@ -94,7 +94,7 @@ function prehash_rule_names( \
@ -198,10 +198,10 @@ index 4e187ac..a41382c 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 cfd90aa..8c28f76 100644
index 5de73c1..6854afe 100644
--- a/zone.tab
+++ b/zone.tab
@@ -270,7 +270,7 @@ MM +1647+09610 Asia/Yangon
@@ -272,7 +272,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 cfd90aa..8c28f76 100644
MQ +1436-06105 America/Martinique
MR +1806-01557 Africa/Nouakchott
diff --git a/zone1970.tab b/zone1970.tab
index 3d21c92..169feda 100644
index 50fcae7..35eb0a6 100644
--- a/zone1970.tab
+++ b/zone1970.tab
@@ -233,7 +233,7 @@ MM +1647+09610 Asia/Yangon
@@ -213,7 +213,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
@ -223,3 +223,6 @@ index 3d21c92..169feda 100644
MQ +1436-06105 America/Martinique
MT +3554+01431 Europe/Malta
MU -2010+05730 Indian/Mauritius
--
2.33.0

21
skip-check_web-testcase.patch
View File

@ -1,28 +1,27 @@
From bb414b02a9474f0acf5231afb5a954bda0bab2fe Mon Sep 17 00:00:00 2001
From 5d544cddbb1787be0f57fb26378a79c5a52849bb Mon Sep 17 00:00:00 2001
From: SuperSix173 <liuchao173@huawei.com>
Date: Sat, 31 Jul 2021 15:29:09 +0800
Date: Fri, 14 Oct 2022 10:06:00 +0800
Subject: [PATCH] skip check_web testcase
check_web needs to access validator.w3.org. Therefore, make check
fails because the external network cannot be accessed.
---
Makefile | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 1136af9..5ccad33 100644
index b68f843..abf504e 100644
--- a/Makefile
+++ b/Makefile
@@ -747,7 +747,7 @@ tzselect: tzselect.ksh version
@@ -769,7 +769,7 @@ tzselect: tzselect.ksh version
check: check_character_set check_white_space check_links \
check_name_lengths check_sorted \
- check_tables check_web check_zishrink check_tzs
+ check_tables check_zishrink check_tzs
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
check_character_set: $(ENCHILADA)
test ! '$(UTF8_LOCALE)' || \
--
1.8.3.1
2.33.0

BIN
tzcode2022a.tar.gz
View File

Binary file not shown.

BIN
tzcode2022e.tar.gz Normal file
View File

Binary file not shown.

26
tzdata.spec
View File

@ -1,6 +1,6 @@
Name: tzdata
Version: 2022a
Release: 6
Version: 2022e
Release: 1
Summary: Timezone data
License: Public Domain
URL: https://www.iana.org/time-zones
@ -9,18 +9,12 @@ 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-Iran-will-stop-DST-in-2023.patch
Patch6001: backport-Chile-s-DST-is-delayed-by-a-week-in-September-2022.patch
Patch6002: backport-Palestine-transitions-are-now-Saturdays-at-02-00.patch
Patch6003: backport-Tweak-expression-of-Palestine-transition.patch
Patch9000: bugfix-0001-add-Beijing-timezone.patch
Patch9001: remove-country-selection-from-tzselect-steps.patch
Patch9002: remove-ROC-timezone.patch
Patch9003: rename-Macau-to-Macao.patch
Patch9004: remove-El_Aaiun-timezone.patch
Patch9005: remove-Israel-timezone.patch
Patch9006: skip-check_web-testcase.patch
Patch9001: remove-ROC-timezone.patch
Patch9002: rename-Macau-to-Macao.patch
Patch9003: remove-El_Aaiun-timezone.patch
Patch9004: remove-Israel-timezone.patch
Patch9005: skip-check_web-testcase.patch
BuildRequires: gawk glibc perl-interpreter
BuildRequires: java-devel
@ -113,6 +107,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
%{_datadir}/javazi-1.8
%changelog
* Tue Oct 18 2022 qinyu<qinyu32@huawei.com> - 2022e-1
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC: update tzdata base to 2022e
* Mon Oct 10 2022 huangduirong<huangduirong@huawei.com> - 2022a-6
- Type:bugfix
- CVE:NA

BIN
tzdata2022a.tar.gz
View File

Binary file not shown.

BIN
tzdata2022e.tar.gz Normal file
View File

Binary file not shown.