git: 46c599340f18 - main - Update tzcode to 2024a.

From: Dag-Erling Smørgrav <des_at_FreeBSD.org>
Date: Tue, 13 Feb 2024 20:36:29 UTC
The branch main has been updated by des:

URL: https://cgit.FreeBSD.org/src/commit/?id=46c599340f187db577b9212ab18022f3c7380c68

commit 46c599340f187db577b9212ab18022f3c7380c68
Merge: b4b61ead7eab 378c74faf328
Author:     Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2024-02-13 20:20:44 +0000
Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2024-02-13 20:31:41 +0000

    Update tzcode to 2024a.
    
    MFC after:      3 weeks
    Sponsored by:   Klara, Inc.

 contrib/tzcode/Makefile      |  261 +++++++----
 contrib/tzcode/NEWS          |  193 +++++++-
 contrib/tzcode/README        |   19 +-
 contrib/tzcode/date.1        |   14 +-
 contrib/tzcode/localtime.c   |  128 +++---
 contrib/tzcode/newctime.3    |   16 +-
 contrib/tzcode/newstrftime.3 |  152 ++++++-
 contrib/tzcode/newtzset.3    |  206 +++++----
 contrib/tzcode/private.h     |   44 +-
 contrib/tzcode/strftime.c    |    7 +-
 contrib/tzcode/theory.html   |   37 +-
 contrib/tzcode/tz-art.html   |  419 ++++++++----------
 contrib/tzcode/tz-link.html  |  118 +++--
 contrib/tzcode/tzdir.h       |    6 +
 contrib/tzcode/tzfile.5      |   32 +-
 contrib/tzcode/tzfile.h      |   14 +-
 contrib/tzcode/tzselect.8    |    2 +-
 contrib/tzcode/tzselect.ksh  | 1006 +++++++++++++++++++++++-------------------
 contrib/tzcode/version       |    2 +-
 contrib/tzcode/zdump.c       |    2 +-
 contrib/tzcode/zic.8         |   35 +-
 contrib/tzcode/zic.c         |  239 +++++-----
 lib/libc/gen/sysconf.c       |    2 +-
 lib/libc/stdtime/strftime.c  |    2 +-
 24 files changed, 1767 insertions(+), 1189 deletions(-)

diff --cc contrib/tzcode/Makefile
index 0e56af89e2a4,000000000000..d48354c72df4
mode 100644,000000..100644
--- a/contrib/tzcode/Makefile
+++ b/contrib/tzcode/Makefile
@@@ -1,1250 -1,0 +1,1361 @@@
 +# Make and install tzdb code and data.
- 
 +# This file is in the public domain, so clarified as of
 +# 2009-05-17 by Arthur David Olson.
++# Request POSIX conformance; this must be the first non-comment line.
++.POSIX:
++# On older platforms you may need to scrounge for a POSIX-conforming 'make'.
++# For example, on Solaris 10 (2005), use /usr/sfw/bin/gmake or
++# /usr/xpg4/bin/make, not /usr/ccs/bin/make.
++
++# To affect how this Makefile works, you can run a shell script like this:
++#
++#	#!/bin/sh
++#	make CC='gcc -std=gnu11' "$@"
++#
++# This example script is appropriate for a pre-2017 GNU/Linux system
++# where a non-default setting is needed to support this package's use of C99.
++#
++# Alternatively, you can simply edit this Makefile to tailor the following
++# macro definitions.
++
++###############################################################################
++# Start of macros that one plausibly might want to tailor.
 +
 +# Package name for the code distribution.
 +PACKAGE=	tzcode
 +
 +# Version number for the distribution, overridden in the 'tarballs' rule below.
 +VERSION=	unknown
 +
 +# Email address for bug reports.
 +BUGEMAIL=	tz@iana.org
 +
 +# 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 -' 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=	Factory
 +
