[illumos-gate merge]

commit 9584cebb1c69707f4c67306b661c2ed47d8676f1
    1666 libwrap is 32bit only

Manifests:
	usr/src/pkg/manifests/developer-library-lint.mf
	usr/src/pkg/manifests/system-library.mf

10 files changed, 82 insertions, 25 deletions

diff --git a/manifest b/manifest
index b1f7b623ee..be9c8104b6 100644
--- a/manifest
+++ b/manifest
@@ -4952,6 +4952,9 @@ f usr/lib/amd64/libvrrpadm.so.1 0755 root bin
 s usr/lib/amd64/libvrrpadm.so=libvrrpadm.so.1
 s usr/lib/amd64/libw.so.1=../../../lib/amd64/libw.so.1
 s usr/lib/amd64/libw.so=../../../lib/amd64/libw.so.1
+f usr/lib/amd64/libwrap.so.1.0 0755 root bin
+s usr/lib/amd64/libwrap.so.1=libwrap.so.1.0
+s usr/lib/amd64/libwrap.so=libwrap.so.1.0
 s usr/lib/amd64/libxnet.so.1=../../../lib/amd64/libxnet.so.1
 s usr/lib/amd64/libxnet.so=../../../lib/amd64/libxnet.so.1
 f usr/lib/amd64/liby.so.1 0755 root bin
diff --git a/usr/src/lib/libwrap/Makefile b/usr/src/lib/libwrap/Makefile
index 17bab3142f..517b9ae163 100644
--- a/usr/src/lib/libwrap/Makefile
+++ b/usr/src/lib/libwrap/Makefile
@@ -10,7 +10,8 @@ include ../Makefile.lib
 HDRS =		tcpd.h
 CHECKHDRS =
 HDRDIR =	.
