Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-8]: src Catch up to current for the following, requested by kre i...



details:   https://anonhg.NetBSD.org/src/rev/d4267dde6bf3
branches:  netbsd-8
changeset: 434967:d4267dde6bf3
user:      martin <martin%NetBSD.org@localhost>
date:      Sun May 06 09:42:38 2018 +0000

description:
Catch up to current for the following, requested by kre in ticket #809:

        external/public-domain/tz/dist/Makefile         up to 1.1.1.21
        external/public-domain/tz/dist/NEWS             up to 1.1.1.22
        external/public-domain/tz/dist/TZDATA_VERSION   up to 1.12
        external/public-domain/tz/dist/africa           up to 1.1.1.15
        external/public-domain/tz/dist/asia             up to 1.1.1.20
        external/public-domain/tz/dist/australasia      up to 1.1.1.15
        external/public-domain/tz/dist/europe           up to 1.1.1.21
        external/public-domain/tz/dist/theory.html      up to 1.1.1.4
        external/public-domain/tz/dist/version          up to 1.1.1.9
        external/public-domain/tz/dist/ziguard.awk      up to 1.1.1.2
        doc/3RDPARTY                                    1.1520 (patch)

tzdata updated to 2018e.

diffstat:

 doc/3RDPARTY                                  |    6 +-
 external/public-domain/tz/dist/Makefile       |   57 +++++++++---
 external/public-domain/tz/dist/NEWS           |   66 ++++++++++++++-
 external/public-domain/tz/dist/TZDATA_VERSION |    2 +-
 external/public-domain/tz/dist/africa         |   43 +++++++-
 external/public-domain/tz/dist/asia           |   18 +++-
 external/public-domain/tz/dist/australasia    |    9 ++
 external/public-domain/tz/dist/europe         |   46 ++++++---
 external/public-domain/tz/dist/theory.html    |  117 ++++++++++++++-----------
 external/public-domain/tz/dist/version        |    2 +-
 external/public-domain/tz/dist/ziguard.awk    |   58 ++++++++++--
 11 files changed, 317 insertions(+), 107 deletions(-)

diffs (truncated from 868 to 300 lines):

diff -r 0a60b75b92a9 -r d4267dde6bf3 doc/3RDPARTY
--- a/doc/3RDPARTY      Sun May 06 09:35:33 2018 +0000
+++ b/doc/3RDPARTY      Sun May 06 09:42:38 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: 3RDPARTY,v 1.1444.2.10 2018/04/12 01:38:42 msaitoh Exp $
+#      $NetBSD: 3RDPARTY,v 1.1444.2.11 2018/05/06 09:42:38 martin Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1411,8 +1411,8 @@
 Added changes from a5 -> a12 manually.
 
 Package:       tz
-Version:       tzcode2017b / tzdata2018d
-Current Vers:  tzcode2018d / tzdata2018d
+Version:       tzcode2017b / tzdata2018e
+Current Vers:  tzcode2018d / tzdata2018e
 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 0a60b75b92a9 -r d4267dde6bf3 external/public-domain/tz/dist/Makefile
--- a/external/public-domain/tz/dist/Makefile   Sun May 06 09:35:33 2018 +0000
+++ b/external/public-domain/tz/dist/Makefile   Sun May 06 09:42:38 2018 +0000
@@ -21,7 +21,7 @@
 
 # Change the line below for your time zone (after finding the zone you want in
 # the time zone files, or adding it to a time zone file).
-# Alternately, if you discover you've got the wrong time zone, you can just
+# Alternatively, if you discover you've got the wrong time zone, you can just
 #      zic -l rightzone
 # to correct things.
 # Use the command
@@ -38,7 +38,7 @@
 # template file are used to determine "spring forward" and "fall back" days and
 # times; the environment variable itself specifies UT offsets of standard and
 # daylight saving time.
-# Alternately, if you discover you've got the wrong time zone, you can just
+# Alternatively, if you discover you've got the wrong time zone, you can just
 #      zic -p rightzone
 # to correct things.
 # Use the command
@@ -236,14 +236,16 @@
   $(GCC_INSTRUMENT) \
   -Wall -Wextra \
   -Walloc-size-larger-than=100000 -Warray-bounds=2 \
