[illumos-gate merge]

commit 6e096e64ab50f0e0567b99c4306fe9f3dead76e6
    3015 lofiadm should use libz.so.1, not libz.so
commit 8e268185036f404515ce8bc575423ac390136e3f
    4548 update prototypes to 2014
commit 6055fc7a0767fd5991c8054028ffc6d2673ecbf6
    4547 e1000g common code doesn't account for LockMAC
commit a43ba7366ce6d85c95e198401ce96efc992c6aeb
    4511 Update timezone info db to 2013i

Conflicts:
	usr/src/uts/common/io/e1000g/e1000g_main.c (typos)
	usr/src/cmd/zic/README.illumos (typos, packaging)

4 files changed, 34 insertions, 7 deletions

diff --git a/usr/src/cmd/lofiadm/main.c b/usr/src/cmd/lofiadm/main.c
index d93edd1ea9..0c32b69323 100644
--- a/usr/src/cmd/lofiadm/main.c
+++ b/usr/src/cmd/lofiadm/main.c
@@ -24,6 +24,7 @@
  * Copyright 2012 Joyent, Inc.  All rights reserved.
  *
  * Copyright 2013 Nexenta Systems, Inc. All rights reserved.
+ * Copyright (c) 2014 Gary Mills
  */
 
 /*
@@ -168,7 +169,7 @@ gzip_compress(void *src, size_t srclen, void *dst, size_t *dstlen, int level)
 
 	/*
 	 * The first time we are called, attempt to dlopen()
-	 * libz.so and get a pointer to the compress2() function
+	 * libz.so.1 and get a pointer to the compress2() function
 	 */
 	if (compress2p == NULL) {
 		if ((libz_hdl = openlib(LIBZ)) == NULL)
diff --git a/usr/src/cmd/zic/README.illumos b/usr/src/cmd/zic/README.illumos
index 27799b3bff..e8143cffb2 100644
--- a/usr/src/cmd/zic/README.illumos
+++ b/usr/src/cmd/zic/README.illumos
@@ -22,7 +22,7 @@ version of the time database which can currently be found at:
 http://www.iana.org/time-zones
 
 You'll need the data tarball. Most data files are used in the gate
-direcetly; however, a few have slightly different names. The following
+directly; however, a few have slightly different names. The following
 commands assume that you're inside of the directory you extracted the
 time zone files.
 
@@ -49,4 +49,24 @@ diff zone.tab.txt' and see what changed and fix zone_sun.tab
 appropriately. Usually this means deleting removed entries and adding
 new ones.
 
-Once that's all set, you should be good to go.
+After that's done, you'll need to go through the more agonizing process of
+packaging. To do this, you'll want to look through the differences that have
+occurred in zone.tab.txt and backward. The contents of backward describe
+hardlinks that need to exist in packaging. Specifically, if you have a line in
+the form of:
+
+LINK	Beleriand	Gondolin
+
+That instructs that Gondolin should be hardlinked to Beleriand. In ips parlance
+that'd be:
+
+hardlink path=usr/share/lib/zoneinfo/Beleriand target=./Gondolin
+
+The differences in zone.tab.txt describe the additions and removals of various
+file entries. If you're not friends with protocmp yet, this should help you out.
+Once both of those are done, you'll need to update the version of the package
+itself in the manifest. IANA releases these as <year><letter>, eg. 2013i.
+Instead, you need to encode that letter to its spot in the alphabet. So 2013i
+would become 2013.9.
+
+Once packaging is all done, then you should be all set.
diff --git a/usr/src/pkg/manifests/system-data-zoneinfo.mf b/usr/src/pkg/manifests/system-data-zoneinfo.mf
index 911f964825..d3db5894ec 100644
--- a/usr/src/pkg/manifests/system-data-zoneinfo.mf
+++ b/usr/src/pkg/manifests/system-data-zoneinfo.mf
@@ -11,10 +11,11 @@
 
 #
 # Copyright 2011 Nexenta Systems, Inc. All rights reserved.
+# Copyright (c) 2014 Joyent, Inc. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/system/data/zoneinfo@2011.13,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH)
+    value=pkg:/system/data/zoneinfo@2013.9,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH)
 set name=pkg.description value="timezone information"
 set name=pkg.summary value="Timezone Information"
 set name=info.classification value=org.opensolaris.category.2008:System/Core
@@ -137,6 +138,7 @@ file path=usr/share/lib/zoneinfo/America/Cayman
 file path=usr/share/lib/zoneinfo/America/Chicago
 file path=usr/share/lib/zoneinfo/America/Chihuahua
 file path=usr/share/lib/zoneinfo/America/Costa_Rica
