aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorPhilip Paeps <philip@FreeBSD.org>2020-12-30 04:50:26 +0000
committerPhilip Paeps <philip@FreeBSD.org>2020-12-30 04:50:26 +0000
commite35a01eec6926bfb5c088ca8961079b51a067bf3 (patch)
tree34e72615cdd1e98b23ff5aeaefd80433c0c647ec /contrib
parent2ff66a915526b6509ca57f2046bc7b20b0de8a61 (diff)
parent96b88ac701b35ce68425046d4be8f51cb75b5d5b (diff)
downloadsrc-e35a01eec6926bfb5c088ca8961079b51a067bf3.tar.gz
src-e35a01eec6926bfb5c088ca8961079b51a067bf3.zip
contrib/tzdata: import tzdata 2020f
Merge commit '96b88ac701b35ce68425046d4be8f51cb75b5d5b' into main Changes: https://github.com/eggert/tz/blob/2020f/NEWS MFC after: 1 day
Diffstat (limited to 'contrib')
-rw-r--r--contrib/tzdata/Makefile5
-rw-r--r--contrib/tzdata/NEWS8
-rw-r--r--contrib/tzdata/version2
-rw-r--r--contrib/tzdata/ziguard.awk9
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) ~ /^-/ \