-  -Wbad-function-cast -Wcast-align -Wdate-time \
+  -Wbad-function-cast -Wcast-align=strict -Wdate-time \
   -Wdeclaration-after-statement -Wdouble-promotion \
   -Wformat=2 -Wformat-overflow=2 -Wformat-signedness -Wformat-truncation \
   -Winit-self -Wjump-misses-init -Wlogical-op \
   -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
   -Wold-style-definition -Woverlength-strings -Wpointer-arith \
-  -Wshadow -Wshift-overflow=2 -Wstrict-prototypes -Wstringop-overflow=5 \
+  -Wshadow -Wshift-overflow=2 -Wstrict-prototypes -Wstringop-overflow=4 \
+  -Wstringop-truncation -Wsuggest-attribute=cold \
   -Wsuggest-attribute=const -Wsuggest-attribute=format \
+  -Wsuggest-attribute=malloc \
   -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure \
   -Wtrampolines -Wundef -Wuninitialized -Wunused \
   -Wvariadic-macros -Wvla -Wwrite-strings \
@@ -514,6 +516,7 @@
                tzfile.5 tzfile.h tzselect.8 tzselect.ksh \
                workman.sh yearistype.sh \
                zdump.8 zdump.c zic.8 zic.c \
+               ziguard.awk zishrink.awk \
                zone.tab zone1970.tab zoneinfo2tdf.pl
 
 # And for the benefit of csh users on systems that assume the user
@@ -559,8 +562,8 @@
 
 # These files can be tailored by setting BACKWARD, PACKRATDATA, etc.
 vanguard.zi main.zi rearguard.zi: $(DSTDATA_ZI_DEPS)
-               $(AWK) -v outfile='$@' -f ziguard.awk $(TDATA) $(PACKRATDATA) \
-                 >$@.out
+               $(AWK) -v DATAFORM=`expr $@ : '\(.*\).zi'` -f ziguard.awk \
+                 $(TDATA) $(PACKRATDATA) >$@.out
                mv $@.out $@
 tzdata.zi:     $(DATAFORM).zi version
                version=`sed 1q version` && \
@@ -900,6 +903,13 @@
                done
                rm -fr time_t.dir
 
+TRADITIONAL_ASC = \
+  tzcode$(VERSION).tar.gz.asc \
+  tzdata$(VERSION).tar.gz.asc
+ALL_ASC = $(TRADITIONAL_ASC) \
+  tzdata$(VERSION)-rearguard.tar.gz.asc \
+  tzdb-$(VERSION).tar.lz.asc
+
 tarballs traditional_tarballs signatures traditional_signatures: version
                VERSION=`cat version` && \
                $(MAKE) VERSION="$$VERSION" $@_version
@@ -907,12 +917,13 @@
 # These *_version rules are intended for use if VERSION is set by some
 # other means.  Ordinarily these rules are used only by the above
 # non-_version rules, which set VERSION on the 'make' command line.
-tarballs_version: traditional_tarballs_version tzdb-$(VERSION).tar.lz
+tarballs_version: traditional_tarballs_version \
+  tzdata$(VERSION)-rearguard.tar.gz \
+  tzdb-$(VERSION).tar.lz
 traditional_tarballs_version: \
   tzcode$(VERSION).tar.gz tzdata$(VERSION).tar.gz
-signatures_version: traditional_signatures_version tzdb-$(VERSION).tar.lz.asc
-traditional_signatures_version: \
-  tzcode$(VERSION).tar.gz.asc tzdata$(VERSION).tar.gz.asc \
+signatures_version: $(ALL_ASC)
+traditional_signatures_version: $(TRADITIONAL_ASC)
 
 tzcode$(VERSION).tar.gz: set-timestamps.out
                LC_ALL=C && export LC_ALL && \
@@ -927,6 +938,26 @@
                  gzip $(GZIPFLAGS) >$@.out
                mv $@.out $@
 
+tzdata$(VERSION)-rearguard.tar.gz: rearguard.zi set-timestamps.out
+               rm -fr tzdata$(VERSION)-rearguard.dir
+               mkdir tzdata$(VERSION)-rearguard.dir
+               ln $(COMMON) $(DATA) $(MISC) tzdata$(VERSION)-rearguard.dir
+               cd tzdata$(VERSION)-rearguard.dir && \
+                 rm -f $(TDATA) $(PACKRATDATA) version
+               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; \
+               done
+               sed '1s/$$/-rearguard/' \
+                 <version >tzdata$(VERSION)-rearguard.dir/version
+               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) | \
+                    gzip $(GZIPFLAGS)) >$@.out
+               mv $@.out $@
+
 tzdb-$(VERSION).tar.lz: set-timestamps.out
                rm -fr tzdb-$(VERSION)
                mkdir tzdb-$(VERSION)
