Author: edwin
Date: Sat Jun 14 01:18:02 2014
New Revision: 267460
URL: http://svnweb.freebsd.org/changeset/base/267460

Log:
  Undo commit r267455, which was done in the wrong directory.

Modified:
  head/contrib/tzdata/africa
  head/contrib/tzdata/australasia
  head/contrib/tzdata/etcetera
  head/contrib/tzdata/europe
  head/contrib/tzdata/factory
  head/contrib/tzdata/leapseconds
  head/contrib/tzdata/northamerica
  head/contrib/tzdata/zone.tab

Modified: head/contrib/tzdata/africa
==============================================================================
--- head/contrib/tzdata/africa  Sat Jun 14 01:03:24 2014        (r267459)
+++ head/contrib/tzdata/africa  Sat Jun 14 01:18:02 2014        (r267460)
@@ -239,13 +239,13 @@ Rule      Egypt   1990    1994    -       May      1      
1:00    1:00    
 # http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
 # </a>
 Rule   Egypt   1995    2010    -       Apr     lastFri  0:00s  1:00    S
-Rule   Egypt   1995    2005    -       Sep     lastThu 24:00   0       -
+Rule   Egypt   1995    2005    -       Sep     lastThu 23:00s  0       -
 # From Steffen Thorsen (2006-09-19):
 # The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports:
 # Egypt will turn back clocks by one hour at the midnight of Thursday
 # after observing the daylight saving time since May.
 # http://news.gom.com.eg/gazette/pdf/2006/09/18/01.pdf
-Rule   Egypt   2006    only    -       Sep     21      24:00   0       -
+Rule   Egypt   2006    only    -       Sep     21      23:00s  0       -
 # From Dirk Losch (2007-08-14):
 # I received a mail from an airline which says that the daylight
 # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
@@ -254,7 +254,7 @@ Rule        Egypt   2006    only    -       Sep     21      
24:00   0       -
 # http://www.timeanddate.com/worldclock/city.html?n=53
 # From Steffen Thorsen (2007-09-04): The official information...:
 # 
http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/000002/0207000000000000001580.htm
-Rule   Egypt   2007    only    -       Sep     Thu>=1  24:00   0       -
+Rule   Egypt   2007    only    -       Sep     Thu>=1  23:00s  0       -
 # From Abdelrahman Hassan (2007-09-06):
 # Due to the Hijri (lunar Islamic calendar) year being 11 days shorter
 # than the year of the Gregorian calendar, Ramadan shifts earlier each
@@ -342,77 +342,46 @@ Rule      Egypt   2007    only    -       Sep     Thu>=1  
24:00   
 # From Gunther Vermier (2015-05-13):
 # our Egypt office confirms that the change will be at 15 May "midnight" 
(24:00)
 
-# From Imed Chihi (2014-06-04):
-# We have finally "located" a precise official reference about the DST changes
-# in Egypt.  The Ministers Cabinet decision is explained at
-# http://www.cabinet.gov.eg/Media/CabinetMeetingsDetails.aspx?id=347 ...
-# [T]his (Arabic) site is not accessible outside Egypt, but the page ...
-# translates into: "With regard to daylight saving time, it is scheduled to
-# take effect at exactly twelve o'clock this evening, Thursday, 15 MAY 2014,
-# to be suspended by twelve o'clock on the evening of Thursday, 26 JUN 2014,
-# and re-established again at the end of the month of Ramadan, at twelve
-# o'clock on the evening of Thursday, 31 JUL 2014."  This statement has been
-# reproduced by other (more accessible) sites[, e.g.,]...
-# http://elgornal.net/news/news.aspx?id=4699258
-
-# From Paul Eggert (2014-06-04):
+# From Paul Eggert (2014-05-13):
 # Sarah El Deeb and Lee Keath of AP report that the Egyptian government says
 # the change is because of blackouts in Cairo, even though Ahram Online (cited
-# above) says DST had no affect on electricity consumption.  There is
-# no information about when DST will end this fall.  See:
+# above) says DST had no affect on electricity consumption.  The AP story says
+# DST will not be observed during Ramadan.  There is no information about when
+# DST will end.  See:
 # 
http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833
 #
