6 files changed, 103 insertions, 81 deletions

diff --git a/security/tcp_wrapper/Makefile b/security/tcp_wrapper/Makefile
index 741d1e28e544..3f1fbaa961a2 100644
--- a/security/tcp_wrapper/Makefile
+++ b/security/tcp_wrapper/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	tcp_wrapper
-# Version required:	6.3
+# Version required:	7.0
 # Date created:		27 Oct 1994
 # Whom:			torstenb
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1994/11/01 01:46:06 torstenb Exp $
 #
 
-DISTNAME=	tcp_wrappers_6.3
+DISTNAME=	tcp_wrappers_7.0
 MASTER_SITES=	ftp://ftp.win.tue.nl/pub/security/
-EXTRACT_CMD=	${.CURDIR}/scripts/extract.sh
-EXTRACT_ARGS=	${WRKSRC}
-EXTRACT_SUFX=	.shar.Z
+ALL_TARGET=	freebsd
 
 pre-install:
 	@mkdir -p ${PREFIX}/sbin
+	@mkdir -p ${PREFIX}/bin
+	@mkdir -p ${PREFIX}/libexec
 	@mkdir -p ${PREFIX}/lib
 	@mkdir -p ${PREFIX}/etc
 	@mkdir -p ${PREFIX}/man/man3
diff --git a/security/tcp_wrapper/distinfo b/security/tcp_wrapper/distinfo
index 11014f9b7b8e..cad14eda4ddf 100644
--- a/security/tcp_wrapper/distinfo
+++ b/security/tcp_wrapper/distinfo
@@ -1 +1 @@
-MD5 (tcp_wrappers_6.3.shar.Z) = c21504fed8ebb0461f2c83d207f7d39f
+MD5 (tcp_wrappers_7.0.tar.gz) = 97e9963eb5e612f2b1ca6a991891e3ee
diff --git a/security/tcp_wrapper/files/patch-aa b/security/tcp_wrapper/files/patch-aa
index e0e25145ad61..86f68e6770d9 100644
--- a/security/tcp_wrapper/files/patch-aa
+++ b/security/tcp_wrapper/files/patch-aa
@@ -1,15 +1,5 @@
-*** Makefile.orig	Mon Oct 31 14:50:32 1994
---- Makefile	Mon Oct 31 14:57:06 1994
-***************
-*** 1,5 ****
---- 1,7 ----
-  # @(#) Makefile 1.12 94/03/23 16:51:32
-  
-+ default: freebsd
-+ 
-  what:
-  	@echo
-  	@echo "Usage: edit the REAL_DAEMON_DIR definition in the Makefile then:"
+*** Makefile.orig	Mon Jan  9 23:41:06 1995
+--- Makefile	Tue Jan 10 00:05:59 1995
 ***************
 *** 46,52 ****
   #REAL_DAEMON_DIR=/usr/sbin
@@ -28,59 +18,75 @@
   # HP-UX SCO
   #REAL_DAEMON_DIR=/etc
 ***************
-*** 120,126 ****
-  # Free bsd and linux by default have no NIS.
-  386bsd netbsd freebsd:
-  	@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
-! 	LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ= NETGROUP= TLI= all
-  
-  linux:
-  	@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
---- 122,129 ----
-  # Free bsd and linux by default have no NIS.
-  386bsd netbsd freebsd:
-  	@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
-! 	LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ= NETGROUP= TLI= \
-! 	EXTRA_CFLAGS="-D_HAVE_PARAM_H" all
-  
-  linux:
-  	@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
+*** 315,321 ****
+  # the ones provided with this source distribution. The environ.c module
+  # implements setenv(), getenv(), and putenv().
+  
+! AUX_OBJ= setenv.o
+  #AUX_OBJ= environ.o
+  #AUX_OBJ= environ.o strcasecmp.o
+  
+--- 317,323 ----
+  # the ones provided with this source distribution. The environ.c module
+  # implements setenv(), getenv(), and putenv().
+  
+! #AUX_OBJ= setenv.o
+  #AUX_OBJ= environ.o
+  #AUX_OBJ= environ.o strcasecmp.o
+  
 ***************
-*** 318,324 ****
-  # instead of a long integer. Compile with -DINET_ADDR_BUG to work around
-  # this mutant behavour.
+*** 372,378 ****
+  # host name aliases. Compile with -DSOLARIS_24_GETHOSTBYNAME_BUG to work
+  # around this. The workaround does no harm on other Solaris versions.
   
 ! BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS
   #BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DINET_ADDR_BUG