@@ -937,12 +968,10 @@
                mv $@.out $@
 
 tzcode$(VERSION).tar.gz.asc: tzcode$(VERSION).tar.gz
-               gpg --armor --detach-sign $?
-
 tzdata$(VERSION).tar.gz.asc: tzdata$(VERSION).tar.gz
-               gpg --armor --detach-sign $?
-
+tzdata$(VERSION)-rearguard.tar.gz.asc: tzdata$(VERSION)-rearguard.tar.gz
 tzdb-$(VERSION).tar.lz.asc: tzdb-$(VERSION).tar.lz
+$(ALL_ASC):
                gpg --armor --detach-sign $?
 
 typecheck:
diff -r 0a60b75b92a9 -r d4267dde6bf3 external/public-domain/tz/dist/NEWS
--- a/external/public-domain/tz/dist/NEWS       Sun May 06 09:35:33 2018 +0000
+++ b/external/public-domain/tz/dist/NEWS       Sun May 06 09:42:38 2018 +0000
@@ -1,5 +1,69 @@
 News for the tz database
 
+Release 2018e - 2018-05-01 23:42:51 -0700
+
+  Briefly:
+
+    North Korea switches back to +09 on 2018-05-05.
+    The main format uses negative DST again, for Ireland etc.
+    'make tarballs' now also builds a rearguard tarball.
+    New 's' and 'd' suffixes in SAVE columns of Rule and Zone lines.
+
+  Changes to past and future time stamps
+
+    North Korea switches back from +0830 to +09 on 2018-05-05.
+    (Thanks to Kang Seonghoon, Arthur David Olson, Seo Sanghyeon,
+    and Tim Parenti.)
+
+    Bring back the negative-DST changes of 2018a, except be more
+    compatible with data parsers that do not support negative DST.
+    Also, this now affects historical time stamps in Namibia and the
+    former Czechoslovakia, not just Ireland.  The main format now uses
+    negative DST to model time stamps in Europe/Dublin (from 1971 on),
+    Europe/Prague (1946/7), and Africa/Windhoek (1994/2017).  This
+    does not affect UT offsets, only time zone abbreviations and the
+    tm_isdst flag.  Also, this does not affect rearguard or vanguard
+    formats; effectively the main format now uses vanguard instead of
+    rearguard format.  Data parsers that do not support negative DST
+    can still use data from the rearguard tarball described below.
+
+  Changes to build procedure
+
+    The command 'make tarballs' now also builds the tarball
+    tzdataVERSION-rearguard.tar.gz, which is like tzdataVERSION.tar.gz
+    except that it uses rearguard format intended for trailing-edge
+    data parsers.
+
+  Changes to data format and to code
+
+    The SAVE column of Rule and Zone lines can now have an 's' or 'd'
+    suffix, which specifies whether the adjusted time is standard time
+    or daylight saving time.  If no suffix is given, daylight saving
+    time is used if and only if the SAVE column is nonzero; this is
+    the longstanding behavior.  Although this new feature is not used
+    in tzdata, it could be used to specify the legal time in Namibia
+    1994-2017, as opposed to the popular time (see below).
+
+  Changes to past time stamps
+
+    From 1994 through 2017 Namibia observed DST in winter, not summer.
+    That is, it used negative DST, as Ireland still does.  This change
+    does not affect UTC offsets; it affects only the tm_isdst flag and
+    the abbreviation used during summer, which is now CAT, not WAST.
+    Although (as noted by Michael Deckers) summer and winter time were
+    both simply called "standard time" in Namibian law, in common
+    practice winter time was considered to be DST (as noted by Stephen
+    Colebourne).  The full effect of this change is only in vanguard
+    format; in rearguard and main format, the tm_isdst flag is still
+    zero in winter and nonzero in summer.
+
+    In 1946/7 Czechoslovakia also observed negative DST in winter.
+    The full effect of this change is only in vanguard format; in
+    rearguard and main formats, it is modeled as plain GMT without
+    daylight saving.  Also, the dates of some 1944/5 DST transitions
+    in Czechoslovakia have been changed.
+
+
 Release 2018d - 2018-03-22 07:05:46 -0700
 
   Briefly:
