Upgrade to beta-13

14 files changed, 38 insertions, 250 deletions

diff --git a/ftp/wu-ftpd+ipv6/Makefile b/ftp/wu-ftpd+ipv6/Makefile
index 55eab5dd3a9f..4879a0c0d208 100644
--- a/ftp/wu-ftpd+ipv6/Makefile
+++ b/ftp/wu-ftpd+ipv6/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:	wu-ftpd
-# Version required:     2.4.2-beta-12
+# Version required:     2.4.2-beta-13
 # Date created:		18 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.9 1996/12/01 01:34:11 obrien Exp $
+# $Id: Makefile,v 1.11 1997/02/01 22:17:11 ache Exp $
 #
 # REMINDER: to use ftpaccess(5) you need to specify -a in command line,
 # it is changed from previous versions
 
-DISTNAME=       wu-ftpd-2.4.2-beta-12
+DISTNAME=       wu-ftpd-2.4.2-beta-13
 CATEGORIES=	net
 # AUSCERT recommendation
 MASTER_SITES=   ftp://ftp.academ.com/pub/wu-ftpd/private/
diff --git a/ftp/wu-ftpd+ipv6/distinfo b/ftp/wu-ftpd+ipv6/distinfo
index 48944170cef0..d4d4368276a2 100644
--- a/ftp/wu-ftpd+ipv6/distinfo
+++ b/ftp/wu-ftpd+ipv6/distinfo
@@ -1 +1 @@
-MD5 (wu-ftpd-2.4.2-beta-12.tar.Z) = 9c9a38d9de9611f6e9a8d30582ba4b5b
+MD5 (wu-ftpd-2.4.2-beta-13.tar.Z) = 86e87d3d711afada4f8aec81ae3940ec
diff --git a/ftp/wu-ftpd+ipv6/files/patch-ad b/ftp/wu-ftpd+ipv6/files/patch-ad
deleted file mode 100644
index c94318c267f6..000000000000
--- a/ftp/wu-ftpd+ipv6/files/patch-ad
+++ /dev/null
@@ -1,58 +0,0 @@
-*** src/ftpd.c.bak	Mon Jan 20 08:05:11 1997
---- src/ftpd.c	Thu Jan 30 17:46:16 1997
-***************
-*** 235,246 ****
-  int logging = 0;
-  int log_commands = 0;
-  
-- #ifdef SKEY			/* H* add-on.  Not as elegant as Wietse's */
-- #include "skey.h"		/* logdaemon package, but does the job.   */
-- struct skey skey_blk;
-- char chbuff[80];
-- #endif
-- 
-  #ifdef SECUREOSF
-  #define SecureWare
-  #include <prot.h>
---- 235,240 ----
-***************
-*** 1201,1212 ****
-              acl_setfunctions();
-  
-  #ifdef SKEY
-! /* 0 means we found the user and the skeykeys file is open for update. */
-!     if (skeychallenge (&skey_blk, name, chbuff) == 0)
-! 	reply (331, "[%s] required for %s.", chbuff, name);
-!     else
-! #endif
-      reply(331, "Password required for %s.", name);
-      askpasswd = 1;
-      /* Delay before reading passwd after first failed attempt to slow down
-       * passwd-guessing programs. */
---- 1195,1205 ----
-              acl_setfunctions();
-  
-  #ifdef SKEY
-!     pwok = skeyaccess(name, NULL, remotehost, remoteaddr);
-!     reply(331, "%s", skey_challenge(name, pw, pwok));
-! #else
-      reply(331, "Password required for %s.", name);
-+ #endif
-      askpasswd = 1;
-      /* Delay before reading passwd after first failed attempt to slow down
-       * passwd-guessing programs. */
-***************
-*** 1378,1389 ****
-          xpasswd = crypt(passwd, salt);
-  #endif
-  #endif
-- #endif
-- #ifdef SKEY
-- /* comment the next line if you REALLY want to allow replayable passwds. */
-- 	strcpy (xpasswd, "wrongo:spazmoid");  /* disable regular passwds */
-- 	if (skeyverify (&skey_blk, passwd) == 0)
-- 	    strcpy (xpasswd, pw->pw_passwd);	/* do it the sleazy way */
-  #endif
-  #ifdef ULTRIX_AUTH
-          if ((numfails = ultrix_check_pass(passwd, xpasswd)) < 0) {
---- 1371,1376 ----
diff --git a/ftp/wu-ftpd+ipv6/files/patch-ai b/ftp/wu-ftpd+ipv6/files/patch-ai
index 8397aba1d9d2..33d688e55100 100644
--- a/ftp/wu-ftpd+ipv6/files/patch-ai
+++ b/ftp/wu-ftpd+ipv6/files/patch-ai
@@ -1,24 +1,7 @@
-*** config.h.orig	Mon Jan 20 06:21:30 1997
---- config.h	Thu Jan 30 16:13:31 1997
+*** config.h.bak	Mon Mar  3 12:39:34 1997
+--- config.h	Sun Apr 27 21:03:14 1997
 ***************
-*** 30,35 ****
---- 30,43 ----
-  #define LOG_FAILED
-  
-  /*
-+  * log login attempts that fail because of class connection
-+  * limits.  Busy servers may want to prevent this logging
-+  * since it can fill up the log file and put a high load on
-+  * syslog.
-+  */
-+ #define LOG_TOOMANY
-+ 
-+ /*
-   * allow use of private file.  (for site group and site gpass)
-   */
-  
-***************
-*** 64,68 ****
+*** 72,76 ****
    * See README-2.4-HOBBIT for more information on this option.
    */
   
diff --git a/ftp/wu-ftpd+ipv6/files/patch-al b/ftp/wu-ftpd+ipv6/files/patch-al
index 91414fc3ef3e..90c5246d7d57 100644
--- a/ftp/wu-ftpd+ipv6/files/patch-al
+++ b/ftp/wu-ftpd+ipv6/files/patch-al
@@ -1,25 +1,19 @@
-*** support/makefiles/Makefile.fbs.bak	Fri Feb 17 20:36:56 1995
---- support/makefiles/Makefile.fbs	Thu Jan 30 16:32:32 1997
+*** support/makefiles/Makefile.fbs.bak	Mon Mar  3 12:11:54 1997
+--- support/makefiles/Makefile.fbs	Sun Apr 27 21:13:35 1997
 ***************
-*** 4,13 ****
+*** 8,14 ****
   LIBC   = /usr/lib/libc.a
   IFLAGS = 
   LFLAGS = 
 ! CFLAGS = -O ${IFLAGS} ${LFLAGS} -DNO_MALLOC_PROTO
   
-! SRCS   = fnmatch.c strcasestr.c authuser.c ftw.c
-! OBJS   = fnmatch.o strcasestr.o authuser.o ftw.o
-  
-  all: $(OBJS)
-  	-rm -f libsupport.a
---- 4,13 ----
+  SRCS   = strcasestr.c authuser.c ftw.c
+  OBJS   = strcasestr.o authuser.o ftw.o
+--- 8,14 ----
   LIBC   = /usr/lib/libc.a
   IFLAGS = 
   LFLAGS = 
 ! CFLAGS += ${IFLAGS} ${LFLAGS} -DNO_MALLOC_PROTO
   
-! SRCS   = strcasestr.c authuser.c ftw.c
-! OBJS   = strcasestr.o authuser.o ftw.o
-  
-  all: $(OBJS)
-  	-rm -f libsupport.a
+  SRCS   = strcasestr.c authuser.c ftw.c
+  OBJS   = strcasestr.o authuser.o ftw.o
diff --git a/ftp/wu-ftpd+ipv6/files/patch-am b/ftp/wu-ftpd+ipv6/files/patch-am
index 63dc0e35c31d..c4f51f43a37c 100644
--- a/ftp/wu-ftpd+ipv6/files/patch-am
+++ b/ftp/wu-ftpd+ipv6/files/patch-am
@@ -1,12 +1,12 @@
-*** src/makefiles/Makefile.fbs.orig	Thu Jan 16 11:27:58 1997
---- src/makefiles/Makefile.fbs	Fri Feb  7 17:04:42 1997
+*** src/makefiles/Makefile.fbs.orig	Mon Mar  3 12:34:52 1997
+--- src/makefiles/Makefile.fbs	Mon Apr 28 00:43:47 1997
 ***************
 *** 1,8 ****
   CC       = cc
   IFLAGS   = -I.. -I../support
   LFLAGS   = -L../support -s
 ! CFLAGS   = -O ${IFLAGS} ${LFLAGS}
-! LIBES    = -lsupport -lcrypt
+! LIBES    = -lsupport -lutil -lcrypt 
   LIBC     = /usr/lib/libc.a
   LINTFLAGS=	
   LKERB    = -lauth -lckrb -lkrb -ldes
@@ -15,34 +15,11 @@
   IFLAGS   = -I.. -I../support
   LFLAGS   = -L../support -s
 ! CFLAGS   += ${IFLAGS} ${LFLAGS}
-! LIBES    = -lsupport -lutil -lskey -lmd -lcrypt
+! LIBES    = -lsupport -lutil -lcrypt -lskey -lmd
   LIBC     = /usr/lib/libc.a
   LINTFLAGS=	
   LKERB    = -lauth -lckrb -lkrb -ldes
 ***************
-*** 10,19 ****
-  
-  SRCS   = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c extensions.c \
-  	 realpath.c acl.c private.c authenticate.c conversions.c hostacc.c \
-! 	 sigfix.c
-  OBJS   = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o extensions.o \
-  	 realpath.o acl.o private.o authenticate.o conversions.o hostacc.o \
-! 	 sigfix.o
-  
-  all: ftpd ftpcount ftpshut ckconfig
-  
---- 10,19 ----
-  
-  SRCS   = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c extensions.c \
-  	 realpath.c acl.c private.c authenticate.c conversions.c hostacc.c \
-! 	 sigfix.c skey-stuff.c
-  OBJS   = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o extensions.o \
-  	 realpath.o acl.o private.o authenticate.o conversions.o hostacc.o \
-! 	 sigfix.o skey-stuff.o
-  
-  all: ftpd ftpcount ftpshut ckconfig
-  
-***************
 *** 24,30 ****
 --- 24,34 ----
   	${CC} ${CFLAGS} -o $@ ftpshut.c vers.o ${LIBES}
diff --git a/ftp/wu-ftpd+ipv6/scripts/configure b/ftp/wu-ftpd+ipv6/scripts/configure
index 1d1fc078cfef..ecea5f4297ea 100644
--- a/ftp/wu-ftpd+ipv6/scripts/configure
+++ b/ftp/wu-ftpd+ipv6/scripts/configure
@@ -5,5 +5,3 @@
 
 mv ${WRKSRC}/src/pathnames.h ${WRKSRC}/src/pathnames.h.bak
 sed <${WRKSRC}/src/pathnames.h.bak >${WRKSRC}/src/pathnames.h s+!!PREFIX!!+$PREFIX+g
-
-cp ${FILESDIR}/skey-stuff.c ${WRKSRC}/src/skey-stuff.c
diff --git a/ftp/wu-ftpd/Makefile b/ftp/wu-ftpd/Makefile
index 55eab5dd3a9f..4879a0c0d208 100644
--- a/ftp/wu-ftpd/Makefile
+++ b/ftp/wu-ftpd/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:	wu-ftpd
-# Version required:     2.4.2-beta-12
+# Version required:     2.4.2-beta-13
 # Date created:		18 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.9 1996/12/01 01:34:11 obrien Exp $
+# $Id: Makefile,v 1.11 1997/02/01 22:17:11 ache Exp $
 #
 # REMINDER: to use ftpaccess(5) you need to specify -a in command line,
 # it is changed from previous versions
 
-DISTNAME=       wu-ftpd-2.4.2-beta-12
+DISTNAME=       wu-ftpd-2.4.2-beta-13
 CATEGORIES=	net
 # AUSCERT recommendation
 MASTER_SITES=   ftp://ftp.academ.com/pub/wu-ftpd/private/
diff --git a/ftp/wu-ftpd/distinfo b/ftp/wu-ftpd/distinfo
index 48944170cef0..d4d4368276a2 100644
--- a/ftp/wu-ftpd/distinfo
+++ b/ftp/wu-ftpd/distinfo
@@ -1 +1 @@
-MD5 (wu-ftpd-2.4.2-beta-12.tar.Z) = 9c9a38d9de9611f6e9a8d30582ba4b5b
+MD5 (wu-ftpd-2.4.2-beta-13.tar.Z) = 86e87d3d711afada4f8aec81ae3940ec
diff --git a/ftp/wu-ftpd/files/patch-ad b/ftp/wu-ftpd/files/patch-ad
deleted file mode 100644
index c94318c267f6..000000000000
--- a/ftp/wu-ftpd/files/patch-ad
+++ /dev/null
@@ -1,58 +0,0 @@
-*** src/ftpd.c.bak	Mon Jan 20 08:05:11 1997
---- src/ftpd.c	Thu Jan 30 17:46:16 1997
-***************
-*** 235,246 ****
-  int logging = 0;
-  int log_commands = 0;
-  
-- #ifdef SKEY			/* H* add-on.  Not as elegant as Wietse's */
-- #include "skey.h"		/* logdaemon package, but does the job.   */
-- struct skey skey_blk;
-- char chbuff[80];
-- #endif
-- 
-  #ifdef SECUREOSF
-  #define SecureWare
-  #include <prot.h>
---- 235,240 ----
-***************
-*** 1201,1212 ****
-              acl_setfunctions();
-  
-  #ifdef SKEY
-! /* 0 means we found the user and the skeykeys file is open for update. */
-!     if (skeychallenge (&skey_blk, name, chbuff) == 0)
-! 	reply (331, "[%s] required for %s.", chbuff, name);
-!     else
-! #endif
-      reply(331, "Password required for %s.", name);
-      askpasswd = 1;
-      /* Delay before reading passwd after first failed attempt to slow down
-       * passwd-guessing programs. */
---- 1195,1205 ----
-              acl_setfunctions();
-  
-  #ifdef SKEY
-!     pwok = skeyaccess(name, NULL, remotehost, remoteaddr);
-!     reply(331, "%s", skey_challenge(name, pw, pwok));
-! #else
-      reply(331, "Password required for %s.", name);
-+ #endif
-      askpasswd = 1;
-      /* Delay before reading passwd after first failed attempt to slow down
-       * passwd-guessing programs. */
-***************
-*** 1378,1389 ****
-          xpasswd = crypt(passwd, salt);
-  #endif
-  #endif
-- #endif
-- #ifdef SKEY
-- /* comment the next line if you REALLY want to allow replayable passwds. */
-- 	strcpy (xpasswd, "wrongo:spazmoid");  /* disable regular passwds */
-- 	if (skeyverify (&skey_blk, passwd) == 0)
-- 	    strcpy (xpasswd, pw->pw_passwd);	/* do it the sleazy way */
-  #endif
-  #ifdef ULTRIX_AUTH
-          if ((numfails = ultrix_check_pass(passwd, xpasswd)) < 0) {
---- 1371,1376 ----
diff --git a/ftp/wu-ftpd/files/patch-ai b/ftp/wu-ftpd/files/patch-ai
index 8397aba1d9d2..33d688e55100 100644
--- a/ftp/wu-ftpd/files/patch-ai
+++ b/ftp/wu-ftpd/files/patch-ai
@@ -1,24 +1,7 @@
-*** config.h.orig	Mon Jan 20 06:21:30 1997
---- config.h	Thu Jan 30 16:13:31 1997
+*** config.h.bak	Mon Mar  3 12:39:34 1997
+--- config.h	Sun Apr 27 21:03:14 1997
 ***************
-*** 30,35 ****
---- 30,43 ----
-  #define LOG_FAILED
-  
-  /*
-+  * log login attempts that fail because of class connection
-+  * limits.  Busy servers may want to prevent this logging
-+  * since it can fill up the log file and put a high load on
-+  * syslog.
-+  */
-+ #define LOG_TOOMANY
-+ 
-+ /*
-   * allow use of private file.  (for site group and site gpass)
-   */
-  
-***************
-*** 64,68 ****
+*** 72,76 ****
    * See README-2.4-HOBBIT for more information on this option.
    */
   
diff --git a/ftp/wu-ftpd/files/patch-al b/ftp/wu-ftpd/files/patch-al
index 91414fc3ef3e..90c5246d7d57 100644
--- a/ftp/wu-ftpd/files/patch-al
+++ b/ftp/wu-ftpd/files/patch-al
@@ -1,25 +1,19 @@
-*** support/makefiles/Makefile.fbs.bak	Fri Feb 17 20:36:56 1995
---- support/makefiles/Makefile.fbs	Thu Jan 30 16:32:32 1997
+*** support/makefiles/Makefile.fbs.bak	Mon Mar  3 12:11:54 1997
+--- support/makefiles/Makefile.fbs	Sun Apr 27 21:13:35 1997
 ***************
-*** 4,13 ****
+*** 8,14 ****
   LIBC   = /usr/lib/libc.a
   IFLAGS = 
   LFLAGS = 
 ! CFLAGS = -O ${IFLAGS} ${LFLAGS} -DNO_MALLOC_PROTO
   
-! SRCS   = fnmatch.c strcasestr.c authuser.c ftw.c
-! OBJS   = fnmatch.o strcasestr.o authuser.o ftw.o
-  
-  all: $(OBJS)
-  	-rm -f libsupport.a
---- 4,13 ----
+  SRCS   = strcasestr.c authuser.c ftw.c
+  OBJS   = strcasestr.o authuser.o ftw.o
+--- 8,14 ----
   LIBC   = /usr/lib/libc.a
   IFLAGS = 
   LFLAGS = 
 ! CFLAGS += ${IFLAGS} ${LFLAGS} -DNO_MALLOC_PROTO
   
-! SRCS   = strcasestr.c authuser.c ftw.c
-! OBJS   = strcasestr.o authuser.o ftw.o
-  
-  all: $(OBJS)
-  	-rm -f libsupport.a
+  SRCS   = strcasestr.c authuser.c ftw.c
+  OBJS   = strcasestr.o authuser.o ftw.o
diff --git a/ftp/wu-ftpd/files/patch-am b/ftp/wu-ftpd/files/patch-am
index 63dc0e35c31d..c4f51f43a37c 100644
--- a/ftp/wu-ftpd/files/patch-am
+++ b/ftp/wu-ftpd/files/patch-am
@@ -1,12 +1,12 @@
-*** src/makefiles/Makefile.fbs.orig	Thu Jan 16 11:27:58 1997
---- src/makefiles/Makefile.fbs	Fri Feb  7 17:04:42 1997
+*** src/makefiles/Makefile.fbs.orig	Mon Mar  3 12:34:52 1997
+--- src/makefiles/Makefile.fbs	Mon Apr 28 00:43:47 1997
 ***************
 *** 1,8 ****
   CC       = cc
   IFLAGS   = -I.. -I../support
   LFLAGS   = -L../support -s
 ! CFLAGS   = -O ${IFLAGS} ${LFLAGS}
-! LIBES    = -lsupport -lcrypt
+! LIBES    = -lsupport -lutil -lcrypt 
   LIBC     = /usr/lib/libc.a
   LINTFLAGS=	
   LKERB    = -lauth -lckrb -lkrb -ldes
@@ -15,34 +15,11 @@
   IFLAGS   = -I.. -I../support
   LFLAGS   = -L../support -s
 ! CFLAGS   += ${IFLAGS} ${LFLAGS}
-! LIBES    = -lsupport -lutil -lskey -lmd -lcrypt
+! LIBES    = -lsupport -lutil -lcrypt -lskey -lmd
   LIBC     = /usr/lib/libc.a
   LINTFLAGS=	
   LKERB    = -lauth -lckrb -lkrb -ldes
 ***************
-*** 10,19 ****
-  
-  SRCS   = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c extensions.c \
-  	 realpath.c acl.c private.c authenticate.c conversions.c hostacc.c \
-! 	 sigfix.c
-  OBJS   = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o extensions.o \
-  	 realpath.o acl.o private.o authenticate.o conversions.o hostacc.o \
-! 	 sigfix.o
-  
-  all: ftpd ftpcount ftpshut ckconfig
-  
---- 10,19 ----
-  
-  SRCS   = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c extensions.c \
-  	 realpath.c acl.c private.c authenticate.c conversions.c hostacc.c \
-! 	 sigfix.c skey-stuff.c
-  OBJS   = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o extensions.o \
-  	 realpath.o acl.o private.o authenticate.o conversions.o hostacc.o \
-! 	 sigfix.o skey-stuff.o
-  
-  all: ftpd ftpcount ftpshut ckconfig
-  
-***************
 *** 24,30 ****
 --- 24,34 ----
   	${CC} ${CFLAGS} -o $@ ftpshut.c vers.o ${LIBES}
diff --git a/ftp/wu-ftpd/scripts/configure b/ftp/wu-ftpd/scripts/configure
index 1d1fc078cfef..ecea5f4297ea 100644
--- a/ftp/wu-ftpd/scripts/configure
+++ b/ftp/wu-ftpd/scripts/configure
@@ -5,5 +5,3 @@
 
 mv ${WRKSRC}/src/pathnames.h ${WRKSRC}/src/pathnames.h.bak
 sed <${WRKSRC}/src/pathnames.h.bak >${WRKSRC}/src/pathnames.h s+!!PREFIX!!+$PREFIX+g
-
-cp ${FILESDIR}/skey-stuff.c ${WRKSRC}/src/skey-stuff.c