aboutsummaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorGarrett Wollman <wollman@FreeBSD.org>2000-08-10 19:20:14 +0000
committerGarrett Wollman <wollman@FreeBSD.org>2000-08-10 19:20:14 +0000
commit952f5f542e8585d433061c0ccab6069bb9810831 (patch)
tree5d9dfcf2a0567409b41a6c0b0e100772873b9c84 /share
parente64bdc7f2af5c911edeebe8ca37e6fb73ea846ba (diff)
downloadsrc-952f5f542e8585d433061c0ccab6069bb9810831.tar.gz
src-952f5f542e8585d433061c0ccab6069bb9810831.zip
Latest timezone updates from Arthur Olson. This update reflects changesvendor/tzdata/tzdata2000f
in Israel, Lithuania, Mexico, and Argentina. Obtained from: ftp://elsie.nci.nih.gov/pub/tzdata2000f.tar.gz
Notes
Notes: svn path=/vendor/tzdata/dist/; revision=64496 svn path=/vendor/tzdata/tzdata2000f/; revision=64498; tag=vendor/tzdata/tzdata2000f
Diffstat (limited to 'share')
-rw-r--r--share/zoneinfo/asia90
-rw-r--r--share/zoneinfo/australasia12
-rw-r--r--share/zoneinfo/europe15
-rw-r--r--share/zoneinfo/northamerica92
-rw-r--r--share/zoneinfo/southamerica31
-rwxr-xr-xshare/zoneinfo/yearistype.sh52
-rw-r--r--share/zoneinfo/zone.tab4
7 files changed, 182 insertions, 114 deletions
diff --git a/share/zoneinfo/asia b/share/zoneinfo/asia
index 6d9f5172fe69..7ef2d0c63e54 100644
--- a/share/zoneinfo/asia
+++ b/share/zoneinfo/asia
@@ -1,4 +1,4 @@
-# @(#)asia 7.55
+# @(#)asia 7.56
# This data is by no means authoritative; if you think you know better,
# go ahead and edit the file (and please send any changes to
@@ -370,9 +370,9 @@ Zone Asia/Jayapura 9:22:48 - LMT 1932 Nov
9:00 - JAYT
# Iran
-# From Paul Eggert (1999-09-27), following up a suggestion by Rich Wales:
+# From Paul Eggert (2000-06-12), following up a suggestion by Rich Wales:
# Ahmea Alavi in
-# <a href="http://tehran.stanford.edu/Iran_Lib/Calendar/taghveem.txt">
+# <a href="http://www.persia.org/Iran_Lib/Calendar/taghveem.txt">
# TAGHVEEM (1993-07-12)
# </a>
# writes ``Daylight saving time in Iran starts from the first day
@@ -385,12 +385,13 @@ Zone Asia/Jayapura 9:22:48 - LMT 1932 Nov
# 1993 03-21 03-21 09-23 09-23
# 1994 03-21 03-21 09-22!= 09-23
# 1995 03-21 03-21 09-22!= 09-23
-# 1996 03-21!= 03-20 09-21!= 09-22
-# 1997 03-21 03-21 09-21!= 09-23
+# 1996 03-21!= 03-20 09-22 09-22
+# 1997 03-22!= 03-21 09-22!= 09-23
# 1998 03-21 03-21 09-21!= 09-23
# 1999 03-22!= 03-21 09-22!= 09-23
# 2000 03-21!= 03-20 09-21!= 09-22
-# 2001 03-17!= 03-21 09-19!= 09-23
+# 2001 03-19!= 03-21 09-19!= 09-23
+# 2002 03-18!= 03-21 09-18!= 09-23
#
# Go with Alavi starting with 1992.
# I used Ed Reingold's cal-persia in GNU Emacs 19.34 to compute Persian dates.
@@ -455,7 +456,23 @@ Zone Asia/Tehran 3:25:44 - LMT 1916
4:00 Iran IR%sT 1979
3:30 Iran IR%sT
+
# Iraq
+#
+# From Jonathan Lennox <lennox@cs.columbia.edu> (2000-06-12):
+# An article in this week's Economist ("Inside the Saddam-free zone", p. 50 in
+# the U.S. edition) on the Iraqi Kurds contains a paragraph:
+# "The three northern provinces ... switched their clocks this spring and
+# are an hour ahead of Baghdad."
+#
+# But Rives McDow (2000-06-18) quotes a contact in Iraqi-Kurdistan as follows:
+# In the past, some Kurdish nationalists, as a protest to the Iraqi
+# Government, did not adhere to daylight saving time. They referred
+# to daylight saving as Saddam time. But, as of today, the time zone
+# in Iraqi-Kurdistan is on standard time with Baghdad, Iraq.
+#
+# So we'll ignore the Economist's claim.
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Iraq 1982 only - May 1 0:00 1:00 D
Rule Iraq 1982 1984 - Oct 1 0:00 0 S
@@ -526,7 +543,7 @@ Rule Zion 1988 only - Apr 9 0:00 1:00 D
Rule Zion 1988 only - Sep 3 0:00 0 S
# From Ephraim Silverberg <ephraim@cs.huji.ac.il>
-# (1997-03-04, 1998-03-16, 1998-12-28, and 2000-01-17):
+# (1997-03-04, 1998-03-16, 1998-12-28, 2000-01-17 and 2000-07-25):
# According to the Office of the Secretary General of the Ministry of
# Interior, there is NO set rule for Daylight-Savings/Standard time changes.
@@ -537,14 +554,19 @@ Rule Zion 1988 only - Sep 3 0:00 0 S
# Saturday night from midnight daylight savings time to 11 p.m. standard
# time. 1996 is an exception to this rule where the change back to standard
# time took place on Sunday night instead of Saturday night to avoid
-# conflicts with the Jewish New Year. Starting in 1999, the change to
-# daylight savings time will still be on a Friday morning but from
+# conflicts with the Jewish New Year. In 1999, the change to
+# daylight savings time was still on a Friday morning but from
# 2 a.m. IST to 3 a.m. IDT; furthermore, the change back to standard time
-# will now also be on a Friday morning from 2 a.m. IDT to 1 a.m. IST for
-# 1999 only. In the years from 2000 to 2002, the change back will be from
-# 2 a.m. IDT to 1 a.m. IST the morning after the Jewish festival of
-# Shmini Atzeret (i.e. the morning of the 23rd of Tishrei in the lunar
-# Hebrew calendar).
+# was also on a Friday morning from 2 a.m. IDT to 1 a.m. IST for
+# 1999 only. In the year 2000, the change to daylight savings time was
+# similar to 1999, but although the change back will be on a Friday, it
+# will take place from 1 a.m. IDT to midnight IST. Starting in 2001, all
+# changes to/from will take place at 1 a.m. old time, but now there is no
+# rule as to what day of the week it will take place in as the start date
+# (except in 2003) is the night after the Passover Seder (i.e. the eve
+# of the 16th of Nisan in the lunar Hebrew calendar) and the end date
+# (except in 2002) is three nights before Yom Kippur [Day of Atonement]
+# (the eve of the 7th of Tishrei in the lunar Hebrew calendar).
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Zion 1989 only - Apr 30 0:00 1:00 D
@@ -592,29 +614,37 @@ Rule Zion 1998 only - Sep 6 0:00 0 S
Rule Zion 1999 only - Apr 2 2:00 1:00 D
Rule Zion 1999 only - Sep 3 2:00 0 S
-# Minister of Interior, Natan Sharansky, has announced the dates for
-# the years 2000-2002. However, sources inside the ministry have noted
-# that the end date of 2000 and both dates of 2001-2002 should be regarded
-# as tentative pending final approval.
+# The Knesset Interior Committee has changed the dates for 2000 for
+# the third time in just over a year and have set new dates for the
+# years 2001-2004 as well.
+#
+# The official announcement for the start date of 2000 can be viewed at:
+#
+# ftp://ftp.huji.ac.il/pub/tz/announcements/2000-start.ps.gz
#
-# The official announcement for the years 2000-2002 can be viewed at:
+# The official announcement for the end date of 2000 and the dates
+# for the years 2001-2004 can be viewed at:
#
-# ftp://ftp.huji.ac.il/pub/tz/announcements/2000-2002.ps.gz
+# ftp://ftp.huji.ac.il/pub/tz/announcements/2000-2004.ps.gz
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Zion 2000 only - Apr 14 2:00 1:00 D
-Rule Zion 2000 only - Oct 22 2:00 0 S
-Rule Zion 2001 only - Apr 6 2:00 1:00 D
-Rule Zion 2001 only - Oct 10 2:00 0 S
-Rule Zion 2002 only - Mar 29 2:00 1:00 D
-Rule Zion 2002 only - Sep 29 2:00 0 S
-
-# From Paul Eggert (2000-01-17):
-# Here are guesses for rules after 2002.
+Rule Zion 2000 only - Oct 6 1:00 0 S
+Rule Zion 2001 only - Apr 9 1:00 1:00 D
+Rule Zion 2001 only - Sep 24 1:00 0 S
+Rule Zion 2002 only - Mar 29 1:00 1:00 D
+Rule Zion 2002 only - Oct 7 1:00 0 S
+Rule Zion 2003 only - Mar 28 1:00 1:00 D
+Rule Zion 2003 only - Oct 3 1:00 0 S
+Rule Zion 2004 only - Apr 7 1:00 1:00 D
+Rule Zion 2004 only - Sep 22 1:00 0 S
+
+# From Paul Eggert (2000-07-25):
+# Here are guesses for rules after 2004.
# They are probably wrong, but they are more likely than no DST at all.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Zion 2003 max - Mar Fri>=25 2:00 1:00 D
-Rule Zion 2003 max - Oct 1 2:00 0 S
+Rule Zion 2005 max - Apr 1 1:00 1:00 D
+Rule Zion 2005 max - Oct 1 1:00 0 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Jerusalem 2:20:56 - LMT 1880
diff --git a/share/zoneinfo/australasia b/share/zoneinfo/australasia
index 32699605f240..c9215d82ec95 100644
--- a/share/zoneinfo/australasia
+++ b/share/zoneinfo/australasia
@@ -1,4 +1,4 @@
-# @(#)australasia 7.56
+# @(#)australasia 7.58
# This file also includes Pacific islands.
# Notes are at the end of this file
@@ -70,8 +70,11 @@ Rule AS 1987 max - Oct lastSun 2:00s 1:00 -
Rule AS 1972 only - Feb 27 2:00s 0 -
Rule AS 1973 1985 - Mar Sun>=1 2:00s 0 -
Rule AS 1986 1989 - Mar Sun>=15 2:00s 0 -
-Rule AS 1990 1994 even Mar Sun>=18 2:00s 0 -
-Rule AS 1990 1994 odd Mar Sun>=1 2:00s 0 -
+Rule AS 1990 only - Mar Sun>=18 2:00s 0 -
+Rule AS 1991 only - Mar Sun>=1 2:00s 0 -
+Rule AS 1992 only - Mar Sun>=18 2:00s 0 -
+Rule AS 1993 only - Mar Sun>=1 2:00s 0 -
+Rule AS 1994 only - Mar Sun>=18 2:00s 0 -
Rule AS 1995 max - Mar lastSun 2:00s 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Australia/Adelaide 9:14:20 - LMT 1895 Feb
@@ -737,6 +740,9 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901
# (Australia) and start daylight saving on the last Sunday in August in 2000
# instead of the first Sunday in October.
+# Sim Alam (2000-07-03) reported a legal citation for the 2000/2001 rules:
+# http://www.thelaw.tas.gov.au/fragview/42++1968+GS3A@EN+2000070300
+
# Victoria
# The rules for 1971 through 1991 were reported by George Shepherd
diff --git a/share/zoneinfo/europe b/share/zoneinfo/europe
index cc08c0c2366f..92b82b622c2e 100644
--- a/share/zoneinfo/europe
+++ b/share/zoneinfo/europe
@@ -1,4 +1,4 @@
-# @(#)europe 7.71
+# @(#)europe 7.73
# This data is by no means authoritative; if you think you know better,
# go ahead and edit the file (and please send any changes to
@@ -131,6 +131,10 @@
# A bill was drafted in 1909 and introduced in Parliament several times,
# but it met with ridicule and opposition, especially from farming interests.
# One-hour Summer Time was eventually adopted as a wartime measure in 1916.
+# See:
+# <a href="http://www.the-times.co.uk/news/pages/tim/2000/05/18/x-timcrtcrt01011.html">
+# Summer Time Arrives Early, The Times (2000-05-18)
+# </a>
# From Paul Eggert (1996-09-03):
# The OED Supplement says that the English originally said ``Daylight Saving''
@@ -1185,6 +1189,10 @@ Zone Europe/Vaduz 0:38:04 - LMT 1894 Jun
# motion to give up shifting to summer time in spring, as it was
# already done by Estonia.
+# From the <a href="http://www.tourism.lt/informa/ff.htm">
+# Fact File, Lithuanian State Department of Tourism
+# </a> (2000-03-27): Local time is GMT+2 hours ..., no daylight saving.
+
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Europe/Vilnius 1:41:16 - LMT 1880
1:24:00 - WMT 1917 # Warsaw Mean Time
@@ -1199,7 +1207,7 @@ Zone Europe/Vilnius 1:41:16 - LMT 1880
2:00 C-Eur EE%sT 1998
2:00 - EET 1998 Mar 29 1:00u
1:00 EU CE%sT 1999 Oct 31 1:00u
- 2:00 EU EE%sT
+ 2:00 - EET
# Luxembourg
# Whitman disagrees with most of these dates in minor ways; go with Shanks.
@@ -1856,7 +1864,8 @@ Zone Europe/Simferopol 2:16:24 - LMT 1880
3:00 1:00 MSD 1996 Oct 27 3:00s
# IATA SSIM (1997-09) says Crimea switched to EET/EEST.
# Assume it happened in March by not changing the clocks.
- 3:00 Russia MSK/MSD 1997 Mar lastSun 1:00u
+ 3:00 Russia MSK/MSD 1997
+ 3:00 - MSK 1997 Mar lastSun 1:00u
2:00 EU EE%sT
# Yugoslavia
diff --git a/share/zoneinfo/northamerica b/share/zoneinfo/northamerica
index 845587fa8205..654450a9c57e 100644
--- a/share/zoneinfo/northamerica
+++ b/share/zoneinfo/northamerica
@@ -1,4 +1,4 @@
-# @(#)northamerica 7.51
+# @(#)northamerica 7.52
# also includes Central America and the Caribbean
# This data is by no means authoritative; if you think you know better,
@@ -1002,52 +1002,35 @@ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20
# Mexico
-# From Guy Harris:
-# Rules are from the Official Airline Guide, Worldwide Edition, for 1987.
-# Rules [before] 1987 are unknown.
-# The comments in the OAG say "Only Ensenada, Mexicale, San Felipe and Tijuana
-# observe DST." This is presumably Baja California Norte, above 28th parallel,
-# as listed there; [there is also] "Baja California Sur and N. Pacific
-# Coast (States of Sinaloa and Sonora)."
-
-# From Bob Devine (1988-01-28):
-# The Federal District (where Mexico City is) has observed [DST] several
-# times but not recently.
+# Gwillim Law reports this source for daylight saving time in Mexico:
+# <a href="http://www.spin.com.mx/verano/">
+# Daylight saving time * SPIN-Internet (in Spanish)
+# </a>
+# Law (2000-03-09) translates it as follows:
#
-# I don't where to draw the line in the North Baja area. 28th latitude
-# sounds good -- but it may be higher (how far [d]o radio stations from
-# San Diego affect culture?).
+# Standard time effective in Mexico takes its origin in the
+# presidential decree of April 24, 1942. The time of the 120th
+# meridian applies to the state of Baja California; of the 105th
+# meridian to the states of Baja California Sur, Sonora, Sinaloa, and
+# Nayarit; and the time of the 90th meridian to the rest of the
+# country.
#
-# The dates of DST probably go back to 1981. The rules are the same as
-# US's. This is going to be a headache for US presidential electi[o]n years!
-
-# From Arthur David Olson (1988-02-13)
-# Since the 1981 starting date is only "probable," we'll keep the 1987
-# starting date below.
-
-# From U. S. Naval Observatory (1989-01-19):
-# MEXICO BAJA CAL N 7 H BEHIND UTC BAJA CALIFORNIA SUR AND
-# MEXICO BAJA CAL N N. PACIFIC COAST (STATES
-# MEXICO BAJA CAL N OF SINALOA AND SONORA)
-# MEXICO BAJA CAL N 8 H BEHIND UTC ABOVE 28TH PARALLEL APR 3
-# MEXICO BAJA CAL N - OCT 29
-# MEXICO BAJA CAL N 7 H BEHIND UTC ABOVE 28TH PARALLEL APR 3
-# MEXICO BAJA CAL N - 0CT 29
-# MEXICO 6 H BEHIND UTC STATES OF DURANGO,
-# MEXICO COAHUILA, NUEVO LEON,
-# MEXICO TAMAULIPAS
-# MEXICO 5 H BEHIND UTC STATES OF DURANGO,
-# MEXICO COAHUILA, NUEVO LEON,
-# MEXICO TAMAULIPAS APR 3 - OCT 29
-# MEXICO 6 H BEHIND UTC GENERAL MEXICO, STATES OF
-# MEXICO CAMPECHE, QUINTANA ROO AND
-# MEXICO YUCATAN
+# In the country, there have been several attempts made to adapt
+# standard time with the object of arriving at a better use of
+# daylight for social and economic activities. In December, 1981 a
+# permanent time zone was decreed for the states of Campeche, Yucatan,
+# and Quintana Roo, displacing them from the 90th to the 75th
+# meridian. This disposition was annulled on December 2, 1982.
+#
+# In 1988 a Summer Time was established for the states of Tamaulipas,
+# Nuevo Leon, Coahuila, and Durango, which meant that from the first
+# Sunday in April to the last [Sunday] of October those states
+# displaced their time from the 90th to the 75th meridian. That
+# disposition lasted for one year.
-# From Arthur David Olson (1989-01-21):
-# April 3 fell on a Sunday in 1988; October 29 fell on a Sunday in 1989. Ahem.
-# USNO claims there should be four Mexican zones rather than three:
-# a zone that's GMT-8 with DST; a zone that's always GMT-7;
-# a zone that's GMT-6 with DST; and a zone that's always GMT-6.
+# From Paul Eggert (2000-07-26):
+# Shanks gives 1942-04-01 instead of 1942-04-24, and omits the 1981
+# and 1988 DST experiments. Go with spin.com.mx.
# From Alan Perry <alan.perry@eng.sun.com> (1996-02-15):
# A guy from our Mexico subsidiary finally found the Presidential Decree
@@ -1093,7 +1076,6 @@ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20
# savings time so as to stay on the same time zone as the southern part of
# Arizona year round.
-# From Shanks:
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Mexico 1939 only - Feb 5 0:00 1:00 D
Rule Mexico 1939 only - Jun 25 0:00 0 S
@@ -1111,10 +1093,22 @@ Rule BajaN 1954 1961 - Sep lastSun 2:00 0 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
# Quintana Roo
Zone America/Cancun -5:47:04 - LMT 1922 Jan 1 0:12:56
+ -6:00 - CST 1981 Dec
+ -5:00 - EST 1982 Dec 2
-6:00 - CST 1996
-6:00 Mexico C%sT 1997 Oct lastSun 2:00
-5:00 Mexico E%sT 1998 Aug 2 2:00
-6:00 Mexico C%sT
+# Campeche, Yucatan
+Zone America/Merida -5:58:28 - LMT 1922 Jan 1 0:01:32
+ -6:00 - CST 1981 Dec
+ -5:00 - EST 1982 Dec 2
+ -6:00 Mexico C%sT
+# Coahuila, Durango, Nuevo Leon, Tamaulipas
+Zone America/Monterrey -6:41:16 - LMT 1922 Jan 1 0:01:32
+ -6:00 - CST 1988
+ -6:00 US C%sT 1989
+ -6:00 Mexico C%sT
# Central Mexico
Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 0:23:24
-7:00 - MST 1927 Jun 10 23:00
@@ -1141,19 +1135,19 @@ Zone America/Hermosillo -7:23:52 - LMT 1921 Dec 31 23:36:08
-7:00 - MST 1931 May 1 23:00
-6:00 - CST 1931 Oct
-7:00 - MST 1932 Mar 30 23:00
- -6:00 - CST 1942 Apr
+ -6:00 - CST 1942 Apr 24
-7:00 - MST 1949 Jan 14
-8:00 - PST 1970
-7:00 Mexico M%sT 1999
-7:00 - MST
-# S Baja California, Nayarit, Sinaloa
+# Baja California Sur, Nayarit, Sinaloa
Zone America/Mazatlan -7:05:40 - LMT 1921 Dec 31 23:54:20
-7:00 - MST 1927 Jun 10 23:00
-6:00 - CST 1930 Nov 15
-7:00 - MST 1931 May 1 23:00
-6:00 - CST 1931 Oct
-7:00 - MST 1932 Mar 30 23:00
- -6:00 - CST 1942 Apr
+ -6:00 - CST 1942 Apr 24
-7:00 - MST 1949 Jan 14
-8:00 - PST 1970
-7:00 Mexico M%sT
@@ -1161,7 +1155,7 @@ Zone America/Mazatlan -7:05:40 - LMT 1921 Dec 31 23:54:20
Zone America/Tijuana -7:48:04 - LMT 1922 Jan 1 0:11:56
-8:00 - PST 1927 Jun 10 23:00
-7:00 - MST 1930 Nov 16
- -8:00 - PST 1942 Apr
+ -8:00 - PST 1942 Apr 24
-7:00 - MST 1949 Jan 14
-8:00 BajaN P%sT 1976
-8:00 US P%sT 1996
diff --git a/share/zoneinfo/southamerica b/share/zoneinfo/southamerica
index 81797ff2a53d..39d5d6b782d4 100644
--- a/share/zoneinfo/southamerica
+++ b/share/zoneinfo/southamerica
@@ -1,4 +1,4 @@
-# @(#)southamerica 7.35
+# @(#)southamerica 7.36
# This data is by no means authoritative; if you think you know better,
# go ahead and edit the file (and please send any changes to
@@ -111,24 +111,31 @@ Rule Arg 1989 1992 - Oct Sun>=15 0:00 1:00 S
# From Rives McDow (2000-01-10):
# On October 3, 1999, 0:00 local, Argentina implemented daylight savings time,
# which did not result in the switch of a time zone, as they stayed 9 hours
-# from the International Date Line. On March 5, 2000, at 0:00 local time,
-# Argentina will come off daylight savings time, which will bring them to 8
-# hours from the International Date Line.
+# from the International Date Line.
+Rule Arg 1999 only - Oct Sun>=1 0:00 1:00 S
+Rule Arg 2000 only - Mar Sun>=1 0:00 0 -
#
# From Peter Gradelski via Steffen Thorsen (2000-03-01):
# We just checked with our San Paulo office and they say the government of
# Argentina decided not to become one of the countries that go on or off DST.
# So Buenos Aires should be -3 hours from GMT at all times.
#
+# From Fabian L. Arce Jofre <farcejofre@bigfoot.com> (2000-04-04):
+# The law that claimed DST for Argentina was derogated by President Fernando
+# de la Rua on March 2, 2000, because it would make people spend more energy
+# in the winter time, rather than less. The change took effect on March 3.
+#
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
#
-# Buenos Aires (BA), Distrito Federal (DF), Santa Cruz (SC),
-# Tierra del Fuego (TF) & Antartida e Islas
+# Buenos Aires (BA), Capital Federal (CF), Santa Cruz (SC),
+# Tierra del Fuego, Antartida e Islas del Atlantico Sur (TF)
Zone America/Buenos_Aires -3:53:48 - LMT 1894 Nov
-4:16:44 - CMT 1920 May # Cordoba Mean Time
-4:00 - ART 1930 Dec
-4:00 Arg AR%sT 1969 Oct 5
- -3:00 Arg AR%sT
+ -3:00 Arg AR%sT 1999 Oct 3 0:00
+ -4:00 Arg AR%sT 2000 Mar 3 0:00
+ -3:00 - ART
#
# Santa Fe (SF), Entre Rios (ER), Corrientes (CN), Misiones (MN), Chaco (CC),
# Formosa (FM), La Pampa (LP), Chubut (CH)
@@ -137,6 +144,8 @@ Zone America/Rosario -4:02:40 - LMT 1894 Nov
-4:00 - ART 1930 Dec
-4:00 Arg AR%sT 1969 Oct 5
-3:00 Arg AR%sT 1991 Jul
+ -3:00 - ART 1999 Oct 3 0:00
+ -4:00 Arg AR%sT 2000 Mar 3 0:00
-3:00 - ART
#
# Cordoba (CB), Santiago del Estero (SE), Salta (SA), Tucuman (TM), La Rioja (LR), San Juan (SJ), San Luis (SL),
@@ -146,6 +155,8 @@ Zone America/Cordoba -4:16:44 - LMT 1894 Nov
-4:00 - ART 1930 Dec
-4:00 Arg AR%sT 1969 Oct 5
-3:00 Arg AR%sT 1990 Jul
+ -3:00 - ART 1999 Oct 3 0:00
+ -4:00 Arg AR%sT 2000 Mar 3 0:00
-3:00 - ART
#
# Jujuy (JY)
@@ -157,6 +168,8 @@ Zone America/Jujuy -4:21:12 - LMT 1894 Nov
-4:00 - WART 1991 Oct 6
-4:00 1:00 WARST 1992 Mar 15
-4:00 - WART 1992 Oct 18
+ -3:00 - ART 1999 Oct 3 0:00
+ -4:00 Arg AR%sT 2000 Mar 3 0:00
-3:00 - ART
#
# Catamarca (CT)
@@ -167,6 +180,8 @@ Zone America/Catamarca -4:23:08 - LMT 1894 Nov
-3:00 Arg AR%sT 1990 Jul
-3:00 - ART 1991 Jul
-3:00 Arg AR%sT 1992 Jul
+ -3:00 - ART 1999 Oct 3 0:00
+ -4:00 Arg AR%sT 2000 Mar 3 0:00
-3:00 - ART
#
# Mendoza (MZ)
@@ -178,6 +193,8 @@ Zone America/Mendoza -4:35:16 - LMT 1894 Nov
-4:00 - WART 1991 Oct 15
-4:00 1:00 WARST 1992 Mar 1
-4:00 - WART 1992 Oct 18
+ -3:00 - ART 1999 Oct 3 0:00
+ -4:00 Arg AR%sT 2000 Mar 3 0:00
-3:00 - ART
# Aruba
diff --git a/share/zoneinfo/yearistype.sh b/share/zoneinfo/yearistype.sh
index 809f5492a1e3..62d6365ecd9d 100755
--- a/share/zoneinfo/yearistype.sh
+++ b/share/zoneinfo/yearistype.sh
@@ -1,26 +1,36 @@
#! /bin/sh
-: '@(#)yearistype.sh 7.4'
+: '@(#)yearistype.sh 7.6'
+
+case $#-$1 in
+ 2-|2-0*|2-*[!0-9]*)
+ echo "$0: wild year - $1" >&2
+ exit 1 ;;
+esac
case $#-$2 in
- 2-even) case $1 in
- *[24680]) exit 0 ;;
- *) exit 1 ;;
- esac ;;
- 2-nonpres) case $1 in
- *[02468][048]|*[13579][26]) exit 1 ;;
- *) exit 0 ;;
- esac ;;
- 2-odd) case $1 in
- *[13579]) exit 0 ;;
- *) exit 1 ;;
- esac ;;
- 2-uspres) case $1 in
- *[02468][048]|*[13579][26]) exit 0 ;;
- *) exit 1 ;;
- esac ;;
- 2-*) echo "$0: wild type - $2" >&2
- exit 1 ;;
- *) echo "$0: usage is $0 year type" >&2
- exit 1 ;;
+ 2-even)
+ case $1 in
+ *[24680]) exit 0 ;;
+ *) exit 1 ;;
+ esac ;;
+ 2-nonpres|2-nonuspres)
+ case $1 in
+ *[02468][048]|*[13579][26]) exit 1 ;;
+ *) exit 0 ;;
+ esac ;;
+ 2-odd)
+ case $1 in
+ *[13579]) exit 0 ;;
+ *) exit 1 ;;
+ esac ;;
+ 2-uspres)
+ case $1 in
+ *[02468][048]|*[13579][26]) exit 0 ;;
+ *) exit 1 ;;
+ esac ;;
+ 2-*)
+ echo "$0: wild type - $2" >&2 ;;
esac
+
+echo "$0: usage is $0 year even|odd|uspres|nonpres|nonuspres" >&2
diff --git a/share/zoneinfo/zone.tab b/share/zoneinfo/zone.tab
index b65b6a352cd0..401ab9ea2550 100644
--- a/share/zoneinfo/zone.tab
+++ b/share/zoneinfo/zone.tab
@@ -1,4 +1,4 @@
-# @(#)zone.tab 1.18
+# @(#)zone.tab 1.19
#
# TZ zone descriptions
#
@@ -247,6 +247,8 @@ MV +0410+07330 Indian/Maldives
MW -1547+03500 Africa/Blantyre
MX +1924-09909 America/Mexico_City Central Time - most locations
MX +2105-08646 America/Cancun Central Time - Quintana Roo
+MX +2058-08937 America/Merida Central Time - Campeche, Yucatan
+MX +2540-10019 America/Monterrey Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas
MX +2313-10625 America/Mazatlan Mountain Time - S Baja, Nayarit, Sinaloa
MX +2838-10605 America/Chihuahua Mountain Time - Chihuahua
MX +2904-11058 America/Hermosillo Mountain Standard Time - Sonora