- # The POSIXRULES macro controls interpretation of POSIX-like TZ
++# The POSIXRULES macro controls interpretation of POSIX-2017.1-like TZ
 +# settings like TZ='EET-2EEST' that lack DST transition rules.
 +# 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 even in tzcode, except for historical timestamps
 +#   that precede the last explicit transition in the POSIXRULES file.
 +#   Hence it typically does not work for current and future timestamps.
 +# 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).
 +# Alternatively, if you discover you've got the wrong timezone, you can just
 +# '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.
 +
 +POSIXRULES=	-
 +
 +# Also see TZDEFRULESTRING below, which takes effect only
 +# if POSIXRULES is '-' or if the template file cannot be accessed.
 +
 +
 +# 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).
 +
 +# 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 timezone 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" timezone information is placed in the "TZDIR" directory
 +# (and subdirectories).
 +# 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)
 +
 +# 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.
 +TIME_T_ALTERNATIVES = $(TIME_T_ALTERNATIVES_HEAD) $(TIME_T_ALTERNATIVES_TAIL)
 +TIME_T_ALTERNATIVES_HEAD = int_least64_t
 +TIME_T_ALTERNATIVES_TAIL = int_least32_t uint_least32_t uint_least64_t
 +
 +# 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
 +# below.  If you want only "right" time, with values interpreted
 +# as seconds since the epoch (counting leap seconds), use
 +#	REDO=		right_only
 +# below.  If you want both sets of data available, with leap seconds not
 +# counted normally, use
 +#	REDO=		posix_right
 +# below.  If you want both sets of data available, with leap seconds counted
 +# normally, use
 +#	REDO=		right_posix
 +# below.  POSIX mandates that leap seconds not be counted; for compatibility
 +# with it, use "posix_only" or "posix_right".  Use POSIX time on systems with
 +# leap smearing; this can work better than unsmeared "right" time with
 +# applications that are not leap second aware, and is closer to unsmeared
 +# "right" time than unsmeared POSIX time is (e.g., 0.5 vs 1.0 s max error).
 +
 +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 was modified in tzdb 2021b to generate version 4 TZif files.
 +# EXPIRES_LINE defaults to 0 for now so that the leapseconds file
 +# can be given to pre-2020a zic implementations and so that TZif files
 +# built by newer zic implementations can be read by pre-2021b libraries.
 +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
 +# To install text data without leap second information (e.g., because
 +# REDO='posix_only'), use
 +#	TZDATA_TEXT=	tzdata.zi
 +# To avoid installing text data, use
 +#	TZDATA_TEXT=
 +
 +TZDATA_TEXT=	leapseconds tzdata.zi
 +
 +# For backward-compatibility links for old zone names, use
 +#	BACKWARD=	backward
 +# To omit these links, use
 +#	BACKWARD=
 +
 +BACKWARD=	backward
 +
 +# If you want out-of-scope and often-wrong data from the file 'backzone',
 +# but only for entries listed in the backward-compatibility file zone.tab, use
 +#	PACKRATDATA=	backzone
 +#	PACKRATLIST=	zone.tab
 +# If you want all the 'backzone' data, use
 +#	PACKRATDATA=	backzone
 +#	PACKRATLIST=
 +# To omit this data, use
 +#	PACKRATDATA=
 +#	PACKRATLIST=
 +
 +PACKRATDATA=
 +PACKRATLIST=
 +
 +# The name of a locale using the UTF-8 encoding, used during self-tests.
 +# The tests are skipped if the name does not appear to work on this system.
 +
 +UTF8_LOCALE=	en_US.utf8
 +
 +# Non-default libraries needed to link.
 +# On some hosts, this should have -lintl unless CFLAGS has -DHAVE_GETTEXT=0.
 +LDLIBS=
 +
- # Add the following to the end of the "CFLAGS=" line as needed to override
- # defaults specified in the source code.  "-DFOO" is equivalent to "-DFOO=1".
++# Add the following to an uncommented "CFLAGS=" line as needed
++# to override defaults specified in the source code or by the system.
++# "-DFOO" is equivalent to "-DFOO=1".
 +#  -DDEPRECATE_TWO_DIGIT_YEARS for optional runtime warnings about strftime
 +#	formats that generate only the last two digits of year numbers
 +#  -DEPOCH_LOCAL if the 'time' function returns local time not UT
 +#  -DEPOCH_OFFSET=N if the 'time' function returns a value N greater
 +#	than what POSIX specifies, assuming local time is UT.
 +#	For example, N is 252460800 on AmigaOS.
 +#  -DHAVE_DECL_ASCTIME_R=0 if <time.h> does not declare asctime_r
 +#  -DHAVE_DECL_ENVIRON if <unistd.h> declares 'environ'
 +#  -DHAVE_DECL_TIMEGM=0 if <time.h> does not declare timegm
 +#  -DHAVE_DIRECT_H if mkdir needs <direct.h> (MS-Windows)
 +#  -DHAVE__GENERIC=0 if _Generic does not work*
 +#  -DHAVE_GETRANDOM if getrandom works (e.g., GNU/Linux),
 +#	-DHAVE_GETRANDOM=0 to avoid using getrandom
 +#  -DHAVE_GETTEXT if gettext works (e.g., GNU/Linux, FreeBSD, Solaris),
 +#	where LDLIBS also needs to contain -lintl on some hosts;
 +#	-DHAVE_GETTEXT=0 to avoid using gettext
 +#  -DHAVE_INCOMPATIBLE_CTIME_R if your system's time.h declares
 +#	ctime_r and asctime_r incompatibly with the POSIX standard
 +#	(Solaris when _POSIX_PTHREAD_SEMANTICS is not defined).
 +#  -DHAVE_INTTYPES_H=0 if <inttypes.h> does not work*+
 +#  -DHAVE_LINK=0 if your system lacks a link function
 +#  -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function
 +#  -DHAVE_LOCALTIME_RZ=0 if you do not want zdump to use localtime_rz
 +#	localtime_rz can make zdump significantly faster, but is nonstandard.
 +#  -DHAVE_MALLOC_ERRNO=0 if malloc etc. do not set errno on failure.
 +#  -DHAVE_POSIX_DECLS=0 if your system's include files do not declare
 +#	functions like 'link' or variables like 'tzname' required by POSIX
 +#  -DHAVE_SETENV=0 if your system lacks the setenv function
 +#  -DHAVE_SNPRINTF=0 if your system lacks the snprintf function+
 +#  -DHAVE_STDCKDINT_H=0 if neither <stdckdint.h> nor substitutes like
 +#	__builtin_add_overflow work*
 +#  -DHAVE_STDINT_H=0 if <stdint.h> does not work*+
 +#  -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 <sys/stat.h> does not work*
 +#  -DHAVE_TZSET=0 if your system lacks a tzset function
 +#  -DHAVE_UNISTD_H=0 if <unistd.h> does not work*
 +#  -DHAVE_UTMPX_H=0 if <utmpx.h> does not work*
 +#  -Dlocale_t=XXX if your system uses XXX instead of locale_t
