diff --git a/backport-Cite-publication-of-Volgograd-change.patch b/backport-Cite-publication-of-Volgograd-change.patch new file mode 100644 index 0000000..905260f --- /dev/null +++ b/backport-Cite-publication-of-Volgograd-change.patch @@ -0,0 +1,29 @@ +From c8891f390fe3c593a5990acb0095218afc74d088 Mon Sep 17 00:00:00 2001 +From: Tim Parenti +Date: Tue, 22 Dec 2020 16:05:59 -0500 +Subject: [PATCH] Cite publication of Volgograd change + +* europe (Europe/Volgograd): Cite pravo.gov.ru. +(Thanks to Stepan Golosunov.) +--- + europe | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/europe b/europe +index fd9e85b..bba4d56 100644 +--- a/europe ++++ b/europe +@@ -2900,6 +2900,10 @@ Zone Europe/Astrakhan 3:12:12 - LMT 1924 May + # 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/ ++# ++# From Stepan Golosunov (2020-12-22): ++# The law was published today on ++# http://publication.pravo.gov.ru/Document/View/0001202012220002 + + Zone Europe/Volgograd 2:57:40 - LMT 1920 Jan 3 + 3:00 - +03 1930 Jun 21 +-- +1.8.3.1 + diff --git a/backport-Correct-LMT-and-pre-1919-transitions-for-Nigeria.patch b/backport-Correct-LMT-and-pre-1919-transitions-for-Nigeria.patch new file mode 100644 index 0000000..05fbb66 --- /dev/null +++ b/backport-Correct-LMT-and-pre-1919-transitions-for-Nigeria.patch @@ -0,0 +1,105 @@ +From 316c1598e166e15c27fe611cacd81aeada2a836d Mon Sep 17 00:00:00 2001 +From: Tim Parenti +Date: Thu, 10 Dec 2020 22:39:46 -0500 +Subject: [PATCH] Correct LMT and pre-1919 transitions for Nigeria + +(Thanks to P Chan.) +* NEWS: Mention this. +* africa (Africa/Lagos): Move LMT 1 s west; add several pre-1919 +transitions with references. +--- + NEWS | 2 ++ + africa | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 64 insertions(+), 1 deletion(-) + +diff --git a/NEWS b/NEWS +index 041d224..991b737 100644 +--- a/NEWS ++++ b/NEWS +@@ -18,6 +18,8 @@ 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 ++ - Nigeria and adjacent: correcting LMT in Lagos, and several 1905 ++ through 1919 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 e0200a9..59cf501 100644 +--- a/africa ++++ b/africa +@@ -1318,8 +1318,69 @@ Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8 + # See Africa/Lagos. + + # Nigeria ++ ++# From P Chan (2020-12-03): ++# GMT was adopted as the standard time of Lagos on 1905-07-01. ++# Lagos Weekly Record, 1905-06-24, p 3 ++# http://ddsnext.crl.edu/titles/31558#?c=0&m=668&s=0&cv=2&r=0&xywh=1446%2C5221%2C1931%2C1235 ++# says "It is officially notified that on and after the 1st of July 1905 ++# Greenwich Mean Solar Time will be adopted thought the Colony and ++# Protectorate, and that it will be necessary to put all clocks 13 minutes and ++# 35 seconds back, recording local mean time." ++# ++# It seemed that Lagos returned to LMT on 1908-07-01. ++# [The Lagos Standard], 1908-07-01, p 5 ++# http://ddsnext.crl.edu/titles/31556#?c=0&m=78&s=0&cv=4&r=0&xywh=-92%2C3590%2C3944%2C2523 ++# says "Scarcely have the people become accustomed to this new time, when ++# another official notice has now appeared announcing that from and after the ++# 1st July next, return will be made to local mean time." ++# ++# From P Chan (2020-11-27): ++# On 1914-01-01, standard time of GMT+0:30 was adopted for the unified Nigeria. ++# Colonial Reports - Annual. No. 878. Nigeria. Report for 1914. (April 1916), ++# p 27 ++# https://libsysdigi.library.illinois.edu/ilharvest/Africana/Books2011-05/3064634/3064634_1914/3064634_1914_opt.pdf#page=27 ++# "On January 1st [1914], a universal standard time for Nigeria was adopted, ++# viz., half an hour fast on Greenwich mean time, corresponding to the meridian ++# 7 [degrees] 30' E. long." ++# Lloyd's Register of Shipping (1915) says "Hitherto the time observed in Lagos ++# was the local mean time. On 1st January, 1914, standard time for the whole of ++# Nigeria was introduced ... Lagos time has been advanced about 16 minutes ++# accordingly." ++# ++# In 1919, standard time was changed to GMT+1. ++# Interpretation Ordinance (Cap 2) ++# The Laws of Nigeria, Containing the Ordinances of Nigeria, in Force on the ++# 1st Day of January, 1923, Vol.I [p 16] ++# https://books.google.com/books?id=BOMrAQAAMAAJ&pg=PA16 ++# "The expression 'Standard time' means standard time as used in Nigeria: ++# namely, 60 minutes in advance of Greenwich mean time. (As amended by 18 of ++# 1919, s. 2.)" ++# From Tim Parenti (2020-12-10): ++# The Lagos Weekly Record, 1919-09-20, p 3 details discussion on the first ++# reading of this Bill by the Legislative Council of the Colony of Nigeria on ++# Thursday 1919-08-28: ++# http://ddsnext.crl.edu/titles/31558?terms&item_id=303484#?m=1118&c=1&s=0&cv=2&r=0&xywh=1261%2C3408%2C2994%2C1915 ++# "The proposal is that the Globe should be divided into twelve zones East and ++# West of Greenwich, of one hour each, Nigeria falling into the zone with a ++# standard of one hour fast on Greenwich Mean Time. Nigeria standard time is ++# now 30 minutes in advance of Greenwich Mean Time ... according to the new ++# proposal, standard time will be advanced another 30 minutes". It was further ++# proposed that the firing of the time guns likewise be adjusted by 30 minutes ++# to compensate. ++# From Tim Parenti (2020-12-10), per P Chan (2020-12-11): ++# The text of Ordinance 18 of 1919, published in Nigeria Gazette, Vol 6, No 52, ++# shows that the change was assented to the following day and took effect "on ++# the 1st day of September, 1919." ++# Nigeria Gazette and Supplements 1919 Jan-Dec, Reference: 73266B-40, ++# img 245-246 ++# https://microform.digital/boa/collections/77/volumes/539/nigeria-lagos-1887-1919 ++ + # Zone NAME STDOFF RULES FORMAT [UNTIL] +-Zone Africa/Lagos 0:13:36 - LMT 1919 Sep ++Zone Africa/Lagos 0:13:35 - LMT 1905 Jul 1 ++ 0:00 - GMT 1908 Jul 1 ++ 0:13:35 - LMT 1914 Jan 1 ++ 0:30 - +0030 1919 Sep 1 + 1:00 - WAT + Link Africa/Lagos Africa/Bangui # Central African Republic + Link Africa/Lagos Africa/Brazzaville # Rep. of the Congo +-- +1.8.3.1 + diff --git a/backport-Document-zic-coalescing-zone-DST-transitions.patch b/backport-Document-zic-coalescing-zone-DST-transitions.patch new file mode 100644 index 0000000..b72ac5b --- /dev/null +++ b/backport-Document-zic-coalescing-zone-DST-transitions.patch @@ -0,0 +1,76 @@ +From c983a0fb70b566b47502fe19dba62d7c298386e7 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Mon, 7 Dec 2020 11:11:14 -0800 +Subject: [PATCH] Document zic coalescing zone+DST transitions + +* NEWS, zic.8: Document that zic coalesces transitions when +a zone falls back just before DST springs forward. + +Document jump-back ambiguity +* zic.8: Document avoidance of two nearly-simultanous transitions +for Grand Turk. +--- + NEWS | 5 +++++ + zic.8 | 30 ++++++++++++++++++++++++++++++ + 2 files changed, 35 insertions(+) + +diff --git a/NEWS b/NEWS +index dd131a9..bd9a2d2 100644 +--- a/NEWS ++++ b/NEWS +@@ -35,6 +35,11 @@ Unreleased, experimental changes + returning to Eastern Time with US DST in 2018, rather than as + maintaining EDT until 2015-11-01. (Thanks to P Chan.) + ++ Changes to documentation ++ ++ The zic man page now documents zic's coalescing of transitions ++ when a zone falls back just before DST springs forward. ++ + + Release 2020d - 2020-10-21 11:24:13 -0700 + +diff --git a/zic.8 b/zic.8 +index dcd2fa3..2273dad 100644 +--- a/zic.8 ++++ b/zic.8 +@@ -590,6 +590,36 @@ first transition into standard time. + In a single zone it is an error if two rules take effect at the same + instant, or if two zone changes take effect at the same instant. + .PP ++If a continuation line subtracts from the UT offset after a transition that ++would be interpreted to be later if using the continuation line's rules, the ++.q "until" ++time of the earlier zone or continuation line is interpreted according ++to the continuation line's rules. ++For example: ++.br ++.ne 7 ++.nf ++.in +2m ++.ta \w'# Rule\0\0'u +\w'NAME\0\0'u +\w'FROM\0\0'u +\w'max\0\0'u +\w'\*-\0\0'u +\w'Mar\0\0'u +\w'Sun>=8\0\0'u +\w'2:00\0\0'u +\w'SAVE\0\0'u ++.sp ++# Rule NAME FROM TO \*- IN ON AT SAVE LETTER/S ++Rule US 2007 max \*- Mar Sun>=8 2:00 1:00 D ++Rule US 2007 max \*- Nov Sun>=1 2:00 0 S ++.ta \w'Zone\0\0America/Grand_Turk\0\0'u +\w'STDOFF\0\0'u +\w'RULES\0\0'u +\w'FORMAT\0\0'u ++# Zone\0\0NAME STDOFF RULES FORMAT [UNTIL] ++Zone\0\0America/Grand_Turk \*-4:00 \*- AST 2018 Mar 11 2:00 ++ \*-5:00 US E%sT ++.sp ++.in ++.fi ++Here, an incorrect reading would be there were two clock changes on 2018-03-11, ++the first from 02:00 AST (\*-04) to 01:00 EST (\*-05), ++and the second an hour later from 02:00 EST (\*-05) to 03:00 EDT (\*-04). ++However, ++.B zic ++interprets this more sensibly as a single transition from 02:00 AST (\*-04) to ++02:00 EDT (\*-04). ++.PP + A link line has the form + .sp + .nf +-- +1.8.3.1 + diff --git a/backport-Fix-NEWS-typo.patch b/backport-Fix-NEWS-typo.patch new file mode 100644 index 0000000..ab91159 --- /dev/null +++ b/backport-Fix-NEWS-typo.patch @@ -0,0 +1,25 @@ +From 3dcdea78d28b47f54dd15ca48207119a441b176b Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Mon, 7 Dec 2020 11:37:59 -0800 +Subject: [PATCH] Fix NEWS typo + +--- + NEWS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/NEWS b/NEWS +index bd9a2d2..041d224 100644 +--- a/NEWS ++++ b/NEWS +@@ -4,7 +4,7 @@ Unreleased, experimental changes + + Changes to future timestamps + +- Volgograd changes time zone from +04 to +03 on 2020-12-20 at 02:00. ++ Volgograd changes time zone from +04 to +03 on 2020-12-27 at 02:00. + (Thanks to Alexander Krivenyshev and Stepan Golosunov.) + + Changes to past timestamps +-- +1.8.3.1 + diff --git a/backport-Fix-rearguard.zi-corruption-in-2020e.patch b/backport-Fix-rearguard.zi-corruption-in-2020e.patch new file mode 100644 index 0000000..37b431a --- /dev/null +++ b/backport-Fix-rearguard.zi-corruption-in-2020e.patch @@ -0,0 +1,84 @@ +From 15e0ac32c17bdb9c7d480a65fbda77e6c5e7d808 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Wed, 23 Dec 2020 11:11:31 -0800 +Subject: [PATCH] Fix rearguard.zi corruption in 2020e + +Problem reported by Deborah Goldsmith in: +https://mm.icann.org/pipermail/tz/2020-December/029637.html +* Makefile (check_public): Also check vanguard.zi, main.zi, +rearguard.zi, to prevent similar problems from recurring. +* NEWS: Mention this. +* ziguard.awk: Be pickier about adjusting comments in +the Europe/Prague and Africa/Windhoek, partly by adding +a check already present for Europe/Dublin. +--- + Makefile | 5 ++++- + NEWS | 8 ++++++++ + ziguard.awk | 9 +++++---- + 3 files changed, 17 insertions(+), 5 deletions(-) + +diff --git a/Makefile b/Makefile +index 5064a19..1136af9 100644 +--- a/Makefile ++++ b/Makefile +@@ -945,7 +945,10 @@ check_public: $(VERSION_DEPS) + mkdir public.dir + ln $(VERSION_DEPS) public.dir + cd public.dir && $(MAKE) CFLAGS='$(GCC_DEBUG_FLAGS)' ALL +- for i in $(TDATA_TO_CHECK) public.dir/tzdata.zi; do \ ++ for i in $(TDATA_TO_CHECK) public.dir/tzdata.zi \ ++ public.dir/vanguard.zi public.dir/main.zi \ ++ public.dir/rearguard.zi; \ ++ do \ + public.dir/zic -v -d public.dir/zoneinfo $$i 2>&1 || exit; \ + done + public.dir/zic -v -d public.dir/zoneinfo-all $(TDATA_TO_CHECK) +diff --git a/NEWS b/NEWS +index 6014b45..a0863fb 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,5 +1,13 @@ + News for the tz database + ++Unreleased, experimental changes ++ ++ Change to build procedure ++ ++ 'make rearguard_tarballs' no longer generates a bad rearguard.zi, ++ fixing a 2020e bug. (Problem reported by Deborah Goldsmith.) ++ ++ + Release 2020e - 2020-12-22 15:14:34 -0800 + + Briefly: +diff --git a/ziguard.awk b/ziguard.awk +index e27e799..7d6f7c9 100644 +--- a/ziguard.awk ++++ b/ziguard.awk +@@ -37,7 +37,7 @@ DATAFORM != "main" { + + # If this line should differ due to Czechoslovakia using negative SAVE values, + # uncomment the desired version and comment out the undesired one. +- if (zone == "Europe/Prague" && /1947 Feb 23/) { ++ if (zone == "Europe/Prague" && /^#?[\t ]+[01]:00[\t ]/ && /1947 Feb 23/) { + if (($(in_comment + 2) != "-") == vanguard) { + uncomment = in_comment + } else { +@@ -65,10 +65,11 @@ DATAFORM != "main" { + # uncomment the desired version and comment out the undesired one. + Rule_Namibia = /^#?Rule[\t ]+Namibia[\t ]/ + Zone_using_Namibia_rule \ +- = (zone == "Africa/Windhoek" \ ++ = (zone == "Africa/Windhoek" && /^#?[\t ]+[12]:00[\t ]/ \ + && ($(in_comment + 2) == "Namibia" \ +- || (1994 <= $(in_comment + 4) && $(in_comment + 4) <= 2017) \ +- || in_comment + 3 == NF)) ++ || ($(in_comment + 2) == "-" && $(in_comment + 3) == "CAT" \ ++ && ((1994 <= $(in_comment + 4) && $(in_comment + 4) <= 2017) \ ++ || in_comment + 3 == NF)))) + if (Rule_Namibia || Zone_using_Namibia_rule) { + if ((Rule_Namibia \ + ? ($(in_comment + 9) ~ /^-/ \ +-- +1.8.3.1 + diff --git a/backport-Improve-doc-of-zic-coalescing-zone-DST-transitions.patch b/backport-Improve-doc-of-zic-coalescing-zone-DST-transitions.patch new file mode 100644 index 0000000..adac956 --- /dev/null +++ b/backport-Improve-doc-of-zic-coalescing-zone-DST-transitions.patch @@ -0,0 +1,77 @@ +From b804a741d5cdb5d1b761de9ad053ba916fa08636 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Tue, 22 Dec 2020 15:11:11 -0800 +Subject: [PATCH] Improve doc of zic coalescing zone+DST transitions + +* zic.8: Improve documentation for how certain transitions +are coalesced. Also, use current data for America/Menominee +instead an America/Grand_Turk entry that not in current data. +Improvements suggested by Tim Parenti. +--- + zic.8 | 36 +++++++++++++++++++++--------------- + 1 file changed, 21 insertions(+), 15 deletions(-) + +diff --git a/zic.8 b/zic.8 +index 2273dad..60262d7 100644 +--- a/zic.8 ++++ b/zic.8 +@@ -590,35 +590,41 @@ first transition into standard time. + In a single zone it is an error if two rules take effect at the same + instant, or if two zone changes take effect at the same instant. + .PP +-If a continuation line subtracts from the UT offset after a transition that +-would be interpreted to be later if using the continuation line's rules, the ++If a continuation line subtracts ++.I N ++seconds from the UT offset after a transition that would be ++interpreted to be later if using the continuation line's UT offset and ++rules, the + .q "until" +-time of the earlier zone or continuation line is interpreted according +-to the continuation line's rules. ++time of the previous zone or continuation line is interpreted ++according to the continuation line's UT offset and rules, and any rule ++that would otherwise take effect in the next ++.I N ++seconds is instead assumed to take effect simultaneously. + For example: + .br + .ne 7 + .nf + .in +2m +-.ta \w'# Rule\0\0'u +\w'NAME\0\0'u +\w'FROM\0\0'u +\w'max\0\0'u +\w'\*-\0\0'u +\w'Mar\0\0'u +\w'Sun>=8\0\0'u +\w'2:00\0\0'u +\w'SAVE\0\0'u ++.ta \w'# Rule\0\0'u +\w'NAME\0\0'u +\w'FROM\0\0'u +\w'2006\0\0'u +\w'\*-\0\0'u +\w'Oct\0\0'u +\w'lastSun\0\0'u +\w'2:00\0\0'u +\w'SAVE\0\0'u + .sp + # Rule NAME FROM TO \*- IN ON AT SAVE LETTER/S +-Rule US 2007 max \*- Mar Sun>=8 2:00 1:00 D +-Rule US 2007 max \*- Nov Sun>=1 2:00 0 S +-.ta \w'Zone\0\0America/Grand_Turk\0\0'u +\w'STDOFF\0\0'u +\w'RULES\0\0'u +\w'FORMAT\0\0'u ++Rule US 1967 2006 - Oct lastSun 2:00 0 S ++Rule US 1967 1973 - Apr lastSun 2:00 1:00 D ++.ta \w'Zone\0\0America/Menominee\0\0'u +\w'STDOFF\0\0'u +\w'RULES\0\0'u +\w'FORMAT\0\0'u + # Zone\0\0NAME STDOFF RULES FORMAT [UNTIL] +-Zone\0\0America/Grand_Turk \*-4:00 \*- AST 2018 Mar 11 2:00 +- \*-5:00 US E%sT ++Zone\0\0America/Menominee \*-5:00 \*- EST 1973 Apr 29 2:00 ++ \*-6:00 US C%sT + .sp + .in + .fi +-Here, an incorrect reading would be there were two clock changes on 2018-03-11, +-the first from 02:00 AST (\*-04) to 01:00 EST (\*-05), +-and the second an hour later from 02:00 EST (\*-05) to 03:00 EDT (\*-04). ++Here, an incorrect reading would be there were two clock changes on 1973-04-29, ++the first from 02:00 EST (\*-05) to 01:00 CST (\*-06), ++and the second an hour later from 02:00 CST (\*-06) to 03:00 CDT (\*-05). + However, + .B zic +-interprets this more sensibly as a single transition from 02:00 AST (\*-04) to +-02:00 EDT (\*-04). ++interprets this more sensibly as a single transition from 02:00 CST (\*-05) to ++02:00 CDT (\*-05). + .PP + A link line has the form + .sp +-- +1.8.3.1 + diff --git a/backport-No-leap-second-on-2021-06-30.patch b/backport-No-leap-second-on-2021-06-30.patch new file mode 100644 index 0000000..9158645 --- /dev/null +++ b/backport-No-leap-second-on-2021-06-30.patch @@ -0,0 +1,41 @@ +From 500141665b78279e47f614dc1acfd77b845a4578 Mon Sep 17 00:00:00 2001 +From: Tim Parenti +Date: Sat, 9 Jan 2021 13:59:02 -0500 +Subject: [PATCH] No leap second on 2021-06-30 + +Per IERS Bulletin C 61 (2021-01-07). +https://hpiers.obspm.fr/iers/bul/bulc/bulletinc.61 + +* leap-seconds.list: Update file from NIST, retrieved from +ftp://ftp.nist.gov/pub/time/leap-seconds.list +--- + leap-seconds.list | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/leap-seconds.list b/leap-seconds.list +index e897a86..3198d65 100644 +--- a/leap-seconds.list ++++ b/leap-seconds.list +@@ -204,10 +204,10 @@ + # current -- the update time stamp, the data and the name of the file + # will not change. + # +-# Updated through IERS Bulletin C60 +-# File expires on: 28 June 2021 ++# Updated through IERS Bulletin C61 ++# File expires on: 28 December 2021 + # +-#@ 3833827200 ++#@ 3849638400 + # + 2272060800 10 # 1 Jan 1972 + 2287785600 11 # 1 Jul 1972 +@@ -252,4 +252,4 @@ + # the hash line is also ignored in the + # computation. + # +-#h 064356a8 39268b92 76e4d5ef 3e22fae1 0cca529c ++#h 2ab8253d d4380d28 75f01343 381504f8 8f8a4bfc +-- +1.8.3.1 + diff --git a/backport-Release-2020e.patch b/backport-Release-2020e.patch new file mode 100644 index 0000000..84d0e26 --- /dev/null +++ b/backport-Release-2020e.patch @@ -0,0 +1,28 @@ +From efc5c061920f1d5820d66b7ec88ebff144c55b3f Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Tue, 22 Dec 2020 15:14:34 -0800 +Subject: [PATCH] Release 2020e + +* NEWS: Increase version to 2020e. +--- + NEWS | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/NEWS b/NEWS +index 991b737..6014b45 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,6 +1,9 @@ + News for the tz database + +-Unreleased, experimental changes ++Release 2020e - 2020-12-22 15:14:34 -0800 ++ ++ Briefly: ++ Volgograd switches to Moscow time on 2020-12-27 at 02:00. + + Changes to future timestamps + +-- +1.8.3.1 + diff --git a/backport-Release-2020f.patch b/backport-Release-2020f.patch new file mode 100644 index 0000000..b8e541b --- /dev/null +++ b/backport-Release-2020f.patch @@ -0,0 +1,25 @@ +From 846c3ac7abc246094dd754ac6dc90423148a5107 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Tue, 29 Dec 2020 00:17:46 -0800 +Subject: [PATCH] Release 2020f + +* NEWS: Increase version to 2020f. +--- + NEWS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/NEWS b/NEWS +index a0863fb..19470cc 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,6 +1,6 @@ + News for the tz database + +-Unreleased, experimental changes ++Release 2020f - 2020-12-29 00:17:46 -0800 + + Change to build procedure + +-- +1.8.3.1 + diff --git a/backport-South-Sudan-changes-from-03-to-02-on-2021-02-01.patch b/backport-South-Sudan-changes-from-03-to-02-on-2021-02-01.patch new file mode 100644 index 0000000..90315f6 --- /dev/null +++ b/backport-South-Sudan-changes-from-03-to-02-on-2021-02-01.patch @@ -0,0 +1,57 @@ +From 7d7a4fb5bdaf778d48903b56d4200dd84282238e Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Tue, 19 Jan 2021 13:17:42 -0800 +Subject: [PATCH] South Sudan changes from +03 to +02 on 2021-02-01. + +(Thanks to Steffen Thorsen.) +* NEWS: Mention this. +* africa (Africa/Juba): Implement it. +--- + NEWS | 7 +++++++ + africa | 8 +++++++- + 2 files changed, 14 insertions(+), 1 deletion(-) + +diff --git a/NEWS b/NEWS +index 19470cc..13c87b0 100644 +--- a/NEWS ++++ b/NEWS +@@ -2,6 +2,13 @@ News for the tz database + + Release 2020f - 2020-12-29 00:17:46 -0800 + ++ Briefly: ++ South Sudan changes from +03 to +02 on 2021-02-01. ++ ++ Changes to future timestamps ++ South Sudan changes from +03 to +02 on 2021-02-01 at 00:00. ++ (Thanks to Steffen Thorsen.) ++ + Change to build procedure + + 'make rearguard_tarballs' no longer generates a bad rearguard.zi, +diff --git a/africa b/africa +index 59cf501..28168cf 100644 +--- a/africa ++++ b/africa +@@ -1527,11 +1527,17 @@ Zone Africa/Khartoum 2:10:08 - LMT 1931 + 3:00 - EAT 2017 Nov 1 + 2:00 - CAT + ++# From Steffen Thorsen (2021-01-18): ++# "South Sudan will change its time zone by setting the clock back 1 ++# hour on February 1, 2021...." ++# from https://eyeradio.org/south-sudan-adopts-new-time-zone-makuei/ ++ + # South Sudan + # Zone NAME STDOFF RULES FORMAT [UNTIL] + Zone Africa/Juba 2:06:28 - LMT 1931 + 2:00 Sudan CA%sT 2000 Jan 15 12:00 +- 3:00 - EAT ++ 3:00 - EAT 2021 Feb 1 00:00 ++ 2:00 - CAT + + # Tanzania + # See Africa/Nairobi. +-- +1.8.3.1 + diff --git a/tzdata.spec b/tzdata.spec index 319674b..442c811 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Name: tzdata Version: 2020a -Release: 9 +Release: 10 Summary: Timezone data License: Public Domain URL: https://www.iana.org/time-zones @@ -95,6 +95,16 @@ Patch6085: backport-Volgograd-change-likely-December-27-not-20.patch Patch6086: backport-Fix-Vanuatu-DST-in-1973-1974-and-1984-transition.patch Patch6087: backport-Model-Turks-Caicos-time-2015-2018-as-AST.patch Patch6088: backport-Seychelles-switched-from-LMT-to-04-on-1907-01-01.patch +Patch6089: backport-Document-zic-coalescing-zone-DST-transitions.patch +Patch6090: backport-Fix-NEWS-typo.patch +Patch6091: backport-Correct-LMT-and-pre-1919-transitions-for-Nigeria.patch +Patch6092: backport-Cite-publication-of-Volgograd-change.patch +Patch6093: backport-Improve-doc-of-zic-coalescing-zone-DST-transitions.patch +Patch6094: backport-Release-2020e.patch +Patch6095: backport-Fix-rearguard.zi-corruption-in-2020e.patch +Patch6096: backport-Release-2020f.patch +Patch6097: backport-No-leap-second-on-2021-06-30.patch +Patch6098: backport-South-Sudan-changes-from-03-to-02-on-2021-02-01.patch Patch9000: bugfix-0001-add-Beijing-timezone.patch Patch9001: remove-country-selection-from-tzselect-steps.patch @@ -192,6 +202,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Fri Jan 22 2021 liuchao - 2020a-10 +- Type:recommended +- CVE:NA +- SUG:NA +- DESC:backport community patches + * Mon Dec 7 2020 liuchao - 2020a-9 - Type:recommended - CVE:NA