Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-9]: src Pull up the following, requested by kre in ticket #1243:
details: https://anonhg.NetBSD.org/src/rev/40af3cae02f4
branches: netbsd-9
changeset: 1002223:40af3cae02f4
user: martin <martin%NetBSD.org@localhost>
date: Tue Apr 06 18:01:21 2021 +0000
description:
Pull up the following, requested by kre in ticket #1243:
external/public-domain/tz/dist/Makefile up to 1.1.1.30
external/public-domain/tz/dist/NEWS up to 1.1.1.34
external/public-domain/tz/dist/TZDATA_VERSION up to 1.24
external/public-domain/tz/dist/africa up to 1.1.1.25
external/public-domain/tz/dist/asia up to 1.1.1.28
external/public-domain/tz/dist/australasia up to 1.1.1.21
external/public-domain/tz/dist/backward up to 1.1.1.12
external/public-domain/tz/dist/backzone up to 1.1.1.20
external/public-domain/tz/dist/etcetera up to 1.1.1.5
external/public-domain/tz/dist/europe up to 1.1.1.30
external/public-domain/tz/dist/leap-seconds.list up to 1.1.1.15
external/public-domain/tz/dist/leapseconds up to 1.1.1.18
external/public-domain/tz/dist/leapseconds.awk up to 1.1.1.12
external/public-domain/tz/dist/northamerica up to 1.1.1.27
external/public-domain/tz/dist/theory.html up to 1.1.1.12
external/public-domain/tz/dist/version up to 1.1.1.21
external/public-domain/tz/dist/ziguard.awk up to 1.1.1.6
external/public-domain/tz/dist/zone.tab up to 1.1.1.19
external/public-domain/tz/dist/zone1970.tab up to 1.1.1.21
doc/3RDPARTY apply patch
Import tzdata2020f from ftp://ftp.iana.org/tz/releases/tzdata2020f.tar.gz
Release 2020f - 2020-12-29 00:17:46 -0800
No changes to tzdata, just to a part of the build procedure
not used on NetBSD
Release 2020e - 2020-12-22 15:14:34 -0800
Volgograd switched to Moscow time on 2020-12-27 at 02:00.
Correct many pre-1986 transitions, fixing entries originally
derived from Shanks. The fixes include changes to:
Australia, Bahamas, Bermuda, Belize, Ghana, Israel and Palestine,
Kenya and adjacent, Nigeria and adjacent, Seychelles, Vanuatu
Australia/Currie has been moved to the 'backward' file and its
corrected data moved to the 'backzone' file.
To better match legislation in Turks and Caicos, the 2015 shift to
year-round observance of -04 is now modeled as AST throughout before
returning to Eastern Time with US DST in 2018, rather than as
maintaining EDT until 2015-11-01.
diffstat:
doc/3RDPARTY | 6 +-
external/public-domain/tz/dist/Makefile | 62 +++-
external/public-domain/tz/dist/NEWS | 62 +++++
external/public-domain/tz/dist/TZDATA_VERSION | 2 +-
external/public-domain/tz/dist/africa | 244 +++++++++++++++++--
external/public-domain/tz/dist/asia | 274 +++++++++++++++++-----
external/public-domain/tz/dist/australasia | 106 ++++++--
external/public-domain/tz/dist/backward | 1 +
external/public-domain/tz/dist/backzone | 6 +
external/public-domain/tz/dist/etcetera | 11 +-
external/public-domain/tz/dist/europe | 16 +-
external/public-domain/tz/dist/leap-seconds.list | 8 +-
external/public-domain/tz/dist/leapseconds | 12 +-
external/public-domain/tz/dist/leapseconds.awk | 4 +
external/public-domain/tz/dist/northamerica | 202 +++++++++++++++-
external/public-domain/tz/dist/theory.html | 5 +-
external/public-domain/tz/dist/version | 2 +-
external/public-domain/tz/dist/ziguard.awk | 9 +-
external/public-domain/tz/dist/zone.tab | 9 +-
external/public-domain/tz/dist/zone1970.tab | 9 +-
20 files changed, 860 insertions(+), 190 deletions(-)
diffs (truncated from 1542 to 300 lines):
diff -r 9389af7a7a5b -r 40af3cae02f4 doc/3RDPARTY
--- a/doc/3RDPARTY Tue Apr 06 17:52:03 2021 +0000
+++ b/doc/3RDPARTY Tue Apr 06 18:01:21 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.1640.2.23 2021/03/27 14:35:04 martin Exp $
+# $NetBSD: 3RDPARTY,v 1.1640.2.24 2021/04/06 18:01:21 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 @@
Added changes from a5 -> a12 manually.
Package: tz
-Version: tzcode2019b / tzdata2020d
-Current Vers: tzcode2020d / tzdata2020d
+Version: tzcode2019b / tzdata2021a
+Current Vers: tzcode2021a / tzdata2021a
Maintainer: Paul Eggert <eggert%cs.ucla.edu@localhost>
Archive Site: ftp://ftp.iana.org/tz/releases/
Archive Site: ftp://munnari.oz.au/pub/oldtz/
diff -r 9389af7a7a5b -r 40af3cae02f4 external/public-domain/tz/dist/Makefile
--- a/external/public-domain/tz/dist/Makefile Tue Apr 06 17:52:03 2021 +0000
+++ b/external/public-domain/tz/dist/Makefile Tue Apr 06 18:01:21 2021 +0000
@@ -583,11 +583,19 @@
cp date '$(DESTDIR)$(BINDIR)/.'
cp -f date.1 '$(DESTDIR)$(MANDIR)/man1/.'
+# Calculate version number from git, if available.
+# Otherwise, use $(VERSION) unless it is "unknown" and there is already
+# a 'version' file, in which case reuse the existing 'version' contents
+# and append "-dirty" if the contents do not already end in "-dirty".
version: $(VERSION_DEPS)
{ (type git) >/dev/null 2>&1 && \
V=`git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \
--abbrev=7 --dirty` || \
- V='$(VERSION)'; } && \
+ if test '$(VERSION)' = unknown && V=`cat $@`; then \
+ case $$V in *-dirty);; *) V=$$V-dirty;; esac; \
+ else \
+ V='$(VERSION)'; \
+ fi; } && \
printf '%s\n' "$$V" >$@.out
mv $@.out $@
@@ -872,11 +880,34 @@
LC_ALL=C sh workman.sh `expr $@ : '\(.*\)\.txt$$'` >$@.out
mv $@.out $@
+# Set file timestamps deterministically if possible,
+# so that tarballs containing the timestamps are reproducible.
+#
+# '$(SET_TIMESTAMP_N) N DEST A B C ...' sets the timestamp of the
+# file DEST to the maximum of the timestamps of the files A B C ...,
+# plus N if GNU ls and touch are available.
+SET_TIMESTAMP_N = sh -c '\
+ n=$$0 dest=$$1; shift; \
+ touch -cmr `ls -t "$$@" | sed 1q` "$$dest" && \
+ if test $$n != 0 && \
+ lsout=`ls -n --time-style="+%s" "$$dest" 2>/dev/null`; then \
+ set x $$lsout && \
+ touch -cmd @`expr $$7 + $$n` "$$dest"; \
+ else :; fi'
+# If DEST depends on A B C ... in this Makefile, callers should use
+# $(SET_TIMESTAMP_DEP) DEST A B C ..., for the benefit of any
+# downstream 'make' that considers equal timestamps to be out of date.
+# POSIX allows this 'make' behavior, and HP-UX 'make' does it.
+# If all that matters is that the timestamp be reproducible
+# and plausible, use $(SET_TIMESTAMP).
+SET_TIMESTAMP = $(SET_TIMESTAMP_N) 0
+SET_TIMESTAMP_DEP = $(SET_TIMESTAMP_N) 1
+
# Set the timestamps to those of the git repository, if available,
# and if the files have not changed since then.
-# This uses GNU 'touch' syntax 'touch -d@N FILE',
-# where N is the number of seconds since 1970.
-# If git or GNU 'touch' is absent, don't bother to sync with git timestamps.
+# This uses GNU 'ls --time-style=+%s', which outputs the seconds count,
+# and GNU 'touch -d@N FILE', where N is the number of seconds since 1970.
+# If git or GNU is absent, don't bother to sync with git timestamps.
# Also, set the timestamp of each prebuilt file like 'leapseconds'
# to be the maximum of the files it depends on.
set-timestamps.out: $(EIGHT_YARDS)
@@ -894,16 +925,16 @@
fi || exit; \
done; \
fi
- touch -cmr `ls -t $(LEAP_DEPS) | sed 1q` leapseconds
+ $(SET_TIMESTAMP_DEP) leapseconds $(LEAP_DEPS)
for file in `ls $(MANTXTS) | sed 's/\.txt$$//'`; do \
- touch -cmr `ls -t $$file workman.sh | sed 1q` $$file.txt || \
+ $(SET_TIMESTAMP_DEP) $$file.txt $$file workman.sh || \
exit; \
done
- touch -cmr `ls -t $(TZDATA_ZI_DEPS) | sed 1q` tzdata.zi
- touch -cmr `ls -t $(VERSION_DEPS) | sed 1q` version
+ $(SET_TIMESTAMP_DEP) version $(VERSION_DEPS)
+ $(SET_TIMESTAMP_DEP) tzdata.zi $(TZDATA_ZI_DEPS)
touch $@
set-tzs-timestamp.out: $(TZS)
- touch -cmr `ls -t $(TZS_DEPS) | sed 1q` $(TZS)
+ $(SET_TIMESTAMP_DEP) $(TZS) $(TZS_DEPS)
touch $@
# The zics below ensure that each data file can stand on its own.
@@ -914,7 +945,10 @@
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)
@@ -981,7 +1015,7 @@
signatures rearguard_signatures traditional_signatures: \
version set-timestamps.out rearguard.zi
VERSION=`cat version` && \
- $(MAKE) VERSION="$$VERSION" $@_version
+ $(MAKE) AWK='$(AWK)' VERSION="$$VERSION" $@_version
# These *_version rules are intended for use if VERSION is set by some
# other means. Ordinarily these rules are used only by the above
@@ -1018,7 +1052,7 @@
for f in $(TDATA) $(PACKRATDATA); do \
rearf=tzdata$(VERSION)-rearguard.dir/$$f; \
$(AWK) -v DATAFORM=rearguard -f ziguard.awk $$f >$$rearf && \
- touch -cmr `ls -t ziguard.awk $$f` $$rearf || exit; \
+ $(SET_TIMESTAMP_DEP) $$rearf ziguard.awk $$f || exit; \
done
sed '1s/$$/-rearguard/' \
<version >tzdata$(VERSION)-rearguard.dir/version
@@ -1037,7 +1071,7 @@
rm -fr tzdb-$(VERSION)
mkdir tzdb-$(VERSION)
ln $(ENCHILADA) tzdb-$(VERSION)
- touch -cmr `ls -t tzdb-$(VERSION)/* | sed 1q` tzdb-$(VERSION)
+ $(SET_TIMESTAMP) tzdb-$(VERSION) tzdb-$(VERSION)/*
LC_ALL=C && export LC_ALL && \
tar $(TARFLAGS) -cf - tzdb-$(VERSION) | lzip -9 >$@.out
mv $@.out $@
@@ -1079,8 +1113,6 @@
zdump.o: version.h
zic.o: private.h tzfile.h version.h
-.KEEP_STATE:
-
.PHONY: ALL INSTALL all
.PHONY: check check_time_t_alternatives
.PHONY: check_web check_zishrink
diff -r 9389af7a7a5b -r 40af3cae02f4 external/public-domain/tz/dist/NEWS
--- a/external/public-domain/tz/dist/NEWS Tue Apr 06 17:52:03 2021 +0000
+++ b/external/public-domain/tz/dist/NEWS Tue Apr 06 18:01:21 2021 +0000
@@ -1,5 +1,67 @@
News for the tz database
+Release 2021a - 2021-01-24 10:54:57 -0800
+
+ Changes to future timestamps
+
+ South Sudan changes from +03 to +02 on 2021-02-01 at 00:00.
+ (Thanks to Steffen Thorsen.)
+
+
+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:
+ Volgograd switches to Moscow time on 2020-12-27 at 02:00.
+
+ Changes to future timestamps
+
+ 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
+
+ Correct many pre-1986 transitions, fixing entries originally
+ derived from Shanks. The fixes include:
+ - Australia: several 1917 through 1971 transitions
+ - Bahamas: several 1941 through 1945 transitions
+ - Bermuda: several 1917 through 1956 transitions
+ - Belize: several 1942 through 1968 transitions
+ - 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.)
+
+ Because of the Australia change, Australia/Currie (King Island) is
+ no longer needed, as it is identical to Australia/Hobart for all
+ timestamps since 1970 and was therefore created by mistake.
+ Australia/Currie has been moved to the 'backward' file and its
+ corrected data moved to the 'backzone' file.
+
+ Changes to past time zone abbreviations and DST flags
+
+ To better match legislation in Turks and Caicos, the 2015 shift to
+ year-round observance of -04 is now modeled as AST throughout before
+ 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
Briefly:
diff -r 9389af7a7a5b -r 40af3cae02f4 external/public-domain/tz/dist/TZDATA_VERSION
--- a/external/public-domain/tz/dist/TZDATA_VERSION Tue Apr 06 17:52:03 2021 +0000
+++ b/external/public-domain/tz/dist/TZDATA_VERSION Tue Apr 06 18:01:21 2021 +0000
@@ -1,1 +1,1 @@
-tzdata-2020d
+tzdata-2021a
diff -r 9389af7a7a5b -r 40af3cae02f4 external/public-domain/tz/dist/africa
--- a/external/public-domain/tz/dist/africa Tue Apr 06 17:52:03 2021 +0000
+++ b/external/public-domain/tz/dist/africa Tue Apr 06 18:01:21 2021 +0000
@@ -386,36 +386,87 @@
# Ghana
-# From Paul Eggert (2018-01-30):
-# Whitman says DST was observed from 1931 to "the present";
-# Shanks & Pottenger say 1936 to 1942 with 20 minutes of DST,
-# with transitions on 09-01 and 12-31 at 00:00.
-# Page 33 of Parish GCB, Colonial Reports - Annual. No. 1066. Gold
-# Coast. Report for 1919. (March 1921), OCLC 784024077
-# http://libsysdigi.library.illinois.edu/ilharvest/africana/books2011-05/5530214/5530214_1919/5530214_1919_opt.pdf
-# lists the Determination of the Time Ordinance, 1919, No. 18,
-# "to advance the time observed locally by the space of twenty minutes
-# during the last four months of each year; the object in view being
-# to extend during those months the period of daylight-time available
-# for evening recreation after office hours."
-# Vanessa Ogle, The Global Transformation of Time, 1870-1950 (2015), p 33,
-# writes "In 1919, the Gold Coast (Ghana as of 1957) made Greenwich
-# time its legal time and simultaneously legalized a summer time of
-# UTC - 00:20 minutes from March to October."; a footnote lists
-# the ordinance as being dated 1919-11-24.
-# The Crown Colonist, Volume 12 (1942), p 176, says "the Government
-# intend advancing Gold Coast time half an hour ahead of G.M.T.
-# The actual date of the alteration has not yet been announced."
-# These sources are incomplete and contradictory. Possibly what is
-# now Ghana observed different DST regimes in different years. For
-# lack of better info, use Shanks except treat the minus sign as a
-# typo, and assume DST started in 1920 not 1936.
+# From P Chan (2020-11-20):
+# Interpretation Amendment Ordinance, 1915 (No.24 of 1915) [1915-11-02]
+# Ordinances of the Gold Coast, Ashanti, Northern Territories 1915, p 69-71
+# https://books.google.com/books?id=ErA-AQAAIAAJ&pg=PA70
+# This Ordinance added "'Time' shall mean Greenwich Mean Time" to the
+# Interpretation Ordinance, 1876.
+#
+# Determination of the Time Ordinance, 1919 (No. 18 of 1919) [1919-11-24]
+# Ordinances of the Gold Coast, Ashanti, Northern Territories 1919, p 75-76
+# https://books.google.com/books?id=MbA-AQAAIAAJ&pg=PA75
+# This Ordinance removed the previous definition of time and introduced DST.
+#
+# Time Determination Ordinance (Cap. 214)
+# The Laws of the Gold Coast (including Togoland Under British Mandate)
+# Vol. II (1937), p 2328
+# https://books.google.com/books?id=Z7M-AQAAIAAJ&pg=PA2328
+# Revised edition of the 1919 Ordinance.
+#
+# Time Determination (Amendment) Ordinance, 1940 (No. 9 of 1940) [1940-04-06]
+# Annual Volume of the Laws of the Gold Coast:
+# Containing All Legislation Enacted During Year 1940, p 22
+# https://books.google.com/books?id=1ao-AQAAIAAJ&pg=PA22
+# This Ordinance changed the forward transition from September to May.
+#
+# Defence (Time Determination Ordinance Amendment) Regulations, 1942
+# (Regulations No. 6 of 1942) [1942-01-31, commenced on 1942-02-08]
+# Annual Volume of the Laws of the Gold Coast:
+# Containing All Legislation Enacted During Year 1942, p 48
+# https://books.google.com/books?id=Das-AQAAIAAJ&pg=PA48
+# These regulations advanced the [standard] time by thirty minutes.
+#
+# Defence (Time Determination Ordinance Amendment (No.2)) Regulations,
+# 1942 (Regulations No. 28 of 1942) [1942-04-25]
+# Annual Volume of the Laws of the Gold Coast:
+# Containing All Legislation Enacted During Year 1942, p 87
+# https://books.google.com/books?id=Das-AQAAIAAJ&pg=PA87
+# These regulations abolished DST and changed the time to GMT+0:30.
+#
+# Defence (Revocation) (No.4) Regulations, 1945 (Regulations No. 45 of
+# 1945) [1945-10-24, commenced on 1946-01-06]
Home |
Main Index |
Thread Index |
Old Index