- #  -DPORT_TO_C89 if tzcode should also run on C89 platforms+
++#  -DPORT_TO_C89 if tzcode should also run on mostly-C89 platforms+
++#	Typically it is better to use a later standard.  For example,
++#	with GCC 4.9.4 (2016), prefer '-std=gnu11' to '-DPORT_TO_C89'.
++#	Even with -DPORT_TO_C89, the code needs at least one C99
++#	feature (integers at least 64 bits wide) and maybe more.
 +#  -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
 +#  -DSUPPORT_C89 if the tzcode library should support C89 callers+
++#	However, this might trigger latent bugs in C99-or-later callers.
 +#  -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.
 +#  -Dtime_tz=\"T\" to use T as the time_t type, rather than the system time_t
 +#	This is intended for internal use only; it mangles external names.
 +#  -DTZ_DOMAIN=\"foo\" to use "foo" for gettext domain name; default is "tz"
 +#  -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory;
 +#	the default is system-supplied, typically "/usr/lib/locale"
 +#  -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified
- #	DST transitions for POSIX-style TZ strings lacking them,
++#	DST transitions for POSIX.1-2017-style TZ strings lacking them,
 +#	in the usual case where POSIXRULES is '-'.  If not specified,
 +#	TZDEFRULESTRING defaults to US rules for future DST transitions.
 +#	This mishandles some past timestamps, as US DST rules have changed.
 +#	It also mishandles settings like TZ='EET-2EEST' for eastern Europe,
 +#	as Europe and US DST rules differ.
 +#  -DTZNAME_MAXIMUM=N to limit time zone abbreviations to N bytes (default 255)
 +#  -DUNINIT_TRAP if reading uninitialized storage can cause problems
 +#	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 older ones that
 +#	ignore or otherwise mishandle 64-bit data in TZif files;
 +#	however, fat TZif files may trigger bugs in newer TZif readers.
 +#	Slim TZif files are more efficient, and are the default.
 +#  -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)
++#  -g to generate symbolic debugging info
++#  -Idir to include from directory 'dir'
++#  -O0 to disable optimization; other -O options to enable more optimization
++#  -Uname to remove any definition of the macro 'name'
 +#  $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking
 +#
 +# * Options marked "*" can be omitted if your compiler is C23 compatible.
 +# * Options marked "+" are obsolescent and are planned to be removed
- #   once the code assumes C99 or later.
++#   once the code assumes C99 or later, say in the year 2029.
 +#
 +# Select instrumentation via "make GCC_INSTRUMENT='whatever'".
 +GCC_INSTRUMENT = \
 +  -fsanitize=undefined -fsanitize-address-use-after-scope \
 +  -fsanitize-undefined-trap-on-error -fstack-protector
 +# Omit -fanalyzer from GCC_DEBUG_FLAGS, as it makes GCC too slow.
 +GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \
 +  $(GCC_INSTRUMENT) \
 +  -Wall -Wextra \
 +  -Walloc-size-larger-than=100000 -Warray-bounds=2 \
 +  -Wbad-function-cast -Wbidi-chars=any,ucn -Wcast-align=strict -Wdate-time \
 +  -Wdeclaration-after-statement -Wdouble-promotion \
 +  -Wduplicated-branches -Wduplicated-cond \
 +  -Wformat=2 -Wformat-overflow=2 -Wformat-signedness -Wformat-truncation \
 +  -Wimplicit-fallthrough=5 -Winit-self -Wlogical-op \
 +  -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
 +  -Wnull-dereference \
 +  -Wold-style-definition -Woverlength-strings -Wpointer-arith \
 +  -Wshadow -Wshift-overflow=2 -Wstrict-overflow \
 +  -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-macros -Wuse-after-free=3 \
 +  -Wvariadic-macros -Wvla -Wwrite-strings \
 +  -Wno-address -Wno-format-nonliteral -Wno-sign-compare \
 +  -Wno-type-limits
 +#
 +# If your system has a "GMT offset" field in its "struct tm"s
 +# (or if you decide to add such a field in your system's "time.h" file),
 +# add the name to a define such as
 +#	-DTM_GMTOFF=tm_gmtoff
 +# to the end of the "CFLAGS=" line.  If not defined, the code attempts to
 +# guess TM_GMTOFF from other macros; define NO_TM_GMTOFF to suppress this.
 +# Similarly, if your system has a "zone abbreviation" field, define
 +#	-DTM_ZONE=tm_zone
- # and define NO_TM_ZONE to suppress any guessing.  Although these two fields
- # not required by POSIX, a future version of POSIX is planned to require them
- # and they are widely available on GNU/Linux and BSD systems.
++# and define NO_TM_ZONE to suppress any guessing.
++# Although these two fields are not required by POSIX.1-2017,
++# POSIX 202x/D4 requires them and they are widely available
++# on GNU/Linux and BSD systems.
 +#
 +# The next batch of options control support for external variables
 +# exported by tzcode.  In practice these variables are less useful
 +# 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 # 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.
++# # to the "CFLAGS=" line.  "tzname" is required by POSIX.1-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
 +# # crashes when combined with some platforms' standard libraries,
 +# # presumably due to memory allocation issues.
 +# #
 +# # To omit or support the external variables "timezone" and "daylight", add
 +# #	-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.
++# # to the "CFLAGS=" line; "timezone" and "daylight" are inspired by Unix
++# # Systems Group code and are required by POSIX.1-2008 and later (with XSI).
 +# # If not defined, the code attempts to guess USG_COMPAT from other macros.
 +# #
 +# # To support the external variable "altzone", add
 +# #	-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 following
 +# functions to be added to the time conversion library.
 +# "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.
