backport community patches
Vostok switches to +05 Sync Case ydata from timeanddata.com Kazakhstan unifies on UTC+5 Signed-off-by: SuperSix173 <liuchao173@huawei.com> (cherry picked from commit 52831d78ab6f459bdd02af00f59b00d33518667b)
This commit is contained in:
SuperSix173
openeuler-sync-bot
parent
73f5ae9cc9
commit
f17d6fc1ed
@ -0,0 +1,67 @@
|
|||||||
|
From 95a16c87f21c4643055482429dad921357a630c9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Tim Parenti <tim@timtimeonline.com>
|
||||||
|
Date: Fri, 19 Jan 2024 14:13:23 -0500
|
||||||
|
Subject: [PATCH] Kazakhstan unifies on UTC+5 beginning 2024-03-01.
|
||||||
|
|
||||||
|
* NEWS: Mention this.
|
||||||
|
* asia (Asia/Almaty, Asia/Qostanay): Switch from UTC+6 to UTC+5
|
||||||
|
beginning 2024-03-01 00:00.
|
||||||
|
|
||||||
|
Conclicts: remove the NEWS part and adapt asia
|
||||||
|
---
|
||||||
|
asia | 18 ++++++++++++++----
|
||||||
|
1 files changed, 14 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/asia b/asia
|
||||||
|
index 8028c06e..20ff92b4 100644
|
||||||
|
--- a/asia
|
||||||
|
+++ b/asia
|
||||||
|
@@ -2457,6 +2457,16 @@ Zone Asia/Amman 2:23:44 - LMT 1931
|
||||||
|
# UTC+6 to UTC+5 effective December 21st, 2018. The legal document is
|
||||||
|
# located here: http://adilet.zan.kz/rus/docs/P1800000817 (russian language).
|
||||||
|
|
||||||
|
+# From Zhanbolat Raimbekov (2024-01-19):
|
||||||
|
+# Kazakhstan (all parts) switching to UTC+5 on March 1, 2024
|
||||||
|
+# https://www.gov.kz/memleket/entities/mti/press/news/details/688998?lang=ru
|
||||||
|
+# [in Russian]
|
||||||
|
+#
|
||||||
|
+# From Alexander Krivenyshev (2024-01-19):
|
||||||
|
+# According to a different news and the official web site for the Ministry of
|
||||||
|
+# Trade and Integration of the Republic of Kazakhstan:
|
||||||
|
+# https://en.inform.kz/news/kazakhstan-to-switch-to-single-hour-zone-mar-1-54ad0b/
|
||||||
|
+
|
||||||
|
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||||
|
#
|
||||||
|
# Almaty (formerly Alma-Ata), representing most locations in Kazakhstan
|
||||||
|
@@ -2467,7 +2477,8 @@ Zone Asia/Almaty 5:07:48 - LMT 1924 May 2 # or Alma-Ata
|
||||||
|
6:00 RussiaAsia +06/+07 1991 Mar 31 2:00s
|
||||||
|
5:00 RussiaAsia +05/+06 1992 Jan 19 2:00s
|
||||||
|
6:00 RussiaAsia +06/+07 2004 Oct 31 2:00s
|
||||||
|
- 6:00 - +06
|
||||||
|
+ 6:00 - +06 2024 Mar 1 0:00
|
||||||
|
+ 5:00 - +05
|
||||||
|
# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) (KZ-KZY)
|
||||||
|
Zone Asia/Qyzylorda 4:21:52 - LMT 1924 May 2
|
||||||
|
4:00 - +04 1930 Jun 21
|
||||||
|
@@ -2481,7 +2492,6 @@ Zone Asia/Qyzylorda 4:21:52 - LMT 1924 May 2
|
||||||
|
5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s
|
||||||
|
6:00 - +06 2018 Dec 21 0:00
|
||||||
|
5:00 - +05
|
||||||
|
-#
|
||||||
|
# Qostanay (aka Kostanay, Kustanay) (KZ-KUS)
|
||||||
|
# The 1991/2 rules are unclear partly because of the 1997 Turgai
|
||||||
|
# reorganization.
|
||||||
|
@@ -2493,8 +2503,8 @@ Zone Asia/Qostanay 4:14:28 - LMT 1924 May 2
|
||||||
|
5:00 RussiaAsia +05/+06 1991 Mar 31 2:00s
|
||||||
|
4:00 RussiaAsia +04/+05 1992 Jan 19 2:00s
|
||||||
|
5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s
|
||||||
|
- 6:00 - +06
|
||||||
|
-
|
||||||
|
+ 6:00 - +06 2024 Mar 1 0:00
|
||||||
|
+ 5:00 - +05
|
||||||
|
# Aqtöbe (aka Aktobe, formerly Aktyubinsk) (KZ-AKT)
|
||||||
|
Zone Asia/Aqtobe 3:48:40 - LMT 1924 May 2
|
||||||
|
4:00 - +04 1930 Jun 21
|
||||||
|
--
|
||||||
|
2.23.0
|
||||||
|
|
||||||
46
backport-Sync-Casey-data-from-timeanddate.com.patch
Normal file
46
backport-Sync-Casey-data-from-timeanddate.com.patch
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
From 6a342bed26d7b43c55bf02bcbd68e8a5ed7d0ea8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||||
|
Date: Wed, 20 Dec 2023 10:57:43 -0800
|
||||||
|
Subject: [PATCH] Sync Casey data from timeanddate.com
|
||||||
|
|
||||||
|
* NEWS: Mention this.
|
||||||
|
* antarctica (Antarctica/Casey): Add five zone changes since 2020.
|
||||||
|
|
||||||
|
Conclicts: remove the NEWS part
|
||||||
|
---
|
||||||
|
antarctica | 12 +++++++++++-
|
||||||
|
1 file changed, 11 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/antarctica b/antarctica
|
||||||
|
index 9931378b..763c2725 100644
|
||||||
|
--- a/antarctica
|
||||||
|
+++ b/antarctica
|
||||||
|
@@ -80,6 +80,11 @@
|
||||||
|
# - 2018 Oct 7 4:00 - 2019 Mar 17 3:00 - 2019 Oct 4 3:00 - 2020 Mar 8 3:00
|
||||||
|
# and now - 2020 Oct 4 0:01
|
||||||
|
|
||||||
|
+# From Paul Eggert (2023-12-20):
|
||||||
|
+# Transitions from 2021 on are taken from:
|
||||||
|
+# https://www.timeanddate.com/time/zone/antarctica/casey
|
||||||
|
+# retrieved at various dates.
|
||||||
|
+
|
||||||
|
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||||
|
Zone Antarctica/Casey 0 - -00 1969
|
||||||
|
8:00 - +08 2009 Oct 18 2:00
|
||||||
|
@@ -93,7 +98,12 @@ Zone Antarctica/Casey 0 - -00 1969
|
||||||
|
8:00 - +08 2019 Oct 4 3:00
|
||||||
|
11:00 - +11 2020 Mar 8 3:00
|
||||||
|
8:00 - +08 2020 Oct 4 0:01
|
||||||
|
- 11:00 - +11
|
||||||
|
+ 11:00 - +11 2021 Mar 14 0:00
|
||||||
|
+ 8:00 - +08 2021 Oct 3 0:01
|
||||||
|
+ 11:00 - +11 2022 Mar 13 0:00
|
||||||
|
+ 8:00 - +08 2022 Oct 2 0:01
|
||||||
|
+ 11:00 - +11 2023 Mar 9 3:00
|
||||||
|
+ 8:00 - +08
|
||||||
|
Zone Antarctica/Davis 0 - -00 1957 Jan 13
|
||||||
|
7:00 - +07 1964 Nov
|
||||||
|
0 - -00 1969 Feb
|
||||||
|
--
|
||||||
|
2.23.0
|
||||||
|
|
||||||
105
backport-Vostok-was-at-07-and-just-switched-to-05.patch
Normal file
105
backport-Vostok-was-at-07-and-just-switched-to-05.patch
Normal file
@ -0,0 +1,105 @@
|
|||||||
|
From 1d0ae801a6fa85ba824ca6c017f75eab54657eba Mon Sep 17 00:00:00 2001
|
||||||
|
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||||
|
Date: Mon, 18 Dec 2023 23:27:30 -0800
|
||||||
|
Subject: [PATCH] Vostok was at +07 and just switched to +05
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
* NEWS: Mention this.
|
||||||
|
* backzone (Antarctica/Vostok): Move from here ...
|
||||||
|
* antarctica (Antarctica/Vostok): ... to here, with fixes from
|
||||||
|
Zakhary V. Akulov. Also, record 1994 closure.
|
||||||
|
* backward (Antarctica/Vostok): Remove Link, as it’s now a Zone.
|
||||||
|
* zone1970.tab (Antarctica/Vostok): Copy entry from zone.tab.
|
||||||
|
(Asia/Urumqi): No longer a standin for Vostok.
|
||||||
|
|
||||||
|
Conclicts: remove the NEWS, aisa, backzone, zone1970.tab part and
|
||||||
|
adapt antarctica because don't backport 0b925f6d8
|
||||||
|
---
|
||||||
|
antarctica | 69 ++++++++++++++++++++++++++++++++++++++++++++-
|
||||||
|
1 file changed, 44 insertions(+), 25 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/antarctica b/antarctica
|
||||||
|
index fc603e99..9931378b 100644
|
||||||
|
--- a/antarctica
|
||||||
|
+++ b/antarctica
|
||||||
|
@@ -240,31 +240,50 @@ Zone Antarctica/Troll 0 - -00 2005 Feb 12
|
||||||
|
# year-round from 1960/61 to 1992
|
||||||
|
|
||||||
|
# Vostok, since 1957-12-16, temporarily closed 1994-02/1994-11
|
||||||
|
-# From Craig Mundell (1994-12-15):
|
||||||
|
-# http://quest.arc.nasa.gov/antarctica/QA/computers/Directions,Time,ZIP
|
||||||
|
-# Vostok, which is one of the Russian stations, is set on the same
|
||||||
|
-# time as Moscow, Russia.
|
||||||
|
-#
|
||||||
|
-# From Lee Hotz (2001-03-08):
|
||||||
|
-# I queried the folks at Columbia who spent the summer at Vostok and this is
|
||||||
|
-# what they had to say about time there:
|
||||||
|
-# "in the US Camp (East Camp) we have been on New Zealand (McMurdo)
|
||||||
|
-# time, which is 12 hours ahead of GMT. The Russian Station Vostok was
|
||||||
|
-# 6 hours behind that (although only 2 miles away, i.e. 6 hours ahead
|
||||||
|
-# of GMT). This is a time zone I think two hours east of Moscow. The
|
||||||
|
-# natural time zone is in between the two: 8 hours ahead of GMT."
|
||||||
|
-#
|
||||||
|
-# From Paul Eggert (2001-05-04):
|
||||||
|
-# This seems to be hopelessly confusing, so I asked Lee Hotz about it
|
||||||
|
-# in person. He said that some Antarctic locations set their local
|
||||||
|
-# time so that noon is the warmest part of the day, and that this
|
||||||
|
-# changes during the year and does not necessarily correspond to mean
|
||||||
|
-# solar noon. So the Vostok time might have been whatever the clocks
|
||||||
|
-# happened to be during their visit. So we still don't really know what time
|
||||||
|
-# it is at Vostok. But we'll guess +06.
|
||||||
|
-#
|
||||||
|
-Zone Antarctica/Vostok 0 - -00 1957 Dec 16
|
||||||
|
- 6:00 - +06
|
||||||
|
+# From Craig Mundell (1994-12-15):
|
||||||
|
+# http://quest.arc.nasa.gov/antarctica/QA/computers/Directions,Time,ZIP
|
||||||
|
+# Vostok, which is one of the Russian stations, is set on the same
|
||||||
|
+# time as Moscow, Russia.
|
||||||
|
+#
|
||||||
|
+# From Lee Hotz (2001-03-08):
|
||||||
|
+# I queried the folks at Columbia who spent the summer at Vostok and this is
|
||||||
|
+# what they had to say about time there:
|
||||||
|
+# "in the US Camp (East Camp) we have been on New Zealand (McMurdo)
|
||||||
|
+# time, which is 12 hours ahead of GMT. The Russian Station Vostok was
|
||||||
|
+# 6 hours behind that (although only 2 miles away, i.e. 6 hours ahead
|
||||||
|
+# of GMT). This is a time zone I think two hours east of Moscow. The
|
||||||
|
+# natural time zone is in between the two: 8 hours ahead of GMT."
|
||||||
|
+#
|
||||||
|
+# From Paul Eggert (2001-05-04):
|
||||||
|
+# This seems to be hopelessly confusing, so I asked Lee Hotz about it
|
||||||
|
+# in person. He said that some Antarctic locations set their local
|
||||||
|
+# time so that noon is the warmest part of the day, and that this
|
||||||
|
+# changes during the year and does not necessarily correspond to mean
|
||||||
|
+# solar noon. So the Vostok time might have been whatever the clocks
|
||||||
|
+# happened to be during their visit. So we still don't really know what time
|
||||||
|
+# it is at Vostok.
|
||||||
|
+#
|
||||||
|
+# From Zakhary V. Akulov (2023-12-17 22:00:48 +0700):
|
||||||
|
+# ... from December, 18, 2023 00:00 by my decision the local time of
|
||||||
|
+# the Antarctic research base Vostok will correspond to UTC+5.
|
||||||
|
+# (2023-12-19): We constantly interact with Progress base, with company who
|
||||||
|
+# builds new wintering station, with sledge convoys, with aviation - they all
|
||||||
|
+# use UTC+5. Besides, difference between Moscow time is just 2 hours now, not 4.
|
||||||
|
+# (2023-12-19, in response to the question "Has local time at Vostok
|
||||||
|
+# been UTC+6 ever since 1957, or has it changed before?"): No. At least
|
||||||
|
+# since my antarctic career start, 10 years ago, Vostok base has UTC+7.
|
||||||
|
+# (In response to a 2023-12-18 question "from 02:00 to 00:00 today"): This.
|
||||||
|
+#
|
||||||
|
+# From Paul Eggert (2023-12-18):
|
||||||
|
+# For lack of better info, guess Vostok was at +07 from founding through today,
|
||||||
|
+# except when closed.
|
||||||
|
+
|
||||||
|
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||||
|
+Zone Antarctica/Vostok 0 - -00 1957 Dec 16
|
||||||
|
+ 7:00 - +07 1994 Feb
|
||||||
|
+ 0 - -00 1994 Nov
|
||||||
|
+ 7:00 - +07 2023 Dec 18 2:00
|
||||||
|
+ 5:00 - +05
|
||||||
|
|
||||||
|
# S Africa - year-round bases
|
||||||
|
# Marion Island, -4653+03752
|
||||||
|
--
|
||||||
|
2.23.0
|
||||||
|
|
||||||
11
tzdata.spec
11
tzdata.spec
@ -1,6 +1,6 @@
|
|||||||
Name: tzdata
|
Name: tzdata
|
||||||
Version: 2022a
|
Version: 2022a
|
||||||
Release: 16
|
Release: 17
|
||||||
Summary: Timezone data
|
Summary: Timezone data
|
||||||
License: Public Domain
|
License: Public Domain
|
||||||
URL: https://www.iana.org/time-zones
|
URL: https://www.iana.org/time-zones
|
||||||
@ -29,6 +29,9 @@ Patch6016: backport-Palestine-no-longer-observes-DST-during-Ramadan.patch
|
|||||||
Patch6017: backport-Greenland-changed-standard-time-already.patch
|
Patch6017: backport-Greenland-changed-standard-time-already.patch
|
||||||
Patch6018: backport-Fix-Palestine-predictions-for-2072-through-2075.patch
|
Patch6018: backport-Fix-Palestine-predictions-for-2072-through-2075.patch
|
||||||
Patch6019: backport-Ittoqqortoormiit-America-Scoresbysund-zone-change.patch
|
Patch6019: backport-Ittoqqortoormiit-America-Scoresbysund-zone-change.patch
|
||||||
|
Patch6020: backport-Vostok-was-at-07-and-just-switched-to-05.patch
|
||||||
|
Patch6021: backport-Sync-Casey-data-from-timeanddate.com.patch
|
||||||
|
Patch6022: backport-Kazakhstan-unifies-on-UTC-5-beginning-2024-03-01.patch
|
||||||
|
|
||||||
Patch9000: bugfix-0001-add-Beijing-timezone.patch
|
Patch9000: bugfix-0001-add-Beijing-timezone.patch
|
||||||
Patch9001: remove-country-selection-from-tzselect-steps.patch
|
Patch9001: remove-country-selection-from-tzselect-steps.patch
|
||||||
@ -129,6 +132,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
|
|||||||
%{_datadir}/javazi-1.8
|
%{_datadir}/javazi-1.8
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jan 23 2024 liuchao <liuchao173@huawei.com> - 2022a-17
|
||||||
|
- Type:bugfix
|
||||||
|
- CVE:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:Vostok switches to +05; Sync Casey data from timeanddata.com; Kazakhstan unifies on UTC+5
|
||||||
|
|
||||||
* Wed Dec 13 2023 langfei<langfei@huawei.com> - 2022a-16
|
* Wed Dec 13 2023 langfei<langfei@huawei.com> - 2022a-16
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- CVE:NA
|
- CVE:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user