Source-Changes-HG archive

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

[src/netbsd-7-0]: src Pull up the following revisions, requested by kre in ti...



details:   https://anonhg.NetBSD.org/src/rev/5ce27359a04a
branches:  netbsd-7-0
changeset: 801468:5ce27359a04a
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Mar 25 14:11:39 2018 +0000

description:
Pull up the following revisions, requested by kre in tickt #1589:

        external/public-domain/tz/dist/ziguard.awk      up to 1.1.1.1
        external/public-domain/tz/dist/CONTRIBUTING     up to 1.1.1.5
        external/public-domain/tz/dist/Makefile         up to 1.1.1.20
        external/public-domain/tz/dist/NEWS             up to 1.1.1.21
        external/public-domain/tz/dist/README           up to 1.1.1.6
        external/public-domain/tz/dist/TZDATA_VERSION   up to 1.11
        external/public-domain/tz/dist/africa           up to 1.1.1.14
        external/public-domain/tz/dist/antarctica       up to 1.1.1.10
        external/public-domain/tz/dist/asia             up to 1.1.1.19
        external/public-domain/tz/dist/australasia      up to 1.1.1.14
        external/public-domain/tz/dist/backzone         up to 1.1.1.14
        external/public-domain/tz/dist/checktab.awk     up to 1.1.1.9
        external/public-domain/tz/dist/europe           up to 1.1.1.20
        external/public-domain/tz/dist/leap-seconds.list up to 1.1.1.9
        external/public-domain/tz/dist/leapseconds      up to 1.1.1.10
        external/public-domain/tz/dist/northamerica     up to 1.1.1.19
        external/public-domain/tz/dist/southamerica     up to 1.1.1.14
        external/public-domain/tz/dist/theory.html      up to 1.1.1.3
        external/public-domain/tz/dist/version          up to 1.1.1.8
        external/public-domain/tz/dist/zishrink.awk     up to 1.1.1.3
        external/public-domain/tz/dist/zone.tab         up to 1.1.1.14
        external/public-domain/tz/dist/zone1970.tab     up to 1.1.1.16


Update of /cvsroot/src/external/public-domain/tz/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv18468

Log Message:
Import tzdata2018d from ftp://ftp.iana.org/tz/releases/tzdata2018d.tar.gz

Summary of changes in tzdata2018d (2018-03-22 07:05:46 -0700):

        In 2018, Palestine starts DST on March 24 (today!), not March 31

        Casey Station in Antarctica changed from +11 to +08 on 2018-03-11
        at 04:00.

        Various adjustments to some historical conversions (several for
        Uruguay (1920 .. 1990), one fpr Enderbury and Kiritimati (1994/5),
        one for Portugal and colonies (1912) and Jamaica and Turks & Caicos
        (pre 1913)).

diffstat:

 doc/3RDPARTY                                     |     6 +-
 external/public-domain/tz/dist/CONTRIBUTING      |    12 +-
 external/public-domain/tz/dist/Makefile          |   310 ++-
 external/public-domain/tz/dist/NEWS              |   305 +++-
 external/public-domain/tz/dist/README            |     4 +-
 external/public-domain/tz/dist/TZDATA_VERSION    |     2 +-
 external/public-domain/tz/dist/africa            |    71 +-
 external/public-domain/tz/dist/antarctica        |     3 +-
 external/public-domain/tz/dist/asia              |   215 +-
 external/public-domain/tz/dist/australasia       |   120 +-
 external/public-domain/tz/dist/backzone          |    58 +-
 external/public-domain/tz/dist/checktab.awk      |     9 +
 external/public-domain/tz/dist/europe            |   171 +-
 external/public-domain/tz/dist/leap-seconds.list |    15 +-
 external/public-domain/tz/dist/leapseconds       |     4 +-
 external/public-domain/tz/dist/northamerica      |    41 +-
 external/public-domain/tz/dist/southamerica      |   447 +++-
 external/public-domain/tz/dist/theory.html       |  1753 ++++++++++++---------
 external/public-domain/tz/dist/version           |     2 +-
 external/public-domain/tz/dist/ziguard.awk       |    62 +
 external/public-domain/tz/dist/zishrink.awk      |     7 +-
 external/public-domain/tz/dist/zone.tab          |     4 +-
 external/public-domain/tz/dist/zone1970.tab      |     7 +-
 23 files changed, 2333 insertions(+), 1295 deletions(-)