-# For now, guess that later spring and fall transitions will use
-# 2010's rules, and guess that Egypt will switch to standard time at
-# 24:00 the last Thursday before Ramadan, and back to DST at 00:00 the
-# first Friday after Ramadan.  To implement this,
-# transition dates for 2015 through 2037 were determined by running
-# the following program under GNU Emacs 24.3, with the results integrated
-# by hand into the table below.  Ramadan again intrudes on the guessed
-# DST starting in 2038, but that's beyond our somewhat-arbitrary cutoff.
-# (let ((islamic-year 1436))
-#   (while (< islamic-year 1460)
-#     (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
-#           (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
-#           (friday 5))
-#       (while (/= friday (mod a 7))
-#         (setq a (1- a)))
-#       (while (/= friday (mod b 7))
-#         (setq b (1+ b)))
-#       (setq a (1- a))
-#       (setq b (1- b))
-#       (setq a (calendar-gregorian-from-absolute a))
-#       (setq b (calendar-gregorian-from-absolute b))
-#       (insert
-#        (format
-#         (concat "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t0\t-\n"
-#                 "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t1:00\tS\n")
-#         (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
-#         (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
-#     (setq islamic-year (+ 1 islamic-year))))
-Rule   Egypt   2008    only    -       Aug     lastThu 24:00   0       -
-Rule   Egypt   2009    only    -       Aug     20      24:00   0       -
-Rule   Egypt   2010    only    -       Aug     10      24:00   0       -
-Rule   Egypt   2010    only    -       Sep      9      24:00   1:00    S
-Rule   Egypt   2010    only    -       Sep     lastThu 24:00   0       -
+# For now, guess that later transitions will use 2010's rules, and that
+# Egypt will agree with Morocco (see below) about the date Ramadan starts and
+# ends, though (unlike Morocco) it will switch at 00:00 standard time.  In
+# Egypt the spring-forward transitions are removed for 2020-2022, when the
+# guessed spring-forward date falls during the estimated Ramadan, and all
+# transitions removed for 2023-2038, where the estimated Ramadan falls entirely
+# outside the guessed daylight-saving time.  Ramadan intrudes on the guessed
+# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff.
+
+Rule   Egypt   2008    only    -       Aug     lastThu 23:00s  0       -
+Rule   Egypt   2009    only    -       Aug     20      23:00s  0       -
+Rule   Egypt   2010    only    -       Aug     11      0:00    0       -
+Rule   Egypt   2010    only    -       Sep     10      0:00    1:00    S
+Rule   Egypt   2010    only    -       Sep     lastThu 23:00s  0       -
 Rule   Egypt   2014    only    -       May     15      24:00   1:00    S
-Rule   Egypt   2014    only    -       Jun     26      24:00   0       -
-Rule   Egypt   2014    only    -       Jul     31      24:00   1:00    S
-Rule   Egypt   2014    max     -       Sep     lastThu 24:00   0       -
+Rule   Egypt   2014    only    -       Jun     29       0:00s  0       -
+Rule   Egypt   2014    only    -       Jul     29       0:00s  1:00    S
+Rule   Egypt   2014    max     -       Sep     lastThu 23:00s  0       -
 Rule   Egypt   2015    2019    -       Apr     lastFri  0:00s  1:00    S
-Rule   Egypt   2015    only    -       Jun     11      24:00   0       -
-Rule   Egypt   2015    only    -       Jul     23      24:00   1:00    S
-Rule   Egypt   2016    only    -       Jun      2      24:00   0       -
-Rule   Egypt   2016    only    -       Jul      7      24:00   1:00    S
-Rule   Egypt   2017    only    -       May     25      24:00   0       -
-Rule   Egypt   2017    only    -       Jun     29      24:00   1:00    S
-Rule   Egypt   2018    only    -       May     10      24:00   0       -
-Rule   Egypt   2018    only    -       Jun     14      24:00   1:00    S
-Rule   Egypt   2019    only    -       May      2      24:00   0       -
-Rule   Egypt   2019    only    -       Jun      6      24:00   1:00    S
-Rule   Egypt   2020    only    -       May     28      24:00   1:00    S
-Rule   Egypt   2021    only    -       May     13      24:00   1:00    S
-Rule   Egypt   2022    only    -       May      5      24:00   1:00    S
+Rule   Egypt   2015    only    -       Jun     18       0:00s  0       -
+Rule   Egypt   2015    only    -       Jul     18       0:00s  1:00    S
+Rule   Egypt   2016    only    -       Jun      7       0:00s  0       -
+Rule   Egypt   2016    only    -       Jul      7       0:00s  1:00    S
+Rule   Egypt   2017    only    -       May     27       0:00s  0       -
+Rule   Egypt   2017    only    -       Jun     26       0:00s  1:00    S
+Rule   Egypt   2018    only    -       May     16       0:00s  0       -
+Rule   Egypt   2018    only    -       Jun     15       0:00s  1:00    S
+Rule   Egypt   2019    only    -       May      6       0:00s  0       -
+Rule   Egypt   2019    only    -       Jun      5       0:00s  1:00    S
+Rule   Egypt   2020    only    -       May     24       0:00s  1:00    S
+Rule   Egypt   2021    only    -       May     13       0:00s  1:00    S
+Rule   Egypt   2022    only    -       May      3       0:00s  1:00    S
 Rule   Egypt   2023    max     -       Apr     lastFri  0:00s  1:00    S
 
 # Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
