OS-422 Locale errors in specific SSH scenarios

Makefile

@@ -18,16 +18,17 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010 Joyent Inc.
+# Copyright (c) 2012, Joyent, Inc.
 #
 # To build everything just run 'gmake' in this directory.
 #
 
 PATH=/sbin:/usr/sbin:/usr/bin:/opt/SUNWspro/bin:/opt/local/bin
 BASE=$(PWD)
 DESTDIR=$(BASE)/proto
-SUBDIRS= bash bzip2 curl gcc gcc4 gnupg gtar gzip less libexpat libidn libm libxml \
-	libz ncurses node.js nss-nspr ntp openldap openssl perl rsync screen socat uuid vim wget
+SUBDIRS= bash bzip2 curl g11n gcc gcc4 gnupg gtar gzip less libexpat libidn \
+	libm libxml libz ncurses node.js nss-nspr ntp openldap openssl perl \
+	rsync screen socat uuid vim wget
 
 NAME=illumos-extra
 

g11n/Makefile

@@ -0,0 +1,38 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").  
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2012, Joyent, Inc.  All rights reserved.
+#
+
+MAKE=/usr/ccs/bin/make
+LIBDIR=${DESTDIR}/usr/lib/iconv
+
+all:
+	@cd src; pwd; $(MAKE) all
+
+install: all
+	@cd src; pwd; $(MAKE) install
+	cp proto/i386/fileroot/usr/lib/iconv/UTF-8%646.so $(LIBDIR)
+
+clean:
+	@cd src; pwd; $(MAKE) clean
+
+FRC:
+