diffs (truncated from 5511 to 300 lines):

diff -r 63156058ec52 -r 5ce27359a04a doc/3RDPARTY
--- a/doc/3RDPARTY      Wed Mar 21 11:11:29 2018 +0000
+++ b/doc/3RDPARTY      Sun Mar 25 14:11:39 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: 3RDPARTY,v 1.1145.2.18.2.25 2017/11/05 20:44:40 snj Exp $
+#      $NetBSD: 3RDPARTY,v 1.1145.2.18.2.26 2018/03/25 14:11:39 martin Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1300,8 +1300,8 @@
 Added changes from a5 -> a12 manually.
 
 Package:       tz
-Version:       tzcode2014j (+ upgraded zic) / tzdata2017c
-Current Vers:  tzcode2017c / tzdata2017c
+Version:       tzcode2014j (+ upgraded zic) / tzdata2017d
+Current Vers:  tzcode2017d / tzdata2017d
 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 63156058ec52 -r 5ce27359a04a external/public-domain/tz/dist/CONTRIBUTING
--- a/external/public-domain/tz/dist/CONTRIBUTING       Wed Mar 21 11:11:29 2018 +0000
+++ b/external/public-domain/tz/dist/CONTRIBUTING       Sun Mar 25 14:11:39 2018 +0000
@@ -25,7 +25,8 @@
 
 Please submit changes against either the latest release in
 <https://www.iana.org/time-zones> or the master branch of the development
-repository.  If you use Git the following workflow may be helpful:
+repository.  The latter is preferred.  If you use Git the following
+workflow may be helpful:
 
   * Copy the development repository.
 
@@ -42,6 +43,12 @@
 
       git checkout -b mybranch
 
+  * Sleuth by using 'git blame'.  For example, when fixing data for
+    Africa/Sao_Tome, if the command 'git blame africa' outputs a line
+    '2951fa3b (Paul Eggert 2018-01-08 09:03:13 -0800 1068) Zone
+    Africa/Sao_Tome 0:26:56 - LMT 1884', commit 2951fa3b should
+    provide some justification for the 'Zone Africa/Sao_Tome' line.
+
   * Edit source files.  Include commentary that justifies the
     changes by citing reliable sources.
 
@@ -67,6 +74,9 @@
 
       git send-email master
 
+    For an archived example of such an email, see
+    <https://mm.icann.org/pipermail/tz/2018-February/026122.html>.
+
   * Start anew by getting current with the master branch again
     (the second step above).
 
diff -r 63156058ec52 -r 5ce27359a04a external/public-domain/tz/dist/Makefile
--- a/external/public-domain/tz/dist/Makefile   Wed Mar 21 11:11:29 2018 +0000
+++ b/external/public-domain/tz/dist/Makefile   Sun Mar 25 14:11:39 2018 +0000
@@ -10,6 +10,15 @@
 # Email address for bug reports.
 BUGEMAIL=      tz%iana.org@localhost
 
+# Choose source data features.  To get new features right away, use:
+#      DATAFORM=       vanguard
+# To wait a while before using new features, to give downstream users
+# time to upgrade zic (the default), use:
+#      DATAFORM=       main
+# To wait even longer for new features, use:
+#      DATAFORM=       rearguard
+DATAFORM=              main
+
 # 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
@@ -25,10 +34,10 @@
 # for handling POSIX-style time zone environment variables,
 # change the line below (after finding the zone you want in the
 # time zone files, or adding it to a time zone file).