- # "offtime_r" is to "offtime" what "gmtime_r" is to "gmtime".
- # "timelocal" is equivalent to "mktime".
++# I.e., "offtime" is like calling "localtime_rz" with a fixed-offset zone.
++# "timelocal" is nearly equivalent to "mktime".
 +# "timeoff" is like "timegm" except that it accepts a second (long) argument
 +# that gives an offset to use when converting to a time_t.
++# I.e., "timeoff" is like calling "mktime_z" with a fixed-offset zone.
 +# "posix2time" and "time2posix" are described in an included manual page.
 +# X3J11's work does not describe any of these functions.
 +# These functions may well disappear in future releases of the time
 +# conversion package.
 +#
 +# If you don't want functions that were inspired by NetBSD, add
 +#	-DNETBSD_INSPIRED=0
 +# to the end of the "CFLAGS=" line.  Otherwise, the functions
 +# "localtime_rz", "mktime_z", "tzalloc", and "tzfree" are added to the
 +# time library, and if STD_INSPIRED is also defined to nonzero the functions
 +# "posix2time_z" and "time2posix_z" are added as well.
 +# The functions ending in "_z" (or "_rz") are like their unsuffixed
 +# (or suffixed-by-"_r") counterparts, except with an extra first
 +# argument of opaque type timezone_t that specifies the timezone.
 +# "tzalloc" allocates a timezone_t value, and "tzfree" frees it.
 +#
 +# If you want to allocate state structures in localtime, add
 +#	-DALL_STATE
 +# to the end of the "CFLAGS=" line.  Storage is obtained by calling malloc.
 +#
 +# NIST-PCTS:151-2, Version 1.4, (1993-12-03) is a test suite put
 +# out by the National Institute of Standards and Technology
- # which claims to test C and Posix conformance.  If you want to pass PCTS, add
++# which claims to test C and POSIX conformance.  If you want to pass PCTS, add
 +#	-DPCTS
 +# to the end of the "CFLAGS=" line.
 +#
 +# If you want strict compliance with XPG4 as of 1994-04-09, add
 +#	-DXPG4_1994_04_09
 +# to the end of the "CFLAGS=" line.  This causes "strftime" to always return
 +# 53 as a week number (rather than 52 or 53) for January days before
 +# January's first Monday when a "%V" format is used and January 1
 +# falls on a Friday, Saturday, or Sunday.
++#
++# POSIX says CFLAGS defaults to "-O 1".
++# Uncomment the following line and edit its contents as needed.
 +
- CFLAGS=
++#CFLAGS= -O 1
 +
- # Linker flags.  Default to $(LFLAGS) for backwards compatibility
- # to release 2012h and earlier.
 +
- LDFLAGS=	$(LFLAGS)
++# The name of a POSIX-like library archiver, its flags, C compiler,
++# linker flags, and 'make' utility.  Ordinarily the defaults suffice.
++# The commented-out values are the defaults specified by POSIX.1-202x/D4.
++#AR = ar
++#ARFLAGS = -rv
++#CC = c17
++#LDFLAGS =
++#MAKE = make
 +
 +# For leap seconds, this Makefile uses LEAPSECONDS='-L leapseconds' in
 +# submake command lines.  The default is no leap seconds.
 +
 +LEAPSECONDS=
 +
++# Where to fetch leap-seconds.list from.
++leaplist_URI = \
++  https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list
++# The file is generated by the IERS Earth Orientation Centre, in Paris.
++leaplist_TZ = Europe/Paris
++
 +# The zic command and its arguments.
 +
 +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 bugs in older applications,
 +# possibly at the expense of introducing bugs in newer ones,
 +# 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.
 +
 +ZIC_INSTALL=	$(ZIC) -d '$(DESTDIR)$(TZDIR)' $(LEAPSECONDS)
 +
- # The name of a Posix-compliant 'awk' on your system.
++# The name of a POSIX-compliant 'awk' on your system.
 +# mawk 1.3.3 and Solaris 10 /usr/bin/awk do not work.
 +# Also, it is better (though not essential) if 'awk' supports UTF-8,
 +# and unfortunately mawk and busybox awk do not support UTF-8.
 +# Try AWK=gawk or AWK=nawk if your awk has the abovementioned problems.
 +AWK=		awk
 +
- # The full path name of a Posix-compliant shell, preferably one that supports
++# The full path name of a POSIX-compliant shell, preferably one that supports
 +# the Korn shell's 'select' statement as an extension.
 +# These days, Bash is the most popular.
 +# It should be OK to set this to /bin/sh, on platforms where /bin/sh
- # lacks 'select' or doesn't completely conform to Posix, but /bin/bash
++# lacks 'select' or doesn't completely conform to POSIX, but /bin/bash
 +# is typically nicer if it works.
 +KSHELL=		/bin/bash
 +
