Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-8]: src Pull up the following, requested by kre in ticket #1631:
details: https://anonhg.NetBSD.org/src/rev/74d80fe720d4
branches: netbsd-8
changeset: 946752:74d80fe720d4
user: martin <martin%NetBSD.org@localhost>
date: Mon Dec 07 19:52:52 2020 +0000
description:
Pull up the following, requested by kre in ticket #1631:
external/public-domain/tz/dist/systemv delete
external/public-domain/tz/dist/pacificnew delete
external/public-domain/tz/dist/yearistype.sh delete
external/public-domain/tz/dist/Makefile up to 1.1.1.29
external/public-domain/tz/dist/NEWS up to 1.1.1.32
external/public-domain/tz/dist/README up to 1.1.1.9
external/public-domain/tz/dist/TZDATA_VERSION up to 1.22
external/public-domain/tz/dist/africa up to 1.1.1.23
external/public-domain/tz/dist/antarctica up to 1.1.1.13
external/public-domain/tz/dist/asia up to 1.1.1.27
external/public-domain/tz/dist/australasia up to 1.1.1.20
external/public-domain/tz/dist/backward up to 1.1.1.11
external/public-domain/tz/dist/backzone up to 1.1.1.19
external/public-domain/tz/dist/checktab.awk up to 1.1.1.10
external/public-domain/tz/dist/etcetera up to 1.1.1.4
external/public-domain/tz/dist/europe up to 1.1.1.29
external/public-domain/tz/dist/factory up to 1.1.1.4
external/public-domain/tz/dist/iso3166.tab up to 1.1.1.6
external/public-domain/tz/dist/leap-seconds.list up to 1.1.1.14
external/public-domain/tz/dist/leapseconds up to 1.1.1.16
external/public-domain/tz/dist/leapseconds.awk up to 1.1.1.11
external/public-domain/tz/dist/northamerica up to 1.1.1.26
external/public-domain/tz/dist/southamerica up to 1.1.1.17
external/public-domain/tz/dist/theory.html up to 1.1.1.11
external/public-domain/tz/dist/version up to 1.1.1.19
external/public-domain/tz/dist/ziguard.awk up to 1.1.1.5
external/public-domain/tz/dist/zishrink.awk up to 1.1.1.7
external/public-domain/tz/dist/zone.tab up to 1.1.1.18
external/public-domain/tz/dist/zone1970.tab up to 1.1.1.20
external/public-domain/tz/dist/zoneinfo2tdf.pl up to 1.1.1.4
distrib/sets/lists/base/mi (apply patch)
doc/3RDPARTY (apply patch)
external/public-domain/tz/share/zoneinfo/Makefile (apply patch)
Update tzdate from 2018i to 2020d
diffstat:
distrib/sets/lists/base/mi | 5 +-
doc/3RDPARTY | 6 +-
external/public-domain/tz/dist/Makefile | 179 +++---
external/public-domain/tz/dist/NEWS | 421 +++++++++++++++-
external/public-domain/tz/dist/README | 6 +-
external/public-domain/tz/dist/TZDATA_VERSION | 2 +-
external/public-domain/tz/dist/africa | 244 +++++++--
external/public-domain/tz/dist/antarctica | 41 +-
external/public-domain/tz/dist/asia | 586 ++++++++++++++-------
external/public-domain/tz/dist/australasia | 206 +++++--
external/public-domain/tz/dist/backward | 4 +-
external/public-domain/tz/dist/backzone | 102 +++-
external/public-domain/tz/dist/checktab.awk | 9 +-
external/public-domain/tz/dist/etcetera | 1 -
external/public-domain/tz/dist/europe | 563 ++++++++++++++-------
external/public-domain/tz/dist/factory | 2 +-
external/public-domain/tz/dist/iso3166.tab | 8 +-
external/public-domain/tz/dist/leap-seconds.list | 10 +-
external/public-domain/tz/dist/leapseconds | 47 +-
external/public-domain/tz/dist/leapseconds.awk | 208 ++++++-
external/public-domain/tz/dist/northamerica | 436 ++++++++++-----
external/public-domain/tz/dist/pacificnew | 29 -
external/public-domain/tz/dist/southamerica | 97 +-
external/public-domain/tz/dist/systemv | 39 -
external/public-domain/tz/dist/theory.html | 270 +++++++---
external/public-domain/tz/dist/version | 2 +-
external/public-domain/tz/dist/yearistype.sh | 39 -
external/public-domain/tz/dist/ziguard.awk | 9 +-
external/public-domain/tz/dist/zishrink.awk | 48 +-
external/public-domain/tz/dist/zone.tab | 15 +-
external/public-domain/tz/dist/zone1970.tab | 13 +-
external/public-domain/tz/dist/zoneinfo2tdf.pl | 4 +-
external/public-domain/tz/share/zoneinfo/Makefile | 6 +-
33 files changed, 2523 insertions(+), 1134 deletions(-)
diffs (truncated from 7496 to 300 lines):
diff -r cf7b1db9f47a -r 74d80fe720d4 distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi Mon Dec 07 19:39:09 2020 +0000
+++ b/distrib/sets/lists/base/mi Mon Dec 07 19:52:52 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1158.2.6 2019/01/02 15:48:00 martin Exp $
+# $NetBSD: mi,v 1.1158.2.7 2020/12/07 19:52:52 martin Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -5426,6 +5426,7 @@
./usr/share/zoneinfo/America/North_Dakota/Beulah base-sys-share share
./usr/share/zoneinfo/America/North_Dakota/Center base-sys-share share
./usr/share/zoneinfo/America/North_Dakota/New_Salem base-sys-share share
+./usr/share/zoneinfo/America/Nuuk base-sys-share share
./usr/share/zoneinfo/America/Ojinaga base-sys-share share
./usr/share/zoneinfo/America/Panama base-sys-share share
./usr/share/zoneinfo/America/Pangnirtung base-sys-share share
@@ -5918,7 +5919,7 @@
./usr/share/zoneinfo/US/Michigan base-sys-share share
./usr/share/zoneinfo/US/Mountain base-sys-share share
./usr/share/zoneinfo/US/Pacific base-sys-share share
-./usr/share/zoneinfo/US/Pacific-New base-sys-share share
+./usr/share/zoneinfo/US/Pacific-New base-obsolete obsolete
./usr/share/zoneinfo/US/Samoa base-sys-share share
./usr/share/zoneinfo/UTC base-sys-share share
./usr/share/zoneinfo/Universal base-sys-share share
diff -r cf7b1db9f47a -r 74d80fe720d4 doc/3RDPARTY
--- a/doc/3RDPARTY Mon Dec 07 19:39:09 2020 +0000
+++ b/doc/3RDPARTY Mon Dec 07 19:52:52 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.1444.2.23 2020/11/01 18:07:58 martin Exp $
+# $NetBSD: 3RDPARTY,v 1.1444.2.24 2020/12/07 19:52:52 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 / tzdata2018i
-Current Vers: tzcode2018i / tzdata2018i
+Version: tzcode2017b / tzdata2020d
+Current Vers: tzcode2020d / tzdata2020d
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 cf7b1db9f47a -r 74d80fe720d4 external/public-domain/tz/dist/Makefile
--- a/external/public-domain/tz/dist/Makefile Mon Dec 07 19:39:09 2020 +0000
+++ b/external/public-domain/tz/dist/Makefile Mon Dec 07 19:52:52 2020 +0000
@@ -12,43 +12,55 @@
# Email address for bug reports.
BUGEMAIL= tz%iana.org@localhost
-# Choose source data features. To get new features right away, use:
+# DATAFORM selects the data format.
+# Available formats represent essentially the same data, albeit
+# possibly with minor discrepancies that users are not likely to notice.
+# To get new features and the best data 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
+# Rearguard users might also want "ZFLAGS = -b fat"; see below.
DATAFORM= main
# Change the line below for your timezone (after finding the one you want in
# one of the $(TDATA) source files, or adding it to a source file).
# Alternatively, if you discover you've got the wrong timezone, you can just
-# zic -l rightzone
-# to correct things.
+# 'zic -l -' to remove it, or 'zic -l rightzone' to change it.
# Use the command
# make zonenames
# to get a list of the values you can use for LOCALTIME.
LOCALTIME= GMT
-# If you want something other than Eastern United States time as a template
-# for handling POSIX-style timezone environment variables,
-# change the line below (after finding the timezone you want in the
+# The POSIXRULES macro controls interpretation of nonstandard and obsolete
+# POSIX-like TZ settings like TZ='EET-2EEST' that lack DST transition rules.
+# Such a setting uses the rules in a template file to determine
+# "spring forward" and "fall back" days and times; the environment
+# variable itself specifies UT offsets of standard and daylight saving time.
+#
+# If POSIXRULES is '-', no template is installed; this is the default.
+#
+# Any other value for POSIXRULES is obsolete and should not be relied on, as:
+# * It does not work correctly in popular implementations such as GNU/Linux.
+# * It does not work in the tzdb implementation for timestamps after 2037.
+# * It is incompatible with 'zic -b slim' if POSIXRULES specifies transitions
+# at standard time or UT rather than at local time.
+# In short, software should avoid ruleless settings like TZ='EET-2EEST'
+# and so should not depend on the value of POSIXRULES.
+#
+# If, despite the above, you want a template for handling these settings,
+# you can change the line below (after finding the timezone you want in the
# one of the $(TDATA) source files, or adding it to a source file).
-# 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
-# daylight saving time.
# Alternatively, if you discover you've got the wrong timezone, you can just
-# zic -p rightzone
-# to correct things.
+# 'zic -p -' to remove it, or 'zic -p rightzone' to change it.
# Use the command
# make zonenames
# to get a list of the values you can use for POSIXRULES.
-# If you want POSIX compatibility, use "America/New_York".
-POSIXRULES= America/New_York
+POSIXRULES= -
# Also see TZDEFRULESTRING below, which takes effect only
# if the time zone files cannot be accessed.
@@ -113,8 +125,8 @@
TIME_T_ALTERNATIVES_HEAD = int64_t
TIME_T_ALTERNATIVES_TAIL = int32_t uint32_t uint64_t
-# What kind of TZif data files to generate.
-# (TZif is the binary time zone data format that zic generates.)
+# What kind of TZif data files to generate. (TZif is the binary time
+# zone data format that zic generates; see Internet RFC 8536.)
# If you want only POSIX time, with time values interpreted as
# seconds since the epoch (not counting leap seconds), use
# REDO= posix_only
@@ -135,6 +147,15 @@
REDO= posix_right
+# Whether to put an "Expires" line in the leapseconds file.
+# Use EXPIRES_LINE=1 to put the line in, 0 to omit it.
+# The EXPIRES_LINE value matters only if REDO's value contains "right".
+# If you change EXPIRES_LINE, remove the leapseconds file before running "make".
+# zic's support for the Expires line was introduced in tzdb 2020a,
+# and EXPIRES_LINE defaults to 0 for now so that the leapseconds file
+# can be given to older zic implementations.
+EXPIRES_LINE= 0
+
# To install data in text form that has all the information of the TZif data,
# (optionally incorporating leap second information), use
# TZDATA_TEXT= tzdata.zi leapseconds
@@ -148,9 +169,6 @@
# 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=
@@ -168,10 +186,6 @@
UTF8_LOCALE= en_US.utf8
-# Since "." may not be in PATH...
-
-YEARISTYPE= ./yearistype
-
# Non-default libraries needed to link.
LDLIBS=
@@ -229,6 +243,12 @@
# other than simply getting garbage data
# -DUSE_LTZ=0 to build zdump with the system time zone library
# Also set TZDOBJS=zdump.o and CHECK_TIME_T_ALTERNATIVES= below.
+# -DZIC_BLOAT_DEFAULT=\"fat\" to default zic's -b option to "fat", and
+# similarly for "slim". Fat TZif files work around incompatibilities
+# and bugs in some TZif readers, notably readers that mishandle 64-bit
+# data in TZif files. Slim TZif files are more efficient and do not
+# work around these incompatibilities and bugs. If not given, the
+# default is "slim".
# -DZIC_MAX_ABBR_LEN_WO_WARN=3
# (or some other number) to set the maximum time zone abbreviation length
# that zic will accept without a warning (the default is 6)
@@ -273,8 +293,9 @@
# than TM_GMTOFF and TM_ZONE. However, most of them are standardized.
# #
# # To omit or support the external variable "tzname", add one of:
-# # -DHAVE_TZNAME=0
-# # -DHAVE_TZNAME=1
+# # -DHAVE_TZNAME=0 # do not support "tzname"
+# # -DHAVE_TZNAME=1 # support "tzname", which is defined by system library
+# # -DHAVE_TZNAME=2 # support and define "tzname"
# # to the "CFLAGS=" line. "tzname" is required by POSIX 1988 and later.
# # If not defined, the code attempts to guess HAVE_TZNAME from other macros.
# # Warning: unless time_tz is also defined, HAVE_TZNAME=1 can cause
@@ -282,26 +303,27 @@
# # presumably due to memory allocation issues.
# #
# # To omit or support the external variables "timezone" and "daylight", add
-# # -DUSG_COMPAT=0
-# # -DUSG_COMPAT=1
+# # -DUSG_COMPAT=0 # do not support
+# # -DUSG_COMPAT=1 # support, and variables are defined by system library
+# # -DUSG_COMPAT=2 # support and define variables
# # to the "CFLAGS=" line; "timezone" and "daylight" are inspired by
# # Unix Systems Group code and are required by POSIX 2008 (with XSI) and later.
# # If not defined, the code attempts to guess USG_COMPAT from other macros.
# #
# # To support the external variable "altzone", add
-# # -DALTZONE
+# # -DALTZONE=0 # do not support
+# # -DALTZONE=1 # support "altzone", which is defined by system library
+# # -DALTZONE=2 # support and define "altzone"
# # to the end of the "CFLAGS=" line; although "altzone" appeared in
# # System V Release 3.1 it has not been standardized.
+# # If not defined, the code attempts to guess ALTZONE from other macros.
#
# If you want functions that were inspired by early versions of X3J11's work,
# add
# -DSTD_INSPIRED
# to the end of the "CFLAGS=" line. This arranges for the functions
-# "tzsetwall", "offtime", "timelocal", "timegm", "timeoff",
+# "offtime", "timelocal", "timegm", "timeoff",
# "posix2time", and "time2posix" to be added to the time conversion library.
-# "tzsetwall" is like "tzset" except that it arranges for local wall clock
-# time (rather than the timezone specified in the TZ environment variable)
-# to be used.
# "offtime" is like "gmtime" except that it accepts a second (long) argument
# that gives an offset to add to the time_t when converting it.
# "timelocal" is equivalent to "mktime".
@@ -311,7 +333,6 @@
# that gives an offset to use when converting to a time_t.
# "posix2time" and "time2posix" are described in an included manual page.
# X3J11's work does not describe any of these functions.
-# Sun has provided "tzsetwall", "timelocal", and "timegm" in SunOS 4.0.
# These functions may well disappear in future releases of the time
# conversion package.
#
@@ -360,6 +381,11 @@
zic= ./zic
ZIC= $(zic) $(ZFLAGS)
+# To shrink the size of installed TZif files,
+# append "-r @N" to omit data before N-seconds-after-the-Epoch.
+# To grow the files and work around older application bugs, append "-b fat";
+# see ZIC_BLOAT_DEFAULT above.
+# See the zic man page for more about -b and -r.
ZFLAGS=
# How to use zic to install TZif files.
@@ -383,25 +409,8 @@
# Name of curl <https://curl.haxx.se/>, used for HTML validation.
CURL= curl
-# The path where SGML DTDs are kept and the catalog file(s) to use when
-# validating HTML 4.01. The default should work on both Debian and Red Hat.
-SGML_TOPDIR= /usr
-SGML_DTDDIR= $(SGML_TOPDIR)/share/xml/w3c-sgml-lib/schema/dtd
-SGML_SEARCH_PATH= $(SGML_DTDDIR)/REC-html401-19991224
-SGML_CATALOG_FILES= \
- $(SGML_TOPDIR)/share/doc/w3-recs/html/www.w3.org/TR/1999/REC-html401-19991224/HTML4.cat:$(SGML_TOPDIR)/share/sgml/html/4.01/HTML4.cat
-
-# The name, arguments and environment of a program to validate HTML 4.01.
-# See <http://openjade.sourceforge.net/doc/> for a validator, and
-# <https://validator.w3.org/source/> for a validation library.
-# Set VALIDATE=':' if you do not have such a program.
-VALIDATE = nsgmls
-VALIDATE_FLAGS = -s -B -wall -wno-unused-param
-VALIDATE_ENV = \
- SGML_CATALOG_FILES='$(SGML_CATALOG_FILES)' \
- SGML_SEARCH_PATH='$(SGML_SEARCH_PATH)' \
- SP_CHARSET_FIXED=YES \
- SP_ENCODING=UTF-8
+# Name of GNU Privacy Guard <https://gnupg.org/>, used to sign distributions.
+GPG= gpg
# This expensive test requires USE_LTZ.
# To suppress it, define this macro to be empty.
@@ -475,11 +484,11 @@
TZCOBJS= zic.o
TZDOBJS= zdump.o localtime.o asctime.o strftime.o
DATEOBJS= date.o localtime.o strftime.o asctime.o
-LIBSRCS= localtime.c asctime.c difftime.c
-LIBOBJS= localtime.o asctime.o difftime.o
+LIBSRCS= localtime.c asctime.c difftime.c strftime.c
+LIBOBJS= localtime.o asctime.o difftime.o strftime.o
HEADERS= tzfile.h private.h
NONLIBSRCS= zic.c zdump.c
-NEWUCBSRCS= date.c strftime.c
+NEWUCBSRCS= date.c
SOURCES= $(HEADERS) $(LIBSRCS) $(NONLIBSRCS) $(NEWUCBSRCS) \
tzselect.ksh workman.sh
MANS= newctime.3 newstrftime.3 newtzset.3 time2posix.3 \
@@ -491,13 +500,14 @@
COMMON= calendars CONTRIBUTING LICENSE Makefile \
NEWS README theory.html version
WEB_PAGES= tz-art.html tz-how-to.html tz-link.html
-CHECK_WEB_PAGES=check_tz-art.html check_tz-how-to.html check_tz-link.html
+CHECK_WEB_PAGES=check_theory.html check_tz-art.html \
+ check_tz-how-to.html check_tz-link.html
DOCS= $(MANS) date.1 $(MANTXTS) $(WEB_PAGES)
PRIMARY_YDATA= africa antarctica asia australasia \
europe northamerica southamerica
Home |
Main Index |
Thread Index |
Old Index