-# (When a POSIX-style environment variable is handled, the rules in the
+# When a POSIX-style environment variable is handled, the rules in the
 # template file are used to determine "spring forward" and "fall back" days and
 # times; the environment variable itself specifies UT offsets of standard and
-# summer time.)
+# daylight saving time.
 # Alternately, if you discover you've got the wrong time zone, you can just
 #      zic -p rightzone
 # to correct things.
@@ -42,36 +51,63 @@
 # Also see TZDEFRULESTRING below, which takes effect only
 # if the time zone files cannot be accessed.
 
-# Everything gets put in subdirectories of. . .
+
+# Installation locations.
+#
+# The defaults are suitable for Debian, except that if REDO is
+# posix_right or right_posix then files that Debian puts under
+# /usr/share/zoneinfo/posix and /usr/share/zoneinfo/right are instead
+# put under /usr/share/zoneinfo-posix and /usr/share/zoneinfo-leaps,
+# respectively.  Problems with the Debian approach are discussed in
+# the commentary for the right_posix rule (below).
 
-TOPDIR=                /usr/local
+# Destination directory, which can be used for staging.
+# 'make DESTDIR=/stage install' installs under /stage (e.g., to
+# /stage/etc/localtime instead of to /etc/localtime).  Files under
+# /stage are not intended to work as-is, but can be copied by hand to
+# the root directory later.  If DESTDIR is empty, 'make install' does
+# not stage, but installs directly into production locations.
+DESTDIR =
+
+# Everything is installed into subdirectories of TOPDIR, and used there.
+# TOPDIR should be empty (meaning the root directory),
+# or a directory name that does not end in "/".
+# TOPDIR should be empty or an absolute name unless you're just testing.
+TOPDIR =
+
+# The default local time zone is taken from the file TZDEFAULT.
+TZDEFAULT = $(TOPDIR)/etc/localtime
+
+# The subdirectory containing installed program and data files, and
+# likewise for installed files that can be shared among architectures.
+# These should be relative file names.
+USRDIR = usr
+USRSHAREDIR = $(USRDIR)/share
 
 # "Compiled" time zone information is placed in the "TZDIR" directory
 # (and subdirectories).
-# Use an absolute path name for TZDIR unless you're just testing the software.
 # TZDIR_BASENAME should not contain "/" and should not be ".", ".." or empty.
+TZDIR_BASENAME=        zoneinfo
+TZDIR = $(TOPDIR)/$(USRSHAREDIR)/$(TZDIR_BASENAME)
+
+# The "tzselect" and (if you do "make INSTALL") "date" commands go in:
+BINDIR = $(TOPDIR)/$(USRDIR)/bin
+
+# The "zdump" command goes in:
+ZDUMPDIR = $(BINDIR)
 
-TZDIR_BASENAME=        zoneinfo
-TZDIR=         $(TOPDIR)/etc/$(TZDIR_BASENAME)
+# The "zic" command goes in:
+ZICDIR = $(TOPDIR)/$(USRDIR)/sbin
+
+# Manual pages go in subdirectories of. . .
+MANDIR = $(TOPDIR)/$(USRSHAREDIR)/man
+
+# Library functions are put in an archive in LIBDIR.
+LIBDIR = $(TOPDIR)/$(USRDIR)/lib
+
 
 # Types to try, as an alternative to time_t.  int64_t should be first.
-TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t
-
-# The "tzselect", "zic", and "zdump" commands get installed in. . .
-
-ETCDIR=                $(TOPDIR)/etc
-
-# If you "make INSTALL", the "date" command gets installed in. . .
-
-BINDIR=                $(TOPDIR)/bin
-
-# Manual pages go in subdirectories of. . .
-
-MANDIR=                $(TOPDIR)/man
-
-# Library functions are put in an archive in LIBDIR.
-
-LIBDIR=                $(TOPDIR)/lib
+TIME_T_ALTERNATIVES = int64_t int32_t uint32_t uint64_t
 
 # If you want only POSIX time, with time values interpreted as
 # seconds since the epoch (not counting leap seconds), use