@@ -945,36 +914,39 @@ Zone      Indian/Mayotte  3:00:56 -       LMT     1911 J
 # From Sebastien Willemijns (2014-03-18):
 # 
http://www.afriquinfos.com/articles/2014/3/18/maroc-heure-dete-avancez-tous-horloges-247891.asp
 
-# From Milamber Space Network (2014-06-05):
-# The Moroccan government has recently announced that the country will return
-# to standard time at 03:00 on Saturday, June 28, 2014 local time....  DST
-# will resume again at 02:00 on Saturday, August 2, 2014....
-# http://www.mmsp.gov.ma/fr/actualites.aspx?id=586
-
-# From Paul Eggert (2014-06-05):
-# For now, guess that later spring and fall transitions will use 2014's rules,
-# and guess that Morocco will switch to standard time at 03:00 the last
-# Saturday before Ramadan, and back to DST at 02:00 the first Saturday after
-# Ramadan.  To implement this, transition dates for 2015 through 2037 were
-# determined by running the following program under GNU Emacs 24.3, with the
-# results integrated by hand into the table below.
-# (let ((islamic-year 1436))
-#   (while (< islamic-year 1460)
-#     (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
-#           (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
-#           (saturday 6))
-#       (while (/= saturday (mod (setq a (1- a)) 7)))
-#       (while (/= saturday (mod b 7))
-#         (setq b (1+ b)))
-#       (setq a (calendar-gregorian-from-absolute a))
-#       (setq b (calendar-gregorian-from-absolute b))
-#       (insert
-#        (format
-#         (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 3:00\t0\t-\n"
-#                 "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 2:00\t1:00\tS\n")
-#         (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
-#         (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
+# From Paul Eggert (2014-03-19):
+# To estimate what the Moroccan government will do in future years,
+# transition dates for 2014 through 2038 were determined by running
+# the following program under GNU Emacs 24.3:
+#
+# (let ((islamic-year 1435))
+#   (while (< islamic-year 1461)
+#     (let ((a
+#           (calendar-gregorian-from-absolute
+#            (calendar-islamic-to-absolute (list 9 1 islamic-year))))
+#          (b
+#           (calendar-gregorian-from-absolute
+#            (calendar-islamic-to-absolute (list 10 1 islamic-year)))))
+#      (insert
+#       (format
+#        (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 3:00\t0\t-\n"
+#                "Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 2:00\t1:00\tS\n")
+#        (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
+#        (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
 #     (setq islamic-year (+ 1 islamic-year))))
+#
+# with spring-forward transitions removed for 2023-2025, when the
+# normal spring-forward date falls during the estimated Ramadan; with
+# all transitions removed for 2026-2035, where the estimated Ramadan
+# falls entirely outside daylight-saving time; and with fall-back
+# transitions removed for 2036-2037, where the normal fall-back
+# date falls during the estimated Ramadan.  Normally, the table would
+# stop after 2037 because 32-bit time_t values roll around early in 2038,
+# but that would imply a prediction of perpetual DST after March 2038
+# due to the year-2037 glitches.  So, this table instead stops after
+# 2038, the first non-glitchy year after the 32-bit rollover.
+# An advantage of stopping after 2038 is that it lets zic guess
+# TZ='WET0WEST,M3.5.0,M10.5.0/3' for time stamps far in the future.
 
 # RULE NAME    FROM    TO      TYPE    IN      ON      AT      SAVE    LETTER/S
 
