14 files changed, 56 insertions, 91 deletions
diff --git a/lib/libc/time/README b/lib/libc/time/README
index 2431e9b0113..c0a2853d215 100644
--- a/lib/libc/time/README
+++ b/lib/libc/time/README
@@ -1,5 +1,6 @@
-$OpenBSD: README,v 1.9 2012/03/01 17:39:44 millert Exp $
-@(#)README	8.4
+$OpenBSD: README,v 1.10 2012/09/13 11:14:20 millert Exp $
+README for the tz distribution
+
 This file is in the public domain, so clarified as of
 2009-05-17 by Arthur David Olson.
 
@@ -41,9 +42,9 @@ tz distribution on a GNU/Linux or similar host.
 
 	mkdir tz
 	cd tz
-	wget 'ftp://munnari.oz.au/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
@@ -81,7 +82,7 @@ Michael Bloom, Art Neilson, Stephen Prince, John Sovereign, and Frank Wales
 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 munnari.oz.au
+Look in <ftp://ftp.iana.org/tz/releases/>
 for updated versions of these files.
 
 Please send comments or information to tz@iana.org.
diff --git a/lib/libc/time/Theory b/lib/libc/time/Theory
index b8a14f44730..1c0b0c34ffc 100644
--- a/lib/libc/time/Theory
+++ b/lib/libc/time/Theory
@@ -1,5 +1,4 @@
-$OpenBSD: Theory,v 1.15 2011/04/25 13:27:27 millert Exp $
-@(#)Theory	8.6
+$OpenBSD: Theory,v 1.16 2012/09/13 11:14:20 millert Exp $
 This file is in the public domain, so clarified as of
 2009-05-17 by Arthur David Olson.
 
@@ -196,26 +195,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.
 
 
@@ -228,7 +227,7 @@ among the following goals:
    agreed since 1970.  This is essential for the intended use: static
    clocks keeping local civil time.
 
- * Indicate to humans as to where that region is.  This simplifes use.
+ * Indicate to humans as to where that region is.  This simplifies use.
 
  * Be robust in the presence of political changes.  This reduces the
    number of updates and backward-compatibility hacks.  For example,
diff --git a/lib/libc/time/ctime.3 b/lib/libc/time/ctime.3
index 37a175dd393..0796ed997d2 100644
--- a/lib/libc/time/ctime.3
+++ b/lib/libc/time/ctime.3
@@ -1,7 +1,7 @@
-.\"	$OpenBSD: ctime.3,v 1.37 2010/08/23 22:35:34 millert Exp $
+.\"	$OpenBSD: ctime.3,v 1.38 2012/09/13 11:14:20 millert Exp $
 .\"
 .\"
-.Dd $Mdocdate: August 23 2010 $
+.Dd $Mdocdate: September 13 2012 $
 .Dt CTIME 3
 .Os
 .Sh NAME
@@ -316,6 +316,5 @@ as the superuser.
 Avoid using out-of-range values with
 .Fn mktime
 when setting up lunch with promptness sticklers in Riyadh.
-.\" based on @(#)newctime.3	8.3
 .\" This file is in the public domain, so clarified as of
 .\" 2009-05-17 by Arthur David Olson.
diff --git a/lib/libc/time/private.h b/lib/libc/time/private.h
index 4f97473ba6e..a7e09020505 100644
--- a/lib/libc/time/private.h
+++ b/lib/libc/time/private.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: private.h,v 1.24 2011/10/10 13:53:24 ajacoutot Exp $	*/
+/*	$OpenBSD: private.h,v 1.25 2012/09/13 11:14:20 millert Exp $	*/
 #ifndef PRIVATE_H
 
 #define PRIVATE_H
@@ -26,18 +26,6 @@
 ** Thank you!
 */
 
-/*
-** ID
-*/
-
-#if 0
-#ifndef lint
-#ifndef NOID
-static char	privatehid[] = "@(#)private.h	8.6";
-#endif /* !defined NOID */
-#endif /* !defined lint */
-#endif
-
 #define GRANDPARENTED	"Local time zone must be set--see zic manual page"
 
 /*
diff --git a/lib/libc/time/strftime.3 b/lib/libc/time/strftime.3
index 331a12dc2ed..06923f67f6e 100644
--- a/lib/libc/time/strftime.3
+++ b/lib/libc/time/strftime.3
@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)strftime.3    5.12 (Berkeley) 6/29/91
-.\"	$OpenBSD: strftime.3,v 1.28 2012/03/01 17:39:44 millert Exp $
+.\"	$OpenBSD: strftime.3,v 1.29 2012/09/13 11:14:20 millert Exp $
 .\"
-.Dd $Mdocdate: March 1 2012 $
+.Dd $Mdocdate: September 13 2012 $
 .Dt STRFTIME 3
 .Os
 .Sh NAME
@@ -251,4 +251,3 @@ is not large enough to store the entire time string.
 The contents of
 .Fa buf
 are implementation specific in this case.
-.\" @(#)newstrftime.3	8.3
diff --git a/lib/libc/time/strftime.c b/lib/libc/time/strftime.c
index 5ed91ad8e8d..3bcee1fc7dd 100644
--- a/lib/libc/time/strftime.c
+++ b/lib/libc/time/strftime.c
@@ -1,10 +1,7 @@
-/*	$OpenBSD: strftime.c,v 1.20 2009/10/27 23:59:59 deraadt Exp $ */
+/*	$OpenBSD: strftime.c,v 1.21 2012/09/13 11:14:20 millert Exp $ */
 #include "private.h"
 
 /*
-** Based on the UCB version with the ID appearing below.
-** This is ANSIish only when "multibyte character == plain character".
-**
 ** Copyright (c) 1989, 1993
 **	The Regents of the University of California.  All rights reserved.
 **
diff --git a/lib/libc/time/time2posix.3 b/lib/libc/time/time2posix.3
index cd6170cd809..c469805c676 100644
--- a/lib/libc/time/time2posix.3
+++ b/lib/libc/time/time2posix.3
@@ -1,5 +1,5 @@
-.\"	$OpenBSD: time2posix.3,v 1.17 2010/08/23 22:35:34 millert Exp $
-.Dd $Mdocdate: August 23 2010 $
+.\"	$OpenBSD: time2posix.3,v 1.18 2012/09/13 11:14:20 millert Exp $
+.Dd $Mdocdate: September 13 2012 $
 .Dt TIME2POSIX 3
 .Os
 .Sh NAME
@@ -138,6 +138,5 @@ degenerate to the identity function.
 .Xr localtime 3 ,
 .Xr mktime 3 ,
 .Xr time 3
-.\" @(#)time2posix.3	8.2
 .\" This file is in the public domain, so clarified as of
 .\" 1996-06-05 by Arthur David Olson.
diff --git a/lib/libc/time/tz-art.htm b/lib/libc/time/tz-art.htm
index c7cce80bc77..7e57b6db749 100644
--- a/lib/libc/time/tz-art.htm
+++ b/lib/libc/time/tz-art.htm
@@ -8,9 +8,6 @@ PUBLIC "-//W3C//DTD HTML 4.01//EN"
 </head>
 <body>
 <h1>Time and the Arts</h1>
-<address>
-@(#)tz-art.htm	8.21
-</address>
 <p>
 This file is in the public domain, so clarified as of
 2009-05-17 by Arthur David Olson.
@@ -213,7 +210,7 @@ Supernaw.</td></tr>
 <tr><td>ID</td><td>272</td></tr>
 <tr><td>Total Time</td><td>73:05</td></tr>
 <tr><td>Notes</td><td>Includes the song "Twilight Time Zone."</td></tr>
-<tr><td><a href="http://www.allmusic.com/cg/amg.dll?p=amg&sql=10:w9fpxzykldje">AMG Rating</a></td><td>3.5 stars</td></tr>
+<tr><td><a href="http://www.allmusic.com/cg/amg.dll?p=amg&amp;sql=10:w9fpxzykldje">AMG Rating</a></td><td>3.5 stars</td></tr>
 <tr><td>ADO Rating</td><td>2 stars</td></tr>
 
 <tr><td>&nbsp;</td></tr>
@@ -224,7 +221,7 @@ Supernaw.</td></tr>
 <tr><td>Label</td><td>Columbia</td></tr>
 <tr><td>ID</td><td>CK-8905</td></tr>
 <tr><td>Total Time</td><td>45:36</td></tr>
-<tr><td><a href="http://www.allmusic.com/cg/amg.dll?p=amg&sql=10:gifqxqt5ld0e">AMG Rating</a></td><td>4.5 stars</td></tr>
+<tr><td><a href="http://www.allmusic.com/cg/amg.dll?p=amg&amp;sql=10:gifqxqt5ld0e">AMG Rating</a></td><td>4.5 stars</td></tr>
 <tr><td>ADO Rating</td><td>1.5 stars</td></tr>
 <tr><td>Notes<td>The title song is also available on "Bob Dylan's Greatest Hits" and "The Essential Bob Dylan."</td></tr>
 <tr><td>&nbsp;</td></tr>
@@ -235,7 +232,7 @@ Supernaw.</td></tr>
 <tr><td>Label</td><td>Universal Jazz France</td></tr>
 <tr><td>ID</td><td>B0012688-02</td></tr>
 <tr><td>Total Time</td><td>42:31</td></tr>
-<tr><td><a href="http://www.allmusic.com/cg/amg.dll?p=amg&sql=10:3bftxzw0ldhe"</a>AMG Rating</a></td><td>3.5 stars</td></tr>
+<tr><td><a href="http://www.allmusic.com/cg/amg.dll?p=amg&amp;sql=10:3bftxzw0ldhe">AMG Rating</a></td><td>3.5 stars</td></tr>
 <tr><td>ADO Rating</td><td>2.5 stars</td></tr>
 <tr><td>Notes<td>Includes the song "Fire and Wood" with the lyric
 "The clocks were turned back you remeber/Think it's still November."
diff --git a/lib/libc/time/tz-link.htm b/lib/libc/time/tz-link.htm
index c0d958ee29a..f4371dfb56d 100644
--- a/lib/libc/time/tz-link.htm
+++ b/lib/libc/time/tz-link.htm
@@ -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,9 +17,6 @@
 </head>
 <body>
 <h1>Sources for Time Zone and Daylight Saving Time Data</h1>
-<address>
-@(#)tz-link.htm	8.33
-</address>
 <p>
 This file is in the public domain, so clarified as of
 2009-05-17 by Arthur David Olson.
@@ -83,14 +80,19 @@ implementation set the <code>TZ</code> environment variable to
 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://munnari.oz.au/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
+are also available.
 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,9 +100,9 @@ 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://munnari.oz.au/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
@@ -122,7 +124,7 @@ 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://munnari.oz.au/pub/oldtz">archived older versions of code
+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.
@@ -138,7 +140,7 @@ These are listed roughly in ascending order of complexity and fanciness.
 Permatime</a>
 is a service for generating and viewing links that refer to a
 particular point in time and can be displayed in multiple timezones.
-It uses the ruby tzinfo gem. 
+It uses the ruby tzinfo gem.
 (From Tim Diggins, 2009-11-03.)
 </li>
 <li><a href="http://twiki.org/cgi-bin/xtra/tzdatepick.html">Date and Time Gateway</a>
diff --git a/lib/libc/time/tzfile.5 b/lib/libc/time/tzfile.5
index 2f89b3b3e6a..ce71b9a070b 100644
--- a/lib/libc/time/tzfile.5
+++ b/lib/libc/time/tzfile.5
@@ -1,5 +1,5 @@
-.\"	$OpenBSD: tzfile.5,v 1.13 2010/08/23 22:35:34 millert Exp $
-.Dd $Mdocdate: August 23 2010 $
+.\"	$OpenBSD: tzfile.5,v 1.14 2012/09/13 11:14:20 millert Exp $
+.Dd $Mdocdate: September 13 2012 $
 .Dt TZFILE 5
 .Os
 .Sh NAME
@@ -150,6 +150,5 @@ after the last transition time stored in the file
 such instants).
 .Sh SEE ALSO
 .Xr ctime 3
-.\" @(#)tzfile.5	8.3
 .\" This file is in the public domain, so clarified as of
 .\" 1996-06-05 by Arthur David Olson.
diff --git a/lib/libc/time/tzfile.h b/lib/libc/time/tzfile.h
index c2153817393..76676bd24cf 100644
--- a/lib/libc/time/tzfile.h
+++ b/lib/libc/time/tzfile.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tzfile.h,v 1.8 2007/02/06 19:35:16 millert Exp $	*/
+/*	$OpenBSD: tzfile.h,v 1.9 2012/09/13 11:14:20 millert Exp $	*/
 
 #ifndef TZFILE_H
 
@@ -18,18 +18,6 @@
 */
 
 /*
-** ID
-*/
-
-#if 0
-#ifndef lint
-#ifndef NOID
-static char	tzfilehid[] = "@(#)tzfile.h	8.1";
-#endif /* !defined NOID */
-#endif /* !defined lint */
-#endif
-
-/*
 ** Information about time zone files.
 */
 
diff --git a/lib/libc/time/tzset.3 b/lib/libc/time/tzset.3
index c634cc0ac3b..760dc44d2a4 100644
--- a/lib/libc/time/tzset.3
+++ b/lib/libc/time/tzset.3
@@ -1,5 +1,5 @@
-.\"	$OpenBSD: tzset.3,v 1.18 2010/08/23 22:35:34 millert Exp $
-.Dd $Mdocdate: August 23 2010 $
+.\"	$OpenBSD: tzset.3,v 1.19 2012/09/13 11:14:20 millert Exp $
+.Dd $Mdocdate: September 13 2012 $
 .Dt TZSET 3
 .Os
 .Sh NAME
@@ -286,6 +286,5 @@ UTC leap seconds are loaded from
 .Xr strftime 3 ,
 .Xr time 3 ,
 .Xr tzfile 5
-.\" @(#)newtzset.3	8.2
 .\" This file is in the public domain, so clarified as of
 .\" 2009-05-17 by Arthur David Olson.
diff --git a/lib/libc/time/zdump.8 b/lib/libc/time/zdump.8
index 3fc4a25eb65..7f8644c0904 100644
--- a/lib/libc/time/zdump.8
+++ b/lib/libc/time/zdump.8
@@ -1,5 +1,5 @@
-.\"	$OpenBSD: zdump.8,v 1.15 2010/08/23 22:35:34 millert Exp $
-.Dd $Mdocdate: August 23 2010 $
+.\"	$OpenBSD: zdump.8,v 1.16 2012/09/13 11:14:20 millert Exp $
+.Dd $Mdocdate: September 13 2012 $
 .Dt ZDUMP 8
 .Os
 .Sh NAME
@@ -59,6 +59,5 @@ This works in all real-world cases;
 .Xr ctime 3 ,
 .Xr tzfile 5 ,
 .Xr zic 8
-.\" @(#)zdump.8	8.2
 .\" This file is in the public domain, so clarified as of
 .\" 2009-05-17 by Arthur David Olson.
diff --git a/lib/libc/time/zic.8 b/lib/libc/time/zic.8
index 3533fd6fa8b..f5970554525 100644
--- a/lib/libc/time/zic.8
+++ b/lib/libc/time/zic.8
@@ -1,5 +1,5 @@
-.\"	$OpenBSD: zic.8,v 1.27 2010/08/23 22:35:34 millert Exp $
-.Dd $Mdocdate: August 23 2010 $
+.\"	$OpenBSD: zic.8,v 1.28 2012/09/13 11:14:20 millert Exp $
+.Dd $Mdocdate: September 13 2012 $
 .Dt ZIC 8
 .Os
 .Sh NAME
@@ -446,6 +446,5 @@ produces a single transition to daylight saving at the new UTC offset
 To get separate transitions
 use multiple zone continuation lines
 specifying transition instants using universal time.
-.\" @(#)zic.8	8.6
 .\" This file is in the public domain, so clarified as of
 .\" 2009-05-17 by Arthur David Olson.