Sync zoneinfo database with tz{code,data}2009k from elsie.

africa:         8.21 -> 8.22
asia:           8.35 -> 8.36
europe:         8.21 -> 8.22
leapseconds:    8.8  -> 8.9

zic.c:          8.19 -> 8.20

From Arthur David Olson's comments:

* africa: Change Mauritius to reflect that the 2008-2009 DST experiment
      is not repeated (and to change end of DST in 2009 from 2:00
      standard time to 2:00 local time) (thanks to Steffen Thorsen).

* asia: Arbitrarily cut off Dhaka DST at end of 2009 (so that a POSIX-
      style time zone string can appear in the Dhaka binary file, and
      for the benefit of systems with old glibc reimplementations of
      the time zone library that don't handle permanent DST correctly).
      Note that another change will be needed once the real end date
      for DST in Dhaka is known.

* europe: Update URL for Directive 2000/84/EC on summer-time
      arrangements (thanks to Colin Watson and Ian Jackson).

* leapseconds: Change "no leap second" comment (no leap second at end
      of 2009).

* zic.c: Do not end a binary file with a POSIX-style time zone string
      for locations that end up in permanent DST (thanks to Andreas Schwab).

diff --git a/share/zoneinfo/africa b/share/zoneinfo/africa
index 1edbc8e..0aa2518 100644 (file)
--- a/share/zoneinfo/africa
+++ b/share/zoneinfo/africa
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)africa   8.21
+# @(#)africa   8.22
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -502,11 +502,33 @@ Zone Africa/Nouakchott    -1:03:48 -      LMT     1912
 # http://www.gov.mu/portal/goc/assemblysite/file/bill2708.pdf
 # </a>
 
+# From Steffen Thorsen (2009-06-05):
+# According to several sources, Mauritius will not continue to observe
+# DST the coming summer...
+#
+# Some sources, in French:
+# <a href="http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-%C2%AB-L%E2%80%99heure-d%E2%80%99%C3%A9t%C3%A9-ne-sera-pas-appliqu%C3%A9e-cette-ann%C3%A9e-%C2%BB">
+# http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-%C2%AB-L%E2%80%99heure-d%E2%80%99%C3%A9t%C3%A9-ne-sera-pas-appliqu%C3%A9e-cette-ann%C3%A9e-%C2%BB
+# </a>
+# <a href="http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints-">
+# http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints-
+# </a>
+#
+# Our wrap-up:
+# <a href="http://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html">
+# http://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html
+# </a>
+
+# From Arthur David Olson (2009-07-11):
+# The "mauritius-dst-will-not-repeat" wrapup includes this:
+# "The trial ended on March 29, 2009, when the clocks moved back by one hour
+# at 2am (or 02:00) local time..."
+
 # Rule NAME    FROM    TO      TYPE    IN      ON      AT      SAVE    LETTER/S
 Rule Mauritius 1982    only    -       Oct     10      0:00    1:00    S
 Rule Mauritius 1983    only    -       Mar     21      0:00    0       -
-Rule Mauritius 2008    max     -       Oct     lastSun 2:00s   1:00    S
-Rule Mauritius 2009    max     -       Mar     lastSun 2:00s   0       -
+Rule Mauritius 2008    only    -       Oct     lastSun 2:00    1:00    S
+Rule Mauritius 2009    only    -       Mar     lastSun 2:00    0       -
 # Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
 Zone Indian/Mauritius  3:50:00 -       LMT     1907            # Port Louis
                        4:00 Mauritius  MU%sT   # Mauritius Time

diff --git a/share/zoneinfo/asia b/share/zoneinfo/asia
index e6ac70d..072bd16 100644 (file)
--- a/share/zoneinfo/asia
+++ b/share/zoneinfo/asia
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)asia     8.35
+# @(#)asia     8.36
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -172,6 +172,12 @@ Zone       Asia/Bahrain    3:22:20 -       LMT     1920            # Al Manamah
 #
 # No DST end date has been announced yet.
 
+# From Arthur David Olson (2009-07-11):
+# Arbitrarily end DST at the end of 2009 so that a POSIX-sytle time zone string
+# can appear in the Dhaka binary file and for the benefit of old glibc
+# reimplementations of the time zone software that mishandle permanent DST.
+# A change will be required once the end date is known.
+
 # Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
 Zone   Asia/Dhaka      6:01:40 -       LMT     1890
                        5:53:20 -       HMT     1941 Oct    # Howrah Mean Time?