@@ -105,11 +141,14 @@
 TZDATA_TEXT=   leapseconds tzdata.zi
 
 # For backward-compatibility links for old zone names, use
+#      BACKWARD=       backward
+# If you also want the link US/Pacific-New, even though it is confusing
+# and is planned to be removed from the database eventually, use
 #      BACKWARD=       backward pacificnew
 # To omit these links, use
 #      BACKWARD=
 
-BACKWARD=      backward pacificnew
+BACKWARD=      backward
 
 # If you want out-of-scope and often-wrong data from the file 'backzone', use
 #      PACKRATDATA=    backzone
@@ -159,13 +198,18 @@
 #  -DHAVE_STDINT_H if you have a non-C99 compiler with <stdint.h>
 #  -DHAVE_STRFTIME_L if <time.h> declares locale_t and strftime_l
 #  -DHAVE_STRDUP=0 if your system lacks the strdup function
+#  -DHAVE_STRTOLL=0 if your system lacks the strtoll function
 #  -DHAVE_SYMLINK=0 if your system lacks the symlink function
 #  -DHAVE_SYS_STAT_H=0 if your compiler lacks a <sys/stat.h>
 #  -DHAVE_SYS_WAIT_H=0 if your compiler lacks a <sys/wait.h>
 #  -DHAVE_TZSET=0 if your system lacks a tzset function
 #  -DHAVE_UNISTD_H=0 if your compiler lacks a <unistd.h>
 #  -Dlocale_t=XXX if your system uses XXX instead of locale_t
+#  -DRESERVE_STD_EXT_IDS if your platform reserves standard identifiers
+#      with external linkage, e.g., applications cannot define 'localtime'.
 #  -Dssize_t=long on hosts like MS-Windows that lack ssize_t
+#  -DSUPPRESS_TZDIR to not prepend TZDIR to file names; this has
+#      security implications and is not recommended for general use
 #  -DTHREAD_SAFE to make localtime.c thread-safe, as POSIX requires;
 #      not needed by the main-program tz code, which is single-threaded.
 #      Append other compiler flags as needed, e.g., -pthread on GNU/Linux.
@@ -313,7 +357,7 @@
 
 # How to use zic to install tz binary files.
 
-ZIC_INSTALL=   $(ZIC) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS)
+ZIC_INSTALL=   $(ZIC) -d '$(DESTDIR)$(TZDIR)' $(LEAPSECONDS)
 
 # The name of a Posix-compliant 'awk' on your system.
 AWK=           awk
@@ -341,8 +385,8 @@
 VALIDATE = nsgmls
 VALIDATE_FLAGS = -s -B -wall -wno-unused-param
 VALIDATE_ENV = \
-  SGML_CATALOG_FILES=$(SGML_CATALOG_FILES) \
-  SGML_SEARCH_PATH=$(SGML_SEARCH_PATH) \
+  SGML_CATALOG_FILES='$(SGML_CATALOG_FILES)' \
+  SGML_SEARCH_PATH='$(SGML_SEARCH_PATH)' \
   SP_CHARSET_FIXED=YES \
   SP_ENCODING=UTF-8
 
@@ -364,13 +408,19 @@
 SAFE_CHARSET=  $(SAFE_CHARSET1)$(SAFE_CHARSET2)$(SAFE_CHARSET3)
 SAFE_CHAR=     '[]'$(SAFE_CHARSET)'-]'
 
+# Non-ASCII non-letters that OK_CHAR allows, as these characters are
+# useful in commentary.  XEmacs 21.5.34 displays them correctly,
+# presumably because they are Latin-1.
+UNUSUAL_OK_CHARSET= °±½¾�
+
 # OK_CHAR matches any character allowed in the distributed files.
