20748631 update timezone data to 2015b s11u2-sru
authorTomas Klacko <tomas.klacko@oracle.com>
Thu, 26 Mar 2015 03:03:25 -0700
branchs11u2-sru
changeset 4019 825fa37cfbe0
parent 4016 7f9e1e7611b8
child 4025 ae7d8c1de67d
20748631 update timezone data to 2015b
components/timezone/Makefile
components/timezone/README
components/timezone/asia
components/timezone/australasia
components/timezone/europe
components/timezone/northamerica
components/timezone/southamerica
components/timezone/system-data-timezone.p5m
--- a/components/timezone/Makefile	Tue Mar 24 20:05:38 2015 -0700
+++ b/components/timezone/Makefile	Thu Mar 26 03:03:25 2015 -0700
@@ -27,7 +27,7 @@
 
 COMPONENT_BUGDB=	utility/timezone
 
-HUMAN_VERSION=		2015a
+HUMAN_VERSION=		2015b
 
 # "etcetera" must be listed before "backward" because it sets up links that
 # "backward" needs.
--- a/components/timezone/README	Tue Mar 24 20:05:38 2015 -0700
+++ b/components/timezone/README	Thu Mar 26 03:03:25 2015 -0700
@@ -8,7 +8,7 @@
 The zoneinfo files track the Olson public source provided at
 ftp://ftp.iana.org/tz/releases/, therefore zoneinfo files may be added and
 removed as the Solaris source is updated.  The current Solaris release of
-the zoneinfo files is based on tzdata2015a.tar.gz.
+the zoneinfo files is based on tzdata2015b.tar.gz.
 
 The /usr/share/lib/zoneinfo/GMT[+-]* timezones listed below have been
 removed from the release.  Replace usage of the
--- a/components/timezone/asia	Tue Mar 24 20:05:38 2015 -0700
+++ b/components/timezone/asia	Thu Mar 26 03:03:25 2015 -0700
@@ -1904,6 +1904,13 @@
 # was at the start of 2008-03-31 (the day of Steffen Thorsen's report);
 # this is almost surely wrong.
 
+# From Ganbold Tsagaankhuu (2015-03-10):
+# It seems like yesterday Mongolian Government meeting has concluded to use
+# daylight saving time in Mongolia....  Starting at 2:00AM of last Saturday of
+# March 2015, daylight saving time starts.  And 00:00AM of last Saturday of
+# September daylight saving time ends.  Source:
+# http://zasag.mn/news/view/8969
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Mongol	1983	1984	-	Apr	1	0:00	1:00	S
 Rule	Mongol	1983	only	-	Oct	1	0:00	0	-
@@ -1924,6 +1931,8 @@
 Rule	Mongol	2001	only	-	Apr	lastSat	2:00	1:00	S
 Rule	Mongol	2001	2006	-	Sep	lastSat	2:00	0	-
 Rule	Mongol	2002	2006	-	Mar	lastSat	2:00	1:00	S
+Rule	Mongol	2015	max	-	Mar	lastSat	2:00	1:00	S
+Rule	Mongol	2015	max	-	Sep	lastSat	0:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 # Hovd, a.k.a. Chovd, Dund-Us, Dzhargalant, Khovd, Jirgalanta
@@ -2342,13 +2351,19 @@
 # official source...:
 # http://www.palestinecabinet.gov.ps/ar/Views/ViewDetails.aspx?pid=1252
 