@@ -180,7 +186,8 @@ Zone        Asia/Dhaka      6:01:40 -       LMT     1890
                        6:30    -       BURT    1951 Sep 30
                        6:00    -       DACT    1971 Mar 26 # Dacca Time
                        6:00    -       BDT     2009 Jun 19 23:00 # Bangladesh Time
-                       6:00    1:00    BDST
+                       6:00    1:00    BDST    2010
+                       6:00    -       BDT
 
 # Bhutan
 # Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]

diff --git a/share/zoneinfo/europe b/share/zoneinfo/europe
index 3f39215..adf20a2 100644 (file)
--- a/share/zoneinfo/europe
+++ b/share/zoneinfo/europe
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)europe   8.21
+# @(#)europe   8.22
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -459,7 +459,7 @@ Rule        EU      1979    1995    -       Sep     lastSun  1:00u  0       -
 Rule   EU      1981    max     -       Mar     lastSun  1:00u  1:00    S
 Rule   EU      1996    max     -       Oct     lastSun  1:00u  0       -
 # The most recent directive covers the years starting in 2002.  See:
-# <a href="http://europa.eu.int/eur-lex/en/lif/dat/2000/en_300L0084.html">
+# <a="http://eur-lex.europa.eu/LexUriServ/LexUriServ.do?uri=CELEX:32000L0084:EN:NOT">
 # Directive 2000/84/EC of the European Parliament and of the Council
 # of 19 January 2001 on summer-time arrangements.
 # </a>

diff --git a/share/zoneinfo/leapseconds b/share/zoneinfo/leapseconds
index bcd51a0..68a4811 100644 (file)
--- a/share/zoneinfo/leapseconds
+++ b/share/zoneinfo/leapseconds
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)leapseconds      8.8
+# @(#)leapseconds      8.9
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -56,13 +56,13 @@ Leap        2008    Dec     31      23:59:60        +       S
 # SERVICE DE LA ROTATION TERRESTRE
 # OBSERVATOIRE DE PARIS
 # 61, Av. de l'Observatoire 75014 PARIS (France)
-# Tel.      : 33 (0) 1 40 51 22 29
+# Tel.      : 33 (0) 1 40 51 22 26
 # FAX       : 33 (0) 1 40 51 22 91
 # Internet  : services.iers@obspm.fr
 #
-# Paris, 15 January 2009
+# Paris, 4 July 2009
 #
-# Bulletin C 37
+# Bulletin C 38
 #
 # To authorities responsible
 # for the measurement and
@@ -70,7 +70,7 @@ Leap  2008    Dec     31      23:59:60        +       S
 #
 # INFORMATION ON UTC - TAI
 #
-# NO positive leap second will be introduced at the end of June 2009.
+# NO positive leap second will be introduced at the end of December 2009.
 # The difference between Coordinated Universal Time UTC and the
 # International Atomic Time TAI is :
 #
@@ -82,6 +82,6 @@ Leap  2008    Dec     31      23:59:60        +       S
 # will be no time step at the next possible date.
 #
 # Daniel GAMBIS
-# Head
-# Earth Orientation Center of the IERS
+# Director
+# Earth Orientation Center of IERS
 # Observatoire de Paris, France

diff --git a/usr.sbin/zic/zic.c b/usr.sbin/zic/zic.c
index 00b1102..7b70fea 100644 (file)
--- a/usr.sbin/zic/zic.c
+++ b/usr.sbin/zic/zic.c
@@ -2,7 +2,7 @@
 ** This file is in the public domain, so clarified as of
 ** 2006-07-17 by Arthur David Olson.
 **
-** @(#)zic.c   8.19
+** @(#)zic.c   8.20
 ** $FreeBSD: src/usr.sbin/zic/zic.c,v 1.11 1999/08/28 01:21:20 peter Exp $
 ** $DragonFly: src/usr.sbin/zic/zic.c,v 1.7 2008/10/19 20:15:58 swildner Exp $
 */
@@ -1802,7 +1802,7 @@ stringzone(char *result, const struct zone * const zpfirst,
                if (stdrp != NULL && stdrp->r_hiyear == 2037)
                        return;
        }
-       if (stdrp == NULL && zp->z_nrules != 0)
+       if (stdrp == NULL && (zp->z_nrules != 0 || zp->z_stdoff != 0))
                return;
        abbrvar = (stdrp == NULL) ? "" : stdrp->r_abbrvar;
        doabbr(result, zp->z_format, abbrvar, FALSE, TRUE);