-# This is the same as SAFE_CHAR, except that multibyte letters are
-# also allowed so that commentary can contain people's names and quote
-# non-English sources.  For non-letters the sources are limited to
-# ASCII renderings for the convenience of maintainers whose text editors
-# mishandle UTF-8 by default (e.g., XEmacs 21.4.22).
-OK_CHAR=       '[][:alpha:]'$(SAFE_CHARSET)'-]'
+# This is the same as SAFE_CHAR, except that UNUSUAL_OK_CHARSET and
+# multibyte letters are also allowed so that commentary can contain a
+# few safe symbols and people's names and can quote non-English sources.
+# Other non-letters are limited to ASCII renderings for the
+# convenience of maintainers using XEmacs 21.5.34, which by default
+# mishandles Unicode characters U+0100 and greater.
+OK_CHAR=       '[][:alpha:]$(UNUSUAL_OK_CHARSET)'$(SAFE_CHARSET)'-]'
 
 # SAFE_LINE matches a line of safe characters.
 # SAFE_SHARP_LINE is similar, except any OK character can follow '#';
@@ -396,7 +446,7 @@
 #MAKE=         make
 
 cc=            cc
-CC=            $(cc) -DTZDIR=\"$(TZDIR)\"
+CC=            $(cc) -DTZDIR='"$(TZDIR)"'
 
 AR=            ar
 
@@ -421,20 +471,23 @@
                        date.1.txt
 COMMON=                calendars CONTRIBUTING LICENSE Makefile \
                        NEWS README theory.html version
-WEB_PAGES=     tz-art.htm tz-how-to.html tz-link.htm
+WEB_PAGES=     tz-art.html tz-how-to.html tz-link.html
 DOCS=          $(MANS) date.1 $(MANTXTS) $(WEB_PAGES)
 PRIMARY_YDATA= africa antarctica asia australasia \
                europe northamerica southamerica
-YDATA=         $(PRIMARY_YDATA) etcetera $(BACKWARD)
+YDATA=         $(PRIMARY_YDATA) etcetera
 NDATA=         systemv factory
-TDATA=         $(YDATA) $(NDATA)
+TDATA_TO_CHECK=        $(YDATA) $(NDATA) backward pacificnew
+TDATA=         $(YDATA) $(NDATA) $(BACKWARD)
 ZONETABLES=    zone1970.tab zone.tab
 TABDATA=       iso3166.tab $(TZDATA_TEXT) $(ZONETABLES)
 LEAP_DEPS=     leapseconds.awk leap-seconds.list
-TZDATA_ZI_DEPS=        zishrink.awk $(TDATA) $(PACKRATDATA)
-DATA=          $(YDATA) $(NDATA) backzone iso3166.tab leap-seconds.list \
+TZDATA_ZI_DEPS=        ziguard.awk zishrink.awk version $(TDATA) $(PACKRATDATA)
+DSTDATA_ZI_DEPS= ziguard.awk $(TDATA) $(PACKRATDATA)
+DATA=          $(TDATA_TO_CHECK) backzone iso3166.tab leap-seconds.list \
                        leapseconds yearistype.sh $(ZONETABLES)
-AWK_SCRIPTS=   checklinks.awk checktab.awk leapseconds.awk zishrink.awk
+AWK_SCRIPTS=   checklinks.awk checktab.awk leapseconds.awk \
+                       ziguard.awk zishrink.awk
 MISC=          $(AWK_SCRIPTS) zoneinfo2tdf.pl
 TZS_YEAR=      2050
 TZS=           to$(TZS_YEAR).tzs
@@ -457,7 +510,7 @@
                newctime.3 newstrftime.3 newtzset.3 northamerica \
                pacificnew private.h \
                southamerica strftime.c systemv theory.html \
-               time2posix.3 tz-art.htm tz-how-to.html tz-link.htm \
+               time2posix.3 tz-art.html tz-how-to.html tz-link.html \



Home | Main Index | Thread Index | Old Index