@@ -996,44 +968,46 @@ Rule      Morocco 1978    only    -       Aug      4      
 0:00   0       
 Rule   Morocco 2008    only    -       Jun      1       0:00   1:00    S
 Rule   Morocco 2008    only    -       Sep      1       0:00   0       -
 Rule   Morocco 2009    only    -       Jun      1       0:00   1:00    S
-Rule   Morocco 2009    only    -       Aug     21       0:00   0       -
+Rule   Morocco 2009    only    -       Aug      21      0:00   0       -
 Rule   Morocco 2010    only    -       May      2       0:00   1:00    S
 Rule   Morocco 2010    only    -       Aug      8       0:00   0       -
 Rule   Morocco 2011    only    -       Apr      3       0:00   1:00    S
-Rule   Morocco 2011    only    -       Jul     31       0      0       -
-Rule   Morocco 2012    2013    -       Apr     lastSun  2:00   1:00    S
-Rule   Morocco 2012    only    -       Sep     30       3:00   0       -
-Rule   Morocco 2012    only    -       Jul     20       3:00   0       -
-Rule   Morocco 2012    only    -       Aug     20       2:00   1:00    S
-Rule   Morocco 2013    only    -       Jul      7       3:00   0       -
-Rule   Morocco 2013    only    -       Aug     10       2:00   1:00    S
-Rule   Morocco 2013    max     -       Oct     lastSun  3:00   0       -
-Rule   Morocco 2014    2022    -       Mar     lastSun  2:00   1:00    S
-Rule   Morocco 2014    only    -       Jun     28       3:00   0       -
-Rule   Morocco 2014    only    -       Aug      2       2:00   1:00    S
-Rule   Morocco 2015    only    -       Jun     13       3:00   0       -
-Rule   Morocco 2015    only    -       Jul     18       2:00   1:00    S
-Rule   Morocco 2016    only    -       Jun      4       3:00   0       -
-Rule   Morocco 2016    only    -       Jul      9       2:00   1:00    S
-Rule   Morocco 2017    only    -       May     20       3:00   0       -
-Rule   Morocco 2017    only    -       Jul      1       2:00   1:00    S
-Rule   Morocco 2018    only    -       May     12       3:00   0       -
-Rule   Morocco 2018    only    -       Jun     16       2:00   1:00    S
-Rule   Morocco 2019    only    -       May      4       3:00   0       -
-Rule   Morocco 2019    only    -       Jun      8       2:00   1:00    S
-Rule   Morocco 2020    only    -       Apr     18       3:00   0       -
-Rule   Morocco 2020    only    -       May     30       2:00   1:00    S
-Rule   Morocco 2021    only    -       Apr     10       3:00   0       -
-Rule   Morocco 2021    only    -       May     15       2:00   1:00    S
-Rule   Morocco 2022    only    -       Apr      2       3:00   0       -
-Rule   Morocco 2022    only    -       May      7       2:00   1:00    S
-Rule   Morocco 2023    only    -       Apr     22       2:00   1:00    S
-Rule   Morocco 2024    only    -       Apr     13       2:00   1:00    S
-Rule   Morocco 2025    only    -       Apr      5       2:00   1:00    S
-Rule   Morocco 2026    max     -       Mar     lastSun  2:00   1:00    S
-Rule   Morocco 2035    only    -       Oct     27       3:00   0       -
-Rule   Morocco 2036    only    -       Oct     18       3:00   0       -
-Rule   Morocco 2037    only    -       Oct     10       3:00   0       -
+Rule   Morocco 2011    only    -       Jul      31      0      0       -
+Rule   Morocco 2012    2013    -       Apr      lastSun 2:00   1:00    S
+Rule   Morocco 2012    only    -       Sep      30      3:00   0       -
+Rule   Morocco 2012    only    -       Jul      20      3:00   0       -
+Rule   Morocco 2012    only    -       Aug      20      2:00   1:00    S
+Rule   Morocco 2013    only    -       Jul       7      3:00   0       -
+Rule   Morocco 2013    only    -       Aug      10      2:00   1:00    S
+Rule   Morocco 2013    2035    -       Oct      lastSun 3:00   0       -
+Rule   Morocco 2014    2022    -       Mar      lastSun 2:00   1:00    S
+Rule   Morocco 2014    only    -       Jun      29      3:00   0       -
+Rule   Morocco 2014    only    -       Jul      29      2:00   1:00    S
+Rule   Morocco 2015    only    -       Jun      18      3:00   0       -
+Rule   Morocco 2015    only    -       Jul      18      2:00   1:00    S
+Rule   Morocco 2016    only    -       Jun       7      3:00   0       -
+Rule   Morocco 2016    only    -       Jul       7      2:00   1:00    S
+Rule   Morocco 2017    only    -       May      27      3:00   0       -
+Rule   Morocco 2017    only    -       Jun      26      2:00   1:00    S
+Rule   Morocco 2018    only    -       May      16      3:00   0       -
+Rule   Morocco 2018    only    -       Jun      15      2:00   1:00    S
+Rule   Morocco 2019    only    -       May       6      3:00   0       -
+Rule   Morocco 2019    only    -       Jun       5      2:00   1:00    S
+Rule   Morocco 2020    only    -       Apr      24      3:00   0       -
+Rule   Morocco 2020    only    -       May      24      2:00   1:00    S
+Rule   Morocco 2021    only    -       Apr      13      3:00   0       -
+Rule   Morocco 2021    only    -       May      13      2:00   1:00    S
+Rule   Morocco 2022    only    -       Apr       3      3:00   0       -
+Rule   Morocco 2022    only    -       May       3      2:00   1:00    S
+Rule   Morocco 2023    only    -       Apr      22      2:00   1:00    S
+Rule   Morocco 2024    only    -       Apr      10      2:00   1:00    S
+Rule   Morocco 2025    only    -       Mar      31      2:00   1:00    S
+Rule   Morocco 2026    max     -       Mar      lastSun 2:00   1:00    S
+Rule   Morocco 2036    only    -       Oct      21      3:00   0       -
+Rule   Morocco 2037    only    -       Oct      11      3:00   0       -
+Rule   Morocco 2038    only    -       Sep      30      3:00   0       -
+Rule   Morocco 2038    only    -       Oct      30      2:00   1:00    S
+Rule   Morocco 2038    max     -       Oct      lastSun 3:00   0       -
 
 # Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
 Zone Africa/Casablanca -0:30:20 -      LMT     1913 Oct 26