- # Name of curl <https://curl.haxx.se/>, used for HTML validation.
++# Name of curl <https://curl.haxx.se/>, used for HTML validation
++# and to fetch leap-seconds.list from upstream.
 +CURL=		curl
 +
 +# 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.
 +CHECK_TIME_T_ALTERNATIVES = check_time_t_alternatives
 +
 +# SAFE_CHAR is a regular expression that matches a safe character.
 +# Some parts of this distribution are limited to safe characters;
 +# others can use any UTF-8 character.
 +# For now, the safe characters are a safe subset of ASCII.
 +# The caller must set the shell variable 'sharp' to the character '#',
 +# since Makefile macros cannot contain '#'.
 +# TAB_CHAR is a single tab character, in single quotes.
 +TAB_CHAR=	'	'
 +SAFE_CHARSET1=	$(TAB_CHAR)' !\"'$$sharp'$$%&'\''()*+,./0123456789:;<=>?@'
 +SAFE_CHARSET2=	'ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\^_`'
 +SAFE_CHARSET3=	'abcdefghijklmnopqrstuvwxyz{|}~'
 +SAFE_CHARSET=	$(SAFE_CHARSET1)$(SAFE_CHARSET2)$(SAFE_CHARSET3)
 +SAFE_CHAR=	'[]'$(SAFE_CHARSET)'-]'
 +
 +# These non-alphabetic, non-ASCII printable characters are Latin-1,
 +# and so are likely displayable even in editors like XEmacs 21
 +# that have limited display capabilities.
 +UNUSUAL_OK_LATIN_1 = ¡¢£¤¥¦§¨©«¬®¯°±²³´¶·¸¹»¼½¾¿×÷
 +# Non-ASCII non-letters that OK_CHAR allows, as these characters are
 +# useful in commentary.
 +UNUSUAL_OK_CHARSET= $(UNUSUAL_OK_LATIN_1)
 +
 +# Put this in a bracket expression to match spaces.
 +s = [:space:]
 +
 +# OK_CHAR matches any character allowed in the distributed files.
 +# 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 '#';
 +# this is so that comments can contain non-ASCII characters.
 +# OK_LINE matches a line of OK characters.
 +SAFE_LINE=	'^'$(SAFE_CHAR)'*$$'
 +SAFE_SHARP_LINE='^'$(SAFE_CHAR)'*('$$sharp$(OK_CHAR)'*)?$$'
 +OK_LINE=	'^'$(OK_CHAR)'*$$'
 +
 +# Flags to give 'tar' when making a distribution.
 +# Try to use flags appropriate for GNU tar.
 +GNUTARFLAGS= --format=pax --pax-option='delete=atime,delete=ctime' \
 +  --numeric-owner --owner=0 --group=0 \
 +  --mode=go+u,go-w --sort=name
 +TARFLAGS=	`if tar $(GNUTARFLAGS) --version >/dev/null 2>&1; \
 +		 then echo $(GNUTARFLAGS); \
 +		 else :; \
 +		 fi`
 +
 +# Flags to give 'gzip' when making a distribution.
 +GZIPFLAGS=	-9n
 +
 +# When comparing .tzs files, use GNU diff's -F'^TZ=' option if supported.
 +# This makes it easier to see which Zone has been affected.
 +DIFF_TZS=	 diff -u$$(! diff -u -F'^TZ=' - - <>/dev/null >&0 2>&1 \
 +			   || echo ' -F^TZ=')
 +
- ###############################################################################
- 
- #MAKE=		make
++# ':' on typical hosts; 'ranlib' on the ancient hosts that still need ranlib.
++RANLIB=		:
 +
- cc=		cc
- CC=		$(cc) -DTZDIR='"$(TZDIR)"'
++# POSIX prohibits defining or using SHELL.  However, csh users on systems
++# that use the user shell for Makefile commands may need to define SHELL.
++#SHELL=		/bin/sh
 +
- AR=		ar
++# End of macros that one plausibly might want to tailor.
++###############################################################################
 +
- # ':' on typical hosts; 'ranlib' on the ancient hosts that still need ranlib.
- RANLIB=		:
 +
 +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 strftime.c
 +LIBOBJS=	localtime.o asctime.o difftime.o strftime.o
 +HEADERS=	tzfile.h private.h
 +NONLIBSRCS=	zic.c zdump.c
 +NEWUCBSRCS=	date.c
 +SOURCES=	$(HEADERS) $(LIBSRCS) $(NONLIBSRCS) $(NEWUCBSRCS) \
 +			tzselect.ksh workman.sh
 +MANS=		newctime.3 newstrftime.3 newtzset.3 time2posix.3 \
 +			tzfile.5 tzselect.8 zic.8 zdump.8
 +MANTXTS=	newctime.3.txt newstrftime.3.txt newtzset.3.txt \
 +			time2posix.3.txt \
 +			tzfile.5.txt tzselect.8.txt zic.8.txt zdump.8.txt \
 +			date.1.txt
 +COMMON=		calendars CONTRIBUTING LICENSE Makefile \
 +			NEWS README SECURITY theory.html version
 +WEB_PAGES=	tz-art.html tz-how-to.html 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
 +YDATA=		$(PRIMARY_YDATA) etcetera
 +NDATA=		factory
 +TDATA_TO_CHECK=	$(YDATA) $(NDATA) backward
 +TDATA=		$(YDATA) $(NDATA) $(BACKWARD)
- ZONETABLES=	zone1970.tab zone.tab
++ZONETABLES=	zone.tab zone1970.tab zonenow.tab
 +TABDATA=	iso3166.tab $(TZDATA_TEXT) $(ZONETABLES)
 +LEAP_DEPS=	leapseconds.awk leap-seconds.list
 +TZDATA_ZI_DEPS=	ziguard.awk zishrink.awk version $(TDATA) \
 +		  $(PACKRATDATA) $(PACKRATLIST)
 +DSTDATA_ZI_DEPS= ziguard.awk $(TDATA) $(PACKRATDATA) $(PACKRATLIST)
 +DATA=		$(TDATA_TO_CHECK) backzone iso3166.tab leap-seconds.list \
 +			leapseconds $(ZONETABLES)