-# From Paul Eggert (2013-09-24):
-# For future dates, guess the last Thursday in March at 24:00 through
-# the first Friday on or after September 21 at 00:00.  This is consistent with
-# the predictions in today's editions of the following URLs,
-# which are for Gaza and Hebron respectively:
-# http://www.timeanddate.com/worldclock/timezone.html?n=702
-# http://www.timeanddate.com/worldclock/timezone.html?n=2364
+# From Steffen Thorsen (2015-03-03):
+# Sources such as http://www.alquds.com/news/article/view/id/548257
+# and http://www.raya.ps/ar/news/890705.html say Palestine areas will
+# start DST on 2015-03-28 00:00 which is one day later than expected.
+#
+# From Paul Eggert (2015-03-03):
+# http://www.timeanddate.com/time/change/west-bank/ramallah?year=2014
+# says that the fall 2014 transition was Oct 23 at 24:00.
+# For future dates, guess the last Friday in March at 24:00 through
+# the first Friday on or after October 21 at 00:00.  This is consistent with
+# the predictions in today's editions of the following URLs:
+# http://www.timeanddate.com/time/change/gaza-strip/gaza
+# http://www.timeanddate.com/time/change/west-bank/hebron
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
@@ -2374,9 +2389,11 @@
 Rule Palestine	2011	only	-	Aug	 1	0:00	0	-
 Rule Palestine	2011	only	-	Aug	30	0:00	1:00	S
 Rule Palestine	2011	only	-	Sep	30	0:00	0	-
-Rule Palestine	2012	max	-	Mar	lastThu	24:00	1:00	S
+Rule Palestine	2012	2014	-	Mar	lastThu	24:00	1:00	S
 Rule Palestine	2012	only	-	Sep	21	1:00	0	-
-Rule Palestine	2013	max	-	Sep	Fri>=21	0:00	0	-
+Rule Palestine	2013	only	-	Sep	Fri>=21	0:00	0	-
+Rule Palestine	2014	max	-	Oct	Fri>=21	0:00	0	-
+Rule Palestine	2015	max	-	Mar	lastFri	24:00	1:00	S
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
--- a/components/timezone/australasia	Tue Mar 24 20:05:38 2015 -0700
+++ b/components/timezone/australasia	Thu Mar 26 03:03:25 2015 -0700
@@ -373,6 +373,7 @@
 			 9:39:00 -	LMT	1901        # Agana
 			10:00	-	GST	2000 Dec 23 # Guam
 			10:00	-	ChST	# Chamorro Standard Time
+Link Pacific/Guam Pacific/Saipan # N Mariana Is
 
 # Kiribati
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -388,12 +389,7 @@
 			 14:00	-	LINT
 
 # N Mariana Is
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Pacific/Saipan	-14:17:00 -	LMT	1844 Dec 31
-			 9:43:00 -	LMT	1901
-			 9:00	-	MPT	1969 Oct    # N Mariana Is Time
-			10:00	-	MPT	2000 Dec 23
-			10:00	-	ChST	# Chamorro Standard Time
+# See Pacific/Guam.
 
 # Marshall Is
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -563,6 +559,7 @@
 			-11:00	-	NST	1967 Apr    # N=Nome
 			-11:00	-	BST	1983 Nov 30 # B=Bering
 			-11:00	-	SST	            # S=Samoa
+Link Pacific/Pago_Pago Pacific/Midway # in US minor outlying islands
 
 # Samoa (formerly and also known as Western Samoa)
 
@@ -744,23 +741,7 @@
 # uninhabited
 
 # Midway
-#
-# From Mark Brader (2005-01-23):
-# [Fallacies and Fantasies of Air Transport History, by R.E.G. Davies,
-# published 1994 by Paladwr Press, McLean, VA, USA; ISBN 0-9626483-5-3]
-# reproduced a Pan American Airways timetable from 1936, for their weekly
-# "Orient Express" flights between San Francisco and Manila, and connecting
-# flights to Chicago and the US East Coast.  As it uses some time zone
-# designations that I've never seen before:....
-# Fri. 6:30A Lv. HONOLOLU (Pearl Harbor), H.I.   H.L.T. Ar. 5:30P Sun.
-#  "   3:00P Ar. MIDWAY ISLAND . . . . . . . . . M.L.T. Lv. 6:00A  "
-#
-Zone Pacific/Midway	-11:49:28 -	LMT	1901
-			-11:00	-	NST	1956 Jun  3
-			-11:00	1:00	NDT	1956 Sep  2
-			-11:00	-	NST	1967 Apr    # N=Nome
-			-11:00	-	BST	1983 Nov 30 # B=Bering
-			-11:00	-	SST	            # S=Samoa
+# See Pacific/Pago_Pago.
 
 # Palmyra
 # uninhabited since World War II; was probably like Pacific/Kiritimati
