Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-6-0]: src Apply patch (requested by apb in ticket #1107):
details: https://anonhg.NetBSD.org/src/rev/f9341fe9399f
branches: netbsd-6-0
changeset: 774978:f9341fe9399f
user: riz <riz%NetBSD.org@localhost>
date: Fri Aug 15 23:37:04 2014 +0000
description:
Apply patch (requested by apb in ticket #1107):
distrib/sets/lists/base/mi patch
doc/3RDPARTY patch
share/zoneinfo/Makefile 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/factory patch
share/zoneinfo/iso3166.tab patch
share/zoneinfo/leap-seconds.list patch
share/zoneinfo/northamerica patch
share/zoneinfo/pacificnew patch
share/zoneinfo/southamerica patch
share/zoneinfo/systemv patch
share/zoneinfo/yearistype.sh patch
share/zoneinfo/zone.tab patch
share/zoneinfo/zone1970.tab patch
Update timezone database from tzdata2014c to tzdata2014f.
This adds two new timezones (Asia/Chita and Asia/Srednekolymsk),
updates many other timezones, and adds two new
data files in the /usr/share/zoneinfo directory (leapseconds
and zone1970.dat).
[apb, ticket #1107]
diffstat:
distrib/sets/lists/base/mi | 6 +-
doc/3RDPARTY | 6 +-
share/zoneinfo/Makefile | 7 +-
share/zoneinfo/africa | 558 +++++++++-------------
share/zoneinfo/antarctica | 118 ++--
share/zoneinfo/asia | 714 +++++++++++++++--------------
share/zoneinfo/australasia | 832 +++++++++++++++------------------
share/zoneinfo/backward | 8 +-
share/zoneinfo/etcetera | 3 +-
share/zoneinfo/europe | 953 +++++++++++++++++++++++++-------------
share/zoneinfo/factory | 1 -
share/zoneinfo/iso3166.tab | 12 +-
share/zoneinfo/leap-seconds.list | 156 +++---
share/zoneinfo/northamerica | 384 ++++++---------
share/zoneinfo/pacificnew | 1 -
share/zoneinfo/southamerica | 385 ++++++---------
share/zoneinfo/systemv | 1 -
share/zoneinfo/yearistype.sh | 6 +-
share/zoneinfo/zone.tab | 63 +-
share/zoneinfo/zone1970.tab | 369 +++++++++++++++
20 files changed, 2474 insertions(+), 2109 deletions(-)
diffs (truncated from 8905 to 300 lines):
diff -r 6549bff6fb98 -r f9341fe9399f distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi Fri Aug 15 08:43:44 2014 +0000
+++ b/distrib/sets/lists/base/mi Fri Aug 15 23:37:04 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.984.2.10.2.2 2014/05/21 21:22:39 bouyer Exp $
+# $NetBSD: mi,v 1.984.2.10.2.3 2014/08/15 23:37:04 riz Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -4520,6 +4520,7 @@
./usr/share/zoneinfo/Asia/Bishkek base-sys-share share
./usr/share/zoneinfo/Asia/Brunei base-sys-share share
./usr/share/zoneinfo/Asia/Calcutta base-sys-share share
+./usr/share/zoneinfo/Asia/Chita base-sys-share share
./usr/share/zoneinfo/Asia/Choibalsan base-sys-share share
./usr/share/zoneinfo/Asia/Chongqing base-sys-share share
./usr/share/zoneinfo/Asia/Chungking base-sys-share share
@@ -4581,6 +4582,7 @@
./usr/share/zoneinfo/Asia/Seoul base-sys-share share
./usr/share/zoneinfo/Asia/Shanghai base-sys-share share
./usr/share/zoneinfo/Asia/Singapore base-sys-share share
+./usr/share/zoneinfo/Asia/Srednekolymsk base-sys-share share
./usr/share/zoneinfo/Asia/Taipei base-sys-share share
./usr/share/zoneinfo/Asia/Tashkent base-sys-share share
./usr/share/zoneinfo/Asia/Tbilisi base-sys-share share
@@ -4928,8 +4930,10 @@
./usr/share/zoneinfo/WET base-sys-share share
./usr/share/zoneinfo/Zulu base-sys-share share
./usr/share/zoneinfo/iso3166.tab base-sys-share share
+./usr/share/zoneinfo/leapseconds base-sys-share share
./usr/share/zoneinfo/posixrules base-sys-share share
./usr/share/zoneinfo/zone.tab base-sys-share share
+./usr/share/zoneinfo/zone1970.tab base-sys-share share
./var base-sys-root
./var/account base-sys-root
./var/at base-cron-root
diff -r 6549bff6fb98 -r f9341fe9399f doc/3RDPARTY
--- a/doc/3RDPARTY Fri Aug 15 08:43:44 2014 +0000
+++ b/doc/3RDPARTY Fri Aug 15 23:37:04 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.909.2.14.2.8 2014/08/15 08:36:56 msaitoh Exp $
+# $NetBSD: 3RDPARTY,v 1.909.2.14.2.9 2014/08/15 23:37:04 riz 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 / tzdata2014c
-Current Vers: tzcode2014c / tzdata2014c
+Version: tzcode2011i / tzdata2014f
+Current Vers: tzcode2014f / tzdata2014f
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 6549bff6fb98 -r f9341fe9399f share/zoneinfo/Makefile
--- a/share/zoneinfo/Makefile Fri Aug 15 08:43:44 2014 +0000
+++ b/share/zoneinfo/Makefile Fri Aug 15 23:37:04 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2009/04/10 16:16:12 apb Exp $
+# $NetBSD: Makefile,v 1.43.14.1 2014/08/15 23:37:04 riz Exp $
.include <bsd.own.mk>
@@ -46,8 +46,9 @@
NDATA= systemv
SDATA= solar87 solar88 solar89
TDATA= $(YDATA) $(NDATA) $(SDATA)
-TABDATA= iso3166.tab zone.tab
-DATA= $(YDATA) $(NDATA) $(SDATA) leapseconds # yearistype.sh
+ZONETABLES= zone1970.tab zone.tab
+TABDATA= iso3166.tab leapseconds $(ZONETABLES)
+DATA= $(YDATA) $(NDATA) $(TABDATA) # yearistype.sh
USNO= usno1988 usno1989
TZBUILDDIR= ${.OBJDIR}/builddir
diff -r 6549bff6fb98 -r f9341fe9399f share/zoneinfo/africa
--- a/share/zoneinfo/africa Fri Aug 15 08:43:44 2014 +0000
+++ b/share/zoneinfo/africa Fri Aug 15 23:37:04 2014 +0000
@@ -1,4 +1,3 @@
-# <pre>
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
@@ -35,13 +34,13 @@
# Previous editions of this database used WAT, CAT, SAT, and EAT
# for +0:00 through +3:00, respectively,
# but Mark R V Murray reports that
-# `SAST' is the official abbreviation for +2:00 in the country of South Africa,
-# `CAT' is commonly used for +2:00 in countries north of South Africa, and
-# `WAT' is probably the best name for +1:00, as the common phrase for
-# the area that includes Nigeria is ``West Africa''.
-# He has heard of ``Western Sahara Time'' for +0:00 but can find no reference.
+# 'SAST' is the official abbreviation for +2:00 in the country of South Africa,
+# 'CAT' is commonly used for +2:00 in countries north of South Africa, and
+# 'WAT' is probably the best name for +1:00, as the common phrase for
+# the area that includes Nigeria is "West Africa".
+# He has heard of "Western Sahara Time" for +0:00 but can find no reference.
#
-# To make things confusing, `WAT' seems to have been used for -1:00 long ago;
+# To make things confusing, 'WAT' seems to have been used for -1:00 long ago;
# I'd guess that this was because people needed _some_ name for -1:00,
# and at the time, far west Africa was the only major land area in -1:00.
# This usage is now obsolete, as the last use of -1:00 on the African
@@ -54,7 +53,7 @@
# 2:00 SAST South Africa Standard Time
# and Murray suggests the following abbreviation:
# 1:00 WAT West Africa Time
-# I realize that this leads to `WAT' being used for both -1:00 and 1:00
+# I realize that this leads to 'WAT' being used for both -1:00 and 1:00
# for times before 1976, but this is the best I can think of
# until we get more information.
#
@@ -131,9 +130,7 @@
2:00 - CAT
# Burkina Faso
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Ouagadougou -0:06:04 - LMT 1912
- 0:00 - GMT
+# See Africa/Abidjan.
# Burundi
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
@@ -161,7 +158,7 @@
# Chad
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Ndjamena 1:00:12 - LMT 1912
+Zone Africa/Ndjamena 1:00:12 - LMT 1912 # N'Djamena
1:00 - WAT 1979 Oct 14
1:00 1:00 WAST 1980 Mar 8
1:00 - WAT
@@ -183,10 +180,20 @@
Zone Africa/Brazzaville 1:01:08 - LMT 1912
1:00 - WAT
-# Cote D'Ivoire
+# Côte D'Ivoire / Ivory Coast
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Abidjan -0:16:08 - LMT 1912
0:00 - GMT
+Link Africa/Abidjan Africa/Bamako # Mali
+Link Africa/Abidjan Africa/Banjul # Gambia
+Link Africa/Abidjan Africa/Conakry # Guinea
+Link Africa/Abidjan Africa/Dakar # Senegal
+Link Africa/Abidjan Africa/Freetown # Sierra Leone
+Link Africa/Abidjan Africa/Lome # Togo
+Link Africa/Abidjan Africa/Nouakchott # Mauritania
+Link Africa/Abidjan Africa/Ouagadougou # Burkina Faso
+Link Africa/Abidjan Africa/Sao_Tome # São Tomé and PrÃncipe
+Link Africa/Abidjan Atlantic/St_Helena # St Helena
# Djibouti
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
@@ -231,30 +238,26 @@
# Egyptians would approve the cancellation."
#
# Egypt to cancel daylight saving time
-# <a href="http://www.almasryalyoum.com/en/node/407168";>
# http://www.almasryalyoum.com/en/node/407168
-# </a>
# or
-# <a href="http://www.worldtimezone.com/dst_news/dst_news_egypt04.html";>
# 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 23:00s 0 -
+Rule Egypt 1995 2005 - Sep lastThu 24:00 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 23:00s 0 -
+Rule Egypt 2006 only - Sep 21 24:00 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.
-# From Jesper Norgaard Welen (2007-08-15): [The following agree:]
+# From Jesper Nørgaard Welen (2007-08-15): [The following agree:]
# http://www.nentjes.info/Bill/bill5.htm
# 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 23:00s 0 -
+Rule Egypt 2007 only - Sep Thu>=1 24:00 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
@@ -288,15 +291,9 @@
#
# timeanddate[2] and another site I've found[3] also support that.
#
-# [1] <a href="https://bugzilla.redhat.com/show_bug.cgi?id=492263";>
-# https://bugzilla.redhat.com/show_bug.cgi?id=492263
-# </a>
-# [2] <a href="http://www.timeanddate.com/worldclock/clockchange.html?n=53";>
-# http://www.timeanddate.com/worldclock/clockchange.html?n=53
-# </a>
-# [3] <a href="http://wwp.greenwichmeantime.com/time-zone/africa/egypt/";>
-# http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
-# </a>
+# [1] https://bugzilla.redhat.com/show_bug.cgi?id=492263
+# [2] http://www.timeanddate.com/worldclock/clockchange.html?n=53
+# [3] http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
# From Arthur David Olson (2009-04-20):
# In 2009 (and for the next several years), Ramadan ends before the fourth
@@ -306,14 +303,10 @@
# From Steffen Thorsen (2009-08-11):
# We have been able to confirm the August change with the Egyptian Cabinet
# Information and Decision Support Center:
-# <a href="http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html";>
# http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html
-# </a>
#
# The Middle East News Agency
-# <a href="http://www.mena.org.eg/index.aspx";>
# http://www.mena.org.eg/index.aspx
-# </a>
# also reports "Egypt starts winter time on August 21"
# today in article numbered "71, 11/08/2009 12:25 GMT."
# Only the title above is available without a subscription to their service,
@@ -321,19 +314,14 @@
# (at least today).
# From Alexander Krivenyshev (2010-07-20):
-# According to News from Egypt - Al-Masry Al-Youm Egypt's cabinet has
+# According to News from Egypt - Al-Masry Al-Youm Egypt's cabinet has
# decided that Daylight Saving Time will not be used in Egypt during
# Ramadan.
#
# Arabic translation:
-# "Clocks to go back during Ramadan--and then forward again"
-# <a href="http://www.almasryalyoum.com/en/news/clocks-go-back-during-ramadan-and-then-forward-again";>
+# "Clocks to go back during Ramadan - and then forward again"
# http://www.almasryalyoum.com/en/news/clocks-go-back-during-ramadan-and-then-forward-again
-# </a>
-# or
-# <a href="http://www.worldtimezone.com/dst_news/dst_news_egypt02.html";>
# 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
@@ -342,46 +330,77 @@
# 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):
+# 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):
# 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:
+# above) says DST had no affect on electricity consumption. There is
+# no information about when DST will end this fall. 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 -
+# 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)))
Home |
Main Index |
Thread Index |
Old Index