From 71f1460ea31917f980c28cab8330c5c0f67358b1 Mon Sep 17 00:00:00 2001 From: SuperSix173 Date: Mon, 7 Dec 2020 11:21:13 +0800 Subject: [PATCH] backport community patches --- ...ix-Ghana-again-for-1942-through-1946.patch | 39 ++++++++ backport-Fix-Ghana-typo-for-1919-1920.patch | 27 ++++++ ...DST-in-1973-1974-and-1984-transition.patch | 77 +++++++++++++++ ...olgograd-label-in-zone-zone1970-.tab.patch | 42 ++++++++ ...ral-pre-1946-transitions-for-Bahamas.patch | 70 +++++++++++++ ...ome-errors-in-recent-Bahamas-changes.patch | 48 +++++++++ ...l-Turks-Caicos-time-2015-2018-as-AST.patch | 97 +++++++++++++++++++ ...port-Re-fix-Ghana-typo-for-1919-1920.patch | 27 ++++++ ...witched-from-LMT-to-04-on-1907-01-01.patch | 56 +++++++++++ ...rad-change-likely-December-27-not-20.patch | 61 ++++++++++++ tzdata.spec | 15 ++- 11 files changed, 558 insertions(+), 1 deletion(-) create mode 100644 backport-Fix-Ghana-again-for-1942-through-1946.patch create mode 100644 backport-Fix-Ghana-typo-for-1919-1920.patch create mode 100644 backport-Fix-Vanuatu-DST-in-1973-1974-and-1984-transition.patch create mode 100644 backport-Fix-Volgograd-label-in-zone-zone1970-.tab.patch create mode 100644 backport-Fix-several-pre-1946-transitions-for-Bahamas.patch create mode 100644 backport-Fix-some-errors-in-recent-Bahamas-changes.patch create mode 100644 backport-Model-Turks-Caicos-time-2015-2018-as-AST.patch create mode 100644 backport-Re-fix-Ghana-typo-for-1919-1920.patch create mode 100644 backport-Seychelles-switched-from-LMT-to-04-on-1907-01-01.patch create mode 100644 backport-Volgograd-change-likely-December-27-not-20.patch diff --git a/backport-Fix-Ghana-again-for-1942-through-1946.patch b/backport-Fix-Ghana-again-for-1942-through-1946.patch new file mode 100644 index 0000000..54e6e32 --- /dev/null +++ b/backport-Fix-Ghana-again-for-1942-through-1946.patch @@ -0,0 +1,39 @@ +From cd1769fe64ca8931d17016138399f31d509b1bec Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Wed, 2 Dec 2020 11:33:32 -0800 +Subject: [PATCH] Fix Ghana again, for 1942 through 1946 + +(Thanks to P Chan.) +* africa (Ghana, Africa/Accra): Standard time was +0030 from +1942 through 1946. +--- + africa | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/africa b/africa +index 429f783..27c987a 100644 +--- a/africa ++++ b/africa +@@ -456,16 +456,16 @@ Zone Africa/Cairo 2:05:09 - LMT 1900 Oct + + # Rule NAME FROM TO - IN ON AT SAVE LETTER/S + Rule Ghana 1919 only - Nov 24 0:00 0:20 +0020 +-Rule Ghana 1920 1946 - Jan 1 2:00 0 GMT ++Rule Ghana 1920 1942 - Jan 1 2:00 0 GMT + Rule Ghana 1920 1939 - Sep 1 2:00 0:20 +0020 +-Rule Ghana 1940 1945 - May 1 2:00 0:20 +0020 ++Rule Ghana 1940 1941 - May 1 2:00 0:20 +0020 + Rule Ghana 1950 1955 - Sep 1 2:00 0:30 +0030 + Rule Ghana 1951 1956 - Jan 1 2:00 0 GMT + + # Zone NAME STDOFF RULES FORMAT [UNTIL] + Zone Africa/Accra -0:00:52 - LMT 1915 Nov 2 + 0:00 Ghana %s 1942 Feb 8 +- 0:30 - +0030 1942 Oct 24 ++ 0:30 - +0030 1946 Jan 6 + 0:00 Ghana %s + + # Guinea +-- +1.8.3.1 + diff --git a/backport-Fix-Ghana-typo-for-1919-1920.patch b/backport-Fix-Ghana-typo-for-1919-1920.patch new file mode 100644 index 0000000..015829a --- /dev/null +++ b/backport-Fix-Ghana-typo-for-1919-1920.patch @@ -0,0 +1,27 @@ +From 6e7558f1905deb07842fa329c54e0788914138aa Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Tue, 1 Dec 2020 14:48:43 -0800 +Subject: [PATCH] Fix Ghana typo for 1919/1920 + +* africa (Ghana): Fix typo in previous change to these rules. +(Thanks to P Chan.) +--- + africa | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/africa b/africa +index 285688d..85644f5 100644 +--- a/africa ++++ b/africa +@@ -455,7 +455,7 @@ Zone Africa/Cairo 2:05:09 - LMT 1900 Oct + # This Ordinance abolished DST. + + # Rule NAME FROM TO - IN ON AT SAVE LETTER/S +-Rule Ghana 1920 only - Nov 24 0:00 0:20 +0020 ++Rule Ghana 1919 only - Nov 24 0:00 0:20 +0020 + Rule Ghana 1920 1946 - Jan 1 2:00 0 GMT + Rule Ghana 1921 1939 - Sep 1 2:00 0:20 +0020 + Rule Ghana 1940 1945 - May 1 2:00 0:20 +0020 +-- +1.8.3.1 + diff --git a/backport-Fix-Vanuatu-DST-in-1973-1974-and-1984-transition.patch b/backport-Fix-Vanuatu-DST-in-1973-1974-and-1984-transition.patch new file mode 100644 index 0000000..bbd7dae --- /dev/null +++ b/backport-Fix-Vanuatu-DST-in-1973-1974-and-1984-transition.patch @@ -0,0 +1,77 @@ +From ff90fc93ac5bbfe2001860f417a11ca7f3124712 Mon Sep 17 00:00:00 2001 +From: Tim Parenti +Date: Sat, 5 Dec 2020 13:32:08 -0500 +Subject: [PATCH] Fix Vanuatu DST in 1973-1974 and 1984 transition + +(Thanks to P Chan.) +* NEWS: Mention this. +* australasia (Vanuatu): DST was observed for three months in 1973-1974. +Spring 1984 transition was on 1984-09-23, not 10-23. Prefer Sat>=22 +24:00 to Sun>=23 0:00 as that better matches the legal text. +--- + NEWS | 1 + + australasia | 35 +++++++++++++++++++++++++++++------ + 2 files changed, 30 insertions(+), 6 deletions(-) + +diff --git a/NEWS b/NEWS +index 76a5417..2182c70 100644 +--- a/NEWS ++++ b/NEWS +@@ -18,6 +18,7 @@ Unreleased, experimental changes + - Ghana: several 1915 through 1956 transitions + - Israel and Palestine: several 1940 through 1985 transitions + - Kenya and adjacent: several 1908 through 1960 transitions ++ - Vanuatu: DST in 1973-1974, and a corrected 1984 transition + (Thanks to P Chan.) + + Because of the Australia change, Australia/Currie (King Island) is +diff --git a/australasia b/australasia +index d6c4e7c..cf8a063 100644 +--- a/australasia ++++ b/australasia +@@ -868,13 +868,36 @@ Zone Pacific/Wake 11:06:28 - LMT 1901 + + + # Vanuatu ++ ++# From P Chan (2020-11-27): ++# Joint Daylight Saving Regulation No 59 of 1973 ++# New Hebrides Condominium Gazette No 336. December 1973 ++# http://www.paclii.org/vu/other/VUNHGovGaz//1973/11.pdf#page=15 ++# ++# Joint Daylight Saving (Repeal) Regulation No 10 of 1974 ++# New Hebrides Condominium Gazette No 336. March 1974 ++# http://www.paclii.org/vu/other/VUNHGovGaz//1974/3.pdf#page=11 ++# ++# Summer Time Act No. 35 of 1982 [commenced 1983-09-01] ++# http://www.paclii.org/vu/other/VUGovGaz/1982/32.pdf#page=48 ++# ++# Summer Time Act (Cap 157) ++# Laws of the Republic of Vanuatu Revised Edition 1988 ++# http://www.paclii.org/cgi-bin/sinodisp/vu/legis/consol_act1988/sta147/sta147.html ++# ++# Summer Time (Amendment) Act No. 6 of 1991 [commenced 1991-11-11] ++# http://www.paclii.org/vu/legis/num_act/sta1991227/ ++# ++# Summer Time (Repeal) Act No. 4 of 1993 [commenced 1993-05-03] ++# http://www.paclii.org/vu/other/VUGovGaz/1993/15.pdf#page=59 ++ + # Rule NAME FROM TO - IN ON AT SAVE LETTER/S +-Rule Vanuatu 1983 only - Sep 25 0:00 1:00 - +-Rule Vanuatu 1984 1991 - Mar Sun>=23 0:00 0 - +-Rule Vanuatu 1984 only - Oct 23 0:00 1:00 - +-Rule Vanuatu 1985 1991 - Sep Sun>=23 0:00 1:00 - +-Rule Vanuatu 1992 1993 - Jan Sun>=23 0:00 0 - +-Rule Vanuatu 1992 only - Oct Sun>=23 0:00 1:00 - ++Rule Vanuatu 1973 only - Dec 22 12:00u 1:00 - ++Rule Vanuatu 1974 only - Mar 30 12:00u 0 - ++Rule Vanuatu 1983 1991 - Sep Sat>=22 24:00 1:00 - ++Rule Vanuatu 1984 1991 - Mar Sat>=22 24:00 0 - ++Rule Vanuatu 1992 1993 - Jan Sat>=22 24:00 0 - ++Rule Vanuatu 1992 only - Oct Sat>=22 24:00 1:00 - + # Zone NAME STDOFF RULES FORMAT [UNTIL] + Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila + 11:00 Vanuatu +11/+12 +-- +1.8.3.1 + diff --git a/backport-Fix-Volgograd-label-in-zone-zone1970-.tab.patch b/backport-Fix-Volgograd-label-in-zone-zone1970-.tab.patch new file mode 100644 index 0000000..d94ce97 --- /dev/null +++ b/backport-Fix-Volgograd-label-in-zone-zone1970-.tab.patch @@ -0,0 +1,42 @@ +From 3831c591e188edc16d1a6855fb20ebee78c4e27b Mon Sep 17 00:00:00 2001 +From: Tim Parenti +Date: Tue, 1 Dec 2020 23:52:23 -0500 +Subject: [PATCH] Fix Volgograd label in {zone,zone1970}.tab + +* zone.tab, zone1970.tab: Volgograd will be MSK+00 from 2020-12-20. +--- + zone.tab | 2 +- + zone1970.tab | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/zone.tab b/zone.tab +index fe48c13..1f0128f 100644 +--- a/zone.tab ++++ b/zone.tab +@@ -336,8 +336,8 @@ RU +554521+0373704 Europe/Moscow MSK+00 - Moscow area + # Programs should use zone1970.tab instead; see above. + UA +4457+03406 Europe/Simferopol Crimea + RU +5836+04939 Europe/Kirov MSK+00 - Kirov ++RU +4844+04425 Europe/Volgograd MSK+00 - Volgograd + RU +4621+04803 Europe/Astrakhan MSK+01 - Astrakhan +-RU +4844+04425 Europe/Volgograd MSK+01 - Volgograd + RU +5134+04602 Europe/Saratov MSK+01 - Saratov + RU +5420+04824 Europe/Ulyanovsk MSK+01 - Ulyanovsk + RU +5312+05009 Europe/Samara MSK+01 - Samara, Udmurtia +diff --git a/zone1970.tab b/zone1970.tab +index 205ed5a..396e4d3 100644 +--- a/zone1970.tab ++++ b/zone1970.tab +@@ -291,8 +291,8 @@ RU +554521+0373704 Europe/Moscow MSK+00 - Moscow area + # Mention RU and UA alphabetically. See "territorial claims" above. + RU,UA +4457+03406 Europe/Simferopol Crimea + RU +5836+04939 Europe/Kirov MSK+00 - Kirov ++RU +4844+04425 Europe/Volgograd MSK+00 - Volgograd + RU +4621+04803 Europe/Astrakhan MSK+01 - Astrakhan +-RU +4844+04425 Europe/Volgograd MSK+01 - Volgograd + RU +5134+04602 Europe/Saratov MSK+01 - Saratov + RU +5420+04824 Europe/Ulyanovsk MSK+01 - Ulyanovsk + RU +5312+05009 Europe/Samara MSK+01 - Samara, Udmurtia +-- +1.8.3.1 + diff --git a/backport-Fix-several-pre-1946-transitions-for-Bahamas.patch b/backport-Fix-several-pre-1946-transitions-for-Bahamas.patch new file mode 100644 index 0000000..3a9f98f --- /dev/null +++ b/backport-Fix-several-pre-1946-transitions-for-Bahamas.patch @@ -0,0 +1,70 @@ +From adf4d8d35a184b1a9eb78058eee8493c43beec4f Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Tue, 1 Dec 2020 15:08:51 -0800 +Subject: [PATCH] Fix several pre-1946 transitions for Bahamas + +(Thanks to P Chan.) +* NEWS: Mention this. +* northamerica (Bahamas): Add WW II DST transitions. +--- + NEWS | 1 + + northamerica | 25 +++++++++++++++++++++++++ + 2 files changed, 26 insertions(+) + +diff --git a/NEWS b/NEWS +index 0690d87..b56db99 100644 +--- a/NEWS ++++ b/NEWS +@@ -12,6 +12,7 @@ Unreleased, experimental changes + Correct many pre-1986 transitions, fixing entries originally + derived from Shanks. The fixes include: + - Australia: several 1917 through 1971 transitions ++ - Bahamas: several 1941 through 1945 transitions + - Bermuda: several 1917 through 1956 transitions + - Belize: several 1942 through 1968 transitions + - Ghana: several 1915 through 1956 transitions +diff --git a/northamerica b/northamerica +index b9a1348..6916880 100644 +--- a/northamerica ++++ b/northamerica +@@ -2935,12 +2935,37 @@ Zone America/Tijuana -7:48:04 - LMT 1922 Jan 1 0:11:56 + # + # For 1899 Milne gives -5:09:29.5; round that. + # ++# From P Chan (2020-11-27) ++# There were two periods of DST observed in 1941-1945: 1941-05-01 midnight to ++# 1944-12-31 and 1945-02-01 to 1945-10-17 midnight. ++# ++# War Time Order 1942 [1942-05-01] and War Time (No. 2) Order 1942 [1942-09-29] ++# Appendix to the Statutes of 7 George VI. and the Year 1942. p 34, 43 ++# https://books.google.com/books?id=5rlNAQAAIAAJ&pg=RA3-PA34 ++# https://books.google.com/books?id=5rlNAQAAIAAJ&pg=RA3-PA43 ++# ++# War Time Order 1943 [1943-03-31] and War Time Order 1944 [1943-12-29] ++# Appendix to the Statutes of 8 George VI. and the Year 1943. p 9-10, 28-29 ++# https://books.google.com/books?id=5rlNAQAAIAAJ&pg=RA4-PA9 ++# https://books.google.com/books?id=5rlNAQAAIAAJ&pg=RA4-PA28 ++# ++# War Time Order 1945 [1945-01-31] and the Order which revoke War Time Order ++# 1945 [1945-10-16] Appendix to the Statutes of 9 George VI. and the Year ++# 1945. p 160, 247-248 ++# https://books.google.com/books?id=5rlNAQAAIAAJ&pg=RA6-PA160 ++# https://books.google.com/books?id=5rlNAQAAIAAJ&pg=RA6-PA247 ++# + # From Sue Williams (2006-12-07): + # The Bahamas announced about a month ago that they plan to change their DST + # rules to sync with the U.S. starting in 2007.... + # http://www.jonesbahamas.com/?c=45&a=10412 + + # Rule NAME FROM TO - IN ON AT SAVE LETTER/S ++Rule Bahamas 1941 only - May 1 0:00 1:00 W ++Rule Bahamas 1944 only - Dec 31 0:00 0 S ++Rule Bahamas 1945 only - Feb 1 0:00 1:00 W ++Rule Bahamas 1945 only - Aug 14 23:00u 1:00 P # Peace ++Rule Bahamas 1945 only - Oct 17 0:00 0 S + Rule Bahamas 1964 1975 - Oct lastSun 2:00 0 S + Rule Bahamas 1964 1975 - Apr lastSun 2:00 1:00 D + # Zone NAME STDOFF RULES FORMAT [UNTIL] +-- +1.8.3.1 + diff --git a/backport-Fix-some-errors-in-recent-Bahamas-changes.patch b/backport-Fix-some-errors-in-recent-Bahamas-changes.patch new file mode 100644 index 0000000..a14c01f --- /dev/null +++ b/backport-Fix-some-errors-in-recent-Bahamas-changes.patch @@ -0,0 +1,48 @@ +From 0b5ae1fb7a8034a3560ae7b5df914092dc12bb7d Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Wed, 2 Dec 2020 15:39:41 -0800 +Subject: [PATCH] Fix some errors in recent Bahamas changes + +(Thanks to P Chan.) +* northamerica (Bahamas): Bahamas started DST in 1942, not 1941. +"Midnight" meant 24:00 (not 00:00) for three WWII transitions. +--- + northamerica | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/northamerica b/northamerica +index 6916880..d8bb8f8 100644 +--- a/northamerica ++++ b/northamerica +@@ -2935,9 +2935,10 @@ Zone America/Tijuana -7:48:04 - LMT 1922 Jan 1 0:11:56 + # + # For 1899 Milne gives -5:09:29.5; round that. + # +-# From P Chan (2020-11-27) +-# There were two periods of DST observed in 1941-1945: 1941-05-01 midnight to +-# 1944-12-31 and 1945-02-01 to 1945-10-17 midnight. ++# From P Chan (2020-11-27, corrected on 2020-12-02): ++# There were two periods of DST observed in 1942-1945: 1942-05-01 ++# midnight to 1944-12-31 midnight and 1945-02-01 to 1945-10-17 midnight. ++# "midnight" should mean 24:00 from the context. + # + # War Time Order 1942 [1942-05-01] and War Time (No. 2) Order 1942 [1942-09-29] + # Appendix to the Statutes of 7 George VI. and the Year 1942. p 34, 43 +@@ -2961,11 +2962,11 @@ Zone America/Tijuana -7:48:04 - LMT 1922 Jan 1 0:11:56 + # http://www.jonesbahamas.com/?c=45&a=10412 + + # Rule NAME FROM TO - IN ON AT SAVE LETTER/S +-Rule Bahamas 1941 only - May 1 0:00 1:00 W +-Rule Bahamas 1944 only - Dec 31 0:00 0 S ++Rule Bahamas 1942 only - May 1 24:00 1:00 W ++Rule Bahamas 1944 only - Dec 31 24:00 0 S + Rule Bahamas 1945 only - Feb 1 0:00 1:00 W + Rule Bahamas 1945 only - Aug 14 23:00u 1:00 P # Peace +-Rule Bahamas 1945 only - Oct 17 0:00 0 S ++Rule Bahamas 1945 only - Oct 17 24:00 0 S + Rule Bahamas 1964 1975 - Oct lastSun 2:00 0 S + Rule Bahamas 1964 1975 - Apr lastSun 2:00 1:00 D + # Zone NAME STDOFF RULES FORMAT [UNTIL] +-- +1.8.3.1 + diff --git a/backport-Model-Turks-Caicos-time-2015-2018-as-AST.patch b/backport-Model-Turks-Caicos-time-2015-2018-as-AST.patch new file mode 100644 index 0000000..8da3b11 --- /dev/null +++ b/backport-Model-Turks-Caicos-time-2015-2018-as-AST.patch @@ -0,0 +1,97 @@ +From b980f1cac5121f702eb6b0cc679d960e8a275a3f Mon Sep 17 00:00:00 2001 +From: Tim Parenti +Date: Sat, 5 Dec 2020 13:39:09 -0500 +Subject: [PATCH] Model Turks & Caicos time 2015-2018 as AST + +(Thanks to P Chan.) +* NEWS: Mention this. +* northamerica (America/Grand_Turk): Model the year-round observance of +-04 in the Turks & Caicos Islands as AST from 2015-03 through 2018-03, +to better match the legislation. This only affects the abbreviation and +DST flag 2015-03-08/11-01. Expand commentary on slight discrepancy with +the 2018-03-11 return to Eastern Time with US rules. +--- + NEWS | 7 +++++++ + northamerica | 31 +++++++++++++++++++++++++++---- + 2 files changed, 34 insertions(+), 4 deletions(-) + +diff --git a/NEWS b/NEWS +index 2182c70..0937d8a 100644 +--- a/NEWS ++++ b/NEWS +@@ -27,6 +27,13 @@ Unreleased, experimental changes + Australia/Currie has been moved to the 'backward' file and its + corrected data moved to the 'backzone' file. + ++ Changes to past time zone abbreviations and DST flags ++ ++ To better match legislation in Turks and Caicos, the 2015 shift to ++ year-round observance of -04 is now modeled as AST throughout before ++ returning to Eastern Time with US DST in 2018, rather than as ++ maintaining EDT until 2015-11-01. (Thanks to P Chan.) ++ + + Release 2020d - 2020-10-21 11:24:13 -0700 + +diff --git a/northamerica b/northamerica +index d8bb8f8..ddc5759 100644 +--- a/northamerica ++++ b/northamerica +@@ -3727,7 +3727,7 @@ Zone America/Miquelon -3:44:40 - LMT 1911 May 15 # St Pierre + # "Eastern Standard Times Begins 2007 + # Clocks are set back one hour at 2:00 a.m. local Daylight Saving Time" + # indicating that the normal ET rules are followed. +-# ++ + # From Paul Eggert (2014-08-19): + # The 2014-08-13 Cabinet meeting decided to stay on UT -04 year-round. See: + # http://tcweeklynews.com/daylight-savings-time-to-be-maintained-p5353-127.htm +@@ -3742,19 +3742,42 @@ Zone America/Miquelon -3:44:40 - LMT 1911 May 15 # St Pierre + # during the summer months and Standard Time, also known as Local + # Time, during the winter months with effect from April 2018 ... + # https://www.gov.uk/government/news/turks-and-caicos-post-cabinet-meeting-statement--3 +-# + # From Paul Eggert (2017-08-26): + # The date of effect of the spring 2018 change appears to be March 11, + # which makes more sense. See: Hamilton D. Time change back + # by March 2018 for TCI. Magnetic Media. 2017-08-25. + # http://magneticmediatv.com/2017/08/time-change-back-by-march-2018-for-tci/ + # ++# From P Chan (2020-11-27): ++# Standard Time Declaration Order 2015 (L.N. 15/2015) ++# http://online.fliphtml5.com/fizd/czin/#p=2 ++# ++# Standard Time Declaration Order 2017 (L.N. 31/2017) ++# http://online.fliphtml5.com/fizd/dmcu/#p=2 ++# ++# From Tim Parenti (2020-12-05): ++# Although L.N. 31/2017 reads that it "shall come into operation at 2:00 a.m. ++# on 11th March 2018", a precise interpretation here poses some problems. The ++# order states that "the standard time to be observed throughout the Turks and ++# Caicos Islands shall be the same time zone as the Eastern United States of ++# America" and further clarifies "[f]or the avoidance of doubt" that it ++# "applies to the Eastern Standard Time as well as any changes thereto for ++# Daylight Saving Time." However, as clocks in Turks and Caicos approached ++# 02:00 -04, and thus the declared implementation time, it was still 01:00 EST ++# (-05), as DST in the Eastern US would not start until an hour later. ++# ++# Since it is unlikely that those on the islands switched their clocks twice in ++# the span of an hour, we assume instead that the adoption of EDT actually took ++# effect once clocks in the Eastern US had sprung forward, from 03:00 -04. ++# This discrepancy only affects the time zone abbreviation and DST flag for the ++# intervening hour, not wall clock times, as -04 was maintained throughout. ++ + # Zone NAME STDOFF RULES FORMAT [UNTIL] + Zone America/Grand_Turk -4:44:32 - LMT 1890 + -5:07:10 - KMT 1912 Feb # Kingston Mean Time + -5:00 - EST 1979 +- -5:00 US E%sT 2015 Nov Sun>=1 2:00 +- -4:00 - AST 2018 Mar 11 3:00 ++ -5:00 US E%sT 2015 Mar 8 2:00 ++ -4:00 - AST 2018 Mar 11 3:00 + -5:00 US E%sT + + # British Virgin Is +-- +1.8.3.1 + diff --git a/backport-Re-fix-Ghana-typo-for-1919-1920.patch b/backport-Re-fix-Ghana-typo-for-1919-1920.patch new file mode 100644 index 0000000..9f0c2d1 --- /dev/null +++ b/backport-Re-fix-Ghana-typo-for-1919-1920.patch @@ -0,0 +1,27 @@ +From 0415d0e5f8266ff67dfd8204ee4fb1ad0ce1d5cf Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Tue, 1 Dec 2020 14:52:41 -0800 +Subject: [PATCH] Re-fix Ghana typo for 1919/1920 + +* africa (Ghana): Re-fix the typo in previous change to these rules. +(Thanks to P Chan.) +--- + africa | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/africa b/africa +index 85644f5..429f783 100644 +--- a/africa ++++ b/africa +@@ -457,7 +457,7 @@ Zone Africa/Cairo 2:05:09 - LMT 1900 Oct + # Rule NAME FROM TO - IN ON AT SAVE LETTER/S + Rule Ghana 1919 only - Nov 24 0:00 0:20 +0020 + Rule Ghana 1920 1946 - Jan 1 2:00 0 GMT +-Rule Ghana 1921 1939 - Sep 1 2:00 0:20 +0020 ++Rule Ghana 1920 1939 - Sep 1 2:00 0:20 +0020 + Rule Ghana 1940 1945 - May 1 2:00 0:20 +0020 + Rule Ghana 1950 1955 - Sep 1 2:00 0:30 +0030 + Rule Ghana 1951 1956 - Jan 1 2:00 0 GMT +-- +1.8.3.1 + diff --git a/backport-Seychelles-switched-from-LMT-to-04-on-1907-01-01.patch b/backport-Seychelles-switched-from-LMT-to-04-on-1907-01-01.patch new file mode 100644 index 0000000..6c77725 --- /dev/null +++ b/backport-Seychelles-switched-from-LMT-to-04-on-1907-01-01.patch @@ -0,0 +1,56 @@ +From ce7b1bbc761ba451b120fc6498ebc5bf2b773fc4 Mon Sep 17 00:00:00 2001 +From: Tim Parenti +Date: Sat, 5 Dec 2020 23:38:05 -0500 +Subject: [PATCH] Seychelles switched from LMT to +04 on 1907-01-01 + +(Thanks to P Chan.) +* NEWS: Mention this. +* africa (Indian/Mahe): Transition from LMT to standard time was +1907-01-01, not 1906-06. +--- + NEWS | 1 + + africa | 15 ++++++++++++++- + 2 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/NEWS b/NEWS +index 0937d8a..dd131a9 100644 +--- a/NEWS ++++ b/NEWS +@@ -18,6 +18,7 @@ Unreleased, experimental changes + - Ghana: several 1915 through 1956 transitions + - Israel and Palestine: several 1940 through 1985 transitions + - Kenya and adjacent: several 1908 through 1960 transitions ++ - Seychelles: the introduction of standard time in 1907, not 1906 + - Vanuatu: DST in 1973-1974, and a corrected 1984 transition + (Thanks to P Chan.) + +diff --git a/africa b/africa +index 27c987a..e0200a9 100644 +--- a/africa ++++ b/africa +@@ -1392,8 +1392,21 @@ Zone Africa/Sao_Tome 0:26:56 - LMT 1884 + # See Africa/Abidjan. + + # Seychelles ++ ++# From P Chan (2020-11-27): ++# Standard Time was adopted on 1907-01-01. ++# ++# Standard Time Ordinance (Chapter 237) ++# The Laws of Seychelles in Force on the 31st December, 1971, Vol. 6, p 571 ++# https://books.google.com/books?id=efE-AQAAIAAJ&pg=PA571 ++# ++# From Tim Parenti (2020-12-05): ++# A footnote on https://books.google.com/books?id=DYdDAQAAMAAJ&pg=PA1689 ++# confirms that Ordinance No. 9 of 1906 "was brought into force on the 1st ++# January, 1907." ++ + # Zone NAME STDOFF RULES FORMAT [UNTIL] +-Zone Indian/Mahe 3:41:48 - LMT 1906 Jun # Victoria ++Zone Indian/Mahe 3:41:48 - LMT 1907 Jan 1 # Victoria + 4:00 - +04 + # From Paul Eggert (2001-05-30): + # Aldabra, Farquhar, and Desroches, originally dependencies of the +-- +1.8.3.1 + diff --git a/backport-Volgograd-change-likely-December-27-not-20.patch b/backport-Volgograd-change-likely-December-27-not-20.patch new file mode 100644 index 0000000..ce6c378 --- /dev/null +++ b/backport-Volgograd-change-likely-December-27-not-20.patch @@ -0,0 +1,61 @@ +From 7c7419c6ad30e987613b4618dae55b2b1db84839 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Fri, 4 Dec 2020 13:56:47 -0800 +Subject: [PATCH] Volgograd change likely December 27, not 20 + +(Thanks to Stepan Golosunov.) +* NEWS: Mention this. +* europe (Europe/Volgograd): Change predicted transition from +04 +to +03 from Dec. 20 to Dec. 27. +--- + NEWS | 2 +- + europe | 12 ++++++------ + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/NEWS b/NEWS +index b56db99..76a5417 100644 +--- a/NEWS ++++ b/NEWS +@@ -5,7 +5,7 @@ Unreleased, experimental changes + Changes to future timestamps + + Volgograd changes time zone from +04 to +03 on 2020-12-20 at 02:00. +- (Thanks to Alexander Krivenyshev.) ++ (Thanks to Alexander Krivenyshev and Stepan Golosunov.) + + Changes to past timestamps + +diff --git a/europe b/europe +index 3a8a4e6..fd9e85b 100644 +--- a/europe ++++ b/europe +@@ -2894,12 +2894,12 @@ Zone Europe/Astrakhan 3:12:12 - LMT 1924 May + + # From Alexander Krivenyshev (2020-11-27): + # The State Duma approved (Nov 24, 2020) the transition of the Volgograd +-# region to the Moscow time zone.... If approved by the the Federation +-# Council and the President, this Federal Law 1012130-7 will enter into force +-# on December 20, 2020.... ++# region to the Moscow time zone.... + # https://sozd.duma.gov.ru/bill/1012130-7 +-# http://docs.cntd.ru/document/566418247 +-# https://gorvesti.ru/society/gosduma-progolosovala-za-vozvrat-volgogradskoy-oblasti-k-moskovskomu-vremeni-95877.html ++# ++# From Stepan Golosunov (2020-12-05): ++# Currently proposed text for the second reading (expected on December 8) ... ++# changes the date to December 27. https://v1.ru/text/gorod/2020/12/04/69601031/ + + Zone Europe/Volgograd 2:57:40 - LMT 1920 Jan 3 + 3:00 - +03 1930 Jun 21 +@@ -2910,7 +2910,7 @@ Zone Europe/Volgograd 2:57:40 - LMT 1920 Jan 3 + 3:00 Russia +03/+04 2011 Mar 27 2:00s + 4:00 - +04 2014 Oct 26 2:00s + 3:00 - +03 2018 Oct 28 2:00s +- 4:00 - +04 2020 Dec 20 2:00s ++ 4:00 - +04 2020 Dec 27 2:00s + 3:00 - +03 + + # From Paul Eggert (2016-11-11): +-- +1.8.3.1 + diff --git a/tzdata.spec b/tzdata.spec index 1ed06ff..f201d17 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Name: tzdata Version: 2020d -Release: 4 +Release: 5 Summary: Timezone data License: Public Domain URL: https://www.iana.org/time-zones @@ -26,6 +26,16 @@ Patch6013: backport-Fix-several-pre-1957-transitions-for-Bermuda.patch Patch6014: backport-Fix-several-pre-1957-transitions-for-Ghana.patch Patch6015: backport-northamerica-Add-URL-for-Yukon-OIC-1980-02.patch Patch6016: backport-Volgograd-switches-from-04-to-03-on-12-20-02-00.patch +Patch6017: backport-Fix-Ghana-typo-for-1919-1920.patch +Patch6018: backport-Re-fix-Ghana-typo-for-1919-1920.patch +Patch6019: backport-Fix-several-pre-1946-transitions-for-Bahamas.patch +Patch6020: backport-Fix-Volgograd-label-in-zone-zone1970-.tab.patch +Patch6021: backport-Fix-Ghana-again-for-1942-through-1946.patch +Patch6022: backport-Fix-some-errors-in-recent-Bahamas-changes.patch +Patch6023: backport-Volgograd-change-likely-December-27-not-20.patch +Patch6024: backport-Fix-Vanuatu-DST-in-1973-1974-and-1984-transition.patch +Patch6025: backport-Model-Turks-Caicos-time-2015-2018-as-AST.patch +Patch6026: backport-Seychelles-switched-from-LMT-to-04-on-1907-01-01.patch Patch9000: bugfix-0001-add-Beijing-timezone.patch Patch9001: remove-country-selection-from-tzselect-steps.patch @@ -121,6 +131,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Mon Dec 7 2020 liuchao - 2020d-5 +- backport community patches + * Mon Nov 30 2020 liuchao - 2020d-4 - backport community patches