update to tzdata2007j from elsie.nci.nih.gov

5 files changed, 36 insertions, 21 deletions

diff --git a/share/zoneinfo/datfiles/asia b/share/zoneinfo/datfiles/asia
index 1c5162c2560..dd005ee44fa 100644
--- a/share/zoneinfo/datfiles/asia
+++ b/share/zoneinfo/datfiles/asia
@@ -1,5 +1,5 @@
-# $OpenBSD: asia,v 1.30 2007/11/06 15:35:52 millert Exp $
-# @(#)asia	8.13
+# $OpenBSD: asia,v 1.31 2007/12/29 13:41:05 millert Exp $
+# @(#)asia	8.14
 # <pre>
 
 # This data is by no means authoritative; if you think you know better,
@@ -578,6 +578,15 @@ Zone Asia/Jayapura	9:22:48 -	LMT	1932 Nov
 # daylight saving time ...
 # http://uk.reuters.com/article/oilRpt/idUKBLA65048420070916
 #
+# From Roozbeh Pournader (2007-11-05):
+# This is quoted from Official Gazette of the Islamic Republic of
+# Iran, Volume 63, Number 18242, dated Tuesday 1386/6/24
+# [2007-10-16]. I am doing the best translation I can:...
+# The official time of the country will be moved forward for one hour
+# on the 24 hours of the first day of the month of Farvardin and will
+# be changed back to its previous state on the 24 hours of the
+# thirtieth day of Shahrivar.
+#
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Iran	1978	1980	-	Mar	21	0:00	1:00	D
 Rule	Iran	1978	only	-	Oct	21	0:00	0	S
diff --git a/share/zoneinfo/datfiles/iso3166.tab b/share/zoneinfo/datfiles/iso3166.tab
index 22ff8208358..7f3d8ed753d 100644
--- a/share/zoneinfo/datfiles/iso3166.tab
+++ b/share/zoneinfo/datfiles/iso3166.tab
@@ -1,13 +1,13 @@
-# $OpenBSD: iso3166.tab,v 1.17 2007/02/02 20:26:51 millert Exp $
+# $OpenBSD: iso3166.tab,v 1.18 2007/12/29 13:41:05 millert Exp $
 # ISO 3166 alpha-2 country codes
 #
-# @(#)iso3166.tab	8.4
+# @(#)iso3166.tab	8.5
 #
 # From Paul Eggert (2006-09-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 No. V-12 (2006-09-26).  See:
+#     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>.
@@ -48,6 +48,7 @@ BG	Bulgaria
 BH	Bahrain
 BI	Burundi
 BJ	Benin
+BL	St Barthelemy
 BM	Bermuda
 BN	Brunei
 BO	Bolivia
@@ -160,6 +161,7 @@ MA	Morocco
 MC	Monaco
 MD	Moldova
 ME	Montenegro
+MF	St Martin (French part)
 MG	Madagascar
 MH	Marshall Islands
 MK	Macedonia
diff --git a/share/zoneinfo/datfiles/northamerica b/share/zoneinfo/datfiles/northamerica
index c7000d5acce..4759a87034b 100644
--- a/share/zoneinfo/datfiles/northamerica
+++ b/share/zoneinfo/datfiles/northamerica
@@ -1,5 +1,5 @@
-# $OpenBSD: northamerica,v 1.29 2007/11/06 15:35:52 millert Exp $
-# @(#)northamerica	8.19
+# $OpenBSD: northamerica,v 1.30 2007/12/29 13:41:05 millert Exp $
+# @(#)northamerica	8.20
 # <pre>
 
 # also includes Central America and the Caribbean
@@ -2304,6 +2304,10 @@ Zone	America/Grenada	-4:07:00 -	LMT	1911 Jul	# St George's
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Guadeloupe	-4:06:08 -	LMT	1911 Jun 8	# Pointe a Pitre
 			-4:00	-	AST
