diff options
| author | Philip Paeps <philip@FreeBSD.org> | 2020-12-30 04:50:26 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2021-01-29 01:14:10 +0000 |
| commit | e8ede3fad66418c867bd7a842c79ffb01e4ed999 (patch) | |
| tree | 04417017157323492c6427715131b1ceb9c0b355 | |
| parent | 58dcfdf3fba790e608a288409ce41bb782cdacde (diff) | |
| download | src-e8ede3fad66418c867bd7a842c79ffb01e4ed999.tar.gz src-e8ede3fad66418c867bd7a842c79ffb01e4ed999.zip | |
MFC: contrib/tzdata: import tzdata 2020f
Merge commit '96b88ac701b35ce68425046d4be8f51cb75b5d5b' into main
Changes: https://github.com/eggert/tz/blob/2020f/NEWS
(cherry picked from commit e35a01eec6926bfb5c088ca8961079b51a067bf3)
(cherry picked from commit ce87312019a18e6bd0c97c50e5762b38ffc21e76)
Approved by: so
| -rw-r--r-- | contrib/tzdata/Makefile | 5 | ||||
| -rw-r--r-- | contrib/tzdata/NEWS | 8 | ||||
| -rw-r--r-- | contrib/tzdata/version | 2 | ||||
| -rw-r--r-- | contrib/tzdata/ziguard.awk | 9 |
4 files changed, 18 insertions, 6 deletions
diff --git a/contrib/tzdata/Makefile b/contrib/tzdata/Makefile index 5064a190c5a5..1136af9298f1 100644 --- a/contrib/tzdata/Makefile +++ b/contrib/tzdata/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/contrib/tzdata/NEWS b/contrib/tzdata/NEWS index 6014b45a0b4a..19470cc41c3d 100644 --- a/contrib/tzdata/NEWS +++ b/contrib/tzdata/NEWS @@ -1,5 +1,13 @@ News for the tz database +Release 2020f - 2020-12-29 00:17:46 -0800 + + 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/contrib/tzdata/version b/contrib/tzdata/version index e788a597fa7b..a481df8cb9d4 100644 --- a/contrib/tzdata/version +++ b/contrib/tzdata/version @@ -1 +1 @@ -2020e +2020f diff --git a/contrib/tzdata/ziguard.awk b/contrib/tzdata/ziguard.awk index e27e799392ec..7d6f7c99c952 100644 --- a/contrib/tzdata/ziguard.awk +++ b/contrib/tzdata/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) ~ /^-/ \ |