--- a/components/timezone/europe	Tue Mar 24 20:05:38 2015 -0700
+++ b/components/timezone/europe	Thu Mar 26 03:03:25 2015 -0700
@@ -2400,7 +2400,7 @@
 			 4:00	Russia	VOL%sT	1989 Mar 26  2:00s # Volgograd T
 			 3:00	Russia	VOL%sT	1991 Mar 31  2:00s
 			 4:00	-	VOLT	1992 Mar 29  2:00s
-			 3:00	Russia	MSK	2011 Mar 27  2:00s
+			 3:00	Russia	MSK/MSD	2011 Mar 27  2:00s
 			 4:00	-	MSK	2014 Oct 26  2:00s
 			 3:00	-	MSK
 
--- a/components/timezone/northamerica	Tue Mar 24 20:05:38 2015 -0700
+++ b/components/timezone/northamerica	Thu Mar 26 03:03:25 2015 -0700
@@ -2312,8 +2312,24 @@
 # "...the new time zone will come into effect at two o'clock on the first Sunday
 # of February, when we will have to advance the clock one hour from its current
 # time..."
+# Also, the new zone will not use DST.
 #
-# Also, the new zone will not use DST.
+# From Carlos Raúl Perasso (2015-02-02):
+# The decree that modifies the Mexican Hour System Law has finally
+# been published at the Diario Oficial de la Federación
+# http://www.dof.gob.mx/nota_detalle.php?codigo=5380123&fecha=31/01/2015
+# It establishes 5 zones for Mexico:
+# 1- Zona Centro (Central Zone): Corresponds to longitude 90 W,
+#    includes most of Mexico, excluding what's mentioned below.
+# 2- Zona Pacífico (Pacific Zone): Longitude 105 W, includes the
+#    states of Baja California Sur; Chihuahua; Nayarit (excluding Bahía
+#    de Banderas which lies in Central Zone); Sinaloa and Sonora.
+# 3- Zona Noroeste (Northwest Zone): Longitude 120 W, includes the
+#    state of Baja California.
+# 4- Zona Sureste (Southeast Zone): Longitude 75 W, includes the state
+#    of Quintana Roo.
+# 5- The islands, reefs and keys shall take their timezone from the
+#    longitude they are located at.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Mexico	1939	only	-	Feb	5	0:00	1:00	D
@@ -2508,14 +2524,9 @@
 ###############################################################################
 
 # Anguilla
+# Antigua and Barbuda
 # See America/Port_of_Spain.
 
-# Antigua and Barbuda
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	America/Antigua	-4:07:12 -	LMT	1912 Mar 2
-			-5:00	-	EST	1951
-			-4:00	-	AST
-
 # Bahamas
 #
 # For 1899 Milne gives -5:09:29.5; round that.
@@ -2581,10 +2592,7 @@
 			-4:00	US	A%sT
 
 # Cayman Is
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	America/Cayman	-5:25:32 -	LMT	1890     # Georgetown
-			-5:07:11 -	KMT	1912 Feb # Kingston Mean Time
-			-5:00	-	EST
+# See America/Panama.
 
 # Costa Rica
 
@@ -3107,6 +3115,7 @@
 Zone	America/Panama	-5:18:08 -	LMT	1890
 			-5:19:36 -	CMT	1908 Apr 22 # Colón Mean Time
 			-5:00	-	EST
+Link America/Panama America/Cayman
 
 # Puerto Rico
 # There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'.
--- a/components/timezone/southamerica	Tue Mar 24 20:05:38 2015 -0700
+++ b/components/timezone/southamerica	Thu Mar 26 03:03:25 2015 -0700
@@ -1206,10 +1206,13 @@
 # DST Start: first Saturday of September 2014 (Sun 07 Sep 2014 04:00 UTC)
 # http://www.diariooficial.interior.gob.cl//media/2014/02/19/do-20140219.pdf
 