-SUBDIRS	=	$(MACH)
+SUBDIRS =       $(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all := 		TARGET = all
 clean :=	TARGET = clean
diff --git a/usr/src/lib/libwrap/Makefile.com b/usr/src/lib/libwrap/Makefile.com
index f63bdd517f..f3ce93d1e5 100644
--- a/usr/src/lib/libwrap/Makefile.com
+++ b/usr/src/lib/libwrap/Makefile.com
@@ -38,9 +38,10 @@ include ../../Makefile.lib
 LIBS =		$(DYNLIB) $(LINTLIB)
 SONAME =	$(LIBRARY:.a=.so)$(MAJOR)
 ROOTLINKS +=	$(ROOTLIBDIR)/$(LIBLINKS)$(MAJOR)
+ROOTLINKS64 +=	$(ROOTLIBDIR64)/$(LIBLINKS)$(MAJOR)
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-MAPFILES =	../mapfile
+MAPFILES =	../mapfile-vers
 
 LDLIBS +=	-lsocket -lnsl -lc
 
@@ -68,6 +69,9 @@ lint: lintcheck
 $(ROOTLIBDIR)/$(LIBLINKS)$(MAJOR): $(ROOTLIBDIR)/$(LIBLINKS)$(VERS)
 	$(INS.liblink)
 
+$(ROOTLIBDIR64)/$(LIBLINKS)$(MAJOR): $(ROOTLIBDIR64)/$(LIBLINKS)$(VERS)
+	$(INS.liblink64)
+
 include ../../Makefile.targ
 
 
diff --git a/usr/src/lib/libwrap/amd64/Makefile b/usr/src/lib/libwrap/amd64/Makefile
new file mode 100644
index 0000000000..48f15f5d2d
--- /dev/null
+++ b/usr/src/lib/libwrap/amd64/Makefile
@@ -0,0 +1,11 @@
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2011 Nexenta Systems, Inc. All rights reserved.
+#
+
+include ../Makefile.com
+include $(SRC)/lib/Makefile.lib.64
+
+install: all $(ROOTLIBS64) .WAIT $(ROOTLINKS64) $(ROOTLINT)
diff --git a/usr/src/lib/libwrap/mapfile b/usr/src/lib/libwrap/mapfile-vers
index a6ccfe109b..9fad00bb38 100644
--- a/usr/src/lib/libwrap/mapfile
+++ b/usr/src/lib/libwrap/mapfile-vers
@@ -24,8 +24,49 @@
 
 $mapfile_version 2
 
-SYMBOL_SCOPE {
+SYMBOL_VERSION ILLUMOS_0.1 {
 	global:
 		allow_severity		{ FLAGS = NODIRECT; };
+		clean_exit;
 		deny_severity		{ FLAGS = NODIRECT; };
+		dot_quad_addr;
+		dry_run;
+		eval_client;
+		eval_hostaddr;
+		eval_hostinfo;
+		eval_hostname;
+		eval_server;
+		eval_user;
+		fromhost;
+		hosts_access;
+		hosts_access_verbose;
+		hosts_allow_table;
+		hosts_ctl;
+		hosts_deny_table;
+		numeric_addr;
+		paranoid;
+		percent_m;
+		percent_x;
+		process_options;
+		refuse;
+		request_init;
+		request_set;
+		rfc931;
+		rfc931_timeout;
+		shell_cmd;
+		skip_ipv6_addrs;
+		sock_host;
+		sock_hostaddr;
+		sock_hostname;
+		sockgen_simplify;
+		split_at;
+		tcpd_buf;
+		tcpd_context;
+		tcpd_gethostbyname;
+		tcpd_warn;
+		tli_host;
+		unknown;
+		xgets;
+	local:
+		*;
 };
diff --git a/usr/src/lib/libwrap/percent_m.c b/usr/src/lib/libwrap/percent_m.c
index 0dfc264ea4..c509a01523 100644
--- a/usr/src/lib/libwrap/percent_m.c
+++ b/usr/src/lib/libwrap/percent_m.c
@@ -2,8 +2,6 @@
  * Copyright 2001 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
  /*
   * Replace %m by system error message.
   * 
@@ -19,10 +17,6 @@ static char sccsid[] = "@(#) percent_m.c 1.1 94/12/28 17:42:37";
 #include <string.h>
 
 extern int errno;
-#ifndef SYS_ERRLIST_DEFINED
-extern char *sys_errlist[];
-extern int sys_nerr;
-#endif
 
 #include "mystdarg.h"
 
@@ -35,11 +29,7 @@ char   *ibuf;
 
     while (*bp = *cp)
 	if (*cp == '%' && cp[1] == 'm') {
-	    if (errno < sys_nerr && errno > 0) {
-		strcpy(bp, sys_errlist[errno]);
-	    } else {
-		sprintf(bp, "Unknown error %d", errno);
-	    }
+	    strcpy(bp, strerror(errno));
 	    bp += strlen(bp);
 	    cp += 2;
 	} else {
diff --git a/usr/src/lib/libwrap/sparcv9/Makefile b/usr/src/lib/libwrap/sparcv9/Makefile
new file mode 100644
index 0000000000..48f15f5d2d
--- /dev/null
+++ b/usr/src/lib/libwrap/sparcv9/Makefile
@@ -0,0 +1,11 @@
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright 2011 Nexenta Systems, Inc. All rights reserved.
+#
+
+include ../Makefile.com
+include $(SRC)/lib/Makefile.lib.64
+
+install: all $(ROOTLIBS64) .WAIT $(ROOTLINKS64) $(ROOTLINT)
diff --git a/usr/src/lib/libwrap/tli.c b/usr/src/lib/libwrap/tli.c
index 70bc462e30..6864698cfd 100644
--- a/usr/src/lib/libwrap/tli.c
+++ b/usr/src/lib/libwrap/tli.c
@@ -3,8 +3,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
  /*
   * tli_host() determines the type of transport (connected, connectionless),
   * the transport address of a client host, and the transport address of a
@@ -49,8 +47,6 @@ static char sccsid[] = "@(#) tli.c 1.15 97/03/21 19:27:25";
 
 extern char *nc_sperror();
 extern int errno;
-extern char *sys_errlist[];
-extern int sys_nerr;
 extern int t_errno;
 extern char *t_errlist[];
 extern int t_nerr;
@@ -320,18 +316,14 @@ static char *tli_error()
 
     if (t_errno != TSYSERR) {
 	if (t_errno < 0 || t_errno >= t_nerr) {
-	    sprintf(buf, "Unknown TLI error %d", t_errno);
+	    snprintf(buf, sizeof (buf), "Unknown TLI error %d", t_errno);
 	    return (buf);
 	} else {
 	    return (t_errlist[t_errno]);
 	}
     } else {
-	if (errno < 0 || errno >= sys_nerr) {
-	    sprintf(buf, "Unknown UNIX error %d", errno);
-	    return (buf);
-	} else {
-	    return (sys_errlist[errno]);
-	}
+	STRN_CPY(buf, strerror(errno), sizeof (buf));
+	return (buf);
     }
 }
 
diff --git a/usr/src/pkg/manifests/developer-library-lint.mf b/usr/src/pkg/manifests/developer-library-lint.mf
index 2297b35983..d0dff37e76 100644
--- a/usr/src/pkg/manifests/developer-library-lint.mf
+++ b/usr/src/pkg/manifests/developer-library-lint.mf
@@ -231,6 +231,7 @@ file path=usr/lib/$(ARCH64)/llib-lsldap.ln
 file path=usr/lib/$(ARCH64)/llib-lsmbios.ln
 $(sparc_ONLY)file path=usr/lib/$(ARCH64)/llib-lv12n.ln
 file path=usr/lib/$(ARCH64)/llib-lvolmgt.ln
+file path=usr/lib/$(ARCH64)/llib-lwrap.ln
 file path=usr/lib/$(ARCH64)/llib-lzoneinfo.ln
 file path=usr/lib/$(ARCH64)/values-Xa.o
 file path=usr/lib/$(ARCH64)/values-Xc.o
diff --git a/usr/src/pkg/manifests/system-library.mf b/usr/src/pkg/manifests/system-library.mf
index 8421d61163..517814cddb 100644
--- a/usr/src/pkg/manifests/system-library.mf
+++ b/usr/src/pkg/manifests/system-library.mf
@@ -365,6 +365,7 @@ file path=usr/lib/$(ARCH64)/libsoftcrypto.so.1
 file path=usr/lib/$(ARCH64)/libsum.so.1
 $(sparc_ONLY)file path=usr/lib/$(ARCH64)/libv12n.so.1
 file path=usr/lib/$(ARCH64)/libvolmgt.so.1
+file path=usr/lib/$(ARCH64)/libwrap.so.1.0
 file path=usr/lib/$(ARCH64)/liby.so.1
 file path=usr/lib/$(ARCH64)/libzoneinfo.so.1
 file path=usr/lib/$(ARCH64)/nss_ad.so.1
@@ -990,6 +991,8 @@ $(sparc_ONLY)link path=usr/lib/$(ARCH64)/libv12n.so target=./libv12n.so.1
 link path=usr/lib/$(ARCH64)/libvolmgt.so target=libvolmgt.so.1
 link path=usr/lib/$(ARCH64)/libw.so target=../../../lib/$(ARCH64)/libw.so.1
 link path=usr/lib/$(ARCH64)/libw.so.1 target=../../../lib/$(ARCH64)/libw.so.1
+link path=usr/lib/$(ARCH64)/libwrap.so target=libwrap.so.1.0
+link path=usr/lib/$(ARCH64)/libwrap.so.1 target=libwrap.so.1.0
 link path=usr/lib/$(ARCH64)/libxnet.so \
     target=../../../lib/$(ARCH64)/libxnet.so.1
 link path=usr/lib/$(ARCH64)/libxnet.so.1 \