Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-6]: src Apply patch, requested by apb in ticket 1064:
details: https://anonhg.NetBSD.org/src/rev/9e172e06d861
branches: netbsd-6
changeset: 776631:9e172e06d861
user: bouyer <bouyer%NetBSD.org@localhost>
date: Wed May 21 21:23:14 2014 +0000
description:
Apply patch, requested by apb in ticket 1064:
doc/3RDPARTY patch
share/zoneinfo/africa patch
share/zoneinfo/antarctica patch
share/zoneinfo/asia patch
share/zoneinfo/australasia patch
share/zoneinfo/backward patch
share/zoneinfo/etcetera patch
share/zoneinfo/europe patch
share/zoneinfo/iso3166.tab patch
share/zoneinfo/leap-seconds.list patch
share/zoneinfo/leapseconds patch
share/zoneinfo/leapseconds.awk patch
share/zoneinfo/northamerica patch
share/zoneinfo/southamerica patch
share/zoneinfo/zone.tab patch
distrib/sets/lists/base/mi patch
Update timezone database from tzdata2013d to tzdata2014c.
This adds a new timezone, Antarctica/Troll, and updates
many other timezones. The Asia/Riyadh{87,88,89} zones are
retained for backward compatibility, although they have
been removed from the upstream distribution.
diffstat:
distrib/sets/lists/base/mi | 3 +-
doc/3RDPARTY | 6 +-
share/zoneinfo/africa | 141 ++++++++++++++++++----
share/zoneinfo/antarctica | 66 ++++++----
share/zoneinfo/asia | 126 +++++++++++++--------
share/zoneinfo/australasia | 52 ++++++--
share/zoneinfo/backward | 12 +-
share/zoneinfo/etcetera | 4 +-
share/zoneinfo/europe | 198 +++++++++++++++++++++++----------
share/zoneinfo/iso3166.tab | 6 +-
share/zoneinfo/leap-seconds.list | 231 +++++++++++++++++++++++++++++++++++++++
share/zoneinfo/leapseconds | 70 ++---------
share/zoneinfo/leapseconds.awk | 66 +++++++++++
share/zoneinfo/northamerica | 157 ++++++++++---------------
share/zoneinfo/southamerica | 83 +++++++++++--
share/zoneinfo/zone.tab | 35 +++--
16 files changed, 886 insertions(+), 370 deletions(-)
diffs (truncated from 2314 to 300 lines):
diff -r 42b15fea740d -r 9e172e06d861 distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi Wed May 21 21:11:01 2014 +0000
+++ b/distrib/sets/lists/base/mi Wed May 21 21:23:14 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.984.2.16 2013/11/17 18:19:45 bouyer Exp $
+# $NetBSD: mi,v 1.984.2.17 2014/05/21 21:23:14 bouyer Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -4503,6 +4503,7 @@
./usr/share/zoneinfo/Antarctica/Rothera base-sys-share share
./usr/share/zoneinfo/Antarctica/South_Pole base-sys-share share
./usr/share/zoneinfo/Antarctica/Syowa base-sys-share share
+./usr/share/zoneinfo/Antarctica/Troll base-sys-share share
./usr/share/zoneinfo/Antarctica/Vostok base-sys-share share
./usr/share/zoneinfo/Arctic base-sys-share
./usr/share/zoneinfo/Arctic/Longyearbyen base-sys-share share
diff -r 42b15fea740d -r 9e172e06d861 doc/3RDPARTY
--- a/doc/3RDPARTY Wed May 21 21:11:01 2014 +0000
+++ b/doc/3RDPARTY Wed May 21 21:23:14 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.909.2.20 2013/07/29 20:21:08 jdc Exp $
+# $NetBSD: 3RDPARTY,v 1.909.2.21 2014/05/21 21:23:14 bouyer Exp $
#
# This file contains a list of the software that has been integrated into
# NetBSD where we are not the primary maintainer.
@@ -1143,8 +1143,8 @@
Added changes from a5 -> a12 manually.
Package: tz
-Version: tzcode2011i / tzdata2013b
-Current Vers: tzcode2013d / tzdata2013d
+Version: tzcode2011i / tzdata2014c
+Current Vers: tzcode2014c / tzdata2014c
Maintainer: Paul Eggert <eggert%cs.ucla.edu@localhost>
Archive Site: ftp://ftp.iana.org/tz/releases/
Archive Site: ftp://munnari.oz.au/pub/oldtz/
diff -r 42b15fea740d -r 9e172e06d861 share/zoneinfo/africa
--- a/share/zoneinfo/africa Wed May 21 21:11:01 2014 +0000
+++ b/share/zoneinfo/africa Wed May 21 21:23:14 2014 +0000
@@ -335,11 +335,54 @@
# http://www.worldtimezone.com/dst_news/dst_news_egypt02.html
# </a>
+# From Ahmad El-Dardiry (2014-05-07):
+# Egypt is to change back to Daylight system on May 15
+# http://english.ahram.org.eg/NewsContent/1/64/100735/Egypt/Politics-/Egypts-government-to-reapply-daylight-saving-time-.aspx
+
+# From Gunther Vermier (2015-05-13):
+# our Egypt office confirms that the change will be at 15 May "midnight" (24:00)
+
+# 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. 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 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 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 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]
Zone Africa/Cairo 2:05:09 - LMT 1900 Oct
@@ -451,6 +494,14 @@
# (either two days before them or five days after them, so as to fall on
# lastFri instead of lastSun).
+# From Even Scharning (2013-10-25):
+# The scheduled end of DST in Libya on Friday, October 25, 2013 was
+# cancelled yesterday....
+# http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/
+#
+# From Paul Eggert (2013-10-25):
+# For now, assume they're reverting to the pre-2012 rules of permanent UTC+2.
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Libya 1951 only - Oct 14 2:00 1:00 S
Rule Libya 1952 only - Jan 1 0:00 0 -
@@ -467,8 +518,8 @@
Rule Libya 1987 1989 - Oct 1 0:00 0 -
Rule Libya 1997 only - Apr 4 0:00 1:00 S
Rule Libya 1997 only - Oct 4 0:00 0 -
-Rule Libya 2013 max - Mar lastFri 1:00 1:00 S
-Rule Libya 2013 max - Oct lastFri 2:00 0 -
+Rule Libya 2013 only - Mar lastFri 1:00 1:00 S
+Rule Libya 2013 only - Oct lastFri 2:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Tripoli 0:52:44 - LMT 1920
1:00 Libya CE%sT 1959
@@ -479,7 +530,8 @@
2:00 - EET 1996 Sep 30
1:00 Libya CE%sT 1997 Oct 4
2:00 - EET 2012 Nov 10 2:00
- 1:00 Libya CE%sT
+ 1:00 Libya CE%sT 2013 Oct 25 2:00
+ 2:00 - EET
# Madagascar
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
@@ -684,15 +736,6 @@
# http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
# </a>
-# From Alex Krivenyshev (2008-05-09):
-# Is Western Sahara (part which administrated by Morocco) going to follow
-# Morocco DST changes? Any information? What about other part of
-# Western Sahara - under administration of POLISARIO Front (also named
-# SADR Saharawi Arab Democratic Republic)?
-
-# From Arthur David Olson (2008-05-09):
-# XXX--guess that it is only Morocco for now; guess only 2008 for now.
-
# From Steffen Thorsen (2008-08-27):
# Morocco will change the clocks back on the midnight between August 31
# and September 1. They originally planned to observe DST to near the end
@@ -858,13 +901,26 @@
# 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):
+# From Steffen Thorsen (2013-09-28):
+# Morocco extends DST by one month, on very short notice, just 1 day
+# before it was going to end. There is a new decree (2.13.781) for
+# this, where DST from now on goes from last Sunday of March at 02:00
+# to last Sunday of October at 03:00, similar to EU rules. Official
+# source (French):
+# http://www.maroc.gov.ma/fr/actualites/lhoraire-dete-gmt1-maintenu-jusquau-27-octobre-2013
+# Another source (specifying the time for start and end in the decree):
+# http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html
+
+# From Sebastien Willemijns (2014-03-18):
+# http://www.afriquinfos.com/articles/2014/3/18/maroc-heure-dete-avancez-tous-horloges-247891.asp
+
+# From Paul Eggert (2014-03-19):
# To estimate what the Moroccan government will do in future years,
-# transition dates for 2014 through 2021 were determined by running
+# 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 1444)
+# (while (< islamic-year 1461)
# (let ((a
# (calendar-gregorian-from-absolute
# (calendar-islamic-to-absolute (list 9 1 islamic-year))))
@@ -879,13 +935,18 @@
# (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.
+# 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
@@ -912,12 +973,14 @@
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 2019 - Apr lastSun 2:00 1:00 S
-Rule Morocco 2012 max - Sep lastSun 3:00 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 -
@@ -930,20 +993,42 @@
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 max - Apr lastSun 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
0:00 Morocco WE%sT 1984 Mar 16
1:00 - CET 1986
0:00 Morocco WE%sT
+
# Western Sahara
+#
+# From Gwillim Law (2013-10-22):
+# A correspondent who is usually well informed about time zone matters
+# ... says that Western Sahara observes daylight saving time, just as
+# Morocco does.
+#
+# From Paul Eggert (2013-10-23):
+# Assume that this has been true since Western Sahara switched to GMT,
+# since most of it was then controlled by Morocco.
+
Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan
-1:00 - WAT 1976 Apr 14
- 0:00 - WET
+ 0:00 Morocco WE%sT
# Mozambique
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
@@ -1100,9 +1185,7 @@
3:00 - EAT
# South Sudan
-Zone Africa/Juba 2:06:24 - LMT 1931
- 2:00 Sudan CA%sT 2000 Jan 15 12:00
- 3:00 - EAT
+Link Africa/Khartoum Africa/Juba
# Swaziland
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
diff -r 42b15fea740d -r 9e172e06d861 share/zoneinfo/antarctica
--- a/share/zoneinfo/antarctica Wed May 21 21:11:01 2014 +0000
+++ b/share/zoneinfo/antarctica Wed May 21 21:23:14 2014 +0000
@@ -16,9 +16,9 @@
#
# Except for the French entries,
# I made up all time zone abbreviations mentioned here; corrections welcome!
-# FORMAT is `zzz' and GMTOFF is 0 for locations while uninhabited.
+# FORMAT is 'zzz' and GMTOFF is 0 for locations while uninhabited.
-# These rules are stolen from the `southamerica' file.
+# These rules are stolen from the 'southamerica' file.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule ArgAQ 1964 1966 - Mar 1 0:00 0 -
Rule ArgAQ 1964 1966 - Oct 15 0:00 1:00 S
@@ -228,25 +228,43 @@
# Scott Island (never inhabited)
#
# year-round base
-# Scott, Ross Island, since 1957-01, is like Antarctica/McMurdo.
-#
-# These rules for New Zealand are stolen from the `australasia' file.
-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule NZAQ 1974 only - Nov 3 2:00s 1:00 D
Home |
Main Index |
Thread Index |
Old Index