Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7]: src Pull up following revision(s) (requested by kre in ticket...
details: https://anonhg.NetBSD.org/src/rev/83db8d8102b4
branches: netbsd-7
changeset: 800059:83db8d8102b4
user: snj <snj%NetBSD.org@localhost>
date: Tue Dec 13 07:29:24 2016 +0000
description:
Pull up following revision(s) (requested by kre in ticket #1324):
distrib/sets/lists/base/mi: 1.1125, 1.1128, 1.1132, 1.1137, 1.1139, 1.1140
external/public-domain/tz/dist/CONTRIBUTING: up to 1.1.1.3
external/public-domain/tz/dist/LICENSE: up to 1.1.1.2
external/public-domain/tz/dist/Makefile: up to 1.1.1.16
external/public-domain/tz/dist/NEWS: up to 1.1.1.16
external/public-domain/tz/dist/README: up to 1.1.1.5
external/public-domain/tz/dist/TZDATA_VERSION: up to 1.6
external/public-domain/tz/dist/Theory: up to 1.1.1.9
external/public-domain/tz/dist/africa: up to 1.1.1.9
external/public-domain/tz/dist/antarctica: up to 1.1.1.7
external/public-domain/tz/dist/asia: up to 1.1.1.15
external/public-domain/tz/dist/australasia: up to 1.1.1.10
external/public-domain/tz/dist/backward: up to 1.1.1.6
external/public-domain/tz/dist/backzone: up to 1.1.1.10
external/public-domain/tz/dist/etcetera: up to 1.1.1.2
external/public-domain/tz/dist/europe: up to 1.1.1.16
external/public-domain/tz/dist/factory: up to 1.1.1.2
external/public-domain/tz/dist/iso3166.tab: up to 1.1.1.4
external/public-domain/tz/dist/leap-seconds.list: up to 1.1.1.6
external/public-domain/tz/dist/leapseconds: up to 1.1.1.7
external/public-domain/tz/dist/northamerica: up to 1.1.1.14
external/public-domain/tz/dist/southamerica: up to 1.1.1.10
external/public-domain/tz/dist/version: up to 1.1.1.3
external/public-domain/tz/dist/zone.tab: up to 1.1.1.10
external/public-domain/tz/dist/zone1970.tab: up to 1.1.1.12
external/public-domain/tz/share/zoneinfo/Makefile: up to 1.3
external/public-domain/tz/tzdata2netbsd: up to 1.11
Update tzdata to 2016j.
diffstat:
distrib/sets/lists/base/mi | 10 +-
external/public-domain/tz/dist/CONTRIBUTING | 6 +-
external/public-domain/tz/dist/LICENSE | 6 +-
external/public-domain/tz/dist/Makefile | 205 ++++-
external/public-domain/tz/dist/NEWS | 467 +++++++++++-
external/public-domain/tz/dist/README | 17 +-
external/public-domain/tz/dist/TZDATA_VERSION | 1 +
external/public-domain/tz/dist/Theory | 104 ++-
external/public-domain/tz/dist/africa | 14 +-
external/public-domain/tz/dist/antarctica | 88 +-
external/public-domain/tz/dist/asia | 569 +++++++++-----
external/public-domain/tz/dist/australasia | 56 +-
external/public-domain/tz/dist/backward | 1 +
external/public-domain/tz/dist/backzone | 16 +-
external/public-domain/tz/dist/etcetera | 74 +-
external/public-domain/tz/dist/europe | 823 ++++++++++++++-------
external/public-domain/tz/dist/factory | 9 +-
external/public-domain/tz/dist/iso3166.tab | 2 +-
external/public-domain/tz/dist/leap-seconds.list | 13 +-
external/public-domain/tz/dist/leapseconds | 5 +-
external/public-domain/tz/dist/northamerica | 91 ++-
external/public-domain/tz/dist/southamerica | 51 +-
external/public-domain/tz/dist/version | 1 +
external/public-domain/tz/dist/zone.tab | 23 +-
external/public-domain/tz/dist/zone1970.tab | 25 +-
external/public-domain/tz/share/zoneinfo/Makefile | 4 +-
external/public-domain/tz/tzdata2netbsd | 26 +-
27 files changed, 1933 insertions(+), 774 deletions(-)
diffs (truncated from 4513 to 300 lines):
diff -r 4d72cf9386f5 -r 83db8d8102b4 distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi Tue Dec 13 06:39:13 2016 +0000
+++ b/distrib/sets/lists/base/mi Tue Dec 13 07:29:24 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1087.2.8 2016/04/12 06:34:09 snj Exp $
+# $NetBSD: mi,v 1.1087.2.9 2016/12/13 07:29:24 snj Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -5405,6 +5405,7 @@
./usr/share/zoneinfo/Asia/Aqtobe base-sys-share share
./usr/share/zoneinfo/Asia/Ashgabat base-sys-share share
./usr/share/zoneinfo/Asia/Ashkhabad base-sys-share share
+./usr/share/zoneinfo/Asia/Atyrau base-sys-share share
./usr/share/zoneinfo/Asia/Baghdad base-sys-share share
./usr/share/zoneinfo/Asia/Bahrain base-sys-share share
./usr/share/zoneinfo/Asia/Baku base-sys-share share
@@ -5425,6 +5426,7 @@
./usr/share/zoneinfo/Asia/Dili base-sys-share share
./usr/share/zoneinfo/Asia/Dubai base-sys-share share
./usr/share/zoneinfo/Asia/Dushanbe base-sys-share share
+./usr/share/zoneinfo/Asia/Famagusta base-sys-share share
./usr/share/zoneinfo/Asia/Gaza base-sys-share share
./usr/share/zoneinfo/Asia/Harbin base-sys-share share
./usr/share/zoneinfo/Asia/Hebron base-sys-share share
@@ -5485,7 +5487,7 @@
./usr/share/zoneinfo/Asia/Thimbu base-sys-share share
./usr/share/zoneinfo/Asia/Thimphu base-sys-share share
./usr/share/zoneinfo/Asia/Tokyo base-sys-share share
-./usr/share/zoneinfo/Asia/Tomsk base-obsolete obsolete
+./usr/share/zoneinfo/Asia/Tomsk base-sys-share share
./usr/share/zoneinfo/Asia/Ujung_Pandang base-sys-share share
./usr/share/zoneinfo/Asia/Ulaanbaatar base-sys-share share
./usr/share/zoneinfo/Asia/Ulan_Bator base-sys-share share
@@ -5494,6 +5496,7 @@
./usr/share/zoneinfo/Asia/Vientiane base-sys-share share
./usr/share/zoneinfo/Asia/Vladivostok base-sys-share share
./usr/share/zoneinfo/Asia/Yakutsk base-sys-share share
+./usr/share/zoneinfo/Asia/Yangon base-sys-share share
./usr/share/zoneinfo/Asia/Yekaterinburg base-sys-share share
./usr/share/zoneinfo/Asia/Yerevan base-sys-share share
./usr/share/zoneinfo/Atlantic base-sys-share
@@ -5619,6 +5622,7 @@
./usr/share/zoneinfo/Europe/Jersey base-sys-share share
./usr/share/zoneinfo/Europe/Kaliningrad base-sys-share share
./usr/share/zoneinfo/Europe/Kiev base-sys-share share
+./usr/share/zoneinfo/Europe/Kirov base-sys-share share
./usr/share/zoneinfo/Europe/Kuybyshev base-obsolete obsolete
./usr/share/zoneinfo/Europe/Lisbon base-sys-share share
./usr/share/zoneinfo/Europe/Ljubljana base-sys-share share
@@ -5640,6 +5644,7 @@
./usr/share/zoneinfo/Europe/Samara base-sys-share share
./usr/share/zoneinfo/Europe/San_Marino base-sys-share share
./usr/share/zoneinfo/Europe/Sarajevo base-sys-share share
+./usr/share/zoneinfo/Europe/Saratov base-sys-share share
./usr/share/zoneinfo/Europe/Simferopol base-sys-share share
./usr/share/zoneinfo/Europe/Skopje base-sys-share share
./usr/share/zoneinfo/Europe/Sofia base-sys-share share
@@ -5805,6 +5810,7 @@
./usr/share/zoneinfo/SystemV/PST8PDT base-obsolete obsolete
./usr/share/zoneinfo/SystemV/YST9 base-obsolete obsolete
./usr/share/zoneinfo/SystemV/YST9YDT base-obsolete obsolete
+./usr/share/zoneinfo/TZDATA_VERSION base-sys-share share
./usr/share/zoneinfo/Turkey base-sys-share share
./usr/share/zoneinfo/UCT base-sys-share share
./usr/share/zoneinfo/US base-sys-share
diff -r 4d72cf9386f5 -r 83db8d8102b4 external/public-domain/tz/dist/CONTRIBUTING
--- a/external/public-domain/tz/dist/CONTRIBUTING Tue Dec 13 06:39:13 2016 +0000
+++ b/external/public-domain/tz/dist/CONTRIBUTING Tue Dec 13 07:29:24 2016 +0000
@@ -18,10 +18,10 @@
justification.
Please submit changes against either the latest release in
-<ftp://ftp.iana.org/tz/> or the master branch of the experimental
-Git repository. If you use Git the following workflow may be helpful:
+<ftp://ftp.iana.org/tz/> or the master branch of the development
+repository. If you use Git the following workflow may be helpful:
- * Copy the experimental repository.
+ * Copy the development repository.
git clone https://github.com/eggert/tz.git
cd tz
diff -r 4d72cf9386f5 -r 83db8d8102b4 external/public-domain/tz/dist/LICENSE
--- a/external/public-domain/tz/dist/LICENSE Tue Dec 13 06:39:13 2016 +0000
+++ b/external/public-domain/tz/dist/LICENSE Tue Dec 13 07:29:24 2016 +0000
@@ -1,4 +1,4 @@
With a few exceptions, all files in the tz code and data (including
-this one) are in the public domain. The exceptions are tzcode's
-date.c, newstrftime.3, and strftime.c, which contain material derived
-from BSD and which use the BSD 3-clause license.
+this one) are in the public domain. The exceptions are date.c,
+newstrftime.3, and strftime.c, which contain material derived from BSD
+and which use the BSD 3-clause license.
diff -r 4d72cf9386f5 -r 83db8d8102b4 external/public-domain/tz/dist/Makefile
--- a/external/public-domain/tz/dist/Makefile Tue Dec 13 06:39:13 2016 +0000
+++ b/external/public-domain/tz/dist/Makefile Tue Dec 13 07:29:24 2016 +0000
@@ -4,8 +4,8 @@
# Package name for the code distribution.
PACKAGE= tzcode
-# Version numbers of the code and data distributions.
-VERSION= 2016b
+# Version number for the distribution, overridden in the 'tarballs' rule below.
+VERSION= unknown
# Email address for bug reports.
BUGEMAIL= tz%iana.org@localhost
@@ -101,7 +101,6 @@
YEARISTYPE= ./yearistype
# Non-default libraries needed to link.
-# Add -lintl if you want to use 'gettext' on Solaris.
LDLIBS=
# Add the following to the end of the "CFLAGS=" line as needed.
@@ -109,9 +108,10 @@
# -DHAVE_DECL_ASCTIME_R=0 if <time.h> does not declare asctime_r
# -DHAVE_DIRECT_H if mkdir needs <direct.h> (MS-Windows)
# -DHAVE_DOS_FILE_NAMES if file names have drive specifiers etc. (MS-DOS)
-# -DHAVE_GETTEXT=1 if 'gettext' works (GNU, Linux, Solaris); also see LDLIBS
+# -DHAVE_GETTEXT=1 if 'gettext' works (e.g., GNU/Linux, FreeBSD, Solaris)
# -DHAVE_INCOMPATIBLE_CTIME_R=1 if your system's time.h declares
-# ctime_r and asctime_r incompatibly with the POSIX standard (Solaris 8).
+# ctime_r and asctime_r incompatibly with the POSIX standard
+# (Solaris when _POSIX_PTHREAD_SEMANTICS is not defined).
# -DHAVE_INTTYPES_H=1 if you have a pre-C99 compiler with "inttypes.h"
# -DHAVE_LINK=0 if your system lacks a link function
# -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function
@@ -129,6 +129,10 @@
# -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" (Microsoft C++ 7?)
+# -DEPOCH_LOCAL=1 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.
# -DNO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU=1
# if you do not want run time warnings about formats that may cause
# year 2000 grief
@@ -240,7 +244,7 @@
CFLAGS=
# Linker flags. Default to $(LFLAGS) for backwards compatibility
-# to tzcode2012h and earlier.
+# to release 2012h and earlier.
LDFLAGS= $(LFLAGS)
@@ -256,7 +260,7 @@
ZFLAGS=
-# How to use zic to install tzdata binary files.
+# How to use zic to install tz binary files.
ZIC_INSTALL= $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS)
@@ -272,16 +276,16 @@
KSHELL= /bin/bash
# The path where SGML DTDs are kept and the catalog file(s) to use when
-# validating. The default is appropriate for Ubuntu 13.10.
+# validating. 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/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 your web pages.
-# See <http://www.jclark.com/sp/> for a validator, and
-# <http://validator.w3.org/source/> for a validation library.
+# See <http://openjade.sourceforge.net/doc/> for a validator, and
+# <https://validator.w3.org/source/> for a validation library.
VALIDATE = nsgmls
VALIDATE_FLAGS = -s -B -wall -wno-unused-param
VALIDATE_ENV = \
@@ -326,7 +330,7 @@
# Flags to give 'tar' when making a distribution.
# Try to use flags appropriate for GNU tar.
-GNUTARFLAGS= --numeric-owner --owner=0 --group=0 --mode=go+u,go-w
+GNUTARFLAGS= --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 :; \
@@ -363,7 +367,7 @@
time2posix.3.txt \
tzfile.5.txt tzselect.8.txt zic.8.txt zdump.8.txt \
date.1.txt
-COMMON= CONTRIBUTING LICENSE Makefile NEWS README Theory
+COMMON= CONTRIBUTING LICENSE Makefile NEWS README Theory version
WEB_PAGES= tz-art.htm tz-how-to.html tz-link.htm
DOCS= $(MANS) date.1 $(MANTXTS) $(WEB_PAGES)
PRIMARY_YDATA= africa antarctica asia australasia \
@@ -378,7 +382,32 @@
leap-seconds.list yearistype.sh
AWK_SCRIPTS= checklinks.awk checktab.awk leapseconds.awk
MISC= $(AWK_SCRIPTS) zoneinfo2tdf.pl
-ENCHILADA= $(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC)
+TZS_YEAR= 2050
+TZS= to$(TZS_YEAR).tzs
+TZS_NEW= to$(TZS_YEAR)new.tzs
+TZS_DEPS= $(PRIMARY_YDATA) asctime.c localtime.c \
+ private.h tzfile.h zdump.c zic.c
+ENCHILADA= $(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC) $(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= \
+ CONTRIBUTING LICENSE Makefile NEWS README Theory \
+ africa antarctica asctime.c asia australasia \
+ backward backzone \
+ checklinks.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 \
+ pacificnew private.h \
+ southamerica strftime.c systemv \
+ time2posix.3 tz-art.htm tz-how-to.html tz-link.htm \
+ tzfile.5 tzfile.h tzselect.8 tzselect.ksh \
+ workman.sh yearistype.sh \
+ zdump.8 zdump.c zic.8 zic.c \
+ zone.tab zone1970.tab zoneinfo2tdf.pl
# And for the benefit of csh users on systems that assume the user
# shell should be used to handle commands in Makefiles. . .
@@ -408,10 +437,21 @@
cp date $(DESTDIR)$(BINDIR)/.
cp -f date.1 $(DESTDIR)$(MANDIR)/man1/.
-version.h:
- (echo 'static char const PKGVERSION[]="($(PACKAGE)) ";' && \
- echo 'static char const TZVERSION[]="$(VERSION)";' && \
- echo 'static char const REPORT_BUGS_TO[]="$(BUGEMAIL)";') >$@
+version: $(VERSION_DEPS)
+ { (type git) >/dev/null 2>&1 && \
+ V=`git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \
+ --abbrev=7 --dirty` || \
+ V=$(VERSION); } && \
+ printf '%s\n' "$$V" >$@.out
+ 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)
@@ -424,7 +464,8 @@
chmod +x yearistype
leapseconds: $(LEAP_DEPS)
- $(AWK) -f leapseconds.awk leap-seconds.list >$@
+ $(AWK) -f leapseconds.awk leap-seconds.list >$@.out
+ mv $@.out $@
# Arguments to pass to submakes of install_data.
# They can be overridden by later submake arguments.
@@ -477,38 +518,65 @@
zones: $(REDO)
+$(TZS_NEW): $(TDATA) zdump zic
+ mkdir -p tzs.dir
+ $(zic) -d tzs.dir $(TDATA)
+ $(AWK) '/^Link/{print $$1 "\t" $$2 "\t" $$3}' \
+ $(TDATA) | LC_ALL=C sort >$@.out
+ wd=`pwd` && \
+ zones=`$(AWK) -v wd="$$wd" \
+ '/^Zone/{print wd "/tzs.dir/" $$2}' $(TDATA) \
+ | LC_ALL=C sort` && \
+ ./zdump -i -c $(TZS_YEAR) $$zones >>$@.out
+ sed 's,^TZ=".*tzs\.dir/,TZ=",' $@.out >$@.sed.out
+ rm -fr tzs.dir $@.out
+ mv $@.sed.out $@
+
+# If $(TZS) does not already exist (e.g., old-format tarballs), create it.
+# If it exists but 'make check_tzs' fails, a maintainer should inspect the
+# failed output and fix the inconsistency, perhaps by running 'make force_tzs'.
+$(TZS):
+ $(MAKE) force_tzs
+
+force_tzs: $(TZS_NEW)
+ cp $(TZS_NEW) $(TZS)
+
libtz.a: $(LIBOBJS)
- $(AR) ru $@ $(LIBOBJS)
+ rm -f $@
+ $(AR) -rc $@ $(LIBOBJS)
$(RANLIB) $@
Home |
Main Index |
Thread Index |
Old Index