Mercurial > unleashed > prev-conversion

changeset 18764:16e059894d57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove libxnet
author Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
date Sat, 14 Jul 2018 10:33:00 -0400
parents 4b3df66990bd
children 015c14627739
files FEATURES.txt share/man/man3/Intro.3 usr/src/Targetdirs usr/src/cmd/abi/appcert/scripts/symprof.pl usr/src/lib/Makefile usr/src/lib/libxnet/Makefile usr/src/lib/libxnet/Makefile.com usr/src/lib/libxnet/amd64/Makefile usr/src/lib/libxnet/common/mapfile-vers usr/src/lib/libxnet/i386/Makefile usr/src/pkg/manifests/system-library.mf
diffstat 11 files changed, 3 insertions(+), 352 deletions(-) [+]
line wrap: on
line diff
--- a/FEATURES.txt	Sun Jul 15 09:36:53 2018 -0400
+++ b/FEATURES.txt	Sat Jul 14 10:33:00 2018 -0400
@@ -12,6 +12,7 @@
  - hsfs-formatted boot archive support
  - libc compat symbols: _nuname, __posix_readdir_r, __threaded
  - binary compatibility bread/bwrite/bwrite2/getblk kernel symbols
+ - libxnet filter library
  * convert BREAD/BWRITE/BWRITE2/GETBLK macros to bread/bwrite/bwrite2/getblk
    static inlines
 
--- a/share/man/man3/Intro.3	Sun Jul 15 09:36:53 2018 -0400
+++ b/share/man/man3/Intro.3	Sat Jul 14 10:33:00 2018 -0400
@@ -245,15 +245,6 @@
 \fBlibsip\fR(3LIB).
 .RE
 
-.sp
-.LP
-Under all circumstances, the use of the Sockets API is recommended over the XTI
-and TLI APIs. If portability to other XPGV4v2 (see \fBstandards\fR(5)) systems
-is a requirement, the application must use the \fBlibxnet\fR interfaces. If
-portability is not required, the sockets interfaces in \fBlibsocket\fR and
-\fBlibnsl\fR are recommended over those in \fBlibxnet\fR. Between the XTI and
-TLI APIs, the \fBXTI\fR interfaces (available with \fBlibxnet\fR) are
-recommended over the \fBTLI\fR interfaces (available with \fBlibnsl\fR).
 .SS "Curses Library Functions"
 .LP
 The functions described in this volume comprise the libraries that provide
--- a/usr/src/Targetdirs	Sun Jul 15 09:36:53 2018 -0400
+++ b/usr/src/Targetdirs	Sat Jul 14 10:33:00 2018 -0400
@@ -659,8 +659,6 @@
 $(ROOT)/usr/lib/libuutil.so:=		REALPATH=../../lib/libuutil.so.1
 $(ROOT)/usr/lib/libw.so.1:=		REALPATH=../../lib/libw.so.1
 $(ROOT)/usr/lib/libw.so:=		REALPATH=../../lib/libw.so.1
-$(ROOT)/usr/lib/libxnet.so.1:=		REALPATH=../../lib/libxnet.so.1
-$(ROOT)/usr/lib/libxnet.so:=		REALPATH=../../lib/libxnet.so.1
 $(ROOT)/usr/lib/libzfs.so.1:=		REALPATH=../../lib/libzfs.so.1
 $(ROOT)/usr/lib/libzfs.so:=		REALPATH=../../lib/libzfs.so.1
 $(ROOT)/usr/lib/libzfs_core.so.1:=	REALPATH=../../lib/libzfs_core.so.1
@@ -897,10 +895,6 @@
 	REALPATH=../../../lib/$(MACH64)/libw.so.1
 $(ROOT)/usr/lib/$(MACH64)/libw.so:= \
 	REALPATH=../../../lib/$(MACH64)/libw.so.1