-# From Juan Correa (2015-01-28):
-# ... today the Ministry of Energy announced that Chile will drop DST, will keep
-# "summer time" (UTC -3 / UTC -5) all year round....
-# http://www.minenergia.cl/ministerio/noticias/generales/ministerio-de-energia-anuncia.html
+# From Eduardo Romero Urra (2015-03-03):
+# Today has been published officially that Chile will use the DST time
+# permanently until March 25 of 2017
+# http://www.diariooficial.interior.gob.cl/media/2015/03/03/1-large.jpg
+#
+# From Paul Eggert (2015-03-03):
+# For now, assume that the extension will persist indefinitely.
 
 # NOTE: ChileAQ rules for Antarctic bases are stored separately in the
 # 'antarctica' file.
@@ -1268,7 +1271,7 @@
 			-3:00	-	CLT
 Zone Pacific/Easter	-7:17:44 -	LMT	1890
 			-7:17:28 -	EMT	1932 Sep    # Easter Mean Time
-			-7:00	Chile	EAS%sT	1982 Mar 13 3:00u # Easter Time
+			-7:00	Chile	EAS%sT	1982 Mar 14 3:00u # Easter Time
 			-6:00	Chile	EAS%sT	2015 Apr 26 3:00u
 			-5:00	-	EAST
 #
@@ -1603,6 +1606,7 @@
 
 # These all agree with Trinidad and Tobago since 1970.
 Link America/Port_of_Spain America/Anguilla
+Link America/Port_of_Spain America/Antigua
 Link America/Port_of_Spain America/Dominica
 Link America/Port_of_Spain America/Grenada
 Link America/Port_of_Spain America/Guadeloupe
--- a/components/timezone/system-data-timezone.p5m	Tue Mar 24 20:05:38 2015 -0700
+++ b/components/timezone/system-data-timezone.p5m	Thu Mar 26 03:03:25 2015 -0700
@@ -27,7 +27,7 @@
 set name=pkg.description value="Timezone definition files"
 set name=pkg.human-version value=$(HUMAN_VERSION)
 set name=com.oracle.info.description value="the timezone definition files"
-set name=com.oracle.info.tpno value=21401
+set name=com.oracle.info.tpno value=22064
 set name=info.classification value=org.opensolaris.category.2008:System/Core
 set name=org.opensolaris.arc-caseid value=LSARC/2001/015
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
@@ -126,14 +126,13 @@
 file path=usr/share/lib/zoneinfo/Africa/Tripoli
 file path=usr/share/lib/zoneinfo/Africa/Tunis
 file path=usr/share/lib/zoneinfo/Africa/Windhoek
-dir  path=usr/share/lib/zoneinfo/America
 file path=usr/share/lib/zoneinfo/America/Adak
 file path=usr/share/lib/zoneinfo/America/Anchorage
 hardlink path=usr/share/lib/zoneinfo/America/Anguilla \
     target=../../../../../usr/share/lib/zoneinfo/America/Port_of_Spain
-file path=usr/share/lib/zoneinfo/America/Antigua
+hardlink path=usr/share/lib/zoneinfo/America/Antigua \
+    target=../../../../../usr/share/lib/zoneinfo/America/Port_of_Spain
 file path=usr/share/lib/zoneinfo/America/Araguaina
-dir  path=usr/share/lib/zoneinfo/America/Argentina
 file path=usr/share/lib/zoneinfo/America/Argentina/Buenos_Aires
 file path=usr/share/lib/zoneinfo/America/Argentina/Catamarca
 hardlink path=usr/share/lib/zoneinfo/America/Argentina/ComodRivadavia \
@@ -172,7 +171,8 @@
 hardlink path=usr/share/lib/zoneinfo/America/Catamarca \
     target=../../../../../usr/share/lib/zoneinfo/America/Argentina/Catamarca
 file path=usr/share/lib/zoneinfo/America/Cayenne
-file path=usr/share/lib/zoneinfo/America/Cayman
+hardlink path=usr/share/lib/zoneinfo/America/Cayman \
+    target=../../../../../usr/share/lib/zoneinfo/America/Panama
 file path=usr/share/lib/zoneinfo/America/Chicago
 file path=usr/share/lib/zoneinfo/America/Chihuahua
 hardlink path=usr/share/lib/zoneinfo/America/Coral_Harbour \
@@ -212,7 +212,6 @@
 file path=usr/share/lib/zoneinfo/America/Halifax
 file path=usr/share/lib/zoneinfo/America/Havana
 file path=usr/share/lib/zoneinfo/America/Hermosillo
