Module Name: src
Committed By: christos
Date: Thu Aug 9 12:38:26 UTC 2012
Modified Files:
src/lib/libc/time: Makefile README Theory checktab.awk private.h
tz-art.htm tz-link.htm tzfile.5 tzfile.h tzselect.ksh zdump.8
zdump.c zic.8 zic.c
Added Files:
src/lib/libc/time: version.h
Log Message:
merge 2012e
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/time/Makefile
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/time/README \
src/lib/libc/time/tzselect.ksh
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/time/Theory
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/time/checktab.awk
cvs rdiff -u -r1.25 -r1.26 src/lib/libc/time/private.h
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/time/tz-art.htm
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/time/tz-link.htm
cvs rdiff -u -r1.17 -r1.18 src/lib/libc/time/tzfile.5
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/time/tzfile.h
cvs rdiff -u -r0 -r1.1 src/lib/libc/time/version.h
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/time/zdump.8
cvs rdiff -u -r1.24 -r1.25 src/lib/libc/time/zdump.c
cvs rdiff -u -r1.19 -r1.20 src/lib/libc/time/zic.8
cvs rdiff -u -r1.29 -r1.30 src/lib/libc/time/zic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/time/Makefile
diff -u src/lib/libc/time/Makefile:1.5 src/lib/libc/time/Makefile:1.6
--- src/lib/libc/time/Makefile:1.5 Sun Oct 16 13:59:32 2011
+++ src/lib/libc/time/Makefile Thu Aug 9 08:38:25 2012
@@ -1,8 +1,10 @@
# <pre>
-# @(#)Makefile 8.11
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
+# Version numbers of the code and data distributions.
+VERSION = 2012e
+
# 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
@@ -226,7 +228,9 @@ ZIC= $(zic) $(ZFLAGS)
AWK= nawk
# The path where SGML DTDs are kept.
-SGML_SEARCH_PATH= $(TOPDIR)/share/doc/sgml-lib/REC-html401-19991224/
+# The default is appropriate for Ubuntu.
+SGML_TOPDIR= /usr
+SGML_SEARCH_PATH= $(SGML_TOPDIR)/share/xml/xhtml/schema/dtd/REC-html401-19991224
# The catalog file(s) to use when validating.
SGML_CATALOG_FILES= HTML4.cat
@@ -242,6 +246,17 @@ VALIDATE_ENV = \
SP_CHARSET_FIXED=YES \
SP_ENCODING=UTF-8
+# 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
+TARFLAGS= `if tar $(GNUTARFLAGS) --version >/dev/null 2>&1; \
+ then echo $(GNUTARFLAGS); \
+ else :; \
+ fi`
+
+# Flags to give 'gzip' when making a distribution.
+GZIPFLAGS= -9n
+
###############################################################################
cc= cc
@@ -311,6 +326,10 @@ INSTALL: ALL install date.1
-rm -f $(MANDIR)/man1/date.1
cp date.1 $(MANDIR)/man1/.
+version.h:
+ echo >$@ \
+ 'static char const TZVERSION[]="tz$(VERSION)";'
+
zdump: $(TZDOBJS)
$(CC) $(CFLAGS) $(LFLAGS) $(TZDOBJS) $(LDLIBS) -o $@
@@ -361,6 +380,7 @@ tzselect: tzselect.ksh
sed \
-e 's|AWK=[^}]*|AWK=$(AWK)|g' \
-e 's|TZDIR=[^}]*|TZDIR=$(TZDIR)|' \
+ -e 's|\(TZVERSION\)=.*|\1=tz$(VERSION)|' \
<$? >$@
chmod +x $@
@@ -373,31 +393,55 @@ check_web: $(WEB_PAGES)
$(VALIDATE_ENV) $(VALIDATE) $(VALIDATE_FLAGS) $(WEB_PAGES)
clean:
- rm -f core *.o *.out tzselect zdump zic yearistype date
+ rm -f core *.o *.out \
+ date tzselect version.h zdump zic yearistype
maintainer-clean: clean
@echo 'This command is intended for maintainers to use; it'
@echo 'deletes files that may need special tools to rebuild.'
- rm -f *.[1-8].txt tzcode.tar.gz tzdata.tar.gz
+ rm -f *.[1-8].txt tzcode*.tar.gz tzdata*.tar.gz
names:
@echo $(ENCHILADA)
+# Set the time stamps to those of the git repository, if available,
+# and if the files have not changed since then.
+# This uses GNU 'touch' syntax 'touch -d@N FILE',
+# where N is the number of seconds since 1970.
+# If git or GNU 'touch' is absent, do nothing.
+set-timestamps:
+ -TZ=UTC0 && export TZ && files=`git ls-files` && \
+ touch -d @1 test.out && rm -f test.out && \
+ for file in $$files; do \
+ test -z "`git diff --name-only $$file`" || continue; \
+ cmd="touch -d @`git log -1 --format='format:%ct' $$file \
+ ` $$file" && \
+ echo "$$cmd" && \
+ $$cmd || exit; \
+ done
+
# The zics below ensure that each data file can stand on its own.
# We also do an all-files run to catch links to links.
-public: $(ENCHILADA)
+public: $(ENCHILADA) set-timestamps
make maintainer-clean
make "CFLAGS=$(GCC_DEBUG_FLAGS)"
- -mkdir /tmp/,tzpublic
+ mkdir -m go-rwx /tmp/,tzpublic
-for i in $(TDATA) ; do zic -v -d /tmp/,tzpublic $$i 2>&1 | grep -v "starting year" ; done
for i in $(TDATA) ; do zic -d /tmp/,tzpublic $$i || exit; done
zic -v -d /tmp/,tzpublic $(TDATA) || exit
rm -f -r /tmp/,tzpublic
- for i in *.[1-8] ; do sh workman.sh $$i > $$i.txt || exit; done
+ for i in *.[1-8] ; do \
+ LC_ALL=C sh workman.sh $$i > $$i.txt && \
+ touch -r $$i $$i.txt || exit; \
+ done
$(AWK) -f checktab.awk $(PRIMARY_YDATA)
- tar cf - $(DOCS) $(SOURCES) $(MISC) *.[1-8].txt | gzip -9 > tzcode.tar.gz
- tar cf - $(DATA) | gzip -9 > tzdata.tar.gz
+ LC_ALL=C && export LC_ALL && \
+ tar $(TARFLAGS) -cf - $(DOCS) $(SOURCES) $(MISC) *.[1-8].txt | \
+ gzip $(GZIPFLAGS) > tzcode$(VERSION).tar.gz
+ LC_ALL=C && export LC_ALL && \
+ tar $(TARFLAGS) -cf - $(DATA) | \
+ gzip $(GZIPFLAGS) > tzdata$(VERSION).tar.gz
typecheck:
make clean
@@ -418,6 +462,7 @@ ialloc.o: private.h
localtime.o: private.h tzfile.h
scheck.o: private.h
strftime.o: tzfile.h
-zic.o: private.h tzfile.h
+zdump.o: version.h
+zic.o: private.h tzfile.h version.h
.KEEP_STATE:
Index: src/lib/libc/time/README
diff -u src/lib/libc/time/README:1.6 src/lib/libc/time/README:1.7
--- src/lib/libc/time/README:1.6 Thu Dec 31 17:49:15 2009
+++ src/lib/libc/time/README Thu Aug 9 08:38:25 2012
@@ -1,4 +1,5 @@
-@(#)README 8.3
+README for the tz distribution
+
This file is in the public domain, so clarified as of
2009-05-17 by Arthur David Olson.
@@ -40,9 +41,9 @@ tz distribution on a GNU/Linux or simila
mkdir tz
cd tz
- wget 'ftp://elsie.nci.nih.gov/pub/tz*.tar.gz'
- gzip -dc tzcode*.tar.gz | tar -xf -
- gzip -dc tzdata*.tar.gz | tar -xf -
+ wget --retr-symlinks 'ftp://ftp.iana.org/tz/tz*-latest.tar.gz'
+ gzip -dc tzcode-latest.tar.gz | tar -xf -
+ gzip -dc tzdata-latest.tar.gz | tar -xf -
Be sure to read the comments in "Makefile" and make any changes needed
to make things right for your system, especially if you are using some
@@ -71,7 +72,7 @@ the files currently do not even attempt
1970, and there are undoubtedly errors even for time stamps since 1970.
If you know that the rules are different from those in a file, by all means
feel free to change file (and please send the changed version to
-t...@elsie.nci.nih.gov for use in the future). Europeans take note!
+t...@iana.org for use in the future). Europeans take note!
Thanks to these Timezone Caballeros who've made major contributions to the
time conversion package: Keith Bostic; Bob Devine; Paul Eggert; Robert Elz;
@@ -80,7 +81,13 @@ Michael Bloom, Art Neilson, Stephen Prin
for testing work, and to Gwillim Law for checking local mean time data.
None of them are responsible for remaining errors.
-Look in the ~ftp/pub directory of elsie.nci.nih.gov
+Look in <ftp://ftp.iana.org/tz/releases/>
for updated versions of these files.
-Please send comments or information to t...@elsie.nci.nih.gov.
+Please send comments or information to t...@iana.org.
+
+Postscript: The README above is largely unmodified (aside from details
+of mailing list and ftp archive addresses) from that prepared many years
+ago by Arthur David Olson, to whom the timezone community owes the
+greatest debt of all. Arthur is not currently maintaining this data or
+code (though he remains involved).
Index: src/lib/libc/time/tzselect.ksh
diff -u src/lib/libc/time/tzselect.ksh:1.6 src/lib/libc/time/tzselect.ksh:1.7
--- src/lib/libc/time/tzselect.ksh:1.6 Thu Dec 31 17:49:16 2009
+++ src/lib/libc/time/tzselect.ksh Thu Aug 9 08:38:26 2012
@@ -1,8 +1,8 @@
#! /bin/ksh
#
-# $NetBSD: tzselect.ksh,v 1.6 2009/12/31 22:49:16 mlelstv Exp $
+# $NetBSD: tzselect.ksh,v 1.7 2012/08/09 12:38:26 christos Exp $
#
-VERSION='@(#)tzselect.ksh 8.2'
+VERSION=see_Makefile
# Ask the user about the time zone, and output the resulting TZ value to stdout.
# Interact with the user via stderr and stdin.
@@ -57,7 +57,7 @@ EOF
exit 0
elif [ "$1" = "--version" ]; then
cat <<EOF
-tzselect $VERSION
+tzselect $TZVERSION
EOF
exit 0
fi
Index: src/lib/libc/time/Theory
diff -u src/lib/libc/time/Theory:1.10 src/lib/libc/time/Theory:1.11
--- src/lib/libc/time/Theory:1.10 Sun Sep 4 06:10:26 2011
+++ src/lib/libc/time/Theory Thu Aug 9 08:38:25 2012
@@ -1,5 +1,3 @@
-# $NetBSD: Theory,v 1.10 2011/09/04 10:10:26 christos Exp $
-@(#)Theory 8.6
This file is in the public domain, so clarified as of
2009-05-17 by Arthur David Olson.
@@ -196,26 +194,26 @@ better.
----- Scope of the tz database -----
-The tz database attempts to record the history and predicted future of
-all computer-based clocks that track civil time. To represent this
-data, the world is partitioned into regions whose clocks all agree
-about time stamps that occur after the somewhat-arbitrary cutoff point
-of the POSIX Epoch (1970-01-01 00:00:00 UTC). For each such region,
-the database records all known clock transitions, and labels the region
+The tz database attempts to record the history and predicted future of
+all computer-based clocks that track civil time. To represent this
+data, the world is partitioned into regions whose clocks all agree
+about time stamps that occur after the somewhat-arbitrary cutoff point
+of the POSIX Epoch (1970-01-01 00:00:00 UTC). For each such region,
+the database records all known clock transitions, and labels the region
with a notable location.
-Clock transitions before 1970 are recorded for each such location,
-because most POSIX-compatible systems support negative time stamps and
+Clock transitions before 1970 are recorded for each such location,
+because most POSIX-compatible systems support negative time stamps and
could misbehave if data were omitted for pre-1970 transitions.
-However, the database is not designed for and does not suffice for
-applications requiring accurate handling of all past times everywhere,
-as it would take far too much effort and guesswork to record all
+However, the database is not designed for and does not suffice for
+applications requiring accurate handling of all past times everywhere,
+as it would take far too much effort and guesswork to record all
details of pre-1970 civil timekeeping.
-As noted in the README file, the tz database is not authoritative
+As noted in the README file, the tz database is not authoritative
(particularly not for pre-1970 time stamps), and it surely has errors.
-Corrections are welcome and encouraged. Users requiring authoritative
-data should consult national standards bodies and the references cited
+Corrections are welcome and encouraged. Users requiring authoritative
+data should consult national standards bodies and the references cited
in the database's comments.
@@ -314,7 +312,7 @@ and these older names are still supporte
See the file `backward' for most of these older names
(e.g. `US/Eastern' instead of `America/New_York').
The other old-fashioned names still supported are
-+`WET', `CET', `MET', and `EET' (see the file `europe').
+`WET', `CET', `MET', and `EET' (see the file `europe').
----- Time zone abbreviations -----
Index: src/lib/libc/time/checktab.awk
diff -u src/lib/libc/time/checktab.awk:1.4 src/lib/libc/time/checktab.awk:1.5
--- src/lib/libc/time/checktab.awk:1.4 Thu Dec 31 17:49:16 2009
+++ src/lib/libc/time/checktab.awk Thu Aug 9 08:38:25 2012
@@ -1,9 +1,7 @@
-# $NetBSD: checktab.awk,v 1.4 2009/12/31 22:49:16 mlelstv Exp $
+# $NetBSD: checktab.awk,v 1.5 2012/08/09 12:38:25 christos Exp $
# Check tz tables for consistency.
-# @(#)checktab.awk 8.1
-
# Contributed by Paul Eggert.
BEGIN {
Index: src/lib/libc/time/private.h
diff -u src/lib/libc/time/private.h:1.25 src/lib/libc/time/private.h:1.26
--- src/lib/libc/time/private.h:1.25 Thu Dec 31 17:49:16 2009
+++ src/lib/libc/time/private.h Thu Aug 9 08:38:25 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: private.h,v 1.25 2009/12/31 22:49:16 mlelstv Exp $ */
+/* $NetBSD: private.h,v 1.26 2012/08/09 12:38:25 christos Exp $ */
#ifndef PRIVATE_H
#define PRIVATE_H
@@ -27,18 +27,6 @@
** Thank you!
*/
-/*
-** ID
-*/
-
-#ifndef lint
-#ifndef NOID
-#if 0
-static char privatehid[] = "@(#)private.h 8.6";
-#endif
-#endif /* !defined NOID */
-#endif /* !defined lint */
-
#define GRANDPARENTED "Local time zone must be set--see zic manual page"
/*
Index: src/lib/libc/time/tz-art.htm
diff -u src/lib/libc/time/tz-art.htm:1.2 src/lib/libc/time/tz-art.htm:1.3
--- src/lib/libc/time/tz-art.htm:1.2 Sun Sep 4 06:10:26 2011
+++ src/lib/libc/time/tz-art.htm Thu Aug 9 08:38:25 2012
@@ -8,16 +8,13 @@ PUBLIC "-//W3C//DTD HTML 4.01//EN"
</head>
<body>
<h1>Time and the Arts</h1>
-<address>
-@(#)tz-art.htm 8.20
-</address>
<p>
This file is in the public domain, so clarified as of
2009-05-17 by Arthur David Olson.
</p>
<p>
Please send corrections to this web page to the
-<a href="mailto:t...@elsie.nci.nih.gov">time zone mailing list</a>.</p>
+<a href="mailto:t...@iana.org">time zone mailing list</a>.</p>
<p>
See also <a href="tz-link.htm">Sources for Time Zone and Daylight Saving Time Data</a>.</p>
<hr>
Index: src/lib/libc/time/tz-link.htm
diff -u src/lib/libc/time/tz-link.htm:1.7 src/lib/libc/time/tz-link.htm:1.8
--- src/lib/libc/time/tz-link.htm:1.7 Sun Sep 4 06:10:26 2011
+++ src/lib/libc/time/tz-link.htm Thu Aug 9 08:38:25 2012
@@ -8,7 +8,7 @@
<meta http-equiv="Content-type" content='text/html; charset="US-ASCII"'>
<meta name="DC.Creator" content="Eggert, Paul">
<meta name="DC.Contributor" content="Olson, Arthur David">
-<meta name="DC.Date" content="2007-12-26">
+<meta name="DC.Date" content="2012-07-19">
<meta name="DC.Description"
content="Sources of information about time zones and daylight saving time">
<meta name="DC.Identifier" content="http://www.twinsun.com/tz/tz-link.htm";>
@@ -17,16 +17,13 @@
</head>
<body>
<h1>Sources for Time Zone and Daylight Saving Time Data</h1>
-<address>
-@(#)tz-link.htm 8.32
-</address>
<p>
This file is in the public domain, so clarified as of
2009-05-17 by Arthur David Olson.
</p>
<p>
Please send corrections to this web page to the
-<a href="mailto:t...@elsie.nci.nih.gov">time zone mailing list</a>.</p>
+<a href="mailto:t...@iana.org">time zone mailing list</a>.</p>
<h2>The <code>tz</code> database</h2>
<p>
The <a href="http://en.wikipedia.org/wiki/Public_domain";>public-domain</a>
@@ -83,14 +80,18 @@ implementation set the <code>TZ</code> e
the location's full name, e.g., <code>TZ="America/New_York"</code>.</p>
<p>
In the <code>tz</code> database's
-<a href="ftp://elsie.nci.nih.gov/pub";><abbr
-title="File Transfer Protocol">FTP</abbr> distribution</a>
+<a href="ftp://ftp.iana.org/tz/releases/";><abbr
+title="File Transfer Protocol">FTP</abbr> releases</a>
the code is in the file <code>tzcode<var>C</var>.tar.gz</code>,
where <code><var>C</var></code> is the code's version;
similarly, the data are in <code>tzdata<var>D</var>.tar.gz</code>,
where <code><var>D</var></code> is the data's version.
Each version is a four-digit year followed by lower-case letters
(a through z, then za through zz, then zza through zzz, and so on).
+Convenience links to
+the <a href="ftp://ftp.iana.org/tz/tzcode-latest.tar.gz";>latest
+code</a> and
+<a href="ftp://ftp.iana.org/tz/tzdata-latest.tar.gz";>latest data</a> revisions
The following <a
href="http://en.wikipedia.org/wiki/Unix_shell";>shell</a> commands download
these files to a <abbr>GNU</abbr>/Linux or similar host;
@@ -98,26 +99,31 @@ see the downloaded
<code>README</code> file for what to do next.</p>
<pre style="margin-left: 2em"><code>mkdir tz
cd tz
-<a href="http://www.gnu.org/software/wget/";>wget</a> 'ftp://elsie.nci.nih.gov/pub/tz*.tar.gz'
-<a href="http://www.gnu.org/software/gzip/";>gzip</a> -dc tzcode*.tar.gz | <a href="http://www.gnu.org/software/tar/";>tar</a> -xf -
-gzip -dc tzdata*.tar.gz | tar -xf -
+<a href="http://www.gnu.org/software/wget/";>wget</a> --retr-symlinks 'ftp://ftp.iana.org/tz/tz*-latest.tar.gz'
+<a href="http://www.gnu.org/software/gzip/";>gzip</a> -dc tzcode-latest.tar.gz | <a href="http://www.gnu.org/software/tar/";>tar</a> -xf -
+gzip -dc tzdata-latest.tar.gz | tar -xf -
</code></pre>
<p>
+The code and data files can also be obtained from the
+<a href="http://www.iana.org";>IANA</a>
+<a href="http://www.iana.org/time-zones";>timezone web page</a>.
+<p>
The code lets you compile the <code>tz</code> source files into
machine-readable binary files, one for each location. It also lets
you read a <code>tz</code> binary file and interpret time stamps for that
location.</p>
<p>
The data are by no means authoritative. If you find errors, please
-send changes to the <a href="mailto:t...@elsie.nci.nih.gov">time zone
+send changes to the <a href="mailto:t...@iana.org">time zone
mailing list</a>. You can also <a
href="http://news.gmane.org/gmane.comp.time.tz";>browse recent
messages</a> sent to the mailing list, <a
-href="mailto:tz-requ...@elsie.nci.nih.gov">subscribe</a> to it,
-retrieve the <a
-href="ftp://elsie.nci.nih.gov/pub/tzarchive.gz";>full archive of old
-messages</a> (in gzip compressed format), or retrieve <a
-href="ftp://munnari.oz.au/pub/oldtz";>archived older versions of code
+href="https://mm.icann.org/mailman/listinfo/tz";>subscribe</a> to it.
+browse the <a
+href="http://mm.icann.org/pipermail/tz/";>archive of old
+messages</a> (message by message or in gzip compressed format),
+or retrieve <a
+href="ftp://ftp.iana.org/tz/releases/";>archived older versions of code
and data</a>.</p>
<p>
The Web has several other sources for time zone and daylight saving time data.
@@ -257,6 +263,11 @@ files. Tcl is freely available under a <
license.</li>
</ul>
<h2>Other <code>tz</code> binary file readers</h2>
+<li><a href="http://search.cpan.org/perldoc?DateTime::TimeZone::Tzfile";>
+DateTime::TimeZone::Tzfile</a>
+is a <code>tz</code> binary file reader written in Perl.
+It is freely available under the same terms as Perl
+(dual <abbr>GPL</abbr> and Artistic license).</li>
<ul>
<li>The <a
href="http://www.gnu.org/software/libc/";><abbr>GNU</abbr> C
Index: src/lib/libc/time/tzfile.5
diff -u src/lib/libc/time/tzfile.5:1.17 src/lib/libc/time/tzfile.5:1.18
--- src/lib/libc/time/tzfile.5:1.17 Sat Feb 25 05:56:52 2012
+++ src/lib/libc/time/tzfile.5 Thu Aug 9 08:38:25 2012
@@ -1,6 +1,5 @@
-.\" $NetBSD: tzfile.5,v 1.17 2012/02/25 10:56:52 shattered Exp $
+.\" $NetBSD: tzfile.5,v 1.18 2012/08/09 12:38:25 christos Exp $
.\"
-.\" @(#)tzfile.5 7.11
.\" This file is in the public domain, so clarified as of
.\" 1996-06-05 by Arthur David Olson (arthur_david_ol...@nih.gov).
.Dd September 16, 2001
Index: src/lib/libc/time/tzfile.h
diff -u src/lib/libc/time/tzfile.h:1.9 src/lib/libc/time/tzfile.h:1.10
--- src/lib/libc/time/tzfile.h:1.9 Thu Dec 31 17:49:16 2009
+++ src/lib/libc/time/tzfile.h Thu Aug 9 08:38:25 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: tzfile.h,v 1.9 2009/12/31 22:49:16 mlelstv Exp $ */
+/* $NetBSD: tzfile.h,v 1.10 2012/08/09 12:38:25 christos Exp $ */
#ifndef TZFILE_H
#define TZFILE_H
@@ -17,18 +17,6 @@
*/
/*
-** ID
-*/
-
-#ifndef lint
-#ifndef NOID
-#if 0
-static char tzfilehid[] = "@(#)tzfile.h 8.1";
-#endif
-#endif /* !defined NOID */
-#endif /* !defined lint */
-
-/*
** Information about time zone files.
*/
Index: src/lib/libc/time/zdump.8
diff -u src/lib/libc/time/zdump.8:1.8 src/lib/libc/time/zdump.8:1.9
--- src/lib/libc/time/zdump.8:1.8 Fri Jan 8 18:14:13 2010
+++ src/lib/libc/time/zdump.8 Thu Aug 9 08:38:26 2012
@@ -1,5 +1,4 @@
-.\" $NetBSD: zdump.8,v 1.8 2010/01/08 23:14:13 joerg Exp $
-.\" @(#)zdump.8 7.4
+.\" $NetBSD: zdump.8,v 1.9 2012/08/09 12:38:26 christos Exp $
.Dd October 29, 2003
.Dt ZDUMP 8
.Os
Index: src/lib/libc/time/zdump.c
diff -u src/lib/libc/time/zdump.c:1.24 src/lib/libc/time/zdump.c:1.25
--- src/lib/libc/time/zdump.c:1.24 Fri Sep 16 12:05:59 2011
+++ src/lib/libc/time/zdump.c Thu Aug 9 08:38:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: zdump.c,v 1.24 2011/09/16 16:05:59 joerg Exp $ */
+/* $NetBSD: zdump.c,v 1.25 2012/08/09 12:38:26 christos Exp $ */
/*
** This file is in the public domain, so clarified as of
** 2009-05-17 by Arthur David Olson.
@@ -6,13 +6,10 @@
#include <sys/cdefs.h>
#ifndef lint
-#ifndef NOID
-__RCSID("$NetBSD: zdump.c,v 1.24 2011/09/16 16:05:59 joerg Exp $");
-#endif /* !defined NOID */
+__RCSID("$NetBSD: zdump.c,v 1.25 2012/08/09 12:38:26 christos Exp $");
#endif /* !defined lint */
-static char elsieid[] = "@(#)zdump.c 8.10";
-
+#include "version.h"
/*
** This code has been made independent of the rest of the time
** conversion package to increase confidence in the verification it provides.
@@ -289,7 +286,7 @@ char * argv[];
progname = argv[0];
for (i = 1; i < argc; ++i)
if (strcmp(argv[i], "--version") == 0) {
- (void) printf("%s\n", elsieid);
+ (void) printf("%s\n", TZVERSION);
exit(EXIT_SUCCESS);
} else if (strcmp(argv[i], "--help") == 0) {
usage(stdout, EXIT_SUCCESS);
Index: src/lib/libc/time/zic.8
diff -u src/lib/libc/time/zic.8:1.19 src/lib/libc/time/zic.8:1.20
--- src/lib/libc/time/zic.8:1.19 Sun Sep 4 06:10:26 2011
+++ src/lib/libc/time/zic.8 Thu Aug 9 08:38:26 2012
@@ -1,5 +1,4 @@
-.\" $NetBSD: zic.8,v 1.19 2011/09/04 10:10:26 christos Exp $
-.\" @(#)zic.8 7.22
+.\" $NetBSD: zic.8,v 1.20 2012/08/09 12:38:26 christos Exp $
.Dd December 20, 2003
.Dt ZIC 8
.Os
Index: src/lib/libc/time/zic.c
diff -u src/lib/libc/time/zic.c:1.29 src/lib/libc/time/zic.c:1.30
--- src/lib/libc/time/zic.c:1.29 Sun Sep 4 06:10:26 2011
+++ src/lib/libc/time/zic.c Thu Aug 9 08:38:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: zic.c,v 1.29 2011/09/04 10:10:26 christos Exp $ */
+/* $NetBSD: zic.c,v 1.30 2012/08/09 12:38:26 christos Exp $ */
/*
** This file is in the public domain, so clarified as of
** 2006-07-17 by Arthur David Olson.
@@ -10,11 +10,10 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: zic.c,v 1.29 2011/09/04 10:10:26 christos Exp $");
+__RCSID("$NetBSD: zic.c,v 1.30 2012/08/09 12:38:26 christos Exp $");
#endif /* !defined lint */
-static char elsieid[] = "@(#)zic.c 8.25";
-
+#include "version.h"
#include "private.h"
#include "locale.h"
#include "tzfile.h"
@@ -514,7 +513,7 @@ char * argv[];
}
for (i = 1; i < argc; ++i)
if (strcmp(argv[i], "--version") == 0) {
- (void) printf("%s\n", elsieid);
+ (void) printf("%s\n", TZVERSION);
exit(EXIT_SUCCESS);
} else if (strcmp(argv[i], "--help") == 0) {
usage(stdout, EXIT_SUCCESS);
Added files:
Index: src/lib/libc/time/version.h
diff -u /dev/null src/lib/libc/time/version.h:1.1
--- /dev/null Thu Aug 9 08:38:26 2012
+++ src/lib/libc/time/version.h Thu Aug 9 08:38:26 2012
@@ -0,0 +1 @@
+static char const TZVERSION[]="tz2012e";