-$(ROOT)/usr/lib/$(MACH64)/libxnet.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libxnet.so.1
-$(ROOT)/usr/lib/$(MACH64)/libxnet.so:= \
-	REALPATH=../../../lib/$(MACH64)/libxnet.so.1
 $(ROOT)/usr/lib/$(MACH64)/libzfs.so:= \
 	REALPATH=../../../lib/$(MACH64)/libzfs.so.1
 $(ROOT)/usr/lib/$(MACH64)/libzfs.so.1:= \
@@ -1050,8 +1044,6 @@
 	/usr/lib/libuutil.so.1 \
 	/usr/lib/libw.so \
 	/usr/lib/libw.so.1 \
-	/usr/lib/libxnet.so \
-	/usr/lib/libxnet.so.1 \
 	/usr/lib/libzfs.so \
 	/usr/lib/libzfs.so.1 \
 	/usr/lib/libzfs_core.so \
@@ -1183,8 +1175,6 @@
 	/usr/lib/$(MACH64)/libuutil.so.1 \
 	/usr/lib/$(MACH64)/libw.so \
 	/usr/lib/$(MACH64)/libw.so.1 \
-	/usr/lib/$(MACH64)/libxnet.so \
-	/usr/lib/$(MACH64)/libxnet.so.1 \
 	/usr/lib/$(MACH64)/libzfs.so \
 	/usr/lib/$(MACH64)/libzfs.so.1 \
 	/usr/lib/$(MACH64)/libzfs_core.so \
--- a/usr/src/cmd/abi/appcert/scripts/symprof.pl	Sun Jul 15 09:36:53 2018 -0400
+++ b/usr/src/cmd/abi/appcert/scripts/symprof.pl	Sat Jul 14 10:33:00 2018 -0400
@@ -409,12 +409,6 @@
 			# FILTER: /usr/lib/libw.so.1
 			# FILTEE: /usr/lib/libc.so.1
 			#
-			# Here is a more perverse one, libxnet.so.1 has 3
-			# filtees:
-			#
-			# FILTER: /usr/lib/libxnet.so.1
-			# FILTEE: /usr/lib/{libsocket.so.1,libnsl.so.1,libc.so.1}
-			#
 			# The important point to note about standard
 			# filters is that they contain NO CODE AT ALL.
 			# All of the symbols in the filter MUST be found
@@ -1273,7 +1267,7 @@
 	}
 	#
 	# What kind of filter is $filter?
-	#	STANDARD  (contains no "real code", e.g. libxnet.so.1), or
+	#	STANDARD  (contains no "real code"), or
 	#	AUXILIARY (provides "code" if needed, but
 	#	           prefers to pass filtee's "code", e.g. libc.so.1)
 	#
--- a/usr/src/lib/Makefile	Sun Jul 15 09:36:53 2018 -0400
+++ b/usr/src/lib/Makefile	Sat Jul 14 10:33:00 2018 -0400
@@ -213,7 +213,6 @@
 	libvscan	\
 	libw		\
 	libwrap		\
-	libxnet		\
 	libzfs		\
 	libzfs_core	\
 	libzonecfg	\
@@ -618,7 +617,7 @@
 rpcsec_gss:	libgss
 sasl_plugins:	pkcs11 libgss libsasl
 scsi:		libfru libumem libdevid libdevinfo
-smbsrv:		libxnet libpthread librt libshare libidmap pkcs11 libsqlite \
+smbsrv:		libpthread librt libshare libidmap pkcs11 libsqlite \
 		libcryptoutil libreparse libcmdutils libresolv2 libsmbfs \
 		libuuid libads libgss libldap5 krb5
 storage:	libdevice libdevinfo libdevid