+  #BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DSOLARIS_24_GETHOSTBYNAME_BUG
   
-  ##########################################################################
---- 321,327 ----
-  # instead of a long integer. Compile with -DINET_ADDR_BUG to work around
-  # this mutant behavour.
+--- 374,380 ----
+  # host name aliases. Compile with -DSOLARIS_24_GETHOSTBYNAME_BUG to work
+  # around this. The workaround does no harm on other Solaris versions.
   
 ! #BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS
   #BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DINET_ADDR_BUG
+  #BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DSOLARIS_24_GETHOSTBYNAME_BUG
+  
+***************
+*** 390,396 ****
+  # If your system supports vsyslog(), comment out the following definition.
+  # If in doubt leave it in, it won't harm.
+  
+! VSYSLOG	= -Dvsyslog=myvsyslog
+  
+  # End of the system dependencies.
+  #################################
+--- 392,398 ----
+  # If your system supports vsyslog(), comment out the following definition.
+  # If in doubt leave it in, it won't harm.
+  
+! #VSYSLOG	= -Dvsyslog=myvsyslog
   
-  ##########################################################################
+  # End of the system dependencies.
+  #################################
 ***************
-*** 345,351 ****
-  # module, which also gives hints on how to add your own extensions.
-  # Uncomment the next definition to turn on the language extensions.
+*** 409,415 ****
+  # Uncomment the next definition to turn on the language extensions
+  # (examples: allow, deny, banners, twist and spawn).
   # 
 ! #STYLE	= -DPROCESS_OPTIONS	# Enable language extensions.
   
   ################################################################
   # Optional: Changing the default disposition of logfile records
---- 348,354 ----
-  # module, which also gives hints on how to add your own extensions.
-  # Uncomment the next definition to turn on the language extensions.
+--- 411,417 ----
+  # Uncomment the next definition to turn on the language extensions
+  # (examples: allow, deny, banners, twist and spawn).
   # 
 ! STYLE	= -DPROCESS_OPTIONS	# Enable language extensions.
   
   ################################################################
   # Optional: Changing the default disposition of logfile records
 ***************
-*** 368,374 ****
+*** 432,438 ****
   #
   # The LOG_XXX names below are taken from the /usr/include/syslog.h file.
   
@@ -88,62 +94,70 @@
   
   # The syslog priority at which successful connections are logged.
   
---- 371,377 ----
+--- 434,441 ----
   #
   # The LOG_XXX names below are taken from the /usr/include/syslog.h file.
   
-! FACILITY= LOG_AUTH	# LOG_MAIL is what most sendmail daemons use
+! #FACILITY= LOG_MAIL	# LOG_MAIL is what most sendmail daemons use
+! FACILITY= LOG_AUTH
   
   # The syslog priority at which successful connections are logged.
   
 ***************
-*** 445,451 ****
+*** 507,513 ****
   # look for access control information. Watch out for the quotes and
   # backslashes when you make changes.
   
 ! TABLES	= -DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\"
   
-  ###########################################
-  # Optional: Turning off host NAME checking
---- 448,454 ----
+  ####################################################
+  # Optional: dealing with host name/address conflicts
+--- 510,516 ----
   # look for access control information. Watch out for the quotes and
   # backslashes when you make changes.
   
 ! TABLES	= -DHOSTS_DENY=\"${PREFIX}/etc/hosts.deny\" -DHOSTS_ALLOW=\"${PREFIX}/etc/hosts.allow\"
   
-  ###########################################
-  # Optional: Turning off host NAME checking
+  ####################################################
+  # Optional: dealing with host name/address conflicts
 ***************
-*** 463,469 ****
-  # daemon wrappers will use only the host address, but your daemons may
-  # still use the host name.
+*** 524,530 ****
+  # requests. When paranoid mode is off and a host name double check fails,
+  # the client can be matched with the PARANOID access control pattern.
   
 ! PARANOID= -DPARANOID
   
   #############################################
   # Optional: Turning on host ADDRESS checking
---- 466,472 ----
-  # daemon wrappers will use only the host address, but your daemons may
-  # still use the host name.
+--- 527,533 ----
+  # requests. When paranoid mode is off and a host name double check fails,
+  # the client can be matched with the PARANOID access control pattern.
   
 ! #PARANOID= -DPARANOID
   
   #############################################
   # Optional: Turning on host ADDRESS checking
 ***************
