diff options
Diffstat (limited to 'usr/src')
25 files changed, 193 insertions, 239 deletions
diff --git a/usr/src/Targetdirs b/usr/src/Targetdirs index ef5fb8e3d0..8f847e85e1 100644 --- a/usr/src/Targetdirs +++ b/usr/src/Targetdirs @@ -410,7 +410,6 @@ UUCP.UUCP= \ ROOT.SFW= \ /usr/sfw/bin \ - /usr/sfw/sbin \ /usr/sfw/include \ /usr/sfw/lib \ /usr/sfw/share diff --git a/usr/src/cmd/Makefile.cmd b/usr/src/cmd/Makefile.cmd index 411161605b..50c82357b1 100644 --- a/usr/src/cmd/Makefile.cmd +++ b/usr/src/cmd/Makefile.cmd @@ -114,7 +114,6 @@ ROOTAUDIOSAMPAU=$(ROOTAUDIOSAMP)/au # ROOTSFW= $(ROOT)/usr/sfw ROOTSFWBIN= $(ROOT)/usr/sfw/bin -ROOTSFWSBIN= $(ROOT)/usr/sfw/sbin ROOTSFWSHARE= $(ROOT)/usr/sfw/share ROOTSFWSHSRC= $(ROOT)/usr/sfw/share/src ROOTSFWINFO= $(ROOT)/usr/sfw/share/info diff --git a/usr/src/cmd/cmd-inet/usr.lib/inetd/Makefile b/usr/src/cmd/cmd-inet/usr.lib/inetd/Makefile index 3e22b4662f..b322b74013 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/inetd/Makefile +++ b/usr/src/cmd/cmd-inet/usr.lib/inetd/Makefile @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -40,13 +40,11 @@ include ../../../svc/Makefile.ctf ROOTMANIFESTDIR= $(ROOTSVCNETWORK) -CPPFLAGS += -D_FILE_OFFSET_BITS=64 -I$(CMDINETCOMMONDIR) -I$(ROOTSFWINCLUDE) \ - -D_REENTRANT +CPPFLAGS += -D_FILE_OFFSET_BITS=64 -I$(CMDINETCOMMONDIR) -D_REENTRANT $(RELEASE_BUILD)CPPFLAGS += -DNDEBUG -LDFLAGS += -R$(SFW_ROOT)/lib LDLIBS += -lsocket -lnsl -lrestart -lscf -lcontract -linetutil \ - -L$(ROOTSFWLIB) -lwrap -linetsvc -luutil -lumem -lbsm + -lwrap -linetsvc -luutil -lumem -lbsm CLOBBERFILES += $(SVCMETHOD) diff --git a/usr/src/cmd/openssl/Makefile b/usr/src/cmd/openssl/Makefile index 07bea1defe..c1f013a6ff 100644 --- a/usr/src/cmd/openssl/Makefile +++ b/usr/src/cmd/openssl/Makefile @@ -20,7 +20,7 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -411,12 +411,16 @@ $(ROOTOPENSSL): $(ROOTSFWMANPAGES) := FILEMODE = 0444 $(ROOTSFWMANPAGES): $(ROOTSFWMANDIRS) -$(ROOTSFWMANDIRS): $(ROOTSFWMAN) +$(ROOTSFWMANDIRS): $(ROOTSFWMAN) $(ROOTSFW)/man $(INS.dir) $(ROOTSFWMAN): $(ROOTSFW)/share $(INS.dir) +$(ROOTSFW)/man: $(ROOTSFW) + $(RM) $@ + $(SYMLINK) share/man $@ + $(ROOTSFW)/share: $(ROOTSFW) $(INS.dir) diff --git a/usr/src/cmd/rpcbind/Makefile b/usr/src/cmd/rpcbind/Makefile index d2540db6ad..39e98a9435 100644 --- a/usr/src/cmd/rpcbind/Makefile +++ b/usr/src/cmd/rpcbind/Makefile @@ -21,7 +21,7 @@ # #ident "%Z%%M% %I% %E% SMI" # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # cmd/rpcbind/Makefile @@ -43,10 +43,8 @@ include ../Makefile.cmd ROOTMANIFESTDIR= $(ROOTSVCNETWORKRPC) CPPFLAGS= -I. -DPORTMAP $(CPPFLAGS.master) -CPPFLAGS += -I$(ROOTSFWINCLUDE) -D_REENTRANT -LDLIBS += -lsocket -lnsl -LDLIBS += -L$(ROOTSFWLIB) -lwrap -lscf -LDFLAGS += -R$(SFW_ROOT)/lib +CPPFLAGS += -D_REENTRANT +LDLIBS += -lsocket -lnsl -lwrap -lscf .KEEP_STATE: diff --git a/usr/src/cmd/sendmail/src/Makefile b/usr/src/cmd/sendmail/src/Makefile index cd028d6a0e..0130839df5 100644 --- a/usr/src/cmd/sendmail/src/Makefile +++ b/usr/src/cmd/sendmail/src/Makefile @@ -20,7 +20,7 @@ # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -48,7 +48,7 @@ LDFLAGS += -R$(SFW_ROOT)/lib $(MAPFILES:%=-M%) CRYPTOLIBS= -lssl -lcrypto # EXPORT DELETE END LDLIBS += ../libsmutil/libsmutil.a ../libsm/libsm.a -lresolv -lsocket \ - -lnsl ../db/libdb.a -lldap -lsldap -L$(ROOTSFWLIB) -lwrap \ + -lnsl ../db/libdb.a -lldap -lsldap -lwrap -L$(ROOTSFWLIB) \ $(CRYPTOLIBS) INCPATH= -I. -I../include -I../db -I$(ROOTSFWINCLUDE) diff --git a/usr/src/cmd/ssh/sshd/Makefile b/usr/src/cmd/ssh/sshd/Makefile index 51392676fb..9c249347bc 100644 --- a/usr/src/cmd/ssh/sshd/Makefile +++ b/usr/src/cmd/ssh/sshd/Makefile @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -75,7 +75,7 @@ LDLIBS += $(SSH_COMMON_LDLIBS) -lsocket \ -lz \ -lpam \ -lbsm \ - -L$(ROOTSFWLIB) -lwrap \ + -lwrap \ $(OPENSSL_LDFLAGS) -lcrypto \ -lgss \ -lcontract @@ -86,8 +86,6 @@ DYNFLAGS += $(OPENSSL_DYNFLAGS) $(C99_DISABLE) POFILE_DIR= .. -CPPFLAGS += -I$(ROOTSFWINCLUDE) - .KEEP_STATE: .PARALLEL: $(OBJS) diff --git a/usr/src/cmd/tcpd/Makefile b/usr/src/cmd/tcpd/Makefile index 576cf1fab2..7469e1a1f6 100644 --- a/usr/src/cmd/tcpd/Makefile +++ b/usr/src/cmd/tcpd/Makefile @@ -1,26 +1,5 @@ # -# 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 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -39,11 +18,11 @@ CPPFLAGS += $(ACCESS) $(PARANOID) $(NETGROUP) $(TLI) \ -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \ -DFACILITY=$(FACILITY) -DSEVERITY=$(SEVERITY) \ -DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" \ - -I$(ROOTSFWINCLUDE) -I../../lib/libwrap + -I../../lib/libwrap tcpd tcpdmatch try-from := \ - LDLIBS += -R$(SFW_ROOT)/lib -L$(ROOTSFWLIB) -lwrap + LDLIBS += -lwrap tcpdchk := \ - LDLIBS += -R$(SFW_ROOT)/lib -L$(ROOTSFWLIB) -lwrap -lnsl + LDLIBS += -lwrap -lnsl # Various components must export interfaces, but also contain name-space # clashes with system libraries. @@ -75,17 +54,19 @@ DISTFILES = environ.c fakelog.c hosts_access.3 hosts_access.4 \ scaffold.h tcpd.1m tcpd.c tcpdchk.1m tcpdchk.c tcpdmatch.1m \ tcpdmatch.c try-from.c README.sfw $(SRCONLY) -ROOTSFWSRC = $(ROOTSFWSHSRC)/tcp_wrappers -ROOTSFWSBINPROG = $(PROG:%=$(ROOTSFWSBIN)/%) -ROOTSFWMANPAGES = $(MANPAGES:%=$(ROOTSFWMAN)/%) -ROOTSFWMANDIRS = $(MANDIRS:%=$(ROOTSFWMAN)/%) -ROOTSFWSRCFILES = $(DISTFILES:%=$(ROOTSFWSRC)/%) +ROOTSRC = $(ROOT)/usr/share/src/tcp_wrappers +$(ROOTSRC) := OWNER = root +$(ROOTSRC) := GROUP = bin +ROOTMAN = $(ROOT)/usr/share/man +ROOTMANPAGES = $(MANPAGES:%=$(ROOTMAN)/%) +ROOTMANDIRS = $(MANDIRS:%=$(ROOTMAN)/%) +ROOTSRCFILES = $(DISTFILES:%=$(ROOTSRC)/%) .KEEP_STATE: all: $(PROG) THIRDPARTYLICENSE -install: all $(ROOTSFWSBINPROG) $(ROOTSFWMANPAGES) $(ROOTSFWSRCFILES) +install: all $(ROOTUSRSBINPROG) $(ROOTMANPAGES) $(ROOTSRCFILES) clean: $(RM) *.o @@ -93,12 +74,6 @@ clean: lint: lint_PROG -$(ROOTSFWSBINPROG): $(ROOTSFWSBIN) -$(ROOTSFWSBIN): $(ROOTSFW) - $(INS.dir) -$(ROOTSFWSBIN)/% : % - $(INS.file) - # These Solaris-specific man page aliases are installed verbatim. sunman/libwrap.3: libwrap.3 mkdir -p sunman; cat libwrap.3 > $@ @@ -109,7 +84,7 @@ sunman/hosts.deny.4: hosts.deny.4 # The rest of the man pages are in the form provided in the original # distribution, but get edited and renamed to follow Solaris man page -# conventions. E.g. tcpd.8 gets installed as /usr/sfw/man/man1m/tcpd.1m. +# conventions. E.g. tcpd.8 gets installed as /usr/share/man/man1m/tcpd.1m. # Create temporary copies in the sunman directory with modified names # and contents. The sed program man.sed contains the content edits. @@ -120,34 +95,29 @@ sunman/%.4: %.5 sunman/%.3: %.3 mkdir -p sunman; sed -f man.sed < $< > $@ -$(ROOTSFWMANPAGES) := FILEMODE = 0444 -$(ROOTSFWMANPAGES): $(ROOTSFWMANDIRS) $(ROOTSFW)/man -$(ROOTSFWMANDIRS): $(ROOTSFWMAN) +$(ROOTMANPAGES) := FILEMODE = 0444 +$(ROOTMANPAGES): $(ROOTMANDIRS) $(ROOT)/usr/share/man +$(ROOTMANDIRS): $(ROOTMAN) $(INS.dir) -$(ROOTSFWMAN): $(ROOTSFW)/share +$(ROOTMAN): $(INS.dir) -$(ROOTSFW)/man: $(ROOTSFW) - $(RM) $@ - $(SYMLINK) share/man $@ $(CHOWNLINK) $(CHGRPLINK) -$(ROOTSFWMAN)/man1m/% $(ROOTSFWMAN)/man3/% $(ROOTSFWMAN)/man4/%: sunman/% +$(ROOTMAN1M)/% $(ROOTMAN3)/% $(ROOTMAN)/man4/%: sunman/% $(INS.file) -$(ROOTSFWSRCFILES) := FILEMODE = 0444 -$(ROOTSFWSRCFILES): $(ROOTSFWSRC) -$(ROOTSFWSRC): $(ROOTSFWSHSRC) - $(INS.dir) -$(ROOTSFWSHSRC): $(ROOTSFW)/share +$(ROOTSRCFILES) := FILEMODE = 0444 +$(ROOTSRCFILES): $(ROOTSRC) +$(ROOTSRC): $(INS.dir) -$(ROOTSFWSRC)/%: %.sfwsrc +$(ROOTSRC)/%: %.sfwsrc $(INS.rename) -$(ROOTSFWSRC)/%: sunman/% +$(ROOTSRC)/%: sunman/% $(INS.file) -$(ROOTSFWSRC)/%: % +$(ROOTSRC)/%: % $(INS.file) -$(ROOTSFW)/share: $(ROOTSFW) +$(ROOT)/usr/share: $(ROOT)/usr $(INS.dir) -$(ROOTSFW): +$(ROOT)/usr: $(ROOT) $(INS.dir) TCPDMATCH_OBJ = tcpdmatch.o fakelog.o inetcf.o scaffold.o diff --git a/usr/src/cmd/tcpd/man.sed b/usr/src/cmd/tcpd/man.sed index 6cdd32c7a2..59f4e832db 100644 --- a/usr/src/cmd/tcpd/man.sed +++ b/usr/src/cmd/tcpd/man.sed @@ -1,7 +1,7 @@ # # ident "%Z%%M% %I% %E% SMI" # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # This sed command script edits the man pages distrubuted with tcp_wrappers @@ -21,8 +21,7 @@ s/#include "tcpd.h"/#include <tcpd.h>/ /#include <tcpd.h>/a\ \.\\" Begin Sun update\ \ -cc [ flag ... ] \-I/usr/sfw/include file ... [ library ... ]\ -\-L/usr/sfw/lib \-R/usr/sfw/lib \-lwrap\ +cc [ flag ... ] file ... [ library ... ] \-lwrap\ \.\\" End Sun update s/or \\fItlid\\fR// @@ -59,7 +58,7 @@ ATTRIBUTE TYPE ATTRIBUTE VALUE\ =\ Availability SUNWtcpd\ =\ -Interface Stability External\ +Interface Stability Committed\ .TE \ .PP\ .SH NOTES\ diff --git a/usr/src/lib/Makefile.lib b/usr/src/lib/Makefile.lib index 7ef968999c..4a500cb0a3 100644 --- a/usr/src/lib/Makefile.lib +++ b/usr/src/lib/Makefile.lib @@ -138,7 +138,6 @@ $(ROOTDEMODIRS) := DIRMODE = 755 # ROOTSFW= $(ROOT)/usr/sfw ROOTSFWBIN= $(ROOT)/usr/sfw/bin -ROOTSFWSBIN= $(ROOT)/usr/sfw/sbin ROOTSFWETC= $(ROOT)/etc/sfw ROOTSFWVAR= $(ROOT)/var/sfw ROOTSFWSHARE= $(ROOT)/usr/sfw/share diff --git a/usr/src/lib/libwrap/DISCLAIMER b/usr/src/lib/libwrap/DISCLAIMER new file mode 100644 index 0000000000..42d82ca775 --- /dev/null +++ b/usr/src/lib/libwrap/DISCLAIMER @@ -0,0 +1,16 @@ +/************************************************************************ +* Copyright 1995 by Wietse Venema. All rights reserved. Some individual +* files may be covered by other copyrights. +* +* This material was originally written and compiled by Wietse Venema at +* Eindhoven University of Technology, The Netherlands, in 1990, 1991, +* 1992, 1993, 1994 and 1995. +* +* Redistribution and use in source and binary forms are permitted +* provided that this entire copyright notice is duplicated in all such +* copies. +* +* This software is provided "as is" and without any expressed or implied +* warranties, including, without limitation, the implied warranties of +* merchantibility and fitness for any particular purpose. +************************************************************************/ diff --git a/usr/src/lib/libwrap/Makefile b/usr/src/lib/libwrap/Makefile index 0e8e224d1f..d50ef1981c 100644 --- a/usr/src/lib/libwrap/Makefile +++ b/usr/src/lib/libwrap/Makefile @@ -1,5 +1,5 @@ # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -12,8 +12,6 @@ CHECKHDRS = HDRDIR = . SUBDIRS = $(MACH) -ROOTHDRDIR = $(ROOTSFWINCLUDE) - all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber @@ -24,6 +22,8 @@ lint := TARGET = lint all clean clobber install lint: $(SUBDIRS) +all install: THIRDPARTYLICENSE + install_h: $(ROOTHDRS) check: $(CHECKHDRS) @@ -33,12 +33,9 @@ $(SUBDIRS): FRC FRC: -$(ROOTHDRS): $(ROOTHDRDIR) - -$(ROOTHDRDIR): $(ROOTSFW) - $(INS.dir) +THIRDPARTYLICENSE: DISCLAIMER + $(GREP) -v '\*\*\*\*' DISCLAIMER > $@ -$(ROOTSFW): - $(INS.dir) +CLOBBERFILES += THIRDPARTYLICENSE include ../Makefile.targ diff --git a/usr/src/lib/libwrap/Makefile.com b/usr/src/lib/libwrap/Makefile.com index 8ad0096289..74850f334d 100644 --- a/usr/src/lib/libwrap/Makefile.com +++ b/usr/src/lib/libwrap/Makefile.com @@ -18,8 +18,7 @@ # # CDDL HEADER END # -# -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -37,7 +36,6 @@ OBJECTS = hosts_access.o options.o shell_cmd.o rfc931.o eval.o \ include ../../Makefile.lib LIBS = $(DYNLIB) $(LINTLIB) -ROOTLIBDIR = $(ROOTSFWLIB) SONAME = $(LIBRARY:.a=.so)$(MAJOR) ROOTLINKS += $(ROOTLIBDIR)/$(LIBLINKS)$(MAJOR) $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) @@ -61,8 +59,10 @@ DISTFILES = clean_exit.c diag.c eval.c fix_options.c fromhost.c \ setenv.c shell_cmd.c socket.c tcpd.h tli.c update.c \ workarounds.c -ROOTSFWSRC = $(ROOTSFWSHSRC)/tcp_wrappers -ROOTSFWSRCFILES = $(DISTFILES:%=$(ROOTSFWSRC)/%) +ROOTSRC = $(ROOT)/usr/share/src/tcp_wrappers +$(ROOTSRC) := OWNER = root +$(ROOTSRC) := GROUP = bin +ROOTSRCFILES = $(DISTFILES:%=$(ROOTSRC)/%) .KEEP_STATE: @@ -70,32 +70,18 @@ all: $(LIBS) lint: lintcheck -$(ROOTLIBS): $(ROOTLIBDIR) - -$(ROOTLIBDIR): $(ROOTSFW) - $(INS.dir) - $(ROOTLIBDIR)/$(LIBLINKS)$(MAJOR): $(ROOTLIBDIR)/$(LIBLINKS)$(VERS) $(INS.liblink) -$(ROOTSFWSRCFILES) := FILEMODE = 0444 -$(ROOTSFWSRCFILES): $(ROOTSFWSRC) - -$(ROOTSFWSRC): $(ROOTSFWSHSRC) - $(INS.dir) +$(ROOTSRCFILES) := FILEMODE = 0444 +$(ROOTSRCFILES): $(ROOTSRC) -$(ROOTSFWSHSRC): $(ROOTSFW)/share +$(ROOTSRC): $(INS.dir) -$(ROOTSFWSRC)/%: $(SRCDIR)/% +$(ROOTSRC)/%: $(SRCDIR)/% $(INS.file) -$(ROOTSFW)/share: $(ROOTSFW) - $(INS.dir) - -$(ROOTSFW): - $(INS.dir) - include ../../Makefile.targ @@ -103,7 +89,7 @@ include ../../Makefile.targ # original Makefile of the tcp_wrappers distribution. ############################## -# System parameters appropriate for Solaris 9 +# System parameters appropriate for Solaris 9 and later TLI = -DTLI BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DLIBC_CALLS_STRTOK diff --git a/usr/src/lib/libwrap/THIRDPARTYLICENSE.descrip b/usr/src/lib/libwrap/THIRDPARTYLICENSE.descrip new file mode 100644 index 0000000000..63e8502e32 --- /dev/null +++ b/usr/src/lib/libwrap/THIRDPARTYLICENSE.descrip @@ -0,0 +1 @@ +TCP WRAPPER SOFTWARE diff --git a/usr/src/lib/libwrap/i386/Makefile b/usr/src/lib/libwrap/i386/Makefile index f0a15b4568..0e11da5547 100644 --- a/usr/src/lib/libwrap/i386/Makefile +++ b/usr/src/lib/libwrap/i386/Makefile @@ -1,10 +1,10 @@ # -# Copyright (c) 2001 by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # include ../Makefile.com -install: all $(ROOTLIBS) .WAIT $(ROOTLINKS) $(ROOTLINT) $(ROOTSFWSRCFILES) +install: all $(ROOTLIBS) .WAIT $(ROOTLINKS) $(ROOTLINT) $(ROOTSRCFILES) diff --git a/usr/src/lib/libwrap/sparc/Makefile b/usr/src/lib/libwrap/sparc/Makefile index f0a15b4568..0e11da5547 100644 --- a/usr/src/lib/libwrap/sparc/Makefile +++ b/usr/src/lib/libwrap/sparc/Makefile @@ -1,10 +1,10 @@ # -# Copyright (c) 2001 by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # include ../Makefile.com -install: all $(ROOTLIBS) .WAIT $(ROOTLINKS) $(ROOTLINT) $(ROOTSFWSRCFILES) +install: all $(ROOTLIBS) .WAIT $(ROOTLINKS) $(ROOTLINT) $(ROOTSRCFILES) diff --git a/usr/src/pkgdefs/SUNWarc/prototype_com b/usr/src/pkgdefs/SUNWarc/prototype_com index 3652da4eee..6aa3ee7b3b 100644 --- a/usr/src/pkgdefs/SUNWarc/prototype_com +++ b/usr/src/pkgdefs/SUNWarc/prototype_com @@ -219,6 +219,8 @@ s none usr/lib/llib-lthread=../../lib/llib-lthread s none usr/lib/llib-lthread.ln=../../lib/llib-lthread.ln s none usr/lib/llib-lthread_db=../../lib/llib-lc_db s none usr/lib/llib-lthread_db.ln=../../lib/llib-lc_db.ln +f none usr/lib/llib-lwrap 644 root bin +f none usr/lib/llib-lwrap.ln 644 root bin s none usr/lib/llib-lxnet=../../lib/llib-lxnet s none usr/lib/llib-lxnet.ln=../../lib/llib-lxnet.ln f none usr/lib/llib-lmalloc 644 root bin @@ -247,10 +249,6 @@ f none usr/lib/llib-lpanel 644 root bin s none usr/ccs/lib/llib-lpanel=../../lib/llib-lpanel f none usr/lib/llib-lpanel.ln 644 root bin s none usr/ccs/lib/llib-lpanel.ln=../../lib/llib-lpanel.ln -d none usr/sfw 755 root bin -d none usr/sfw/lib 755 root bin -f none usr/sfw/lib/llib-lwrap 644 root bin -f none usr/sfw/lib/llib-lwrap.ln 644 root bin d none usr/xpg4 755 root bin d none usr/xpg4/lib 755 root bin f none usr/xpg4/lib/llib-lcurses 644 root bin diff --git a/usr/src/pkgdefs/SUNWarc/prototype_i386 b/usr/src/pkgdefs/SUNWarc/prototype_i386 index 8ccb82608d..c075cea73e 100644 --- a/usr/src/pkgdefs/SUNWarc/prototype_i386 +++ b/usr/src/pkgdefs/SUNWarc/prototype_i386 @@ -169,5 +169,3 @@ s none usr/ccs/lib/amd64/values-Xs.o=../../../lib/amd64/values-Xs.o s none usr/ccs/lib/amd64/values-Xt.o=../../../lib/amd64/values-Xt.o s none usr/ccs/lib/amd64/values-xpg4.o=../../../lib/amd64/values-xpg4.o s none usr/ccs/lib/amd64/values-xpg6.o=../../../lib/amd64/values-xpg6.o -d none usr/sfw/lib/amd64 755 root bin -s none usr/sfw/lib/64=amd64 diff --git a/usr/src/pkgdefs/SUNWcsl/prototype_com b/usr/src/pkgdefs/SUNWcsl/prototype_com index 3b070ff330..6a84023a77 100644 --- a/usr/src/pkgdefs/SUNWcsl/prototype_com +++ b/usr/src/pkgdefs/SUNWcsl/prototype_com @@ -18,8 +18,6 @@ # # CDDL HEADER END - -# # # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -285,6 +283,9 @@ f none usr/lib/libvt0.so.1 755 root bin s none usr/lib/libvt0.so=./libvt0.so.1 s none usr/lib/libw.so=../../lib/libw.so.1 s none usr/lib/libw.so.1=../../lib/libw.so.1 +f none usr/lib/libwrap.so.1.0 755 root bin +s none usr/lib/libwrap.so.1=libwrap.so.1.0 +s none usr/lib/libwrap.so=libwrap.so.1.0 s none usr/lib/libxnet.so=../../lib/libxnet.so.1 s none usr/lib/libxnet.so.1=../../lib/libxnet.so.1 s none usr/lib/libzoneinfo.so=./libzoneinfo.so.1 @@ -365,11 +366,6 @@ s none usr/ccs/lib/liby.so=../../lib/liby.so.1 f none usr/lib/liby.so.1 0755 root bin s none usr/lib/libpam.so.1=../../lib/libpam.so.1 s none usr/lib/libpam.so=../../lib/libpam.so.1 -d none usr/sfw 755 root bin -d none usr/sfw/lib 755 root bin -f none usr/sfw/lib/libwrap.so.1.0 755 root bin -s none usr/sfw/lib/libwrap.so.1=libwrap.so.1.0 -s none usr/sfw/lib/libwrap.so=libwrap.so.1.0 d none usr/xpg4 755 root bin d none usr/xpg4/lib 755 root bin s none usr/xpg4/lib/libcurses.so=./libcurses.so.2 diff --git a/usr/src/pkgdefs/SUNWhea/prototype_com b/usr/src/pkgdefs/SUNWhea/prototype_com index 003ab182d6..f723a79fbe 100644 --- a/usr/src/pkgdefs/SUNWhea/prototype_com +++ b/usr/src/pkgdefs/SUNWhea/prototype_com @@ -1357,6 +1357,7 @@ f none usr/include/sys/zone.h 644 root bin f none usr/include/sysexits.h 644 root bin f none usr/include/syslog.h 644 root bin f none usr/include/tar.h 644 root bin +f none usr/include/tcpd.h 644 root bin f none usr/include/term.h 644 root bin f none usr/include/termio.h 644 root bin f none usr/include/termios.h 644 root bin @@ -1416,9 +1417,6 @@ f none usr/include/wordexp.h 644 root bin f none usr/include/xti.h 644 root bin f none usr/include/xti_inet.h 644 root bin f none usr/include/zone.h 644 root bin -d none usr/sfw 755 root bin -d none usr/sfw/include 755 root bin -f none usr/sfw/include/tcpd.h 644 root bin d none usr/share 755 root sys d none usr/share/src 755 root sys d none usr/share/src/uts 755 root bin diff --git a/usr/src/pkgdefs/SUNWopenssl-libraries/prototype_i386 b/usr/src/pkgdefs/SUNWopenssl-libraries/prototype_i386 index 9a24a51c50..fccf2a9f0d 100644 --- a/usr/src/pkgdefs/SUNWopenssl-libraries/prototype_i386 +++ b/usr/src/pkgdefs/SUNWopenssl-libraries/prototype_i386 @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -50,6 +50,7 @@ # # d none usr/sfw/lib/amd64 755 root bin +s none usr/sfw/lib/64=amd64 f none usr/sfw/lib/amd64/libcrypto.so.0.9.8 755 root bin s none usr/sfw/lib/amd64/libcrypto.so=./libcrypto.so.0.9.8 f none usr/sfw/lib/amd64/libssl.so.0.9.8 755 root bin diff --git a/usr/src/pkgdefs/SUNWopenssl-man/prototype_com b/usr/src/pkgdefs/SUNWopenssl-man/prototype_com index af9a6920c4..6e2db4e4c9 100644 --- a/usr/src/pkgdefs/SUNWopenssl-man/prototype_com +++ b/usr/src/pkgdefs/SUNWopenssl-man/prototype_com @@ -20,7 +20,7 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -46,6 +46,7 @@ i depend # d none usr 0755 root sys d none usr/sfw 0755 root bin +s none usr/sfw/man=share/man d none usr/sfw/share 0755 root bin d none usr/sfw/share/man 0755 root bin d none usr/sfw/share/man/man1 0755 root bin diff --git a/usr/src/pkgdefs/SUNWtcpd/prototype_com b/usr/src/pkgdefs/SUNWtcpd/prototype_com index 212afcc2fa..22321aaa3b 100644 --- a/usr/src/pkgdefs/SUNWtcpd/prototype_com +++ b/usr/src/pkgdefs/SUNWtcpd/prototype_com @@ -1,5 +1,5 @@ # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -22,25 +22,23 @@ i depend # SUNWtcpd # d none usr 755 root sys -d none usr/sfw 755 root bin -s none usr/sfw/man=share/man -d none usr/sfw/sbin 755 root bin -f none usr/sfw/sbin/safe_finger 555 root bin -f none usr/sfw/sbin/tcpd 555 root bin -f none usr/sfw/sbin/tcpdchk 555 root bin -f none usr/sfw/sbin/tcpdmatch 555 root bin -f none usr/sfw/sbin/try-from 555 root bin -d none usr/sfw/share 755 root bin -d none usr/sfw/share/man 755 root bin -d none usr/sfw/share/man/man1m 755 root bin -f none usr/sfw/share/man/man1m/tcpd.1m 444 root bin -f none usr/sfw/share/man/man1m/tcpdchk.1m 444 root bin -f none usr/sfw/share/man/man1m/tcpdmatch.1m 444 root bin -d none usr/sfw/share/man/man3 755 root bin -f none usr/sfw/share/man/man3/hosts_access.3 444 root bin -f none usr/sfw/share/man/man3/libwrap.3 444 root bin -d none usr/sfw/share/man/man4 755 root bin -f none usr/sfw/share/man/man4/hosts_access.4 444 root bin -f none usr/sfw/share/man/man4/hosts.allow.4 444 root bin -f none usr/sfw/share/man/man4/hosts.deny.4 444 root bin -f none usr/sfw/share/man/man4/hosts_options.4 444 root bin +d none usr/sbin 755 root bin +f none usr/sbin/safe_finger 555 root bin +f none usr/sbin/tcpd 555 root bin +f none usr/sbin/tcpdchk 555 root bin +f none usr/sbin/tcpdmatch 555 root bin +f none usr/sbin/try-from 555 root bin +d none usr/share 755 root sys +d none usr/share/man 755 root bin +d none usr/share/man/man1m 755 root bin +f none usr/share/man/man1m/tcpd.1m 444 root bin +f none usr/share/man/man1m/tcpdchk.1m 444 root bin +f none usr/share/man/man1m/tcpdmatch.1m 444 root bin +d none usr/share/man/man3 755 root bin +f none usr/share/man/man3/hosts_access.3 444 root bin +f none usr/share/man/man3/libwrap.3 444 root bin +d none usr/share/man/man4 755 root bin +f none usr/share/man/man4/hosts_access.4 444 root bin +f none usr/share/man/man4/hosts.allow.4 444 root bin +f none usr/share/man/man4/hosts.deny.4 444 root bin +f none usr/share/man/man4/hosts_options.4 444 root bin diff --git a/usr/src/pkgdefs/SUNWtcpdS/prototype_com b/usr/src/pkgdefs/SUNWtcpdS/prototype_com index 0b555cefd5..0e3fc04161 100644 --- a/usr/src/pkgdefs/SUNWtcpdS/prototype_com +++ b/usr/src/pkgdefs/SUNWtcpdS/prototype_com @@ -1,6 +1,6 @@ # -# Copyright (c) 2001 by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" # @@ -24,79 +24,78 @@ i depend # SUNWtcpdS # d none usr 755 root sys -d none usr/sfw 755 root bin -d none usr/sfw/share 755 root bin -d none usr/sfw/share/src 755 root bin -d none usr/sfw/share/src/tcp_wrappers 755 root bin -f none usr/sfw/share/src/tcp_wrappers/BLURB 444 root bin -f none usr/sfw/share/src/tcp_wrappers/Banners.Makefile 444 root bin -f none usr/sfw/share/src/tcp_wrappers/CHANGES 444 root bin -f none usr/sfw/share/src/tcp_wrappers/DISCLAIMER 444 root bin -f none usr/sfw/share/src/tcp_wrappers/Makefile 444 root bin -f none usr/sfw/share/src/tcp_wrappers/Makefile.dist 444 root bin -f none usr/sfw/share/src/tcp_wrappers/Makefile.org 444 root bin -f none usr/sfw/share/src/tcp_wrappers/README 444 root bin -f none usr/sfw/share/src/tcp_wrappers/README.IRIX 444 root bin -f none usr/sfw/share/src/tcp_wrappers/README.NIS 444 root bin -f none usr/sfw/share/src/tcp_wrappers/README.ipv6 444 root bin -f none usr/sfw/share/src/tcp_wrappers/README.sfw 444 root bin -f none usr/sfw/share/src/tcp_wrappers/clean_exit.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/diag.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/environ.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/eval.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/fakelog.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/fix_options.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/fromhost.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/hosts_access.3 444 root bin -f none usr/sfw/share/src/tcp_wrappers/hosts_access.4 444 root bin -f none usr/sfw/share/src/tcp_wrappers/hosts_access.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/hosts_access.c.org 444 root bin -f none usr/sfw/share/src/tcp_wrappers/hosts_ctl.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/hosts_options.4 444 root bin -f none usr/sfw/share/src/tcp_wrappers/inetcf.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/inetcf.h 444 root bin -f none usr/sfw/share/src/tcp_wrappers/misc.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/misc.c.org 444 root bin -f none usr/sfw/share/src/tcp_wrappers/miscd.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/mystdarg.h 444 root bin -f none usr/sfw/share/src/tcp_wrappers/myvsyslog.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/ncr.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/options.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/patchlevel.h 444 root bin -f none usr/sfw/share/src/tcp_wrappers/percent_m.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/percent_x.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/printf.ck 444 root bin -f none usr/sfw/share/src/tcp_wrappers/ptx.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/refuse.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/rfc931.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/rfc931.c.org 444 root bin -f none usr/sfw/share/src/tcp_wrappers/safe_finger.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/scaffold.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/scaffold.c.org 444 root bin -f none usr/sfw/share/src/tcp_wrappers/scaffold.h 444 root bin -f none usr/sfw/share/src/tcp_wrappers/setenv.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/shell_cmd.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/socket.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/socket.c.diff 444 root bin -f none usr/sfw/share/src/tcp_wrappers/socket.c.org 444 root bin -f none usr/sfw/share/src/tcp_wrappers/strcasecmp.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/tags 444 root bin -f none usr/sfw/share/src/tcp_wrappers/tcpd.1m 444 root bin -f none usr/sfw/share/src/tcp_wrappers/tcpd.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/tcpd.h 444 root bin -f none usr/sfw/share/src/tcp_wrappers/tcpd.h.org 444 root bin -f none usr/sfw/share/src/tcp_wrappers/tcpdchk.1m 444 root bin -f none usr/sfw/share/src/tcp_wrappers/tcpdchk.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/tcpdchk.c.org 444 root bin -f none usr/sfw/share/src/tcp_wrappers/tcpdmatch.1m 444 root bin -f none usr/sfw/share/src/tcp_wrappers/tcpdmatch.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/tcpdmatch.c.org 444 root bin -f none usr/sfw/share/src/tcp_wrappers/tli-sequent.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/tli-sequent.h 444 root bin -f none usr/sfw/share/src/tcp_wrappers/tli.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/tli.c.org 444 root bin -f none usr/sfw/share/src/tcp_wrappers/try-from.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/update.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/update.c.org 444 root bin -f none usr/sfw/share/src/tcp_wrappers/vfprintf.c 444 root bin -f none usr/sfw/share/src/tcp_wrappers/workarounds.c 444 root bin +d none usr/share 755 root sys +d none usr/share/src 755 root sys +d none usr/share/src/tcp_wrappers 755 root bin +f none usr/share/src/tcp_wrappers/BLURB 444 root bin +f none usr/share/src/tcp_wrappers/Banners.Makefile 444 root bin +f none usr/share/src/tcp_wrappers/CHANGES 444 root bin +f none usr/share/src/tcp_wrappers/DISCLAIMER 444 root bin +f none usr/share/src/tcp_wrappers/Makefile 444 root bin +f none usr/share/src/tcp_wrappers/Makefile.dist 444 root bin +f none usr/share/src/tcp_wrappers/Makefile.org 444 root bin +f none usr/share/src/tcp_wrappers/README 444 root bin +f none usr/share/src/tcp_wrappers/README.IRIX 444 root bin +f none usr/share/src/tcp_wrappers/README.NIS 444 root bin +f none usr/share/src/tcp_wrappers/README.ipv6 444 root bin +f none usr/share/src/tcp_wrappers/README.sfw 444 root bin +f none usr/share/src/tcp_wrappers/clean_exit.c 444 root bin +f none usr/share/src/tcp_wrappers/diag.c 444 root bin +f none usr/share/src/tcp_wrappers/environ.c 444 root bin +f none usr/share/src/tcp_wrappers/eval.c 444 root bin +f none usr/share/src/tcp_wrappers/fakelog.c 444 root bin +f none usr/share/src/tcp_wrappers/fix_options.c 444 root bin +f none usr/share/src/tcp_wrappers/fromhost.c 444 root bin +f none usr/share/src/tcp_wrappers/hosts_access.3 444 root bin +f none usr/share/src/tcp_wrappers/hosts_access.4 444 root bin +f none usr/share/src/tcp_wrappers/hosts_access.c 444 root bin +f none usr/share/src/tcp_wrappers/hosts_access.c.org 444 root bin +f none usr/share/src/tcp_wrappers/hosts_ctl.c 444 root bin +f none usr/share/src/tcp_wrappers/hosts_options.4 444 root bin +f none usr/share/src/tcp_wrappers/inetcf.c 444 root bin +f none usr/share/src/tcp_wrappers/inetcf.h 444 root bin +f none usr/share/src/tcp_wrappers/misc.c 444 root bin +f none usr/share/src/tcp_wrappers/misc.c.org 444 root bin +f none usr/share/src/tcp_wrappers/miscd.c 444 root bin +f none usr/share/src/tcp_wrappers/mystdarg.h 444 root bin +f none usr/share/src/tcp_wrappers/myvsyslog.c 444 root bin +f none usr/share/src/tcp_wrappers/ncr.c 444 root bin +f none usr/share/src/tcp_wrappers/options.c 444 root bin +f none usr/share/src/tcp_wrappers/patchlevel.h 444 root bin +f none usr/share/src/tcp_wrappers/percent_m.c 444 root bin +f none usr/share/src/tcp_wrappers/percent_x.c 444 root bin +f none usr/share/src/tcp_wrappers/printf.ck 444 root bin +f none usr/share/src/tcp_wrappers/ptx.c 444 root bin +f none usr/share/src/tcp_wrappers/refuse.c 444 root bin +f none usr/share/src/tcp_wrappers/rfc931.c 444 root bin +f none usr/share/src/tcp_wrappers/rfc931.c.org 444 root bin +f none usr/share/src/tcp_wrappers/safe_finger.c 444 root bin +f none usr/share/src/tcp_wrappers/scaffold.c 444 root bin +f none usr/share/src/tcp_wrappers/scaffold.c.org 444 root bin +f none usr/share/src/tcp_wrappers/scaffold.h 444 root bin +f none usr/share/src/tcp_wrappers/setenv.c 444 root bin +f none usr/share/src/tcp_wrappers/shell_cmd.c 444 root bin +f none usr/share/src/tcp_wrappers/socket.c 444 root bin +f none usr/share/src/tcp_wrappers/socket.c.diff 444 root bin +f none usr/share/src/tcp_wrappers/socket.c.org 444 root bin +f none usr/share/src/tcp_wrappers/strcasecmp.c 444 root bin +f none usr/share/src/tcp_wrappers/tags 444 root bin +f none usr/share/src/tcp_wrappers/tcpd.1m 444 root bin +f none usr/share/src/tcp_wrappers/tcpd.c 444 root bin +f none usr/share/src/tcp_wrappers/tcpd.h 444 root bin +f none usr/share/src/tcp_wrappers/tcpd.h.org 444 root bin +f none usr/share/src/tcp_wrappers/tcpdchk.1m 444 root bin +f none usr/share/src/tcp_wrappers/tcpdchk.c 444 root bin +f none usr/share/src/tcp_wrappers/tcpdchk.c.org 444 root bin +f none usr/share/src/tcp_wrappers/tcpdmatch.1m 444 root bin +f none usr/share/src/tcp_wrappers/tcpdmatch.c 444 root bin +f none usr/share/src/tcp_wrappers/tcpdmatch.c.org 444 root bin +f none usr/share/src/tcp_wrappers/tli-sequent.c 444 root bin +f none usr/share/src/tcp_wrappers/tli-sequent.h 444 root bin +f none usr/share/src/tcp_wrappers/tli.c 444 root bin +f none usr/share/src/tcp_wrappers/tli.c.org 444 root bin +f none usr/share/src/tcp_wrappers/try-from.c 444 root bin +f none usr/share/src/tcp_wrappers/update.c 444 root bin +f none usr/share/src/tcp_wrappers/update.c.org 444 root bin +f none usr/share/src/tcp_wrappers/vfprintf.c 444 root bin +f none usr/share/src/tcp_wrappers/workarounds.c 444 root bin diff --git a/usr/src/tools/opensolaris/license-list b/usr/src/tools/opensolaris/license-list index 916ab48edf..d5614e42f8 100644 --- a/usr/src/tools/opensolaris/license-list +++ b/usr/src/tools/opensolaris/license-list @@ -88,6 +88,7 @@ usr/src/lib/libresolv2/THIRDPARTYLICENSE usr/src/lib/libsasl/THIRDPARTYLICENSE usr/src/lib/libshell/THIRDPARTYLICENSE usr/src/lib/libtecla/THIRDPARTYLICENSE +usr/src/lib/libwrap/THIRDPARTYLICENSE usr/src/lib/pam_modules/authtok_check/THIRDPARTYLICENSE usr/src/lib/passwdutil/THIRDPARTYLICENSE usr/src/lib/pkcs11/include/THIRDPARTYLICENSE |