-dir  path=usr/share/lib/zoneinfo/America/Indiana
 file path=usr/share/lib/zoneinfo/America/Indiana/Indianapolis
 file path=usr/share/lib/zoneinfo/America/Indiana/Knox
 file path=usr/share/lib/zoneinfo/America/Indiana/Marengo
@@ -229,7 +228,6 @@
 hardlink path=usr/share/lib/zoneinfo/America/Jujuy \
     target=../../../../../usr/share/lib/zoneinfo/America/Argentina/Jujuy
 file path=usr/share/lib/zoneinfo/America/Juneau
-dir  path=usr/share/lib/zoneinfo/America/Kentucky
 file path=usr/share/lib/zoneinfo/America/Kentucky/Louisville
 file path=usr/share/lib/zoneinfo/America/Kentucky/Monticello
 hardlink path=usr/share/lib/zoneinfo/America/Knox_IN \
@@ -269,7 +267,6 @@
 file path=usr/share/lib/zoneinfo/America/Nipigon
 file path=usr/share/lib/zoneinfo/America/Nome
 file path=usr/share/lib/zoneinfo/America/Noronha
-dir  path=usr/share/lib/zoneinfo/America/North_Dakota
 file path=usr/share/lib/zoneinfo/America/North_Dakota/Beulah
 file path=usr/share/lib/zoneinfo/America/North_Dakota/Center
 file path=usr/share/lib/zoneinfo/America/North_Dakota/New_Salem
@@ -327,7 +324,6 @@
 file path=usr/share/lib/zoneinfo/America/Winnipeg
 file path=usr/share/lib/zoneinfo/America/Yakutat
 file path=usr/share/lib/zoneinfo/America/Yellowknife
-dir  path=usr/share/lib/zoneinfo/Antarctica
 file path=usr/share/lib/zoneinfo/Antarctica/Casey
 file path=usr/share/lib/zoneinfo/Antarctica/Davis
 file path=usr/share/lib/zoneinfo/Antarctica/DumontDUrville
@@ -342,10 +338,8 @@
 file path=usr/share/lib/zoneinfo/Antarctica/Syowa
 file path=usr/share/lib/zoneinfo/Antarctica/Troll
 file path=usr/share/lib/zoneinfo/Antarctica/Vostok
-dir  path=usr/share/lib/zoneinfo/Arctic
 hardlink path=usr/share/lib/zoneinfo/Arctic/Longyearbyen \
     target=../../../../../usr/share/lib/zoneinfo/Europe/Oslo
-dir  path=usr/share/lib/zoneinfo/Asia
 hardlink path=usr/share/lib/zoneinfo/Asia/Aden \
     target=../../../../../usr/share/lib/zoneinfo/Asia/Riyadh
 file path=usr/share/lib/zoneinfo/Asia/Almaty
@@ -463,7 +457,6 @@
 file path=usr/share/lib/zoneinfo/Asia/Yakutsk
 file path=usr/share/lib/zoneinfo/Asia/Yekaterinburg
 file path=usr/share/lib/zoneinfo/Asia/Yerevan
-dir  path=usr/share/lib/zoneinfo/Atlantic
 file path=usr/share/lib/zoneinfo/Atlantic/Azores
 file path=usr/share/lib/zoneinfo/Atlantic/Bermuda
 file path=usr/share/lib/zoneinfo/Atlantic/Canary
@@ -479,7 +472,6 @@
 hardlink path=usr/share/lib/zoneinfo/Atlantic/St_Helena \
     target=../../../../../usr/share/lib/zoneinfo/Africa/Abidjan
 file path=usr/share/lib/zoneinfo/Atlantic/Stanley
-dir  path=usr/share/lib/zoneinfo/Australia
 hardlink path=usr/share/lib/zoneinfo/Australia/ACT \
     target=../../../../../usr/share/lib/zoneinfo/Australia/Sydney
 file path=usr/share/lib/zoneinfo/Australia/Adelaide
