[OS-663] Post-6.5 Illumos sync

Merge https://github.com/illumos/illumos-gate

Conflicts:
	exception_lists/packaging
	usr/src/cmd/dtrace/test/cmd/scripts/dtest.pl
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.badguess.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.guess32.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.guess64.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.include.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.nodtrace.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh
	usr/src/cmd/lp/Makefile
	usr/src/cmd/lp/cmd/lpadmin/options.c
	usr/src/cmd/lp/cmd/lpfilter.c
	usr/src/cmd/lp/cmd/lpforms.c
	usr/src/cmd/lp/cmd/lpusers.c
	usr/src/cmd/lp/lib/lp/isterminfo.c
	usr/src/cmd/lp/lib/lp/tidbit.c
	usr/src/cmd/terminfo/att.ti
	usr/src/cmd/zpool/zpool_main.c
	usr/src/common/dis/i386/dis_tables.c
	usr/src/lib/libdtrace/common/dt_options.c
	usr/src/lib/libzfs/common/libzfs_dataset.c
	usr/src/man/man1m/dladm.1m
	usr/src/man/man1m/flowadm.1m
	usr/src/man/man1m/zoneadm.1m
	usr/src/man/man1m/zonecfg.1m
	usr/src/pkg/manifests/print-lp-print-client-commands.mf
	usr/src/pkg/manifests/print-lp.mf
	usr/src/uts/common/fs/zfs/sys/zio.h
	usr/src/uts/common/fs/zfs/zio.c
	usr/src/uts/i86pc/ml/mach_offsets.in
	usr/src/uts/intel/amd64/ml/mach_offsets.in
	usr/src/uts/intel/sys/tss.h

1 files changed, 3 insertions, 88 deletions

diff --git a/usr/src/pkg/manifests/source-security-tcp-wrapper.mf b/usr/src/pkg/manifests/source-security-tcp-wrapper.mf
index 4ecc4aea82..9fa05189a1 100644
--- a/usr/src/pkg/manifests/source-security-tcp-wrapper.mf
+++ b/usr/src/pkg/manifests/source-security-tcp-wrapper.mf
@@ -21,94 +21,9 @@
 
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2011 Nexenta Systems, Inc. All rights reserved.
 #
 
-set name=pkg.fmri \
-    value=pkg:/source/security/tcp-wrapper@7.6,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH)
-set name=pkg.description \
-    value="tcpd - access control facility for internet services (Source)"
-set name=pkg.summary \
-    value="tcpd - access control facility for internet services (Source)"
-set name=info.classification value=org.opensolaris.category.2008:System/Core
+set name=pkg.fmri value=pkg:/source/security/tcp-wrapper@7.6,5.11-0.148
+set name=pkg.obsolete value=true
 set name=variant.arch value=$(ARCH)
