backport community patches
This commit is contained in:
shenkai
parent
b71768fa80
commit
2148675f9c
103
backport-Fix-Kenya-transitions-1908-1960.patch
Normal file
103
backport-Fix-Kenya-transitions-1908-1960.patch
Normal file
@ -0,0 +1,103 @@
|
|||||||
|
From eff0719a7dc9e0fa7faae3fdce27752daac5a5e3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||||
|
Date: Sat, 24 Oct 2020 14:55:32 -0700
|
||||||
|
Subject: [PATCH 4/6] Fix Kenya transitions 1908/1960
|
||||||
|
|
||||||
|
Fix several transitions from 1908 through 1960, and supply
|
||||||
|
legal citations for the fixes. (Thanks to P Chan.)
|
||||||
|
* NEWS: Mention this.
|
||||||
|
* africa (Africa/Nairobi): Fix all transitions for 1908 through 1960.
|
||||||
|
---
|
||||||
|
NEWS | 13 +++++++++++++
|
||||||
|
africa | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
|
||||||
|
2 files changed, 60 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/NEWS b/NEWS
|
||||||
|
index 328face..27ad63d 100644
|
||||||
|
--- a/NEWS
|
||||||
|
+++ b/NEWS
|
||||||
|
@@ -1,5 +1,18 @@
|
||||||
|
News for the tz database
|
||||||
|
|
||||||
|
+Unreleased, experimental changes
|
||||||
|
+
|
||||||
|
+ Changes to past timestamps
|
||||||
|
+
|
||||||
|
+ Correct several 1908 through 1960 transitions for Kenya and adjacent,
|
||||||
|
+ fixing several hazy entries originally derived from Shanks.
|
||||||
|
+ Insert a transition from LMT to +0230 on 1908-05.
|
||||||
|
+ The first transition to +03 was on 1928-06-30, not 1928-07.
|
||||||
|
+ The later transition to +0230 was on 1930-01-04, not the guessed 01-01.
|
||||||
|
+ The transition to +0245 was on 1936-12-31, not 1940.
|
||||||
|
+ And the final transition to +03 was on 1942-07-31, not 1960.
|
||||||
|
+ (Thanks to P Chan.)
|
||||||
|
+
|
||||||
|
Release 2020d - 2020-10-21 11:24:13 -0700
|
||||||
|
|
||||||
|
Briefly:
|
||||||
|
diff --git a/africa b/africa
|
||||||
|
index 566436b..2313e71 100644
|
||||||
|
--- a/africa
|
||||||
|
+++ b/africa
|
||||||
|
@@ -433,11 +433,54 @@ Zone Africa/Bissau -1:02:20 - LMT 1912 Jan 1 1:00u
|
||||||
|
0:00 - GMT
|
||||||
|
|
||||||
|
# Kenya
|
||||||
|
+
|
||||||
|
+# From P Chan (2020-10-24):
|
||||||
|
+#
|
||||||
|
+# The standard time of GMT+2:30 was adopted in the East Africa Protectorate....
|
||||||
|
+# [The Official Gazette, 1908-05-01, p 274]
|
||||||
|
+# https://books.google.com/books?id=e-cAC-sjPSEC&pg=PA274
|
||||||
|
+#
|
||||||
|
+# At midnight on 30 June 1928 the clocks throughout Kenya was put forward
|
||||||
|
+# half an hour by the Alteration of Time Ordinance, 1928.
|
||||||
|
+# https://gazettes.africa/archive/ke/1928/ke-government-gazette-dated-1928-05-11-no-28.pdf
|
||||||
|
+# [Ordinance No. 11 of 1928, The Offical Gazette, 1928-06-26, p 813]
|
||||||
|
+# https://books.google.com/books?id=2S0S6os32ZUC&pg=PA813
|
||||||
|
+#
|
||||||
|
+# The 1928 ordinance was repealed by the Alteration of Time (repeal) Ordinance,
|
||||||
|
+# 1929 and the time was restored to GMT+2:30 at midnight on 4 January 1930.
|
||||||
|
+# [Ordinance No. 97 of 1929, The Official Gazette, 1929-12-31, p 2701]
|
||||||
|
+# https://books.google.com/books?id=_g18jIZQlwwC&pg=PA2701
|
||||||
|
+#
|
||||||
|
+# The Alteration of Time Ordinance, 1936 changed the time to GMT+2:45
|
||||||
|
+# and repealed the previous ordinance at midnight on 31 December 1936.
|
||||||
|
+# [The Official Gazette, 1936-07-21, p 705]
|
||||||
|
+# https://books.google.com/books?id=K7j41z0aC5wC&pg=PA705
|
||||||
|
+#
|
||||||
|
+# The Defence (Amendment of Laws No. 120) Regulations changed the time
|
||||||
|
+# to GMT+3 at midnight on 31 July 1942.
|
||||||
|
+# [Kenya Official Gazette Supplement No. 32, 1942-07-21, p 331]
|
||||||
|
+# https://books.google.com/books?hl=zh-TW&id=c_E-AQAAIAAJ&pg=PA331
|
||||||
|
+# The provision of the 1936 ordinance was not repealed and was later
|
||||||
|
+# incorporated in the Interpretation and General Clauses Ordinance in 1948.
|
||||||
|
+# Although it was overridden by the 1942 regulations.
|
||||||
|
+# [The Laws of Kenya in force on 1948-09-21, Title I, Chapter 1, 31]
|
||||||
|
+# https://dds.crl.edu/item/217517 (p.101)
|
||||||
|
+# In 1950 the Interpretation and General Clauses Ordinance was amended to adopt
|
||||||
|
+# GMT+3 permanently as the 1942 regulations were due to expire on 10 December.
|
||||||
|
+# https://books.google.com/books?id=jvR8mUDAwR0C&pg=PA787
|
||||||
|
+# [Ordinance No. 44 of 1950, Kenya Ordinances 1950, Vol. XXIX, p 294]
|
||||||
|
+# https://books.google.com/books?id=-_dQAQAAMAAJ&pg=PA294
|
||||||
|
+
|
||||||
|
+# From Paul Eggert (2020-10-24):
|
||||||
|
+# The 1908-05-01 announcement does not give an effective date,
|
||||||
|
+# so just say "1908 May".
|
||||||
|
+
|
||||||
|
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||||
|
-Zone Africa/Nairobi 2:27:16 - LMT 1928 Jul
|
||||||
|
- 3:00 - EAT 1930
|
||||||
|
- 2:30 - +0230 1940
|
||||||
|
- 2:45 - +0245 1960
|
||||||
|
+Zone Africa/Nairobi 2:27:16 - LMT 1908 May
|
||||||
|
+ 2:30 - +0230 1928 Jun 30 24:00
|
||||||
|
+ 3:00 - EAT 1930 Jan 4 24:00
|
||||||
|
+ 2:30 - +0230 1936 Dec 31 24:00
|
||||||
|
+ 2:45 - +0245 1942 Jul 31 24:00
|
||||||
|
3:00 - EAT
|
||||||
|
Link Africa/Nairobi Africa/Addis_Ababa # Ethiopia
|
||||||
|
Link Africa/Nairobi Africa/Asmara # Eritrea
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
48
backport-Fix-zone-.tab-Yukon-comment-columns.patch
Normal file
48
backport-Fix-zone-.tab-Yukon-comment-columns.patch
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
From 52ba05422a75b5d5bb7b57f5fa353a7142975948 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||||
|
Date: Mon, 26 Oct 2020 19:34:50 -0700
|
||||||
|
Subject: [PATCH 6/6] Fix zone*.tab Yukon comment columns
|
||||||
|
|
||||||
|
Problem reported by Chris Walton in:
|
||||||
|
https://mm.icann.org/pipermail/tz/2020-October/029411.html
|
||||||
|
* zone.tab, zone1970.tab: Yukon is MST, not Pacific.
|
||||||
|
---
|
||||||
|
zone.tab | 4 ++--
|
||||||
|
zone1970.tab | 4 ++--
|
||||||
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/zone.tab b/zone.tab
|
||||||
|
index 8d056e3..6333b99 100644
|
||||||
|
--- a/zone.tab
|
||||||
|
+++ b/zone.tab
|
||||||
|
@@ -130,9 +130,9 @@ CA +682059-1334300 America/Inuvik Mountain - NT (west)
|
||||||
|
CA +4906-11631 America/Creston MST - BC (Creston)
|
||||||
|
CA +5946-12014 America/Dawson_Creek MST - BC (Dawson Cr, Ft St John)
|
||||||
|
CA +5848-12242 America/Fort_Nelson MST - BC (Ft Nelson)
|
||||||
|
+CA +6043-13503 America/Whitehorse MST - Yukon (east)
|
||||||
|
+CA +6404-13925 America/Dawson MST - Yukon (west)
|
||||||
|
CA +4916-12307 America/Vancouver Pacific - BC (most areas)
|
||||||
|
-CA +6043-13503 America/Whitehorse Pacific - Yukon (east)
|
||||||
|
-CA +6404-13925 America/Dawson Pacific - Yukon (west)
|
||||||
|
CC -1210+09655 Indian/Cocos
|
||||||
|
CD -0418+01518 Africa/Kinshasa Dem. Rep. of Congo (west)
|
||||||
|
CD -1140+02728 Africa/Lubumbashi Dem. Rep. of Congo (east)
|
||||||
|
diff --git a/zone1970.tab b/zone1970.tab
|
||||||
|
index 53ee77e..699dda2 100644
|
||||||
|
--- a/zone1970.tab
|
||||||
|
+++ b/zone1970.tab
|
||||||
|
@@ -127,9 +127,9 @@ CA +682059-1334300 America/Inuvik Mountain - NT (west)
|
||||||
|
CA +4906-11631 America/Creston MST - BC (Creston)
|
||||||
|
CA +5946-12014 America/Dawson_Creek MST - BC (Dawson Cr, Ft St John)
|
||||||
|
CA +5848-12242 America/Fort_Nelson MST - BC (Ft Nelson)
|
||||||
|
+CA +6043-13503 America/Whitehorse MST - Yukon (east)
|
||||||
|
+CA +6404-13925 America/Dawson MST - Yukon (west)
|
||||||
|
CA +4916-12307 America/Vancouver Pacific - BC (most areas)
|
||||||
|
-CA +6043-13503 America/Whitehorse Pacific - Yukon (east)
|
||||||
|
-CA +6404-13925 America/Dawson Pacific - Yukon (west)
|
||||||
|
CC -1210+09655 Indian/Cocos
|
||||||
|
CH,DE,LI +4723+00832 Europe/Zurich Swiss time
|
||||||
|
CI,BF,GM,GN,ML,MR,SH,SL,SN,TG +0519-00402 Africa/Abidjan
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
28
backport-leapseconds-now-says-why-NIST-not-IERS.patch
Normal file
28
backport-leapseconds-now-says-why-NIST-not-IERS.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
From b106a6e844a090abc6debb4d3e9496b5231c0fb4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||||
|
Date: Sun, 25 Oct 2020 14:43:16 -0700
|
||||||
|
Subject: [PATCH 5/6] leapseconds now says why NIST, not IERS
|
||||||
|
|
||||||
|
* leapseconds.awk: Output a comment about this.
|
||||||
|
---
|
||||||
|
leapseconds.awk | 4 ++++
|
||||||
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/leapseconds.awk b/leapseconds.awk
|
||||||
|
index 1d3c606..b6c48bc 100755
|
||||||
|
--- a/leapseconds.awk
|
||||||
|
+++ b/leapseconds.awk
|
||||||
|
@@ -24,6 +24,10 @@ BEGIN {
|
||||||
|
print "# NIST format leap-seconds.list file, which can be copied from"
|
||||||
|
print "# <ftp://ftp.nist.gov/pub/time/leap-seconds.list>"
|
||||||
|
print "# or <ftp://ftp.boulder.nist.gov/pub/time/leap-seconds.list>."
|
||||||
|
+ print "# The NIST file is used instead of its IERS upstream counterpart"
|
||||||
|
+ print "# <https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list>"
|
||||||
|
+ print "# because under US law the NIST file is public domain"
|
||||||
|
+ print "# whereas the IERS file's copyright and license status is unclear."
|
||||||
|
print "# For more about leap-seconds.list, please see"
|
||||||
|
print "# The NTP Timescale and Leap Seconds"
|
||||||
|
print "# <https://www.eecis.udel.edu/~mills/leap.html>."
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
16
tzdata.spec
16
tzdata.spec
@ -1,6 +1,6 @@
|
|||||||
Name: tzdata
|
Name: tzdata
|
||||||
Version: 2020d
|
Version: 2020d
|
||||||
Release: 2
|
Release: 3
|
||||||
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
|
||||||
@ -9,6 +9,13 @@ Source1: https://data.iana.org/time-zones/releases/tzcode%{version}.tar.gz
|
|||||||
Source2: javazic.tar.gz
|
Source2: javazic.tar.gz
|
||||||
Source3: javazic-1.8-37392f2f5d59.tar.xz
|
Source3: javazic-1.8-37392f2f5d59.tar.xz
|
||||||
|
|
||||||
|
Patch6000: backport-etcetera-Update-comment-in-the-light-of-Neil-Fuller-.patch
|
||||||
|
Patch6001: backport-Port-to-downstream-HP-UX-style-make.patch
|
||||||
|
Patch6002: backport-Use-better-fallback-for-unknown-VERSION.patch
|
||||||
|
Patch6003: backport-Fix-Kenya-transitions-1908-1960.patch
|
||||||
|
Patch6004: backport-Fix-zone-.tab-Yukon-comment-columns.patch
|
||||||
|
Patch6005: backport-leapseconds-now-says-why-NIST-not-IERS.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
|
||||||
Patch9002: remove-ROC-timezone.patch
|
Patch9002: remove-ROC-timezone.patch
|
||||||
@ -16,10 +23,6 @@ Patch9003: rename-Macau-to-Macao.patch
|
|||||||
Patch9004: remove-El_Aaiun-timezone.patch
|
Patch9004: remove-El_Aaiun-timezone.patch
|
||||||
Patch9005: remove-Israel-timezone.patch
|
Patch9005: remove-Israel-timezone.patch
|
||||||
|
|
||||||
Patch9006: backport-etcetera-Update-comment-in-the-light-of-Neil-Fuller-.patch
|
|
||||||
Patch9007: backport-Port-to-downstream-HP-UX-style-make.patch
|
|
||||||
Patch9008: backport-Use-better-fallback-for-unknown-VERSION.patch
|
|
||||||
|
|
||||||
BuildRequires: gawk glibc perl-interpreter
|
BuildRequires: gawk glibc perl-interpreter
|
||||||
BuildRequires: java-devel
|
BuildRequires: java-devel
|
||||||
BuildRequires: glibc-common >= 2.5.90-7
|
BuildRequires: glibc-common >= 2.5.90-7
|
||||||
@ -107,6 +110,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
|
|||||||
%{_datadir}/javazi-1.8
|
%{_datadir}/javazi-1.8
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Oct 27 2020 shenkai<shenkai8@huawei.com> - 2020d-3
|
||||||
|
- backport community patches
|
||||||
|
|
||||||
* Tue Oct 27 2020 shenkai<shenkai8@huawei.com> - 2020d-2
|
* Tue Oct 27 2020 shenkai<shenkai8@huawei.com> - 2020d-2
|
||||||
- backport community patches
|
- backport community patches
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user