Modified: head/contrib/tzdata/australasia
==============================================================================
--- head/contrib/tzdata/australasia     Sat Jun 14 01:03:24 2014        
(r267459)
+++ head/contrib/tzdata/australasia     Sat Jun 14 01:18:02 2014        
(r267460)
@@ -250,14 +250,24 @@ Zone Antarctica/Macquarie 0       -       zzz     1899 N
 Zone Indian/Christmas  7:02:52 -       LMT     1895 Feb
                        7:00    -       CXT     # Christmas Island Time
 
-# Cocos (Keeling) Is
+# Cook Is
+# From Shanks & Pottenger:
+# Rule NAME    FROM    TO      TYPE    IN      ON      AT      SAVE    LETTER/S
+Rule   Cook    1978    only    -       Nov     12      0:00    0:30    HS
+Rule   Cook    1979    1991    -       Mar     Sun>=1  0:00    0       -
+Rule   Cook    1979    1990    -       Oct     lastSun 0:00    0:30    HS
+# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+Zone Pacific/Rarotonga -10:39:04 -     LMT     1901            # Avarua
+                       -10:30  -       CKT     1978 Nov 12     # Cook Is Time
+                       -10:00  Cook    CK%sT
+
+# Cocos
 # These islands were ruled by the Ross family from about 1830 to 1978.
 # We don't know when standard time was introduced; for now, we guess 1900.
 # Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
 Zone   Indian/Cocos    6:27:40 -       LMT     1900
                        6:30    -       CCT     # Cocos Islands Time
 
-
 # Fiji
 
 # Milne gives 11:55:44 for Suva.
@@ -463,8 +473,7 @@ Rule        NZ      1934    1940    -       Apr     lastSun 
2:00    0       M
 Rule   NZ      1934    1940    -       Sep     lastSun 2:00    0:30    S
 Rule   NZ      1946    only    -       Jan      1      0:00    0       S
 # Since 1957 Chatham has been 45 minutes ahead of NZ, but there's no
-# convenient single notation for the date and time of this transition
-# so we must duplicate the Rule lines.
+# convenient notation for this so we must duplicate the Rule lines.
 Rule   NZ      1974    only    -       Nov     Sun>=1  2:00s   1:00    D
 Rule   Chatham 1974    only    -       Nov     Sun>=1  2:45s   1:00    D
 Rule   NZ      1975    only    -       Feb     lastSun 2:00s   0       S