@@ -514,7 +506,6 @@
     target=../../../../../usr/share/lib/zoneinfo/Australia/Perth
 hardlink path=usr/share/lib/zoneinfo/Australia/Yancowinna \
     target=../../../../../usr/share/lib/zoneinfo/Australia/Broken_Hill
-dir  path=usr/share/lib/zoneinfo/Brazil
 hardlink path=usr/share/lib/zoneinfo/Brazil/Acre \
     target=../../../../../usr/share/lib/zoneinfo/America/Rio_Branco
 hardlink path=usr/share/lib/zoneinfo/Brazil/DeNoronha \
@@ -525,7 +516,6 @@
     target=../../../../../usr/share/lib/zoneinfo/America/Manaus
 file path=usr/share/lib/zoneinfo/CET
 file path=usr/share/lib/zoneinfo/CST6CDT
-dir  path=usr/share/lib/zoneinfo/Canada
 hardlink path=usr/share/lib/zoneinfo/Canada/Atlantic \
     target=../../../../../usr/share/lib/zoneinfo/America/Halifax
 hardlink path=usr/share/lib/zoneinfo/Canada/Central \
@@ -544,7 +534,6 @@
     target=../../../../../usr/share/lib/zoneinfo/America/Regina
 hardlink path=usr/share/lib/zoneinfo/Canada/Yukon \
     target=../../../../../usr/share/lib/zoneinfo/America/Whitehorse
-dir  path=usr/share/lib/zoneinfo/Chile
 hardlink path=usr/share/lib/zoneinfo/Chile/Continental \
     target=../../../../../usr/share/lib/zoneinfo/America/Santiago
 hardlink path=usr/share/lib/zoneinfo/Chile/EasterIsland \
@@ -558,7 +547,6 @@
     target=../../../../usr/share/lib/zoneinfo/Africa/Cairo
 hardlink path=usr/share/lib/zoneinfo/Eire \
     target=../../../../usr/share/lib/zoneinfo/Europe/Dublin
-dir  path=usr/share/lib/zoneinfo/Etc
 file path=usr/share/lib/zoneinfo/Etc/GMT
 hardlink path=usr/share/lib/zoneinfo/Etc/GMT+0 \
     target=../../../../../usr/share/lib/zoneinfo/Etc/GMT
@@ -600,7 +588,6 @@
     target=../../../../../usr/share/lib/zoneinfo/Etc/UTC
 hardlink path=usr/share/lib/zoneinfo/Etc/Zulu \
     target=../../../../../usr/share/lib/zoneinfo/Etc/UTC
-dir  path=usr/share/lib/zoneinfo/Europe
 file path=usr/share/lib/zoneinfo/Europe/Amsterdam
 file path=usr/share/lib/zoneinfo/Europe/Andorra
 file path=usr/share/lib/zoneinfo/Europe/Athens
@@ -697,7 +684,6 @@
     target=../../../../usr/share/lib/zoneinfo/Asia/Hong_Kong
 hardlink path=usr/share/lib/zoneinfo/Iceland \
     target=../../../../usr/share/lib/zoneinfo/Atlantic/Reykjavik
-dir  path=usr/share/lib/zoneinfo/Indian
 hardlink path=usr/share/lib/zoneinfo/Indian/Antananarivo \
     target=../../../../../usr/share/lib/zoneinfo/Africa/Nairobi
 file path=usr/share/lib/zoneinfo/Indian/Chagos
@@ -727,14 +713,12 @@
 file path=usr/share/lib/zoneinfo/MET
 file path=usr/share/lib/zoneinfo/MST
 file path=usr/share/lib/zoneinfo/MST7MDT
-dir  path=usr/share/lib/zoneinfo/Mexico
 hardlink path=usr/share/lib/zoneinfo/Mexico/BajaNorte \
     target=../../../../../usr/share/lib/zoneinfo/America/Tijuana
 hardlink path=usr/share/lib/zoneinfo/Mexico/BajaSur \
     target=../../../../../usr/share/lib/zoneinfo/America/Mazatlan
 hardlink path=usr/share/lib/zoneinfo/Mexico/General \
     target=../../../../../usr/share/lib/zoneinfo/America/Mexico_City
