Skip to content

Commit 9d0bfab

Browse files
author
GitHub Actions
committed
Update tzdata and zoneinfo to version 2020f.
1 parent 9b084ca commit 9d0bfab

File tree

4 files changed

+18
-6
lines changed

4 files changed

+18
-6
lines changed

tzdata/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,10 @@ check_public: $(VERSION_DEPS)
945945
mkdir public.dir
946946
ln $(VERSION_DEPS) public.dir
947947
cd public.dir && $(MAKE) CFLAGS='$(GCC_DEBUG_FLAGS)' ALL
948-
for i in $(TDATA_TO_CHECK) public.dir/tzdata.zi; do \
948+
for i in $(TDATA_TO_CHECK) public.dir/tzdata.zi \
949+
public.dir/vanguard.zi public.dir/main.zi \
950+
public.dir/rearguard.zi; \
951+
do \
949952
public.dir/zic -v -d public.dir/zoneinfo $$i 2>&1 || exit; \
950953
done
951954
public.dir/zic -v -d public.dir/zoneinfo-all $(TDATA_TO_CHECK)

tzdata/NEWS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
News for the tz database
22

3+
Release 2020f - 2020-12-29 00:17:46 -0800
4+
5+
Change to build procedure
6+
7+
'make rearguard_tarballs' no longer generates a bad rearguard.zi,
8+
fixing a 2020e bug. (Problem reported by Deborah Goldsmith.)
9+
10+
311
Release 2020e - 2020-12-22 15:14:34 -0800
412

513
Briefly:

tzdata/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2020e
1+
2020f

tzdata/ziguard.awk

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ DATAFORM != "main" {
3737

3838
# If this line should differ due to Czechoslovakia using negative SAVE values,
3939
# uncomment the desired version and comment out the undesired one.
40-
if (zone == "Europe/Prague" && /1947 Feb 23/) {
40+
if (zone == "Europe/Prague" && /^#?[\t ]+[01]:00[\t ]/ && /1947 Feb 23/) {
4141
if (($(in_comment + 2) != "-") == vanguard) {
4242
uncomment = in_comment
4343
} else {
@@ -65,10 +65,11 @@ DATAFORM != "main" {
6565
# uncomment the desired version and comment out the undesired one.
6666
Rule_Namibia = /^#?Rule[\t ]+Namibia[\t ]/
6767
Zone_using_Namibia_rule \
68-
= (zone == "Africa/Windhoek" \
68+
= (zone == "Africa/Windhoek" && /^#?[\t ]+[12]:00[\t ]/ \
6969
&& ($(in_comment + 2) == "Namibia" \
70-
|| (1994 <= $(in_comment + 4) && $(in_comment + 4) <= 2017) \
71-
|| in_comment + 3 == NF))
70+
|| ($(in_comment + 2) == "-" && $(in_comment + 3) == "CAT" \
71+
&& ((1994 <= $(in_comment + 4) && $(in_comment + 4) <= 2017) \
72+
|| in_comment + 3 == NF))))
7273
if (Rule_Namibia || Zone_using_Namibia_rule) {
7374
if ((Rule_Namibia \
7475
? ($(in_comment + 9) ~ /^-/ \

0 commit comments

Comments
 (0)