@@ -502,17 +511,6 @@ Link Pacific/Auckland Antarctica/McMurdo
 # previously whalers, sealers, pastoralists, and scientific personnel wintered
 # was probably like Pacific/Auckland
 
-# Cook Is
-# From Shanks & Pottenger:
-# Rule NAME    FROM    TO      TYPE    IN      ON      AT      SAVE    LETTER/S
-Rule   Cook    1978    only    -       Nov     12      0:00    0:30    HS
-Rule   Cook    1979    1991    -       Mar     Sun>=1  0:00    0       -
-Rule   Cook    1979    1990    -       Oct     lastSun 0:00    0:30    HS
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
-Zone Pacific/Rarotonga -10:39:04 -     LMT     1901            # Avarua
-                       -10:30  -       CKT     1978 Nov 12     # Cook Is Time
-                       -10:00  Cook    CK%sT
-
 ###############################################################################
 
 

Modified: head/contrib/tzdata/etcetera
==============================================================================
--- head/contrib/tzdata/etcetera        Sat Jun 14 01:03:24 2014        
(r267459)
+++ head/contrib/tzdata/etcetera        Sat Jun 14 01:18:02 2014        
(r267460)
@@ -15,9 +15,9 @@ Zone  Etc/UCT         0       -       UCT
 
 # The following link uses older naming conventions,
 # but it belongs here, not in the file `backward',
-# as functions like gmtime load the "GMT" file to handle leap seconds properly.
+# as functions like gmtime load the "UTC" file to handle leap seconds properly.
 # We want this to work even on installations that omit the other older names.
-Link   Etc/GMT                         GMT
+Link   Etc/UTC                         UTC
 
 Link   Etc/UTC                         Etc/Universal
 Link   Etc/UTC                         Etc/Zulu

Modified: head/contrib/tzdata/europe
==============================================================================
--- head/contrib/tzdata/europe  Sat Jun 14 01:03:24 2014        (r267459)
+++ head/contrib/tzdata/europe  Sat Jun 14 01:18:02 2014        (r267460)
@@ -6,7 +6,7 @@
 # go ahead and edit the file (and please send any changes to
 # t...@iana.org for general use in the future).
 
-# From Paul Eggert (2014-05-31):
+# From Paul Eggert (2006-03-22):
 # A good source for time zone historical data outside the U.S. is
 # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
 # San Diego: ACS Publications, Inc. (2003).
@@ -17,9 +17,6 @@
 # published semiannually.  Law sent in several helpful summaries
 # of the IATA's data after 1990.
 #
-# A reliable and entertaining source about time zones is
-# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
-#
 # Except where otherwise noted, Shanks & Pottenger is the source for
 # entries through 1991, and IATA SSIM is the source for entries afterwards.
 #
@@ -29,9 +26,9 @@
 #      Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated),
 #      which I found in the UCLA library.
 #
+#      <a 
href="http://www.pettswoodvillage.co.uk/Daylight_Savings_William_Willett.pdf";>
 #      William Willett, The Waste of Daylight, 19th edition
-#      <http://cs.ucla.edu/~eggert/The-Waste-of-Daylight-19th.pdf>
-#      [PDF] (1914-03)
+#      </a> (1914-03)
 #
 #      Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
 #      <http://www.jstor.org/stable/1774359>.  He writes:
@@ -61,7 +58,10 @@
 #        1:00       CET CEST CEMT Central Europe
 #        1:00:14    SET           Swedish (1879-1899)*
 #        2:00       EET EEST      Eastern Europe
-#        3:00       MSK MSD  MSM* Moscow
+#        3:00       MSK MSD       Moscow
+#
+# A reliable and entertaining source about time zones, especially in Britain,
+# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
 
 # From Peter Ilieve (1994-12-04),
 # The original six [EU members]: Belgium, France, (West) Germany, Italy,
@@ -558,11 +558,11 @@ Rule      Russia  1917    only    -       Dec     28      
 0:00   0       M
 Rule   Russia  1918    only    -       May     31      22:00   2:00    MDST    
# Moscow Double Summer Time
 Rule   Russia  1918    only    -       Sep     16       1:00   1:00    MST
 Rule   Russia  1919    only    -       May     31      23:00   2:00    MDST