-dir  path=usr/share/lib/zoneinfo/Mideast
 hardlink path=usr/share/lib/zoneinfo/Mideast/Riyadh87 \
     target=../../../../../usr/share/lib/zoneinfo/Asia/Riyadh87
 hardlink path=usr/share/lib/zoneinfo/Mideast/Riyadh88 \
@@ -750,7 +734,6 @@
 hardlink path=usr/share/lib/zoneinfo/PRC \
     target=../../../../usr/share/lib/zoneinfo/Asia/Shanghai
 file path=usr/share/lib/zoneinfo/PST8PDT
-dir  path=usr/share/lib/zoneinfo/Pacific
 file path=usr/share/lib/zoneinfo/Pacific/Apia
 file path=usr/share/lib/zoneinfo/Pacific/Auckland
 file path=usr/share/lib/zoneinfo/Pacific/Bougainville
@@ -774,7 +757,8 @@
 file path=usr/share/lib/zoneinfo/Pacific/Kwajalein
 file path=usr/share/lib/zoneinfo/Pacific/Majuro
 file path=usr/share/lib/zoneinfo/Pacific/Marquesas
-file path=usr/share/lib/zoneinfo/Pacific/Midway
+hardlink path=usr/share/lib/zoneinfo/Pacific/Midway \
+    target=../../../../../usr/share/lib/zoneinfo/Pacific/Pago_Pago
 file path=usr/share/lib/zoneinfo/Pacific/Nauru
 file path=usr/share/lib/zoneinfo/Pacific/Niue
 file path=usr/share/lib/zoneinfo/Pacific/Norfolk
@@ -787,7 +771,8 @@
     target=../../../../../usr/share/lib/zoneinfo/Pacific/Pohnpei
 file path=usr/share/lib/zoneinfo/Pacific/Port_Moresby
 file path=usr/share/lib/zoneinfo/Pacific/Rarotonga
-file path=usr/share/lib/zoneinfo/Pacific/Saipan
+hardlink path=usr/share/lib/zoneinfo/Pacific/Saipan \
+    target=../../../../../usr/share/lib/zoneinfo/Pacific/Guam
 hardlink path=usr/share/lib/zoneinfo/Pacific/Samoa \
     target=../../../../../usr/share/lib/zoneinfo/Pacific/Pago_Pago
 file path=usr/share/lib/zoneinfo/Pacific/Tahiti
@@ -811,7 +796,6 @@
     target=../../../../usr/share/lib/zoneinfo/Europe/Istanbul
 hardlink path=usr/share/lib/zoneinfo/UCT \
     target=../../../../usr/share/lib/zoneinfo/Etc/UCT
-dir  path=usr/share/lib/zoneinfo/US
 hardlink path=usr/share/lib/zoneinfo/US/Alaska \
     target=../../../../../usr/share/lib/zoneinfo/America/Anchorage
 hardlink path=usr/share/lib/zoneinfo/US/Aleutian \
@@ -855,7 +839,6 @@
     pkg.linted=true
 link path=usr/share/lib/zoneinfo/posixrules target=./US/Eastern
 link path=usr/share/lib/zoneinfo/posixrules target=./US/Eastern
-dir  path=usr/share/lib/zoneinfo/src
 file README path=usr/share/lib/zoneinfo/src/README
 file africa path=usr/share/lib/zoneinfo/src/africa
 file antarctica path=usr/share/lib/zoneinfo/src/antarctica
@@ -872,12 +855,9 @@
 file solar89 path=usr/share/lib/zoneinfo/src/solar89
 file southamerica path=usr/share/lib/zoneinfo/src/southamerica
 file systemv path=usr/share/lib/zoneinfo/src/systemv
-dir  path=usr/share/lib/zoneinfo/tab
 file continent.tab path=usr/share/lib/zoneinfo/tab/continent.tab
 file country.tab path=usr/share/lib/zoneinfo/tab/country.tab
 file zone_sun.tab path=usr/share/lib/zoneinfo/tab/zone_sun.tab
-dir  path=usr/share/man
-dir  path=usr/share/man/man4
 file zoneinfo.4 path=usr/share/man/man4/zoneinfo.4 owner=root group=bin \
     mode=0444
 license cr_Sun license=cr_Sun