--- a/usr/src/lib/libxnet/Makefile	Sun Jul 15 09:36:53 2018 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-#
-# 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 usr/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 usr/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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-include		../Makefile.lib
-
-SUBDIRS =	$(MACH) $(BUILD64) $(MACH64)
-
-all :=		TARGET= all
-clean :=	TARGET= clean
-clobber :=	TARGET= clobber
-install :=	TARGET= install
-
-.KEEP_STATE:
-
-all clean clobber install: $(SUBDIRS)
-
-$(SUBDIRS):	FRC
-	@cd $@; pwd; $(MAKE) $(TARGET)
-
-FRC:
--- a/usr/src/lib/libxnet/Makefile.com	Sun Jul 15 09:36:53 2018 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-#
-# 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 usr/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 usr/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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-LIBRARY = 	libxnet.a
-VERS =		.1
-
-include		$(SRC)/lib/Makefile.rootfs
-
-DYNFLAGS +=     $(ZLOADFLTR)
-CPPFLAGS +=	-D__EXTENSIONS__
--- a/usr/src/lib/libxnet/amd64/Makefile	Sun Jul 15 09:36:53 2018 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-#
-# 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 usr/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 usr/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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-include		$(SRC)/lib/Makefile.filter.com
-include		../Makefile.com
-include		$(SRC)/lib/Makefile.lib.64
-
-install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
-
-include		$(SRC)/lib/Makefile.filter.targ
--- a/usr/src/lib/libxnet/common/mapfile-vers	Sun Jul 15 09:36:53 2018 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,177 +0,0 @@
-#
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# 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 usr/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 usr/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
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-#	usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-$mapfile_version 2
-
-SYMBOL_VERSION SUNW_1.4 {
-    global:
-	gai_strerror		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-} SUNW_1.3.1;
-
-SYMBOL_VERSION SUNW_1.3.1 {
-    global:
-	__xnet_getaddrinfo	{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	freeaddrinfo		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	getaddrinfo		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	getnameinfo		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	inet_ntop		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	inet_pton		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-} SUNW_1.3;
-
-SYMBOL_VERSION SUNW_1.3 {
-    global:
-	if_freenameindex	{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	if_indextoname		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	if_nameindex		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	if_nametoindex		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	sockatmark		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-} SUNW_1.2;
-
-SYMBOL_VERSION SUNW_1.2 {
-    global:
-	_xti_rcvreldata		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_rcvv		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_rcvvudata		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_sndreldata		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_sndv		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_sndvudata		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_sysconf		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_xns5_accept	{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_xns5_snd		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-} SUNW_1.1;
-
-SYMBOL_VERSION SUNW_1.1 {
-    global:
-	__t_errno		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	__xnet_bind		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	__xnet_connect		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	__xnet_getsockopt	{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	__xnet_listen		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	__xnet_recvmsg		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	__xnet_sendmsg		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	__xnet_sendto		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	__xnet_socket		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	__xnet_socketpair	{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	_xti_accept		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_alloc		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_bind		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_close		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_connect		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_error		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_free		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_getinfo		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_getprotaddr	{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_getstate		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_listen		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_look		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_open		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_optmgmt		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_rcv		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_rcvconnect		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_rcvdis		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_rcvrel		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_rcvudata		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_rcvuderr		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_snd		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_snddis		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_sndrel		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_sndudata		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_strerror		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_sync		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	_xti_unbind		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	accept			{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	bind			{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	connect			{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	endhostent		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	endnetent		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	endprotoent		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	endservent		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	gethostbyaddr		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	gethostbyname		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	gethostent		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	gethostname		{ TYPE = FUNCTION; FILTER = libc.so.1 };
-	getnetbyaddr		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	getnetbyname		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	getnetent		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	getpeername		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	getprotobyname		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	getprotobynumber	{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	getprotoent		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	getservbyname		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	getservbyport		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	getservent		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	getsockname		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	getsockopt		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	h_errno {
-		TYPE = DATA;
-		SIZE = 0x4;
-		FLAGS = NODIRECT;
-		FILTER = libnsl.so.1;
-	};
-	htonl			{ TYPE = FUNCTION; FILTER = libc.so.1 };
-	htons			{ TYPE = FUNCTION; FILTER = libc.so.1 };
-	inet_addr		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	inet_lnaof		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	inet_makeaddr		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	inet_netof		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	inet_network		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	inet_ntoa		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	listen	 		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	ntohl			{ TYPE = FUNCTION; FILTER = libc.so.1 };
-	ntohs			{ TYPE = FUNCTION; FILTER = libc.so.1 };
-	recv			{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	recvfrom		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	recvmsg			{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	send			{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	sendmsg			{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	sendto			{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	sethostent		{ TYPE = FUNCTION; FILTER = libnsl.so.1 };
-	setnetent		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	setprotoent		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	setservent		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	setsockopt		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	shutdown		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	socket			{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	socketpair		{ TYPE = FUNCTION; FILTER = libsocket.so.1 };
-	t_errno {
-		TYPE = DATA;
-		SIZE = 0x4;
-		FILTER = libnsl.so.1;
-	};
-    local:
-	*;
-};
--- a/usr/src/lib/libxnet/i386/Makefile	Sun Jul 15 09:36:53 2018 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-#
-# 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 usr/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 usr/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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-include		$(SRC)/lib/Makefile.filter.com
-include		../Makefile.com
-
-install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS)
-
-include		$(SRC)/lib/Makefile.filter.targ
--- a/usr/src/pkg/manifests/system-library.mf	Sun Jul 15 09:36:53 2018 -0400
+++ b/usr/src/pkg/manifests/system-library.mf	Sat Jul 14 10:33:00 2018 -0400
@@ -221,7 +221,6 @@
 file path=lib/$(ARCH64)/libuuid.so.1
 file path=lib/$(ARCH64)/libuutil.so.1
 file path=lib/$(ARCH64)/libw.so.1
-file path=lib/$(ARCH64)/libxnet.so.1
 file path=lib/$(ARCH64)/nss_compat.so.1
 file path=lib/$(ARCH64)/nss_dns.so.1
 file path=lib/$(ARCH64)/nss_files.so.1
@@ -302,7 +301,6 @@
 file path=lib/libuuid.so.1
 file path=lib/libuutil.so.1
 file path=lib/libw.so.1
-file path=lib/libxnet.so.1
 file path=lib/mpxio/stmsboot_util mode=0555
 file path=lib/nss_compat.so.1
 file path=lib/nss_dns.so.1
@@ -585,7 +583,6 @@
 link path=lib/$(ARCH64)/libuuid.so target=libuuid.so.1
 link path=lib/$(ARCH64)/libuutil.so target=libuutil.so.1
 link path=lib/$(ARCH64)/libw.so target=libw.so.1
-link path=lib/$(ARCH64)/libxnet.so target=libxnet.so.1
 link path=lib/32 target=.
 link path=lib/64 target=$(ARCH64)
 link path=lib/crypto/32 target=.
@@ -645,7 +642,6 @@
 link path=lib/libumem.so target=libumem.so.1
 link path=lib/libuuid.so target=libuuid.so.1
 link path=lib/libw.so target=libw.so.1
-link path=lib/libxnet.so target=libxnet.so.1
 link path=lib/secure/32 target=.
 link path=lib/secure/64 target=$(ARCH64)
 link path=usr/lib/$(ARCH64)/libadm.so \
@@ -879,10 +875,6 @@
 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 \
-    target=../../../lib/$(ARCH64)/libxnet.so.1
 link path=usr/lib/$(ARCH64)/nss_compat.so.1 \
     target=../../../lib/$(ARCH64)/nss_compat.so.1
 link path=usr/lib/$(ARCH64)/nss_dns.so.1 \
@@ -1049,8 +1041,6 @@
 link path=usr/lib/libw.so.1 target=../../lib/libw.so.1
 link path=usr/lib/libwrap.so target=libwrap.so.1.0
 link path=usr/lib/libwrap.so.1 target=libwrap.so.1.0
-link path=usr/lib/libxnet.so target=../../lib/libxnet.so.1
-link path=usr/lib/libxnet.so.1 target=../../lib/libxnet.so.1
 link path=usr/lib/lwp/$(ARCH64)/libthread.so.1 \
     target=../../$(ARCH64)/libthread.so.1
 link path=usr/lib/lwp/$(ARCH64)/libthread_db.so.1 \