-Rule   Russia  1919    only    -       Jul      1       2:00   1:00    MSD
-Rule   Russia  1919    only    -       Aug     16       0:00   0       MSK
-Rule   Russia  1921    only    -       Feb     14      23:00   1:00    MSD
-Rule   Russia  1921    only    -       Mar     20      23:00   2:00    MSM # 
Midsummer
-Rule   Russia  1921    only    -       Sep      1       0:00   1:00    MSD
+Rule   Russia  1919    only    -       Jul      1       2:00   1:00    S
+Rule   Russia  1919    only    -       Aug     16       0:00   0       -
+Rule   Russia  1921    only    -       Feb     14      23:00   1:00    S
+Rule   Russia  1921    only    -       Mar     20      23:00   2:00    M # 
Midsummer
+Rule   Russia  1921    only    -       Sep      1       0:00   1:00    S
 Rule   Russia  1921    only    -       Oct      1       0:00   0       -
 # Act No.925 of the Council of Ministers of the USSR (1980-10-24):
 Rule   Russia  1981    1984    -       Apr      1       0:00   1:00    S
@@ -2217,7 +2217,6 @@ Zone Europe/Kaliningrad    1:22:00 -      LMT     1
 Zone Europe/Moscow      2:30:20 -      LMT     1880
                         2:30   -       MMT     1916 Jul  3 # Moscow Mean Time
                         2:30:48 Russia %s      1919 Jul  1 2:00
-                        3:00   Russia  %s      1921 Oct
                         3:00   Russia  MSK/MSD 1922 Oct
                         2:00   -       EET     1930 Jun 21
                         3:00   Russia  MSK/MSD 1991 Mar 31 2:00s
@@ -2376,7 +2375,7 @@ Zone Asia/Yakutsk  8:38:40 -      LMT     1919 De
 Zone Asia/Vladivostok   8:47:44 -      LMT     1922 Nov 15
                         9:00   -       VLAT    1930 Jun 21 # Vladivostok Time
                        10:00   Russia  VLA%sT  1991 Mar 31 2:00s
-                        9:00   Russia  VLA%sT  1992 Jan 19 2:00s
+                        9:00   Russia  VLA%sST 1992 Jan 19 2:00s
                        10:00   Russia  VLA%sT  2011 Mar 27 2:00s
                        11:00   -       VLAT
 

Modified: head/contrib/tzdata/factory
==============================================================================
--- head/contrib/tzdata/factory Sat Jun 14 01:03:24 2014        (r267459)
+++ head/contrib/tzdata/factory Sat Jun 14 01:18:02 2014        (r267460)
@@ -7,4 +7,4 @@
 # Also useful for the "comp.sources" version.
 
 # Zone NAME    GMTOFF  RULES   FORMAT
-Zone   Factory 0       - "Local time zone must be set--see zic manual page"
+Zone   Factory 0       - "Local time zone must be set--use tzsetup"

Modified: head/contrib/tzdata/leapseconds
==============================================================================
--- head/contrib/tzdata/leapseconds     Sat Jun 14 01:03:24 2014        
(r267459)
+++ head/contrib/tzdata/leapseconds     Sat Jun 14 01:18:02 2014        
(r267460)
@@ -1,20 +1,14 @@
-# Allowance for leapseconds added to each timezone file.
-
-# This file is in the public domain.
+# <pre>
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
 
-# This file is generated automatically from the data in the public-domain
-# leap-seconds.list file available from most NIST time servers.
-# If the URL <ftp://time.nist.gov/pub/leap-seconds.list> does not work,
-# you should be able to pick up leap-seconds.list from a secondary NIST server.
-# For more about leap-seconds.list, please see
-# The NTP Timescale and Leap Seconds
-# <http://www.eecis.udel.edu/~mills/leap.html>.
+# Allowance for leapseconds added to each timezone file.
 
 # The International Earth Rotation Service periodically uses leap seconds
 # to keep UTC to within 0.9 s of UT1
 # (which measures the true angular orientation of the earth in space); see
 # Terry J Quinn, The BIPM and the accurate measure of time,
-# Proc IEEE 79, 7 (July 1991), 894-905 <http://dx.doi.org/10.1109/5.84965>.
+# Proc IEEE 79, 7 (July 1991), 894-905.
 # There were no leap seconds before 1972, because the official mechanism
 # accounting for the discrepancy between atomic time and the earth's rotation
 # did not exist until the early 1970s.