-dir path=usr group=sys
-dir path=usr/share group=sys
-dir path=usr/share/src group=sys
-dir path=usr/share/src/tcp_wrappers
-file path=usr/share/src/tcp_wrappers/BLURB
-file path=usr/share/src/tcp_wrappers/Banners.Makefile
-file path=usr/share/src/tcp_wrappers/CHANGES
-file path=usr/share/src/tcp_wrappers/DISCLAIMER
-file path=usr/share/src/tcp_wrappers/Makefile
-file path=usr/share/src/tcp_wrappers/Makefile.dist
-file path=usr/share/src/tcp_wrappers/Makefile.org
-file path=usr/share/src/tcp_wrappers/README
-file path=usr/share/src/tcp_wrappers/README.IRIX
-file path=usr/share/src/tcp_wrappers/README.NIS
-file path=usr/share/src/tcp_wrappers/README.ipv6
-file path=usr/share/src/tcp_wrappers/README.sfw
-file path=usr/share/src/tcp_wrappers/clean_exit.c
-file path=usr/share/src/tcp_wrappers/diag.c
-file path=usr/share/src/tcp_wrappers/environ.c
-file path=usr/share/src/tcp_wrappers/eval.c
-file path=usr/share/src/tcp_wrappers/fakelog.c
-file path=usr/share/src/tcp_wrappers/fix_options.c
-file path=usr/share/src/tcp_wrappers/fromhost.c
-file path=usr/share/src/tcp_wrappers/hosts_access.3
-file path=usr/share/src/tcp_wrappers/hosts_access.4
-file path=usr/share/src/tcp_wrappers/hosts_access.c
-file path=usr/share/src/tcp_wrappers/hosts_access.c.org
-file path=usr/share/src/tcp_wrappers/hosts_ctl.c
-file path=usr/share/src/tcp_wrappers/hosts_options.4
-file path=usr/share/src/tcp_wrappers/inetcf.c
-file path=usr/share/src/tcp_wrappers/inetcf.h
-file path=usr/share/src/tcp_wrappers/misc.c
-file path=usr/share/src/tcp_wrappers/misc.c.org
-file path=usr/share/src/tcp_wrappers/miscd.c
-file path=usr/share/src/tcp_wrappers/mystdarg.h
-file path=usr/share/src/tcp_wrappers/myvsyslog.c
-file path=usr/share/src/tcp_wrappers/ncr.c
-file path=usr/share/src/tcp_wrappers/options.c
-file path=usr/share/src/tcp_wrappers/patchlevel.h
-file path=usr/share/src/tcp_wrappers/percent_m.c
-file path=usr/share/src/tcp_wrappers/percent_x.c
-file path=usr/share/src/tcp_wrappers/printf.ck
-file path=usr/share/src/tcp_wrappers/ptx.c
-file path=usr/share/src/tcp_wrappers/refuse.c
-file path=usr/share/src/tcp_wrappers/rfc931.c
-file path=usr/share/src/tcp_wrappers/rfc931.c.org
-file path=usr/share/src/tcp_wrappers/safe_finger.c
-file path=usr/share/src/tcp_wrappers/scaffold.c
-file path=usr/share/src/tcp_wrappers/scaffold.c.org
-file path=usr/share/src/tcp_wrappers/scaffold.h
-file path=usr/share/src/tcp_wrappers/setenv.c
-file path=usr/share/src/tcp_wrappers/shell_cmd.c
-file path=usr/share/src/tcp_wrappers/socket.c
-file path=usr/share/src/tcp_wrappers/socket.c.diff
-file path=usr/share/src/tcp_wrappers/socket.c.org
-file path=usr/share/src/tcp_wrappers/strcasecmp.c
-file path=usr/share/src/tcp_wrappers/tags
-file path=usr/share/src/tcp_wrappers/tcpd.1m
-file path=usr/share/src/tcp_wrappers/tcpd.c
-file path=usr/share/src/tcp_wrappers/tcpd.h
-file path=usr/share/src/tcp_wrappers/tcpd.h.org
-file path=usr/share/src/tcp_wrappers/tcpdchk.1m
-file path=usr/share/src/tcp_wrappers/tcpdchk.c
-file path=usr/share/src/tcp_wrappers/tcpdchk.c.org
-file path=usr/share/src/tcp_wrappers/tcpdmatch.1m
-file path=usr/share/src/tcp_wrappers/tcpdmatch.c
-file path=usr/share/src/tcp_wrappers/tcpdmatch.c.org
-file path=usr/share/src/tcp_wrappers/tli-sequent.c
-file path=usr/share/src/tcp_wrappers/tli-sequent.h
-file path=usr/share/src/tcp_wrappers/tli.c
-file path=usr/share/src/tcp_wrappers/tli.c.org
-file path=usr/share/src/tcp_wrappers/try-from.c
-file path=usr/share/src/tcp_wrappers/update.c
-file path=usr/share/src/tcp_wrappers/update.c.org
-file path=usr/share/src/tcp_wrappers/vfprintf.c
-file path=usr/share/src/tcp_wrappers/workarounds.c
-legacy pkg=SUNWtcpdS \
-    desc="tcpd - access control facility for internet services (Source)" \
-    name="tcpd - access control facility for internet services (Source)"
-license usr/src/cmd/tcpd/THIRDPARTYLICENSE \
-    license=usr/src/cmd/tcpd/THIRDPARTYLICENSE