+# St Barthelemy
+Link America/Guadeloupe	America/St_Barthelemy
+# St Martin (French part)
+Link America/Guadeloupe	America/Marigot
 
 # Guatemala
 #
diff --git a/share/zoneinfo/datfiles/southamerica b/share/zoneinfo/datfiles/southamerica
index 27ee5dcea9c..8d5cd443881 100644
--- a/share/zoneinfo/datfiles/southamerica
+++ b/share/zoneinfo/datfiles/southamerica
@@ -1,5 +1,5 @@
-# $OpenBSD: southamerica,v 1.29 2007/10/04 18:51:34 millert Exp $
-# @(#)southamerica	8.12
+# $OpenBSD: southamerica,v 1.30 2007/12/29 13:41:05 millert Exp $
+# @(#)southamerica	8.13
 # <pre>
 
 # This data is by no means authoritative; if you think you know better,
@@ -1108,19 +1108,17 @@ Zone America/Montevideo	-3:44:44 -	LMT	1898 Jun 28
 
 # Venezuela
 #
-# From Kiraz Janicke (2007-09-25), in
-# http://www.venezuelanalysis.com/analysis/2645:
-# The proposal ... involves turning the clock back half an hour from
-# +4.00 Greenwich Mean Time (GMT), to +4.30GMT, the time zone
-# Venezuela had until December 31, 1964, when the current time zone
-# was adopted. The change was due to take place on September 17 and
-# then on September 24, but has since been postponed until December
-# 31, to allow for compliance with international organizations, such
-# as the International Office of Weights and Measures.
+# From John Stainforth (2007-11-28):
+# ... the change for Venezuela originally expected for 2007-12-31 has
+# been brought forward to 2007-12-09.  The official announcement was
+# published today in the "Gaceta Oficial de la Republica Bolivariana
+# de Venezuela, numero 38.819" (official document for all laws or
+# resolution publication)
+# http://www.globovision.com/news.php?nid=72208
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Caracas	-4:27:44 -	LMT	1890
 			-4:27:40 -	CMT	1912 Feb 12 # Caracas Mean Time?
 			-4:30	-	VET	1965	     # Venezuela Time
-			-4:00	-	VET	2008
+			-4:00	-	VET	2007 Dec  9 03:00
 			-4:30	-	VET
diff --git a/share/zoneinfo/datfiles/zone.tab b/share/zoneinfo/datfiles/zone.tab
index b1fc45ca951..f5ae6818c35 100644
--- a/share/zoneinfo/datfiles/zone.tab
+++ b/share/zoneinfo/datfiles/zone.tab
@@ -1,5 +1,5 @@
-# $OpenBSD: zone.tab,v 1.21 2007/08/22 11:29:44 millert Exp $
-# @(#)zone.tab	8.11
+# $OpenBSD: zone.tab,v 1.22 2007/12/29 13:41:05 millert Exp $
+# @(#)zone.tab	8.12
 #
 # TZ zone descriptions
 #
@@ -78,6 +78,7 @@ BG	+4241+02319	Europe/Sofia
 BH	+2623+05035	Asia/Bahrain
 BI	-0323+02922	Africa/Bujumbura
 BJ	+0629+00237	Africa/Porto-Novo
+BL	+1753-06251	America/St_Barthelemy
 BM	+3217-06446	Atlantic/Bermuda
 BN	+0456+11455	Asia/Brunei
 BO	-1630-06809	America/La_Paz
@@ -251,6 +252,7 @@ MA	+3339-00735	Africa/Casablanca
 MC	+4342+00723	Europe/Monaco
 MD	+4700+02850	Europe/Chisinau
 ME	+4226+01916	Europe/Podgorica
+MF	+1804-06305	America/Marigot
 MG	-1855+04731	Indian/Antananarivo
 MH	+0709+17112	Pacific/Majuro	most locations
 MH	+0905+16720	Pacific/Kwajalein	Kwajalein