@@ -25,8 +19,8 @@
 # or
 #      Leap    YEAR    MON     DAY     23:59:59        -       R/S
 
-# If the leapsecond is Rolling (R) the given time is local time.
-# If the leapsecond is Stationary (S) the given time is UTC.
+# If the leapsecond is Rolling (R) the given time is local time
+# If the leapsecond is Stationary (S) the given time is UTC
 
 # Leap YEAR    MONTH   DAY     HH:MM:SS        CORR    R/S
 Leap   1972    Jun     30      23:59:60        +       S
@@ -54,3 +48,53 @@ Leap 1998    Dec     31      23:59:60        +       S
 Leap   2005    Dec     31      23:59:60        +       S
 Leap   2008    Dec     31      23:59:60        +       S
 Leap   2012    Jun     30      23:59:60        +       S
+
+# INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS)
+#
+# SERVICE INTERNATIONAL DE LA ROTATION TERRESTRE ET DES SYSTEMES DE REFERENCE
+#
+#
+# SERVICE DE LA ROTATION TERRESTRE
+# OBSERVATOIRE DE PARIS
+# 61, Av. de l'Observatoire 75014 PARIS (France)
+# Tel.      : 33 (0) 1 40 51 22 26
+# FAX       : 33 (0) 1 40 51 22 91
+# e-mail    : (E-Mail Removed)
+# http://hpiers.obspm.fr/eop-pc
+#
+# Paris, 5 January 2012
+#
+#
+# Bulletin C 43
+#
+# To authorities responsible
+# for the measurement and
+# distribution of time
+#
+#
+# UTC TIME STEP
+# on the 1st of July 2012
+#
+#
+# A positive leap second will be introduced at the end of June 2012.
+# The sequence of dates of the UTC second markers will be:
+#
+#                          2012 June 30,     23h 59m 59s
+#                          2012 June 30,     23h 59m 60s
+#                          2012 July  1,      0h  0m  0s
+#
+# The difference between UTC and the International Atomic Time TAI is:
+#
+# from 2009 January 1, 0h UTC, to 2012 July 1  0h UTC  : UTC-TAI = - 34s
+# from 2012 July 1,    0h UTC, until further notice    : UTC-TAI = - 35s
+#
+# Leap seconds can be introduced in UTC at the end of the months of December
+# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every
+# six months, either to announce a time step in UTC or to confirm that there
+# will be no time step at the next possible date.
+#
+#
+# Daniel GAMBIS
+# Head
+# Earth Orientation Center of IERS
+# Observatoire de Paris, France

Modified: head/contrib/tzdata/northamerica
==============================================================================
--- head/contrib/tzdata/northamerica    Sat Jun 14 01:03:24 2014        
(r267459)
+++ head/contrib/tzdata/northamerica    Sat Jun 14 01:18:02 2014        
(r267460)
@@ -1019,9 +1019,9 @@ Zone America/Menominee    -5:50:27 -      LMT     18
 #      Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated),
 #      which I found in the UCLA library.
 #
+#      <a 
href="http://www.pettswoodvillage.co.uk/Daylight_Savings_William_Willett.pdf";>
 #      William Willett, The Waste of Daylight, 19th edition
-#      <http://cs.ucla.edu/~eggert/The-Waste-of-Daylight-19th.pdf>
-#      [PDF] (1914-03)
+#      </a> (1914-03)
 #
 #      Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
 #      <http://www.jstor.org/stable/1774359>.

Modified: head/contrib/tzdata/zone.tab
==============================================================================
--- head/contrib/tzdata/zone.tab        Sat Jun 14 01:03:24 2014        
(r267459)
+++ head/contrib/tzdata/zone.tab        Sat Jun 14 01:18:02 2014        
(r267460)
@@ -10,7 +10,8 @@
 # zone where civil clocks have agreed since 1970.  The columns of the
 # table are as follows:
 #
-# 1.  ISO 3166 2-character country code.  See the file 'iso3166.tab'.
+# 1.  ISO 3166 2-character country code.
+#     See the file '/usr/share/misc/iso3166.tab'.
 # 2.  Latitude and longitude of the area's principal location
 #     in ISO 6709 sign-degrees-minutes-seconds format,
 #     either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS,
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to