Module Name: src
Committed By: martin
Date: Sun Oct 18 18:18:45 UTC 2020
Modified Files:
src/doc [netbsd-9]: 3RDPARTY
src/external/public-domain/tz/dist [netbsd-9]: Makefile NEWS
TZDATA_VERSION australasia europe version ziguard.awk
Log Message:
Pull up the following, requested by kre in ticket #1116:
external/public-domain/tz/dist/Makefile up to 1.1.1.28
external/public-domain/tz/dist/NEWS up to 1.1.1.31
external/public-domain/tz/dist/TZDATA_VERSION up to 1.21
external/public-domain/tz/dist/australasia up to 1.1.1.20
external/public-domain/tz/dist/europe up to 1.1.1.28
external/public-domain/tz/dist/version up to 1.1.1.18
external/public-domain/tz/dist/ziguard.awk up to 1.1.1.5
doc/3RDPARTY (apply patch)
Import tzdata2020c:
Release 2020c - 2020-10-16 11:15:53 -0700
Fiji starts DST later than usual, on 2020-12-20.
To generate a diff of this commit:
cvs rdiff -u -r1.1640.2.18 -r1.1640.2.19 src/doc/3RDPARTY
cvs rdiff -u -r1.1.1.24.2.3 -r1.1.1.24.2.4 \
src/external/public-domain/tz/dist/Makefile \
src/external/public-domain/tz/dist/europe
cvs rdiff -u -r1.1.1.27.2.3 -r1.1.1.27.2.4 \
src/external/public-domain/tz/dist/NEWS
cvs rdiff -u -r1.17.2.3 -r1.17.2.4 \
src/external/public-domain/tz/dist/TZDATA_VERSION
cvs rdiff -u -r1.1.1.17.2.2 -r1.1.1.17.2.3 \
src/external/public-domain/tz/dist/australasia
cvs rdiff -u -r1.1.1.14.2.3 -r1.1.1.14.2.4 \
src/external/public-domain/tz/dist/version
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.2.1 \
src/external/public-domain/tz/dist/ziguard.awk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1640.2.18 src/doc/3RDPARTY:1.1640.2.19
--- src/doc/3RDPARTY:1.1640.2.18 Sun Oct 11 11:26:24 2020
+++ src/doc/3RDPARTY Sun Oct 18 18:18:44 2020
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.1640.2.18 2020/10/11 11:26:24 martin Exp $
+# $NetBSD: 3RDPARTY,v 1.1640.2.19 2020/10/18 18:18:44 martin Exp $
#
# This file contains a list of the software that has been integrated into
# NetBSD where we are not the primary maintainer.
@@ -1398,8 +1398,8 @@ Notes:
Added changes from a5 -> a12 manually.
Package: tz
-Version: tzcode2019b / tzdata2020b
-Current Vers: tzcode2020b / tzdata2020b
+Version: tzcode2019b / tzdata2020c
+Current Vers: tzcode2020c / tzdata2020c
Maintainer: Paul Eggert <egg...@cs.ucla.edu>
Archive Site: ftp://ftp.iana.org/tz/releases/
Archive Site: ftp://munnari.oz.au/pub/oldtz/
Index: src/external/public-domain/tz/dist/Makefile
diff -u src/external/public-domain/tz/dist/Makefile:1.1.1.24.2.3 src/external/public-domain/tz/dist/Makefile:1.1.1.24.2.4
--- src/external/public-domain/tz/dist/Makefile:1.1.1.24.2.3 Sun Oct 11 11:26:25 2020
+++ src/external/public-domain/tz/dist/Makefile Sun Oct 18 18:18:44 2020
@@ -1022,10 +1022,14 @@ tzdata$(VERSION)-rearguard.tar.gz: rearg
done
sed '1s/$$/-rearguard/' \
<version >tzdata$(VERSION)-rearguard.dir/version
+ : The dummy pacificnew pacifies TZUpdater 2.3.1 and earlier.
+ touch -md 2020-10-12T22:53:00Z \
+ tzdata$(VERSION)-rearguard.dir/pacificnew
touch -cmr version tzdata$(VERSION)-rearguard.dir/version
LC_ALL=C && export LC_ALL && \
(cd tzdata$(VERSION)-rearguard.dir && \
- tar $(TARFLAGS) -cf - $(COMMON) $(DATA) $(MISC) | \
+ tar $(TARFLAGS) -cf - \
+ $(COMMON) $(DATA) $(MISC) pacificnew | \
gzip $(GZIPFLAGS)) >$@.out
mv $@.out $@
Index: src/external/public-domain/tz/dist/europe
diff -u src/external/public-domain/tz/dist/europe:1.1.1.24.2.3 src/external/public-domain/tz/dist/europe:1.1.1.24.2.4
--- src/external/public-domain/tz/dist/europe:1.1.1.24.2.3 Sun Oct 11 11:26:25 2020
+++ src/external/public-domain/tz/dist/europe Sun Oct 18 18:18:44 2020
@@ -1589,6 +1589,8 @@ Rule Hungary 1946 only - Oct 7 2:00 0
# https://library.hungaricana.hu/hu/view/Zala_1948_09/?pg=64
# https://library.hungaricana.hu/hu/view/SatoraljaujhelyiLeveltar_ZempleniNepujsag_1948/?pg=53
# https://library.hungaricana.hu/hu/view/SatoraljaujhelyiLeveltar_ZempleniNepujsag_1948/?pg=160
+# https://library.hungaricana.hu/hu/view/UjSzo_1949_01-04/?pg=102
+# https://library.hungaricana.hu/hu/view/KeletMagyarorszag_1949_03/?pg=96
# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1949_09/?pg=94
Rule Hungary 1947 1949 - Apr Sun>=4 2:00s 1:00 S
Rule Hungary 1947 1949 - Oct Sun>=1 2:00s 0 -
@@ -1604,9 +1606,10 @@ Rule Hungary 1955 only - Oct 2 3:00 0
# https://library.hungaricana.hu/hu/view/PestMegyeiHirlap_1957_09/?pg=143
Rule Hungary 1956 1957 - Jun Sun>=1 2:00 1:00 S
Rule Hungary 1956 1957 - Sep lastSun 3:00 0 -
-# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1980/?pg=1227
+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1980/?pg=189
Rule Hungary 1980 only - Apr 6 0:00 1:00 S
Rule Hungary 1980 only - Sep 28 1:00 0 -
+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1980/?pg=1227
# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1981_01/?pg=79
# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1982/?pg=115
# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1983/?pg=85
@@ -1617,6 +1620,7 @@ Rule Hungary 1981 1983 - Sep lastSun 1:
Zone Europe/Budapest 1:16:20 - LMT 1890 Nov 1
1:00 C-Eur CE%sT 1918
# https://library.hungaricana.hu/hu/view/OGYK_RT_1941/?pg=1204
+# https://library.hungaricana.hu/hu/view/OGYK_RT_1942/?pg=3955
1:00 Hungary CE%sT 1941 Apr 7 23:00
1:00 C-Eur CE%sT 1945
1:00 Hungary CE%sT 1984
Index: src/external/public-domain/tz/dist/NEWS
diff -u src/external/public-domain/tz/dist/NEWS:1.1.1.27.2.3 src/external/public-domain/tz/dist/NEWS:1.1.1.27.2.4
--- src/external/public-domain/tz/dist/NEWS:1.1.1.27.2.3 Sun Oct 11 11:26:25 2020
+++ src/external/public-domain/tz/dist/NEWS Sun Oct 18 18:18:44 2020
@@ -1,5 +1,25 @@
News for the tz database
+Release 2020c - 2020-10-16 11:15:53 -0700
+
+ Briefly:
+ Fiji starts DST later than usual, on 2020-12-20.
+
+ Changes to future timestamps
+
+ Fiji will start DST on 2020-12-20, instead of 2020-11-08 as
+ previously predicted. DST will still end on 2021-01-17.
+ (Thanks to Raymond Kumar and Alan Mintz.) Assume for now that
+ the later-than-usual start date is a one-time departure from the
+ recent pattern.
+
+ Changes to build procedure
+
+ Rearguard tarballs now contain an empty file pacificnew.
+ Some older downstream software expects this file to exist.
+ (Problem reported by Mike Cullinan.)
+
+
Release 2020b - 2020-10-06 18:35:04 -0700
Briefly:
Index: src/external/public-domain/tz/dist/TZDATA_VERSION
diff -u src/external/public-domain/tz/dist/TZDATA_VERSION:1.17.2.3 src/external/public-domain/tz/dist/TZDATA_VERSION:1.17.2.4
--- src/external/public-domain/tz/dist/TZDATA_VERSION:1.17.2.3 Sun Oct 11 11:26:25 2020
+++ src/external/public-domain/tz/dist/TZDATA_VERSION Sun Oct 18 18:18:44 2020
@@ -1 +1 @@
-tzdata-2020b
+tzdata-2020c
Index: src/external/public-domain/tz/dist/australasia
diff -u src/external/public-domain/tz/dist/australasia:1.1.1.17.2.2 src/external/public-domain/tz/dist/australasia:1.1.1.17.2.3
--- src/external/public-domain/tz/dist/australasia:1.1.1.17.2.2 Sun Oct 11 11:26:25 2020
+++ src/external/public-domain/tz/dist/australasia Sun Oct 18 18:18:44 2020
@@ -381,6 +381,19 @@ Zone Indian/Cocos 6:27:40 - LMT 1900
# From Michael Deckers (2019-08-06):
# https://www.laws.gov.fj/LawsAsMade/downloadfile/848
+# From Raymond Kumar (2020-10-08):
+# [DST in Fiji] is from December 20th 2020, till 17th January 2021.
+# From Alan Mintz (2020-10-08):
+# https://www.laws.gov.fj/LawsAsMade/GetFile/1071
+# From Tim Parenti (2020-10-08):
+# https://www.fijivillage.com/news/Daylight-saving-from-Dec-20th-this-year-to-Jan-17th-2021-8rf4x5/
+# "Minister for Employment, Parveen Bala says they had never thought of
+# stopping daylight saving. He says it was just to decide on when it should
+# start and end. Bala says it is a short period..."
+# Since the end date is still in line with our ongoing predictions, assume for
+# now that the later-than-usual start date is a one-time departure from the
+# recent second Sunday in November pattern.
+
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 -
Rule Fiji 1999 2000 - Feb lastSun 3:00 0 -
@@ -392,7 +405,9 @@ Rule Fiji 2012 2013 - Jan Sun>=18 3:00 0
Rule Fiji 2014 only - Jan Sun>=18 2:00 0 -
Rule Fiji 2014 2018 - Nov Sun>=1 2:00 1:00 -
Rule Fiji 2015 max - Jan Sun>=12 3:00 0 -
-Rule Fiji 2019 max - Nov Sun>=8 2:00 1:00 -
+Rule Fiji 2019 only - Nov Sun>=8 2:00 1:00 -
+Rule Fiji 2020 only - Dec 20 2:00 1:00 -
+Rule Fiji 2021 max - Nov Sun>=8 2:00 1:00 -
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Fiji 11:55:44 - LMT 1915 Oct 26 # Suva
12:00 Fiji +12/+13
Index: src/external/public-domain/tz/dist/version
diff -u src/external/public-domain/tz/dist/version:1.1.1.14.2.3 src/external/public-domain/tz/dist/version:1.1.1.14.2.4
--- src/external/public-domain/tz/dist/version:1.1.1.14.2.3 Sun Oct 11 11:26:25 2020
+++ src/external/public-domain/tz/dist/version Sun Oct 18 18:18:44 2020
@@ -1 +1 @@
-2020b
+2020c
Index: src/external/public-domain/tz/dist/ziguard.awk
diff -u src/external/public-domain/tz/dist/ziguard.awk:1.1.1.4 src/external/public-domain/tz/dist/ziguard.awk:1.1.1.4.2.1
--- src/external/public-domain/tz/dist/ziguard.awk:1.1.1.4 Sun Dec 30 00:40:53 2018
+++ src/external/public-domain/tz/dist/ziguard.awk Sun Oct 18 18:18:44 2020
@@ -3,6 +3,13 @@
# Contributed by Paul Eggert. This file is in the public domain.
# This is not a general-purpose converter; it is designed for current tzdata.
+# It just converts from current source to main, vanguard, and rearguard forms.
+# Although it might be nice for it to be idempotent, or to be useful
+# for converting back and forth between vanguard and rearguard formats,
+# it does not do these nonessential tasks now.
+#
+# Although main and vanguard forms are currently equivalent,
+# this need not always be the case.
#
# When converting to vanguard form, the output can use negative SAVE
# values.
@@ -28,7 +35,7 @@ DATAFORM != "main" {
in_comment = /^#/
uncomment = comment_out = 0
- # If the line should differ due to Czechoslovakia using negative SAVE values,
+ # 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 (($(in_comment + 2) != "-") == vanguard) {