- AWK_SCRIPTS=	checklinks.awk checktab.awk leapseconds.awk \
++AWK_SCRIPTS=	checklinks.awk checknow.awk checktab.awk leapseconds.awk \
 +			ziguard.awk zishrink.awk
 +MISC=		$(AWK_SCRIPTS)
 +TZS_YEAR=	2050
 +TZS_CUTOFF_FLAG=	-c $(TZS_YEAR)
 +TZS=		to$(TZS_YEAR).tzs
 +TZS_NEW=	to$(TZS_YEAR)new.tzs
 +TZS_DEPS=	$(YDATA) asctime.c localtime.c \
 +			private.h tzfile.h zdump.c zic.c
 +TZDATA_DIST = $(COMMON) $(DATA) $(MISC)
 +# EIGHT_YARDS is just a yard short of the whole ENCHILADA.
 +EIGHT_YARDS = $(TZDATA_DIST) $(DOCS) $(SOURCES) tzdata.zi
 +ENCHILADA = $(EIGHT_YARDS) $(TZS)
 +
 +# Consult these files when deciding whether to rebuild the 'version' file.
 +# This list is not the same as the output of 'git ls-files', since
 +# .gitignore is not distributed.
 +VERSION_DEPS= \
 +		calendars CONTRIBUTING LICENSE Makefile NEWS README SECURITY \
 +		africa antarctica asctime.c asia australasia \
 +		backward backzone \
- 		checklinks.awk checktab.awk \
++		checklinks.awk checknow.awk checktab.awk \
 +		date.1 date.c difftime.c \
 +		etcetera europe factory iso3166.tab \
 +		leap-seconds.list leapseconds.awk localtime.c \
 +		newctime.3 newstrftime.3 newtzset.3 northamerica \
 +		private.h southamerica strftime.c theory.html \
 +		time2posix.3 tz-art.html tz-how-to.html tz-link.html \
 +		tzfile.5 tzfile.h tzselect.8 tzselect.ksh \
 +		workman.sh zdump.8 zdump.c zic.8 zic.c \
 +		ziguard.awk zishrink.awk \