+file path=usr/share/lib/zoneinfo/America/Creston
 file path=usr/share/lib/zoneinfo/America/Cuiaba
 file path=usr/share/lib/zoneinfo/America/Curacao
 file path=usr/share/lib/zoneinfo/America/Danmarkshavn
@@ -288,6 +290,7 @@ file path=usr/share/lib/zoneinfo/Asia/Kamchatka
 file path=usr/share/lib/zoneinfo/Asia/Karachi
 file path=usr/share/lib/zoneinfo/Asia/Kashgar
 file path=usr/share/lib/zoneinfo/Asia/Kathmandu
+file path=usr/share/lib/zoneinfo/Asia/Khandyga
 file path=usr/share/lib/zoneinfo/Asia/Kolkata
 file path=usr/share/lib/zoneinfo/Asia/Krasnoyarsk
 file path=usr/share/lib/zoneinfo/Asia/Kuala_Lumpur
@@ -326,6 +329,7 @@ file path=usr/share/lib/zoneinfo/Asia/Thimphu
 file path=usr/share/lib/zoneinfo/Asia/Tokyo
 file path=usr/share/lib/zoneinfo/Asia/Ulaanbaatar
 file path=usr/share/lib/zoneinfo/Asia/Urumqi
+file path=usr/share/lib/zoneinfo/Asia/Ust-Nera
 file path=usr/share/lib/zoneinfo/Asia/Vientiane
 file path=usr/share/lib/zoneinfo/Asia/Vladivostok
 file path=usr/share/lib/zoneinfo/Asia/Yakutsk
@@ -395,6 +399,7 @@ file path=usr/share/lib/zoneinfo/Europe/Berlin
 file path=usr/share/lib/zoneinfo/Europe/Brussels
 file path=usr/share/lib/zoneinfo/Europe/Bucharest
 file path=usr/share/lib/zoneinfo/Europe/Budapest
+file path=usr/share/lib/zoneinfo/Europe/Busingen
 file path=usr/share/lib/zoneinfo/Europe/Chisinau
 file path=usr/share/lib/zoneinfo/Europe/Copenhagen
 file path=usr/share/lib/zoneinfo/Europe/Dublin
@@ -547,9 +552,9 @@ hardlink path=usr/share/lib/zoneinfo/America/Shiprock target=../America/Denver
 hardlink path=usr/share/lib/zoneinfo/America/St_Barthelemy \
     target=../America/Guadeloupe
 hardlink path=usr/share/lib/zoneinfo/America/Virgin \
-    target=../America/St_Thomas
+    target=../America/Port_of_Spain
 hardlink path=usr/share/lib/zoneinfo/Antarctica/South_Pole \
-    target=../Antarctica/McMurdo
+    target=../Pacific/Auckland
 hardlink path=usr/share/lib/zoneinfo/Arctic/Longyearbyen target=../Europe/Oslo
 hardlink path=usr/share/lib/zoneinfo/Asia/Ashkhabad target=../Asia/Ashgabat
 hardlink path=usr/share/lib/zoneinfo/Asia/Calcutta target=../Asia/Kolkata
@@ -634,6 +639,7 @@ hardlink path=usr/share/lib/zoneinfo/Europe/Podgorica \
 hardlink path=usr/share/lib/zoneinfo/Europe/San_Marino target=../Europe/Rome
 hardlink path=usr/share/lib/zoneinfo/Europe/Sarajevo target=../Europe/Belgrade
 hardlink path=usr/share/lib/zoneinfo/Europe/Skopje target=../Europe/Belgrade
+hardlink path=usr/share/lib/zoneinfo/Europe/Tiraspol target=../Europe/Chisinau
 hardlink path=usr/share/lib/zoneinfo/Europe/Vatican target=../Europe/Rome
 hardlink path=usr/share/lib/zoneinfo/Europe/Zagreb target=../Europe/Belgrade
 hardlink path=usr/share/lib/zoneinfo/GB target=Europe/London
diff --git a/usr/src/uts/common/io/e1000g/e1000g_main.c b/usr/src/uts/common/io/e1000g/e1000g_main.c
index ad61f5cd4d..f769457ed4 100644
--- a/usr/src/uts/common/io/e1000g/e1000g_main.c
+++ b/usr/src/uts/common/io/e1000g/e1000g_main.c
@@ -2454,7 +2454,7 @@ e1000g_init_unicst(struct e1000g *Adapter)
 		 * According to the datasheet, we need to check a few of the
 		 * bits set in the FWSM register. If the value is zero,
 		 * everything is available. If the value is 1, none of the
-		 * additional registers are availabl.e If the value is 2-7, only
+		 * additional registers are available. If the value is 2-7, only
 		 * that number are available.
 		 */
 		if (hw->mac.type == e1000_pch_lpt) {