Module Name: src
Committed By: bouyer
Date: Sat Sep 7 17:17:36 UTC 2013
Modified Files:
src/doc [netbsd-5]: 3RDPARTY
src/share/zoneinfo [netbsd-5]: africa asia australasia europe
iso3166.tab southamerica zone.tab
Log Message:
doc/3RDPARTY patch
share/zoneinfo/africa patch
share/zoneinfo/asia patch
share/zoneinfo/australasia patch
share/zoneinfo/europe patch
share/zoneinfo/iso3166.tab patch
share/zoneinfo/southamerica patch
share/zoneinfo/zone.tab patch
Import tzdata2013d from
ftp://ftp.iana.org/tz/releases/tzdata2013d.tar.gz
Summary of changes from tzdata2013c to tzdata2013d:
Changes affecting current and future time stamps:
Morocco's midsummer transitions this year are July 7 and August 10,
not July 9 and August 8. (Thanks to Andrew Paprocki.)
Israel now falls back on the last Sunday of October.
(Thanks to Ephraim Silverberg.)
Changes affecting past time stamps:
Specify Jerusalem's location more precisely; this changes the
pre-1880 times by 2 s.
Changing affecting metadata only:
Fix typos in the entries for country codes BQ and SX.
Changes affecting documentation and commentary:
Deemphasize the significance of national borders.
Update the zdump man page.
Remove obsolete NOID comment (thanks to Denis Excoffier).
Update several URLs and comments in the web pages.
Spelling fixes (thanks to Kevin Lyda and Jonathan Leffler).
Update URL for CLDR Zone->Tzid table (thanks to Yoshito Umaoka).
[apb, ticket #1870]
To generate a diff of this commit:
cvs rdiff -u -r1.647.2.24 -r1.647.2.25 src/doc/3RDPARTY
cvs rdiff -u -r1.1.1.27.2.5 -r1.1.1.27.2.6 src/share/zoneinfo/africa
cvs rdiff -u -r1.1.1.44.2.9 -r1.1.1.44.2.10 src/share/zoneinfo/asia
cvs rdiff -u -r1.17.2.8 -r1.17.2.9 src/share/zoneinfo/australasia
cvs rdiff -u -r1.1.1.38.2.5 -r1.1.1.38.2.6 src/share/zoneinfo/europe
cvs rdiff -u -r1.1.1.17.2.2 -r1.1.1.17.2.3 src/share/zoneinfo/iso3166.tab
cvs rdiff -u -r1.1.1.42.2.8 -r1.1.1.42.2.9 src/share/zoneinfo/southamerica
cvs rdiff -u -r1.1.1.33.2.6 -r1.1.1.33.2.7 src/share/zoneinfo/zone.tab
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.647.2.24 src/doc/3RDPARTY:1.647.2.25
--- src/doc/3RDPARTY:1.647.2.24 Thu Mar 14 19:59:49 2013
+++ src/doc/3RDPARTY Sat Sep 7 17:17:35 2013
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.647.2.24 2013/03/14 19:59:49 riz Exp $
+# $NetBSD: 3RDPARTY,v 1.647.2.25 2013/09/07 17:17:35 bouyer Exp $
#
# This file contains a list of the software that has been integrated into
# NetBSD where we are not the primary maintainer.
@@ -924,8 +924,8 @@ License: BSD (4-clause)
Notes:
Package: tz
-Version: tzcode2004a / tzdata2013b
-Current Vers: tzcode2013b / tzdata2013b
+Version: tzcode2004a / tzdata2013d
+Current Vers: tzcode2013d / tzdata2013d
Maintainer: Paul Eggert <egg...@cs.ucla.edu>
Archive Site: ftp://ftp.iana.org/tz/releases/
Archive Site: ftp://munnari.oz.au/pub/oldtz/
Index: src/share/zoneinfo/africa
diff -u src/share/zoneinfo/africa:1.1.1.27.2.5 src/share/zoneinfo/africa:1.1.1.27.2.6
--- src/share/zoneinfo/africa:1.1.1.27.2.5 Fri Mar 15 18:48:07 2013
+++ src/share/zoneinfo/africa Sat Sep 7 17:17:35 2013
@@ -852,12 +852,18 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J
# announced that year's Ramadan daylight-saving transitions would be
# 2012-07-20 and 2012-08-20; see
# <http://www.mmsp.gov.ma/fr/actualites.aspx?id=288>.
-#
+
+# From Andrew Paprocki (2013-07-02):
+# Morocco announced that the year's Ramadan daylight-savings
+# transitions would be 2013-07-07 and 2013-08-10; see:
+# http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10
+
+# From Paul Eggert (2013-07-03):
# To estimate what the Moroccan government will do in future years,
-# transition dates for 2013 through 2021 were determined by running
+# transition dates for 2014 through 2021 were determined by running
# the following program under GNU Emacs 24.3:
#
-# (let ((islamic-year 1434))
+# (let ((islamic-year 1435))
# (while (< islamic-year 1444)
# (let ((a
# (calendar-gregorian-from-absolute
@@ -910,8 +916,8 @@ Rule Morocco 2012 2019 - Apr lastSun 2:
Rule Morocco 2012 max - Sep lastSun 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 9 3:00 0 -
-Rule Morocco 2013 only - Aug 8 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 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 -
Index: src/share/zoneinfo/asia
diff -u src/share/zoneinfo/asia:1.1.1.44.2.9 src/share/zoneinfo/asia:1.1.1.44.2.10
--- src/share/zoneinfo/asia:1.1.1.44.2.9 Sat May 11 22:29:10 2013
+++ src/share/zoneinfo/asia Sat Sep 7 17:17:35 2013
@@ -1212,39 +1212,21 @@ Rule Zion 2011 only - Oct 2 2:00 0 S
Rule Zion 2012 only - Mar Fri>=26 2:00 1:00 D
Rule Zion 2012 only - Sep 23 2:00 0 S
-# From Ephraim Silverberg (2012-10-18):
-# Yesterday, the Interior Ministry Committee, after more than a year
-# past, approved sending the proposed June 2011 changes to the Time
-# Decree Law back to the Knesset for second and third (final) votes
-# before the upcoming elections on Jan. 22, 2013. Hence, although the
-# changes are not yet law, they are expected to be so before February 2013.
-#
-# As of 2013, DST starts at 02:00 on the Friday before the last Sunday in March.
-# DST ends at 02:00 on the first Sunday after October 1, unless it occurs on the
-# second day of the Jewish Rosh Hashana holiday, in which case DST ends a day
-# later (i.e. at 02:00 the first Monday after October 2).
-# [Rosh Hashana holidays are factored in until 2100.]
-
-# From Ephraim Silverberg (2012-11-05):
-# The Knesset passed today (in second and final readings) the amendment to the
-# Time Decree Law making the changes ... law.
+# From Ephraim Silverberg (2013-06-27):
+# On June 23, 2013, the Israeli government approved changes to the
+# Time Decree Law. The next day, the changes passed the First Reading
+# in the Knesset. The law is expected to pass the Second and Third
+# (final) Readings by the beginning of September 2013.
+#
+# As of 2013, DST starts at 02:00 on the Friday before the last Sunday
+# in March. DST ends at 02:00 on the last Sunday of October.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Zion 2013 max - Mar Fri>=23 2:00 1:00 D
-Rule Zion 2013 2026 - Oct Sun>=2 2:00 0 S
-Rule Zion 2027 only - Oct Mon>=3 2:00 0 S
-Rule Zion 2028 max - Oct Sun>=2 2:00 0 S
-# The following rules are commented out for now, as they break older
-# versions of zic that support only signed 32-bit timestamps, i.e.,
-# through 2038-01-19 03:14:07 UTC.
-#Rule Zion 2028 2053 - Oct Sun>=2 2:00 0 S
-#Rule Zion 2054 only - Oct Mon>=3 2:00 0 S
-#Rule Zion 2055 2080 - Oct Sun>=2 2:00 0 S
-#Rule Zion 2081 only - Oct Mon>=3 2:00 0 S
-#Rule Zion 2082 max - Oct Sun>=2 2:00 0 S
+Rule Zion 2013 max - Oct lastSun 2:00 0 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Asia/Jerusalem 2:20:56 - LMT 1880
+Zone Asia/Jerusalem 2:20:54 - LMT 1880
2:20:40 - JMT 1918 # Jerusalem Mean Time?
2:00 Zion I%sT
@@ -2547,8 +2529,8 @@ Rule Syria 2006 only - Sep 22 0:00 0 -
Rule Syria 2007 only - Mar lastFri 0:00 1:00 S
# From Jesper Norgard (2007-10-27):
# The sister center ICARDA of my work CIMMYT is confirming that Syria DST will
-# not take place 1.st November at 0:00 o'clock but 1.st November at 24:00 or
-# rather Midnight between Thursday and Friday. This does make more sence than
+# not take place 1st November at 0:00 o'clock but 1st November at 24:00 or
+# rather Midnight between Thursday and Friday. This does make more sense than
# having it between Wednesday and Thursday (two workdays in Syria) since the
# weekend in Syria is not Saturday and Sunday, but Friday and Saturday. So now
# it is implemented at midnight of the last workday before weekend...
Index: src/share/zoneinfo/australasia
diff -u src/share/zoneinfo/australasia:1.17.2.8 src/share/zoneinfo/australasia:1.17.2.9
--- src/share/zoneinfo/australasia:1.17.2.8 Sat May 11 22:29:10 2013
+++ src/share/zoneinfo/australasia Sat Sep 7 17:17:35 2013
@@ -230,10 +230,16 @@ Zone Australia/Lord_Howe 10:36:20 - LMT
# - Macquarie Island will stay on UTC+11 for winter and therefore not
# switch back from daylight savings time when other parts of Australia do
# on 4 April.
+#
+# From Arthur David Olson (2013-05-23):
+# The 1919 transition is overspecified below so pre-2013 zics
+# will produce a binary file with an EST-type as the first 32-bit type;
+# this is required for correct handling of times before 1916 by
+# pre-2013 versions of localtime.
Zone Antarctica/Macquarie 0 - zzz 1899 Nov
10:00 - EST 1916 Oct 1 2:00
10:00 1:00 EST 1917 Feb
- 10:00 Aus EST 1919 Apr
+ 10:00 Aus EST 1919 Apr 1 0:00s
0 - zzz 1948 Mar 25
10:00 Aus EST 1967
10:00 AT EST 2010 Apr 4 3:00
@@ -1475,12 +1481,12 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901
# From Paul Eggert (2000-01-08):
# IATA SSIM (1999-09) says DST ends 0100 local time. Go with McDow.
-# From the BBC World Service (1998-10-31 11:32 UTC):
+# From the BBC World Service in
+# http://news.bbc.co.uk/2/hi/asia-pacific/205226.stm (1998-10-31 16:03 UTC):
# The Fijiian government says the main reasons for the time change is to
-# improve productivity and reduce road accidents. But correspondents say it
-# also hopes the move will boost Fiji's ability to compete with other pacific
-# islands in the effort to attract tourists to witness the dawning of the new
-# millenium.
+# improve productivity and reduce road accidents.... [T]he move is also
+# intended to boost Fiji's ability to attract tourists to witness the dawning
+# of the new millennium.
# http://www.fiji.gov.fj/press/2000_09/2000_09_13-05.shtml (2000-09-13)
# reports that Fiji has discontinued DST.
@@ -1625,7 +1631,7 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901
# Shanks & Pottenger say the transition was on 1968-10-01; go with Mundell.
# From Eric Ulevik (1999-05-03):
-# Tonga's director of tourism, who is also secretary of the National Millenium
+# Tonga's director of tourism, who is also secretary of the National Millennium
# Committee, has a plan to get Tonga back in front.
# He has proposed a one-off move to tropical daylight saving for Tonga from
# October to March, which has won approval in principle from the Tongan
Index: src/share/zoneinfo/europe
diff -u src/share/zoneinfo/europe:1.1.1.38.2.5 src/share/zoneinfo/europe:1.1.1.38.2.6
--- src/share/zoneinfo/europe:1.1.1.38.2.5 Fri Mar 15 18:48:07 2013
+++ src/share/zoneinfo/europe Sat Sep 7 17:17:35 2013
@@ -523,7 +523,7 @@ Rule C-Eur 1944 only - Oct 2 2:00s 0 -
# It seems that Paris, Monaco, Rule France, Rule Belgium all agree on
# 2:00 standard time, e.g. 3:00 local time. However there are no
# countries that use C-Eur rules in September 1945, so the only items
-# affected are apparently these ficticious zones that translates acronyms
+# affected are apparently these fictitious zones that translate acronyms
# CET and MET:
#
# Zone CET 1:00 C-Eur CE%sT
@@ -2779,9 +2779,9 @@ Link Europe/Istanbul Asia/Istanbul # Ist
# Ukraine
#
-# From Igor Karpov, who works for the Ukranian Ministry of Justice,
+# From Igor Karpov, who works for the Ukrainian Ministry of Justice,
# via Garrett Wollman (2003-01-27):
-# BTW, I've found the official document on this matter. It's goverment
+# BTW, I've found the official document on this matter. It's government
# regulations number 509, May 13, 1996. In my poor translation it says:
# "Time in Ukraine is set to second timezone (Kiev time). Each last Sunday
# of March at 3am the time is changing to 4am and each last Sunday of
@@ -2815,7 +2815,7 @@ Link Europe/Istanbul Asia/Istanbul # Ist
# time this year after all.
#
# From Udo Schwedt (2011-10-18):
-# As far as I understand, the recent change to the Ukranian time zone
+# As far as I understand, the recent change to the Ukrainian time zone
# (Europe/Kiev) to introduce permanent daylight saving time (similar
# to Russia) was reverted today:
#
Index: src/share/zoneinfo/iso3166.tab
diff -u src/share/zoneinfo/iso3166.tab:1.1.1.17.2.2 src/share/zoneinfo/iso3166.tab:1.1.1.17.2.3
--- src/share/zoneinfo/iso3166.tab:1.1.1.17.2.2 Sat Sep 15 09:26:43 2012
+++ src/share/zoneinfo/iso3166.tab Sat Sep 7 17:17:35 2013
@@ -1,16 +1,14 @@
-# <pre>
+# ISO 3166 alpha-2 country codes
+#
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
-# ISO 3166 alpha-2 country codes
#
-# From Paul Eggert (2006-09-27):
+# From Paul Eggert (2013-05-27):
#
# This file contains a table with the following columns:
# 1. ISO 3166-1 alpha-2 country code, current as of
-# ISO 3166-1 Newsletter VI-1 (2007-09-21). See:
-# <a href="http://www.iso.org/iso/en/prods-services/iso3166ma/index.html";>
-# ISO 3166 Maintenance agency (ISO 3166/MA)
-# </a>.
+# ISO 3166-1 Newsletter VI-15 (2013-05-10). See: Updates on ISO 3166
+# http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm
# 2. The usual English name for the country,
# chosen so that alphabetic sorting of subsets produces helpful lists.
# This is not the same as the English name in the ISO 3166 tables.
@@ -20,8 +18,9 @@
#
# Lines beginning with `#' are comments.
#
-# From Arthur David Olson (2011-08-17):
-# Resynchronized today with the ISO 3166 site (adding SS for South Sudan).
+# This table is intended as an aid for users, to help them select time
+# zone data appropriate for their practical needs. It is not intended
+# to take or endorse any position on legal or territorial claims.
#
#country-
#code country name
@@ -54,7 +53,7 @@ BL St Barthelemy
BM Bermuda
BN Brunei
BO Bolivia
-BQ Bonaire Sint Eustatius & Saba
+BQ Bonaire, St Eustatius & Saba
BR Brazil
BS Bahamas
BT Bhutan
@@ -235,7 +234,7 @@ SR Suriname
SS South Sudan
ST Sao Tome & Principe
SV El Salvador
-SX Sint Maarten
+SX St Maarten (Dutch part)
SY Syria
SZ Swaziland
TC Turks & Caicos Is
Index: src/share/zoneinfo/southamerica
diff -u src/share/zoneinfo/southamerica:1.1.1.42.2.8 src/share/zoneinfo/southamerica:1.1.1.42.2.9
--- src/share/zoneinfo/southamerica:1.1.1.42.2.8 Sat May 11 22:29:10 2013
+++ src/share/zoneinfo/southamerica Sat Sep 7 17:17:35 2013
@@ -971,7 +971,7 @@ Rule Brazil 2007 only - Feb 25 0:00 0 -
# adopted by the same states as before.
Rule Brazil 2007 only - Oct Sun>=8 0:00 1:00 S
# From Frederico A. C. Neves (2008-09-10):
-# Acording to this decree
+# According to this decree
# <a href="http://www.planalto.gov.br/ccivil_03/_Ato2007-2010/2008/Decreto/D6558.htm";>
# http://www.planalto.gov.br/ccivil_03/_Ato2007-2010/2008/Decreto/D6558.htm
# </a>
@@ -1203,7 +1203,7 @@ Zone America/Rio_Branco -4:31:12 - LMT 1
# http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651
# </a>
#
-# This is not yet reflected in the offical "cambio de hora" site, but
+# This is not yet reflected in the official "cambio de hora" site, but
# probably will be soon:
# <a href="http://www.horaoficial.cl/cambio.htm";>
# http://www.horaoficial.cl/cambio.htm
Index: src/share/zoneinfo/zone.tab
diff -u src/share/zoneinfo/zone.tab:1.1.1.33.2.6 src/share/zoneinfo/zone.tab:1.1.1.33.2.7
--- src/share/zoneinfo/zone.tab:1.1.1.33.2.6 Sat May 11 22:29:10 2013
+++ src/share/zoneinfo/zone.tab Sat Sep 7 17:17:35 2013
@@ -1,18 +1,21 @@
-# <pre>
+# TZ zone descriptions
+#
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
#
-# TZ zone descriptions
-#
-# From Paul Eggert (1996-08-05):
+# From Paul Eggert (2013-05-27):
#
# This file contains a table with the following columns:
# 1. ISO 3166 2-character country code. See the file `iso3166.tab'.
+# This identifies a country that overlaps the zone. The country may
+# overlap other zones and the zone may overlap other countries.
# 2. Latitude and longitude of the zone's principal location
# in ISO 6709 sign-degrees-minutes-seconds format,
# either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS,
# first latitude (+ is north), then longitude (+ is east).
+# This location need not lie within the column-1 country.
# 3. Zone name used in value of TZ environment variable.
+# Please see the 'Theory' file for how zone names are chosen.
# 4. Comments; present if and only if the country has multiple rows.
#
# Columns are separated by a single tab.
@@ -22,6 +25,10 @@
#
# Lines beginning with `#' are comments.
#
+# This table is intended as an aid for users, to help them select time
+# zone data appropriate for their practical needs. It is not intended
+# to take or endorse any position on legal or territorial claims.
+#
#country-
#code coordinates TZ comments
AD +4230+00131 Europe/Andorra
@@ -216,7 +223,7 @@ ID -0002+10920 Asia/Pontianak west & cen
ID -0507+11924 Asia/Makassar east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor
ID -0232+14042 Asia/Jayapura west New Guinea (Irian Jaya) & Malukus (Moluccas)
IE +5320-00615 Europe/Dublin
-IL +3146+03514 Asia/Jerusalem
+IL +314650+0351326 Asia/Jerusalem
IM +5409-00428 Europe/Isle_of_Man
IN +2232+08822 Asia/Kolkata
IO -0720+07225 Indian/Chagos