- 		zone.tab zone1970.tab
- 
- # And for the benefit of csh users on systems that assume the user
- # shell should be used to handle commands in Makefiles. . .
- 
- SHELL=		/bin/sh
++		zone.tab zone1970.tab zonenow.tab
 +
 +all:		tzselect zic zdump libtz.a $(TABDATA) \
 +		  vanguard.zi main.zi rearguard.zi
 +
 +ALL:		all date $(ENCHILADA)
 +
 +install:	all $(DATA) $(REDO) $(MANS)
 +		mkdir -p '$(DESTDIR)$(BINDIR)' \
 +			'$(DESTDIR)$(ZDUMPDIR)' '$(DESTDIR)$(ZICDIR)' \
 +			'$(DESTDIR)$(LIBDIR)' \
 +			'$(DESTDIR)$(MANDIR)/man3' '$(DESTDIR)$(MANDIR)/man5' \
 +			'$(DESTDIR)$(MANDIR)/man8'
 +		$(ZIC_INSTALL) -l $(LOCALTIME) \
 +			`case '$(POSIXRULES)' in ?*) echo '-p';; esac \
 +			` $(POSIXRULES) \
 +			-t '$(DESTDIR)$(TZDEFAULT)'
 +		cp -f $(TABDATA) '$(DESTDIR)$(TZDIR)/.'
 +		cp tzselect '$(DESTDIR)$(BINDIR)/.'
 +		cp zdump '$(DESTDIR)$(ZDUMPDIR)/.'
 +		cp zic '$(DESTDIR)$(ZICDIR)/.'
 +		cp libtz.a '$(DESTDIR)$(LIBDIR)/.'
 +		$(RANLIB) '$(DESTDIR)$(LIBDIR)/libtz.a'
 +		cp -f newctime.3 newtzset.3 '$(DESTDIR)$(MANDIR)/man3/.'
 +		cp -f tzfile.5 '$(DESTDIR)$(MANDIR)/man5/.'
 +		cp -f tzselect.8 zdump.8 zic.8 '$(DESTDIR)$(MANDIR)/man8/.'
 +
 +INSTALL:	ALL install date.1
 +		mkdir -p '$(DESTDIR)$(BINDIR)' '$(DESTDIR)$(MANDIR)/man1'
 +		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` || \
 +		  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 $@
 +
 +# These files can be tailored by setting BACKWARD, PACKRATDATA, PACKRATLIST.
 +vanguard.zi main.zi rearguard.zi: $(DSTDATA_ZI_DEPS)
 +		$(AWK) \
 +		  -v DATAFORM=`expr $@ : '\(.*\).zi'` \
 +		  -v PACKRATDATA='$(PACKRATDATA)' \
 +		  -v PACKRATLIST='$(PACKRATLIST)' \
 +		  -f ziguard.awk \
 +		  $(TDATA) $(PACKRATDATA) >$@.out
 +		mv $@.out $@
 +# This file has a version comment that attempts to capture any tailoring
 +# via BACKWARD, DATAFORM, PACKRATDATA, PACKRATLIST, and REDO.
 +tzdata.zi:	$(DATAFORM).zi version zishrink.awk
 +		version=`sed 1q version` && \
 +		  LC_ALL=C $(AWK) \
 +		    -v dataform='$(DATAFORM)' \
 +		    -v deps='$(DSTDATA_ZI_DEPS) zishrink.awk' \
 +		    -v redo='$(REDO)' \
 +		    -v version="$$version" \
 +		    -f zishrink.awk \
 +		    $(DATAFORM).zi >$@.out
 +		mv $@.out $@
 +
++tzdir.h:
++		printf '%s\n' >$@.out \
++		  '#ifndef TZDEFAULT' \
++		  '# define TZDEFAULT "$(TZDEFAULT)" /* default zone */' \
++		  '#endif' \
++		  '#ifndef TZDIR' \
++		  '# define TZDIR "$(TZDIR)" /* TZif directory */' \
++		  '#endif'
++		mv $@.out $@
++
 +version.h:	version
 +		VERSION=`cat version` && printf '%s\n' \
 +		  'static char const PKGVERSION[]="($(PACKAGE)) ";' \
 +		  "static char const TZVERSION[]=\"$$VERSION\";" \
 +		  'static char const REPORT_BUGS_TO[]="$(BUGEMAIL)";' \
 +		  >$@.out
 +		mv $@.out $@
 +
 +zdump:		$(TZDOBJS)
 +		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS)
 +
 +zic:		$(TZCOBJS)
 +		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS)
 +
 +leapseconds:	$(LEAP_DEPS)
 +		$(AWK) -v EXPIRES_LINE=$(EXPIRES_LINE) \
 +		  -f leapseconds.awk leap-seconds.list >$@.out
 +		mv $@.out $@
 +
++# Awk script to extract a Git-style author from leap-seconds.list comments.
++EXTRACT_AUTHOR = \
++  author_line { sub(/^.[[:space:]]*/, ""); \
++      sub(/:[[:space:]]*/, " <"); \
++      printf "%s>\n", $$0; \
++      success = 1; \
++      exit \
++  } \
++  /Questions or comments to:/ { author_line = 1 } \
++  END { exit !success }
++
++# Fetch leap-seconds.list from upstream.
++fetch-leap-seconds.list:
++		$(CURL) -OR $(leaplist_URI)
++
++# Fetch leap-seconds.list from upstream and commit it to the local repository.
++commit-leap-seconds.list: fetch-leap-seconds.list
++		author=$$($(AWK) '$(EXTRACT_AUTHOR)' leap-seconds.list) && \
++		date=$$(TZ=$(leaplist_TZ) stat -c%y leap-seconds.list) && \
++		git commit --author="$$author" --date="$$date" -m'make $@' \
++		  leap-seconds.list
++
 +# Arguments to pass to submakes of install_data.
 +# They can be overridden by later submake arguments.
 +INSTALLARGS = \
 + BACKWARD='$(BACKWARD)' \
 + DESTDIR='$(DESTDIR)' \
 + LEAPSECONDS='$(LEAPSECONDS)' \
 + PACKRATDATA='$(PACKRATDATA)' \
 + PACKRATLIST='$(PACKRATLIST)' \
 + TZDEFAULT='$(TZDEFAULT)' \
 + TZDIR='$(TZDIR)' \
 + ZIC='$(ZIC)'
 +
 +INSTALL_DATA_DEPS = zic leapseconds tzdata.zi
 +
 +# 'make install_data' installs one set of TZif files.
 +install_data: $(INSTALL_DATA_DEPS)
 +		$(ZIC_INSTALL) tzdata.zi
 +
 +posix_only: $(INSTALL_DATA_DEPS)
 +		$(MAKE) $(INSTALLARGS) LEAPSECONDS= install_data
 +
 +right_only: $(INSTALL_DATA_DEPS)
 +		$(MAKE) $(INSTALLARGS) LEAPSECONDS='-L leapseconds' \
 +			install_data
 +
 +# In earlier versions of this makefile, the other two directories were
 +# subdirectories of $(TZDIR).  However, this led to configuration errors.
 +# For example, with posix_right under the earlier scheme,
 +# TZ='right/Australia/Adelaide' got you localtime with leap seconds,
 +# but gmtime without leap seconds, which led to problems with applications
 +# like sendmail that subtract gmtime from localtime.
 +# Therefore, the other two directories are now siblings of $(TZDIR).
 +# You must replace all of $(TZDIR) to switch from not using leap seconds
 +# to using them, or vice versa.
 +right_posix:	right_only
 +		rm -fr '$(DESTDIR)$(TZDIR)-leaps'
 +		ln -s '$(TZDIR_BASENAME)' '$(DESTDIR)$(TZDIR)-leaps' || \
 +		  $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-leaps' right_only
 +		$(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-posix' posix_only
 +
 +posix_right:	posix_only
 +		rm -fr '$(DESTDIR)$(TZDIR)-posix'
 +		ln -s '$(TZDIR_BASENAME)' '$(DESTDIR)$(TZDIR)-posix' || \
 +		  $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-posix' posix_only
 +		$(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-leaps' right_only
 +
 +zones:		$(REDO)
 +
 +# dummy.zd is not a real file; it is mentioned here only so that the
 +# top-level 'make' does not have a syntax error.
 +ZDS = dummy.zd
 +# Rule used only by submakes invoked by the $(TZS_NEW) rule.
 +# It is separate so that GNU 'make -j' can run instances in parallel.
 +$(ZDS): zdump
 +		./zdump -i $(TZS_CUTOFF_FLAG) '$(wd)/'$$(expr $@ : '\(.*\).zd') \
 +		  >$@
 +
 +TZS_NEW_DEPS = tzdata.zi zdump zic
 +$(TZS_NEW): $(TZS_NEW_DEPS)
 +		rm -fr tzs$(TZS_YEAR).dir
 +		mkdir tzs$(TZS_YEAR).dir
 +		$(zic) -d tzs$(TZS_YEAR).dir tzdata.zi
 +		$(AWK) '/^L/{print "Link\t" $$2 "\t" $$3}' \
 +		   tzdata.zi | LC_ALL=C sort >$@.out
 +		wd=`pwd` && \
 +		x=`$(AWK) '/^Z/{print "tzs$(TZS_YEAR).dir/" $$2 ".zd"}' \
 +				tzdata.zi \
 +			| LC_ALL=C sort -t . -k 2,2` && \
 +		set x $$x && \
 +		shift && \
 +		ZDS=$$* && \
 +		$(MAKE) wd="$$wd" TZS_CUTOFF_FLAG="$(TZS_CUTOFF_FLAG)" \
 +		  ZDS="$$ZDS" $$ZDS && \
 +		sed 's,^TZ=".*\.dir/,TZ=",' $$ZDS >>$@.out
 +		rm -fr tzs$(TZS_YEAR).dir
 +		mv $@.out $@
 +
 +# If $(TZS) exists but 'make check_tzs' fails, a maintainer should inspect the
 +# failed output and fix the inconsistency, perhaps by running 'make force_tzs'.
 +$(TZS):
 +		touch $@
 +
 +force_tzs:	$(TZS_NEW)
 +		cp $(TZS_NEW) $(TZS)
 +
 +libtz.a:	$(LIBOBJS)
 +		rm -f $@
- 		$(AR) -rc $@ $(LIBOBJS)
++		$(AR) $(ARFLAGS) $@ $(LIBOBJS)
 +		$(RANLIB) $@
 +
 +date:		$(DATEOBJS)
 +		$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(DATEOBJS) $(LDLIBS)
 +
 +tzselect:	tzselect.ksh version
 +		VERSION=`cat version` && sed \
- 			-e 's|#!/bin/bash|#!$(KSHELL)|g' \
- 			-e 's|AWK=[^}]*|AWK='\''$(AWK)'\''|g' \
- 			-e 's|\(PKGVERSION\)=.*|\1='\''($(PACKAGE)) '\''|' \
- 			-e 's|\(REPORT_BUGS_TO\)=.*|\1=$(BUGEMAIL)|' \
- 			-e 's|TZDIR=[^}]*|TZDIR=$(TZDIR)|' \
- 			-e 's|\(TZVERSION\)=.*|\1='"$$VERSION"'|' \
- 			<$@.ksh >$@.out
++		  -e "s'#!/bin/bash'#!"'$(KSHELL)'\' \
++		  -e s\''\(AWK\)=[^}]*'\''\1=\'\''$(AWK)\'\'\' \
++		  -e s\''\(PKGVERSION\)=.*'\''\1=\'\''($(PACKAGE)) \'\'\' \
++		  -e s\''\(REPORT_BUGS_TO\)=.*'\''\1=\'\''$(BUGEMAIL)\'\'\' \
++		  -e s\''\(TZDIR\)=[^}]*'\''\1=\'\''$(TZDIR)\'\'\' \
++		  -e s\''\(TZVERSION\)=.*'\''\1=\'"'$$VERSION\\''" \
++		  <$@.ksh >$@.out
 +		chmod +x $@.out
 +		mv $@.out $@
 +
 +check: check_back check_mild
 +check_mild:	check_character_set check_white_space check_links \
- 		  check_name_lengths check_slashed_abbrs check_sorted \
++		  check_name_lengths check_now \
++		  check_slashed_abbrs check_sorted \
 +		  check_tables check_web check_ziguard check_zishrink check_tzs
 +
++# True if UTF8_LOCALE does not work;
++# otherwise, false but with LC_ALL set to $(UTF8_LOCALE).
++UTF8_LOCALE_MISSING = \
++  { test ! '$(UTF8_LOCALE)' \
++    || ! printf 'A\304\200B\n' \
++         | LC_ALL='$(UTF8_LOCALE)' grep -q '^A.B$$' >/dev/null 2>&1 \
++    || { LC_ALL='$(UTF8_LOCALE)'; export LC_ALL; false; }; }
++
 +check_character_set: $(ENCHILADA)
- 	test ! '$(UTF8_LOCALE)' || \
- 	! printf 'A\304\200B\n' | \
- 	  LC_ALL='$(UTF8_LOCALE)' grep -q '^A.B$$' >/dev/null 2>&1 || { \
- 		LC_ALL='$(UTF8_LOCALE)' && export LC_ALL && \
++	$(UTF8_LOCALE_MISSING) || { \
 +		sharp='#' && \
 +		! grep -Env $(SAFE_LINE) $(MANS) date.1 $(MANTXTS) \
 +			$(MISC) $(SOURCES) $(WEB_PAGES) \
 +			CONTRIBUTING LICENSE README SECURITY \
 +			version tzdata.zi && \
 +		! grep -Env $(SAFE_LINE)'|^UNUSUAL_OK_'$(OK_CHAR)'*$$' \
 +			Makefile && \
 +		! grep -Env $(SAFE_SHARP_LINE) $(TDATA_TO_CHECK) backzone \
 +			leapseconds zone.tab && \
 +		! grep -Env $(OK_LINE) $(ENCHILADA); \
 +	}
 +	touch $@
 +
 +check_white_space: $(ENCHILADA)
*** 3935 LINES SKIPPED ***