@@ -39,7 +103,7 @@
     Enderbury and Kiritimati skipped New Year's Eve 1994, not
     New Year's Day 1995.  (Thanks to Kerry Shetline.)
 
-    Fix the 1912-01-01 transition for Portugual and its colonies.
+    Fix the 1912-01-01 transition for Portugal and its colonies.
     This transition was at 00:00 according to the new UT offset, not
     according to the old one.  Also assume that Cape Verde switched on
     the same date as the rest, not in 1907.  This affects
diff -r 0a60b75b92a9 -r d4267dde6bf3 external/public-domain/tz/dist/TZDATA_VERSION
--- a/external/public-domain/tz/dist/TZDATA_VERSION     Sun May 06 09:35:33 2018 +0000
+++ b/external/public-domain/tz/dist/TZDATA_VERSION     Sun May 06 09:42:38 2018 +0000
@@ -1,1 +1,1 @@
-tzdata-2018d
+tzdata-2018e
diff -r 0a60b75b92a9 -r d4267dde6bf3 external/public-domain/tz/dist/africa
--- a/external/public-domain/tz/dist/africa     Sun May 06 09:35:33 2018 +0000
+++ b/external/public-domain/tz/dist/africa     Sun May 06 09:42:38 2018 +0000
@@ -6,7 +6,7 @@
 # tz%iana.org@localhost for general use in the future).  For more, please see
 # the file CONTRIBUTING in the tz distribution.
 
-# From Paul Eggert (2017-02-20):
+# From Paul Eggert (2017-04-09):
 #
 # Unless otherwise specified, the source for data through 1990 is:
 # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
@@ -52,7 +52,7 @@
 # cannot now come up with solid citations.
 #
 # I invented the following abbreviations; corrections are welcome!
-#       +02    WAST    West Africa Summer Time
+#       +02    WAST    West Africa Summer Time (no longer used)
 #       +03    CAST    Central Africa Summer Time (no longer used)
 #       +03    SAST    South Africa Summer Time (no longer used)
 #       +03    EAT     East Africa Time
@@ -967,6 +967,10 @@
 # commence at OOhOO on Monday 21 March 1994 and shall end at 02h00 on
 # Sunday 4 September 1994.
 
+# From Michael Deckers (2017-04-06):
+# ... both summer and winter time are called "standard"
+# (which differs from the use in Ireland) ...
+
 # From Petronella Sibeene (2007-03-30):
 # http://allafrica.com/stories/200703300178.html
 # While the entire country changes its time, Katima Mulilo and other
@@ -992,19 +996,42 @@
 # the same time they would normally start DST, the first Sunday in September:
 # https://www.timeanddate.com/news/time/namibia-new-time-zone.html
 
+# From Paul Eggert (2017-04-09):
+# Before the change, summer and winter time were both standard time legally.
+# However in common parlance, winter time was considered to be DST.  See, e.g.:
+# http://www.nbc.na/news/namibias-winter-time-could-be-scrapped.2706
+# https://zone.my.na/news/times-are-changing-in-namibia
+# https://www.newera.com.na/2017/02/23/namibias-winter-time-might-be-repealed/
+# Use plain "WAT" and "CAT" for the time zone abbreviations, to be compatible
+# with Namibia's neighbors.
+
 # RULE NAME    FROM    TO      TYPE    IN      ON      AT      SAVE    LETTER/S
-Rule   Namibia 1994    only    -       Mar     21      0:00    0       -
-Rule   Namibia 1994    2016    -       Sep     Sun>=1  2:00    1:00    S
-Rule   Namibia 1995    2017    -       Apr     Sun>=1  2:00    0       -
+# Vanguard section, for zic and other parsers that support negative DST.
+Rule   Namibia 1994    only    -       Mar     21      0:00    -1:00   WAT
+Rule   Namibia 1994    2017    -       Sep     Sun>=1  2:00    0       CAT
+Rule   Namibia 1995    2017    -       Apr     Sun>=1  2:00    -1:00   WAT
+# Rearguard section, for parsers that do not support negative DST.
+#Rule  Namibia 1994    only    -       Mar     21      0:00    0       WAT
+#Rule  Namibia 1994    2017    -       Sep     Sun>=1  2:00    1:00    CAT
+#Rule  Namibia 1995    2017    -       Apr     Sun>=1  2:00    0       WAT
+# End of rearguard section.
+



Home | Main Index | Thread Index | Old Index