-*** 522,527 ****
---- 525,538 ----
+*** 587,592 ****
+--- 590,610 ----
   LIB	= libwrap.a
   
-  all other: config-check tcpd try try-from safe_finger
+  all other: config-check tcpd tcpdmatch try-from safe_finger tcpdchk
 + 
 + install:
 + 	install -c libwrap.a ${PREFIX}/lib/libwrap.a
-+ 	install -c tcpd ${PREFIX}/sbin/tcpd
++ 	install -c tcpd ${PREFIX}/libexec/tcpd
++ 	install -c tcpdchk ${PREFIX}/sbin/tcpdchk
++ 	install -c tcpdmatch ${PREFIX}/sbin/tcpdmatch
++ 	install -c safe_finger ${PREFIX}/bin/safe_finger
++ 	install -c tcpd.8 ${PREFIX}/man/man8/tcpd.8
++ 	install -c tcpdchk.8 ${PREFIX}/man/man8/tcpdchk.8
++ 	install -c tcpdmatch.8 ${PREFIX}/man/man8/tcpdmatch.8
 + 	install -c hosts_access.3 ${PREFIX}/man/man3/hosts_access.3
 + 	install -c hosts_access.5 ${PREFIX}/man/man5/hosts_access.5
 + 	install -c hosts_options.5 ${PREFIX}/man/man5/hosts_options.5
-+ 	install -c tcpd.8 ${PREFIX}/man/man8/tcpd.8
++ 	
++ 
+  
+  # Invalidate all object files when the compiler options (CFLAGS) have changed.
   
-  config-check:
-  	@set +e; test -n "$(REAL_DAEMON_DIR)" || { make; exit 1; }
diff --git a/security/tcp_wrapper/pkg-comment b/security/tcp_wrapper/pkg-comment
index ff7ae397dbb1..ea955ab0d70e 100644
--- a/security/tcp_wrapper/pkg-comment
+++ b/security/tcp_wrapper/pkg-comment
@@ -1 +1,2 @@
-tcp-wrapper, TCP/IP daemon wrapper package, version 6.3
+
+This is the 7.0 version of the TCP/IP daemon wrapper package.
diff --git a/security/tcp_wrapper/pkg-descr b/security/tcp_wrapper/pkg-descr
index 7afb891c523d..ebde7a2713aa 100644
--- a/security/tcp_wrapper/pkg-descr
+++ b/security/tcp_wrapper/pkg-descr
@@ -1,4 +1,5 @@
-This is the 6.3 version of the TCP/IP daemon wrapper package.
+
+This is the 7.0 version of the TCP/IP daemon wrapper package.
 
 With this package you can monitor and filter incoming requests for the
 SYSTAT, FINGER, FTP, TELNET, RLOGIN, RSH, EXEC, TFTP, TALK, and other
@@ -6,13 +7,14 @@ network services.
 
 The package provides tiny daemon wrapper programs that can be installed
 without any changes to existing software or to existing configuration
-files.  The wrappers report the name of the remote host and of the
+files.  The wrappers report the name of the client host and of the
 requested service; the wrappers do not exchange information with the
-remote client process, and impose no overhead on the actual
-communication between the client and server applications.
+client or server applications, and impose no overhead on the actual
+conversation between the client and server applications.
 
 Optional features are: access control to restrict what systems can
-connect to your network daemons; remote user name lookups with the RFC
-931 protocol; additional protection against hosts that pretend to have
-someone elses host name; additional protection against hosts that
+connect to what network daemons; client user name lookups with the RFC
+931 etc. protocol; additional protection against hosts that pretend to
+have someone elses host name; additional protection against hosts that
 pretend to have someone elses host address.
+
diff --git a/security/tcp_wrapper/pkg-plist b/security/tcp_wrapper/pkg-plist
index 376a4b39ade4..fb24d65b39dc 100644
--- a/security/tcp_wrapper/pkg-plist
+++ b/security/tcp_wrapper/pkg-plist
@@ -1,7 +1,12 @@
 @cwd /usr/local
-sbin/tcpd
+libexec/tcpd
+sbin/tcpdchk
+sbin/tcpdmatch
+bin/safe_finger
 lib/libwrap.a
 man/man3/hosts_access.3
 man/man5/hosts_access.5
 man/man5/hosts_options.5
 man/man8/tcpd.8
+man/man8/tcpdchk.8
+man/man8/tcpdmatch.8