Module Name: src
Committed By: riz
Date: Thu Mar 14 19:59:52 UTC 2013
Modified Files:
src/distrib/sets/lists/base [netbsd-5]: mi
src/doc [netbsd-5]: 3RDPARTY
src/share/zoneinfo [netbsd-5]: africa northamerica southamerica
Log Message:
Apply changes (requested by apb in ticket #1854):
Merge tzdata2013a from ftp://ftp.iana.org/tz/releases/tzdata2013a.tar.gz
Merge tzdata2013b from ftp://ftp.iana.org/tz/releases/tzdata2013b.tar.gz
Changes from tzdata2012j to tzdata2013a:
Change affecting binary data format:
The zone offset at the end of version-2-format zone files is now
allowed to be 24:00, as per POSIX.1-2008. (Thanks to Arthor David Olson.)
Changes affecting current and future time stamps:
Chile's 2013 rules, and we guess rules for 2014 and later, will be
the same as 2012, namely Apr Sun>=23 03:00 UTC to Sep Sun>=2 04:00 UTC.
(Thanks to Steffen Thorsen and Robert Elz.)
New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen.
(Thanks to Tobias Conradi and Arthur David Olson.)
Many changes affect historical time stamps before 1940.
These were deduced from: Milne J. Civil time. Geogr J. 1899
Feb;13(2):173-94 <http://www.jstor.org/stable/1774359>.
Changes from tzdata2012j to tzdata2013a:
Changes affecting current and future time stamps:
Haiti uses US daylight-saving rules this year, and presumably future years.
This changes time stamps starting today. (Thanks to Steffen Thorsen.)
Paraguay will end DST on March 24 this year.
(Thanks to Steffen Thorsen.) For now, assume it's just this year.
Morocco does not observe DST during Ramadan;
try to predict Ramadan in Morocco as best we can.
(Thanks to Erik Homoet for the heads-up.)
Changes affecting commentary:
Update URLs in tz-link page. Add URLs for webOS, BB10, iOS.
Update URL for Solaris. Mention Internet RFC 6557.
Update Internet RFCs 2445->5545, 2822->5322.
Switch from FTP to HTTP for Internet RFCs.
To generate a diff of this commit:
cvs rdiff -u -r1.780.2.25 -r1.780.2.26 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.647.2.23 -r1.647.2.24 src/doc/3RDPARTY
cvs rdiff -u -r1.1.1.27.2.3 -r1.1.1.27.2.4 src/share/zoneinfo/africa
cvs rdiff -u -r1.1.1.42.2.6 -r1.1.1.42.2.7 src/share/zoneinfo/northamerica
cvs rdiff -u -r1.1.1.42.2.5 -r1.1.1.42.2.6 src/share/zoneinfo/southamerica
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.780.2.25 src/distrib/sets/lists/base/mi:1.780.2.26
--- src/distrib/sets/lists/base/mi:1.780.2.25 Thu Nov 15 13:28:22 2012
+++ src/distrib/sets/lists/base/mi Thu Mar 14 19:59:50 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.780.2.25 2012/11/15 13:28:22 msaitoh Exp $
+# $NetBSD: mi,v 1.780.2.26 2013/03/14 19:59:50 riz Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -4578,6 +4578,7 @@
./usr/share/zoneinfo/Asia/Kashgar base-sys-share share
./usr/share/zoneinfo/Asia/Kathmandu base-sys-share share
./usr/share/zoneinfo/Asia/Katmandu base-sys-share share
+./usr/share/zoneinfo/Asia/Khandyga base-sys-share share
./usr/share/zoneinfo/Asia/Kolkata base-sys-share share
./usr/share/zoneinfo/Asia/Krasnoyarsk base-sys-share share
./usr/share/zoneinfo/Asia/Kuala_Lumpur base-sys-share share
@@ -4623,6 +4624,7 @@
./usr/share/zoneinfo/Asia/Ulaanbaatar base-sys-share share
./usr/share/zoneinfo/Asia/Ulan_Bator base-sys-share share
./usr/share/zoneinfo/Asia/Urumqi base-sys-share share
+./usr/share/zoneinfo/Asia/Ust-Nera base-sys-share share
./usr/share/zoneinfo/Asia/Vientiane base-sys-share share
./usr/share/zoneinfo/Asia/Vladivostok base-sys-share share
./usr/share/zoneinfo/Asia/Yakutsk base-sys-share share
@@ -4738,6 +4740,7 @@
./usr/share/zoneinfo/Europe/Brussels base-sys-share share
./usr/share/zoneinfo/Europe/Bucharest base-sys-share share
./usr/share/zoneinfo/Europe/Budapest base-sys-share share
+./usr/share/zoneinfo/Europe/Busingen base-sys-share share
./usr/share/zoneinfo/Europe/Chisinau base-sys-share share
./usr/share/zoneinfo/Europe/Copenhagen base-sys-share share
./usr/share/zoneinfo/Europe/Dublin base-sys-share share
Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.647.2.23 src/doc/3RDPARTY:1.647.2.24
--- src/doc/3RDPARTY:1.647.2.23 Wed Nov 14 20:01:00 2012
+++ src/doc/3RDPARTY Thu Mar 14 19:59:49 2013
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.647.2.23 2012/11/14 20:01:00 riz Exp $
+# $NetBSD: 3RDPARTY,v 1.647.2.24 2013/03/14 19:59:49 riz 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 / tzdata2012j
-Current Vers: tzcode2012j / tzdata2012j
+Version: tzcode2004a / tzdata2013b
+Current Vers: tzcode2013b / tzdata2013b
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.3 src/share/zoneinfo/africa:1.1.1.27.2.4
--- src/share/zoneinfo/africa:1.1.1.27.2.3 Wed Nov 14 20:01:00 2012
+++ src/share/zoneinfo/africa Thu Mar 14 19:59:51 2013
@@ -833,6 +833,41 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J
# 3:00 am Friday, July 20, 2012 and will again be advanced by 60 minutes
# August 20, 2012 from 2:00 am.
+# From Paul Eggert (2013-03-06):
+# Morocco's daylight-saving transitions due to Ramadan seem to be
+# announced a bit in advance. On 2012-07-11 the Moroccan government
+# 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>.
+#
+# To estimate what the Moroccan government will do in future years,
+# transition dates for 2013 through 2021 were determined by running
+# the following program under GNU Emacs 24.3:
+#
+# (let ((islamic-year 1434))
+# (while (< islamic-year 1444)
+# (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 the results hand-edited for 2020-2022, when the normal spring-forward
+# date falls during the estimated Ramadan.
+#
+# From 2023 through 2038 Ramadan is not predicted to overlap with
+# daylight saving time. Starting in 2039 there will be overlap again,
+# but 32-bit time_t values roll around in 2038 so for now do not worry
+# about dates after 2038.
+
# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Morocco 1939 only - Sep 12 0:00 1:00 S
@@ -858,10 +893,28 @@ Rule Morocco 2010 only - May 2 0:00 1:
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 max - Apr lastSun 2:00 1:00 S
+Rule Morocco 2012 2019 - Apr lastSun 2:00 1:00 S
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 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 - May 24 2:00 1:00 S
+Rule Morocco 2021 only - May 13 2:00 1:00 S
+Rule Morocco 2022 only - May 3 2:00 1:00 S
+Rule Morocco 2023 max - Apr lastSun 2:00 1:00 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
Index: src/share/zoneinfo/northamerica
diff -u src/share/zoneinfo/northamerica:1.1.1.42.2.6 src/share/zoneinfo/northamerica:1.1.1.42.2.7
--- src/share/zoneinfo/northamerica:1.1.1.42.2.6 Wed Nov 14 20:01:01 2012
+++ src/share/zoneinfo/northamerica Thu Mar 14 19:59:51 2013
@@ -2981,24 +2981,21 @@ Zone America/Guatemala -6:02:04 - LMT 19
# apparently using the same start and end date as USA/Canada.
# So this means they have already changed their time.
#
-# (Sources in French):
-# <a href="http://www.alterpresse.org/spip.php?article12510";>
# http://www.alterpresse.org/spip.php?article12510
-# </a>
-# <a href="http://radiovision2000haiti.net/home/?p=13253";>
# http://radiovision2000haiti.net/home/?p=13253
-# </a>
#
-# Our coverage:
-# <a href="http://www.timeanddate.com/news/time/haiti-dst-2012.html";>
-# http://www.timeanddate.com/news/time/haiti-dst-2012.html
-# </a>
-
# From Arthur David Olson (2012-03-11):
# The alterpresse.org source seems to show a US-style leap from 2:00 a.m. to
# 3:00 a.m. rather than the traditional Haitian jump at midnight.
-# Assume a US-style fall back as well XXX.
-# Do not yet assume that the change carries forward past 2012 XXX.
+# Assume a US-style fall back as well.
+
+# From Steffen Thorsen (2013-03-10):
+# It appears that Haiti is observing DST this year as well, same rules
+# as US/Canada. They did it last year as well, and it looks like they
+# are going to observe DST every year now...
+#
+# http://radiovision2000haiti.net/public/haiti-avis-changement-dheure-dimanche/
+# http://www.canalplushaiti.net/?p=6714
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Haiti 1983 only - May 8 0:00 1:00 D
@@ -3010,8 +3007,8 @@ Rule Haiti 1988 1997 - Apr Sun>=1 1:00s
Rule Haiti 1988 1997 - Oct lastSun 1:00s 0 S
Rule Haiti 2005 2006 - Apr Sun>=1 0:00 1:00 D
Rule Haiti 2005 2006 - Oct lastSun 0:00 0 S
-Rule Haiti 2012 only - Mar Sun>=8 2:00 1:00 D
-Rule Haiti 2012 only - Nov Sun>=1 2:00 0 S
+Rule Haiti 2012 max - Mar Sun>=8 2:00 1:00 D
+Rule Haiti 2012 max - Nov Sun>=1 2:00 0 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Port-au-Prince -4:49:20 - LMT 1890
-4:49 - PPMT 1917 Jan 24 12:00 # P-a-P MT
Index: src/share/zoneinfo/southamerica
diff -u src/share/zoneinfo/southamerica:1.1.1.42.2.5 src/share/zoneinfo/southamerica:1.1.1.42.2.6
--- src/share/zoneinfo/southamerica:1.1.1.42.2.5 Wed Nov 14 20:01:01 2012
+++ src/share/zoneinfo/southamerica Thu Mar 14 19:59:51 2013
@@ -1560,6 +1560,15 @@ Rule Para 2005 2009 - Mar Sun>=8 0:00 0
# ...
Rule Para 2010 max - Oct Sun>=1 0:00 1:00 S
Rule Para 2010 max - Apr Sun>=8 0:00 0 -
+#
+# From Steffen Thorsen (2013-03-07):
+# Paraguay will end DST on 2013-03-24 00:00....
+# They do not tell if this will be a permanent change or just this year....
+# http://www.ande.gov.py/interna.php?id=1075
+#
+# From Paul Eggert (2013-03-07):
+# For now, assume it's just this year.
+Rule Para 2013 only - Mar 24 0:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Asuncion -3:50:40 - LMT 1890
