sync with netbsd 960418

4 files changed, 34 insertions, 10 deletions

diff --git a/share/zoneinfo/datfiles/etcetera b/share/zoneinfo/datfiles/etcetera
index ed619aecfaa..8bc9a204422 100644
--- a/share/zoneinfo/datfiles/etcetera
+++ b/share/zoneinfo/datfiles/etcetera
@@ -1,4 +1,5 @@
-# @(#)etcetera	7.4
+#	$OpenBSD: etcetera,v 1.2 1996/04/22 01:28:45 deraadt Exp $
+# @(#)etcetera	7.5
 
 # All of these are set up just so people can "zic -l" to a timezone
 # that's right for their area, even if it doesn't have a name or DST rules
@@ -27,7 +28,8 @@ Link	Etc/GMT				Etc/GMT0
 #		zic -l GMT-12
 # so we moved the names into the Etc subdirectory.
 
-Zone	Etc/GMT-13	13	-	GMT-13 # 12 hours ahead of GMT, plus DST
+Zone	Etc/GMT-14	14	-	GMT-14	# 14 hours ahead of GMT
+Zone	Etc/GMT-13	13	-	GMT-13
 Zone	Etc/GMT-12	12	-	GMT-12
 Zone	Etc/GMT-11	11	-	GMT-11
 Zone	Etc/GMT-10	10	-	GMT-10
diff --git a/share/zoneinfo/datfiles/europe b/share/zoneinfo/datfiles/europe
index 85c05eef114..7ab9b78a149 100644
--- a/share/zoneinfo/datfiles/europe
+++ b/share/zoneinfo/datfiles/europe
@@ -1,4 +1,5 @@
-# @(#)europe	7.31
+#	$OpenBSD: europe,v 1.3 1996/04/22 01:28:53 deraadt Exp $
+# @(#)europe	7.33
 
 # 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
@@ -1644,7 +1645,12 @@ Zone	Europe/Lisbon	-0:36:32 -	LMT	1884
 # From Rui Pedro Salgueiro <rps@inescca.inescc.pt> (November 12, 1992):
 # Portugal has recently (September, 27) changed timezone
 # (from WET to MET or CET) to harmonize with EEC.
-			1:00	EC	MET%s
+			 1:00	EC	MET%s	1996 Mar 31 1:00u
+# Martin Bruckmann <martin@ua.pt> (1996-02-29) reports via Peter Ilieve
+# that Portugal is reverting to 0:00 by not moving its clocks this spring.
+# The new Prime Minister was fed up with getting up in the dark in the winter.
+			 0:00	1:00  "WET DST"	1996 Oct 27 1:00u
+			 0:00	EC	WET%s
 # We don't know what happened to Madeira or the Azores,
 # so we'll just use Shanks for now.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
diff --git a/share/zoneinfo/datfiles/northamerica b/share/zoneinfo/datfiles/northamerica
index c62699fcb9d..3b2405136b0 100644
--- a/share/zoneinfo/datfiles/northamerica
+++ b/share/zoneinfo/datfiles/northamerica
@@ -1,4 +1,5 @@
-# @(#)northamerica	7.21
+#	$OpenBSD: northamerica,v 1.3 1996/04/22 01:28:57 deraadt Exp $
+# @(#)northamerica	7.22
 # also includes Central America and the Caribbean
 
 # This data is by no means authoritative; if you think you know better,
@@ -852,6 +853,15 @@ Zone America/Whitehorse	-9:00:12 -	LMT	1900 Aug 20
 # Shanks also says there are four zones, but disagrees about the fourth.
 # Instead of GMT-6 with DST, he says there's GMT-8 without DST.
 
+# From Paul Eggert (1996-02-07):
+# Today in news:4f90v4$g6g@news.internet.com.mx, Kevin Pitts
+# <bravo2@internet.com.mx> wrote that Mexico will use Horario de Verano (DST)
+# starting this year with the same rules as the US, and gave FIDE as a source.
+# (FIDE is a private organization that promotes efficient electrical use.)
+# On 1996-02-02 Mario Camou wrote that the transition times are Apr Sun>=1
+# 0:00 and Nov 1 0:00 but also wrote ``The DST-out date looks a bit fishy''.
+# Go with Pitts after 1996, and with Shanks before that.
+
 # From Shanks (1991):
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Mexico	1922	only	-	Jan	1	0:00	0	S
@@ -863,6 +873,9 @@ Rule	Mexico	1943	only	-	Dec	16	0:00	1:00	D
 Rule	Mexico	1944	only	-	May	1	0:00	0	S
 Rule	Mexico	1950	only	-	Feb	12	0:00	1:00	D
 Rule	Mexico	1950	only	-	Jul	30	0:00	0	S
+Rule	Mexico	1996	max	-	Apr	Sun>=1	2:00	1:00	D
+Rule	Mexico	1996	max	-	Oct	lastSun	2:00	0	S
+#
 Rule	BajaN	1950	1966	-	Apr	lastSun	2:00	1:00	D
 Rule	BajaN	1950	1961	-	Sep	lastSun	2:00	0	S
 Rule	BajaN	1961	1966	-	Oct	lastSun	2:00	0	S
@@ -883,20 +896,22 @@ Zone America/Mazatlan	-7:05:40 -	LMT	1921 Dec 31 23:54:20
 			-6:00	-	CST	1942 Apr
 			-7:00	-	MST	1949 Jan 14
 			-8:00	-	PST	1970
-			-7:00	-	MST
+			-7:00	Mexico	M%sT
 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
 			-7:00	-	MST	1949 Jan 14
 			-8:00	BajaN	P%sT	1967 Apr lastSun 2:00
-			-8:00	US	P%sT
+			-8:00	US	P%sT	1996
+			-8:00	Mexico	P%sT
 Zone America/Ensenada	-7:46:28 -	LMT	1922 Jan  1  0:13:32
 			-8:00	-	PST	1927 Jun 10 23:00
 			-7:00	-	MST	1930 Nov 16
 			-8:00	-	PST	1942 Apr
 			-7:00	-	MST	1949 Jan 14
-			-8:00	-	PST
+			-8:00	-	PST	1996
+			-8:00	Mexico	P%sT
 #
 # Revillagigedo Is
 # no information
diff --git a/share/zoneinfo/datfiles/solar89 b/share/zoneinfo/datfiles/solar89
index 5a720a8dfde..601fdc60809 100644
--- a/share/zoneinfo/datfiles/solar89
+++ b/share/zoneinfo/datfiles/solar89
@@ -1,4 +1,5 @@
-# @(#)solar89	7.3
+#	$OpenBSD: solar89,v 1.3 1996/04/22 01:29:00 deraadt Exp $
+# @(#)solar89	7.4
 
 # Apparent noon times below are for Riyadh; they're a bit off for other places.
 # Times were computed using a formula provided by the U. S. Naval Observatory:
@@ -390,4 +391,4 @@ Zone	Asia/Riyadh89	3:07:04	-		??	1989
 			3:07:04	sol89		??	1990
 			3:07:04	-		??
 # For backward compatibility...
-Link	Asia/Riyadh88	Mideast/Riyadh88
+Link	Asia/Riyadh89	Mideast/Riyadh89