Update wu-ftpd to version 2.4.2-beta-18

Fix long dirname security vulnerability reported on redhat-watch-list@redhat.com
Use ${INSTALL_xxx} variables from pkg system instead of internal defaults

14 files changed, 261 insertions, 244 deletions

diff --git a/net/wu-ftpd/Makefile b/net/wu-ftpd/Makefile
index dca1b9a3480..7b32f139770 100644
--- a/net/wu-ftpd/Makefile
+++ b/net/wu-ftpd/Makefile
@@ -1,19 +1,27 @@
-# $NetBSD: Makefile,v 1.6 1998/08/20 15:17:21 tsarna Exp $
+# $NetBSD: Makefile,v 1.7 1999/02/13 09:05:02 rh Exp $
 # $FreeBSD Id: Makefile,v 1.16 1997/12/24 17:45:28 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-16
-PKGNAME=        wu-ftpd-2.4.2b16
+DISTNAME=       wu-ftpd-2.4.2-beta-18
+PKGNAME=        wu-ftpd-2.4.2b18
 CATEGORIES=	net
 # AUSCERT recommendation
-MASTER_SITES=   ftp://ftp.academ.com/pub/wu-ftpd/private/
+MASTER_SITES=   ftp://ftp.academ.com/pub/wu-ftpd/private/ \
+		ftp://ftp.cp.in-berlin.de/pub/ftpsrc/
 EXTRACT_SUFX=   .tar.Z
 
-MAINTAINER=     rh@vip.at
+MAINTAINER=     rh@netbsd.org
 HOMEPAGE=	http://www.academ.com/academ/wu-ftpd/
 
+CONFLICTS=	wu-ftpd*
+
+MAKE_ENV+=	INSTALL="${INSTALL}"
+MAKE_ENV+=	INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
+MAKE_ENV+=	INSTALL_MAN="${INSTALL_MAN}"
+
 do-build:
 	cd ${WRKSRC} && ./build nbs PREFIX=${PREFIX}
 
diff --git a/net/wu-ftpd/files/md5 b/net/wu-ftpd/files/md5
index f1231247857..5c3deaaa287 100644
--- a/net/wu-ftpd/files/md5
+++ b/net/wu-ftpd/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:25:13 agc Exp $
+$NetBSD: md5,v 1.3 1999/02/13 09:05:02 rh Exp $
 
-MD5 (wu-ftpd-2.4.2-beta-16.tar.Z) = c18c083c2a82eef1ccba6df9a406f026
+MD5 (wu-ftpd-2.4.2-beta-18.tar.Z) = b320d7872ba807c04f1b677595f28d86
diff --git a/net/wu-ftpd/patches/patch-aa b/net/wu-ftpd/patches/patch-aa
index d3032d93392..d6cd30ca38b 100644
--- a/net/wu-ftpd/patches/patch-aa
+++ b/net/wu-ftpd/patches/patch-aa
@@ -1,59 +1,64 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 11:11:04 agc Exp $
+$NetBSD: patch-aa,v 1.4 1999/02/13 09:05:02 rh Exp $
 
-*** makefiles/Makefile.nbs.orig	Mon Mar  2 20:04:28 1998
---- makefiles/Makefile.nbs	Mon Mar  2 20:07:29 1998
-***************
-*** 2,10 ****
-  # Makefile for NetBSD 1.2
-  # $Id: patch-aa,v 1.3 1998/08/07 11:11:04 agc Exp $
-  #
-! BINDIR=		/usr/local/bin
-! ETCDIR=		/usr/local/libexec
-! MANDIR=		/usr/local/man
-  MANEXT=		8
-  INSTALL=	install
-  
---- 2,12 ----
-  # Makefile for NetBSD 1.2
-  # $Id: patch-aa,v 1.3 1998/08/07 11:11:04 agc Exp $
-  #
-! PREFIX?=	/usr/pkg
-! BINDIR=		${PREFIX}/bin
-! ETCDIR=		${PREFIX}/etc
-! MANDIR=		${PREFIX}/man
-! LIBEXECDIR=	${PREFIX}/libexec
-  MANEXT=		8
-  INSTALL=	install
-  
-***************
-*** 13,24 ****
-  	@ echo 'You can say "build help" for details on how it works.'
-  
-  install: bin/ftpd bin/ftpcount bin/ftpshut
-! 	-mv -f ${ETCDIR}/ftpd ${ETCDIR}/ftpd-old
-  	@echo installing binaries.
-! 	${INSTALL} -c -o bin -g bin -m 755 bin/ftpd ${ETCDIR}/ftpd
-  	${INSTALL} -c -o bin -g bin -m 755 bin/ftpshut ${BINDIR}/ftpshut
-  	${INSTALL} -c -o bin -g bin -m 755 bin/ftpcount ${BINDIR}/ftpcount
-  	${INSTALL} -c -o bin -g bin -m 755 bin/ftpwho ${BINDIR}/ftpwho
-  	@echo installing manpages.
-  	${INSTALL} -c -o bin -g bin -m 644 doc/ftpd.8 ${MANDIR}/man8/ftpd.8
-  	${INSTALL} -c -o bin -g bin -m 644 doc/ftpcount.1 ${MANDIR}/man1/ftpcount.1
---- 15,31 ----
-  	@ echo 'You can say "build help" for details on how it works.'
-  
-  install: bin/ftpd bin/ftpcount bin/ftpshut
-! 	-mv -f ${LIBEXECDIR}/ftpd ${LIBEXECDIR}/ftpd-old
-  	@echo installing binaries.
-! 	${INSTALL} -c -o bin -g bin -m 755 bin/ftpd ${LIBEXECDIR}/ftpd
-  	${INSTALL} -c -o bin -g bin -m 755 bin/ftpshut ${BINDIR}/ftpshut
-  	${INSTALL} -c -o bin -g bin -m 755 bin/ftpcount ${BINDIR}/ftpcount
-  	${INSTALL} -c -o bin -g bin -m 755 bin/ftpwho ${BINDIR}/ftpwho
-+ 	${INSTALL} -c -o bin -g bin -m 755 bin/ckconfig ${BINDIR}/ftpckconfig
-+ 	@echo Installing basic configuration
-+ 	${INSTALL} -c -o root -g bin -m 644 doc/examples/ftpaccess ${ETCDIR}/ftpaccess.example
-+ 	${INSTALL} -c -o root -g bin -m 644 doc/examples/ftpusers ${ETCDIR}/ftpusers.example
-+ 	${INSTALL} -c -o root -g bin -m 644 doc/examples/ftpconversions ${ETCDIR}/ftpconversions.example
-  	@echo installing manpages.
-  	${INSTALL} -c -o bin -g bin -m 644 doc/ftpd.8 ${MANDIR}/man8/ftpd.8
-  	${INSTALL} -c -o bin -g bin -m 644 doc/ftpcount.1 ${MANDIR}/man1/ftpcount.1
+--- makefiles/Makefile.nbs.orig	Fri Jul  3 19:03:20 1998
++++ makefiles/Makefile.nbs	Sat Feb 13 08:31:28 1999
+@@ -2,32 +2,42 @@
+ # Makefile for NetBSD 1.2
+ # $Id: patch-aa,v 1.4 1999/02/13 09:05:02 rh Exp $
+ #
+-BINDIR=		/usr/local/bin
+-ETCDIR=		/usr/local/libexec
+-MANDIR=		/usr/local/man
++PREFIX?=	/usr/pkg
++BINDIR=		${PREFIX}/bin
++ETCDIR=		${PREFIX}/etc
++MANDIR=		${PREFIX}/man
++LIBEXECDIR=	${PREFIX}/libexec
+ MANEXT=		8
+-INSTALL=	install
++INSTALL?=	install
++INSTALL_PROGRAM?= ${INSTALL} -c -o bin -g bin -m 555
++INSTALL_DATA?=	${INSTALL} -c -o root -g wheel -m 444
++INSTALL_MAN?=	${INSTALL} -c -o root -g wheel -m 444
+ 
+ all:
+ 	@ echo 'Use the "build" command (shell script) to make ftpd.'
+ 	@ echo 'You can say "build help" for details on how it works.'
+ 
+ install: bin/ftpd bin/ftpcount bin/ftpshut
+-	-mv -f ${ETCDIR}/ftpd ${ETCDIR}/ftpd-old
++	-mv -f ${LIBEXECDIR}/ftpd ${LIBEXECDIR}/ftpd-old
+ 	@echo installing binaries.
+-	${INSTALL} -c -o bin -g bin -m 755 bin/ftpd ${ETCDIR}/ftpd
+-	${INSTALL} -c -o bin -g bin -m 755 bin/ftpshut ${BINDIR}/ftpshut
+-	${INSTALL} -c -o bin -g bin -m 755 bin/ftpcount ${BINDIR}/ftpcount
+-	${INSTALL} -c -o bin -g bin -m 755 bin/ftpwho ${BINDIR}/ftpwho
++	${INSTALL_PROGRAM} bin/ftpd ${LIBEXECDIR}/ftpd
++	${INSTALL_PROGRAM} bin/ftpshut ${BINDIR}/ftpshut
++	${INSTALL_PROGRAM} bin/ftpcount ${BINDIR}/ftpcount
++	${INSTALL_PROGRAM} bin/ftpwho ${BINDIR}/ftpwho
++	${INSTALL_PROGRAM} bin/ckconfig ${BINDIR}/ftpckconfig
++	@echo Installing basic configuration
++	${INSTALL_DATA} doc/examples/ftpaccess ${ETCDIR}/ftpaccess.example
++	${INSTALL_DATA} doc/examples/ftpusers ${ETCDIR}/ftpusers.example
++	${INSTALL_DATA} doc/examples/ftpconversions ${ETCDIR}/ftpconversions.example
+ 	@echo installing manpages.
+-	${INSTALL} -c -o bin -g bin -m 644 doc/ftpd.8 ${MANDIR}/man8/ftpd.8
+-	${INSTALL} -c -o bin -g bin -m 644 doc/ftpcount.1 ${MANDIR}/man1/ftpcount.1
+-	${INSTALL} -c -o bin -g bin -m 644 doc/ftpwho.1 ${MANDIR}/man1/ftpwho.1
+-	${INSTALL} -c -o bin -g bin -m 644 doc/ftpshut.8 ${MANDIR}/man8/ftpshut.8
+-	${INSTALL} -c -o bin -g bin -m 644 doc/ftpaccess.5 ${MANDIR}/man5/ftpaccess.5
+-	${INSTALL} -c -o bin -g bin -m 644 doc/ftphosts.5 ${MANDIR}/man5/ftphosts.5
+-	${INSTALL} -c -o bin -g bin -m 644 doc/ftpconversions.5 ${MANDIR}/man5/ftpconversions.5
+-	${INSTALL} -c -o bin -g bin -m 644 doc/xferlog.5 ${MANDIR}/man5/xferlog.5
++	${INSTALL_MAN} doc/ftpd.8 ${MANDIR}/man8/ftpd.8
++	${INSTALL_MAN} doc/ftpcount.1 ${MANDIR}/man1/ftpcount.1
++	${INSTALL_MAN} doc/ftpwho.1 ${MANDIR}/man1/ftpwho.1
++	${INSTALL_MAN} doc/ftpshut.8 ${MANDIR}/man8/ftpshut.8
++	${INSTALL_MAN} doc/ftpaccess.5 ${MANDIR}/man5/ftpaccess.5
++	${INSTALL_MAN} doc/ftphosts.5 ${MANDIR}/man5/ftphosts.5
++	${INSTALL_MAN} doc/ftpconversions.5 ${MANDIR}/man5/ftpconversions.5
++	${INSTALL_MAN} doc/xferlog.5 ${MANDIR}/man5/xferlog.5
+ 
+ 
+ 
diff --git a/net/wu-ftpd/patches/patch-ab b/net/wu-ftpd/patches/patch-ab
index 69cd32a4194..d280af7b7ee 100644
--- a/net/wu-ftpd/patches/patch-ab
+++ b/net/wu-ftpd/patches/patch-ab
@@ -1,67 +1,41 @@
-$NetBSD: patch-ab,v 1.4 1998/08/07 11:11:04 agc Exp $
+$NetBSD: patch-ab,v 1.5 1999/02/13 09:05:02 rh Exp $
 
-*** src/pathnames.h.orig	Mon Dec 22 00:25:08 1997
---- src/pathnames.h	Mon Mar  2 19:13:35 1998
-***************
-*** 45,54 ****
-  #define _PATH_CVT       "/etc/ftpd/ftpconversions"
-  #define _PATH_PRIVATE   "/etc/ftpd/ftpgroups"
-  #else
-! #define _PATH_FTPUSERS  "/usr/local/lib/ftpd/ftpusers"
-! #define _PATH_FTPACCESS "/usr/local/lib/ftpd/ftpaccess"
-! #define _PATH_CVT       "/usr/local/lib/ftpd/ftpconversions"
-! #define _PATH_PRIVATE   "/usr/local/lib/ftpd/ftpgroups"
-  #endif
-  #endif
-  
---- 45,54 ----
-  #define _PATH_CVT       "/etc/ftpd/ftpconversions"
-  #define _PATH_PRIVATE   "/etc/ftpd/ftpgroups"
-  #else
-! #define _PATH_FTPUSERS  PREFIX "/etc/ftpusers"
-! #define _PATH_FTPACCESS PREFIX "/etc/ftpaccess"
-! #define _PATH_CVT       PREFIX "/etc/ftpconversions"
-! #define _PATH_PRIVATE   PREFIX "/etc/ftpgroups"
-  #endif
-  #endif
-  
-***************
-*** 69,78 ****
-  #endif
-  #else
-  #ifndef _PATH_PIDNAMES
-! #define _PATH_PIDNAMES  "/usr/local/lib/ftpd/pids/%s"
-  #endif
-  #ifndef _PATH_XFERLOG
-! #define _PATH_XFERLOG   "/usr/local/logs/xferlog"
-  #endif
-  #endif
-  
---- 69,78 ----
-  #endif
-  #else
-  #ifndef _PATH_PIDNAMES
-! #define _PATH_PIDNAMES  "/var/run/%s"
-  #endif
-  #ifndef _PATH_XFERLOG
-! #define _PATH_XFERLOG   "/var/logs/xferlog"
-  #endif
-  #endif
-  
-***************
-*** 117,123 ****
-  #ifdef USE_ETC_FTPD
-  #define _PATH_FTPHOSTS  "/etc/ftpd/ftphosts"
-  #else
-! #define _PATH_FTPHOSTS  "/usr/local/lib/ftpd/ftphosts"
-  #endif
-  #endif
-  #endif
---- 117,123 ----
-  #ifdef USE_ETC_FTPD
-  #define _PATH_FTPHOSTS  "/etc/ftpd/ftphosts"
-  #else
-! #define _PATH_FTPHOSTS  PREFIX "/etc/ftphosts"
-  #endif
-  #endif
-  #endif
+--- src/pathnames.h.orig	Mon Jul  6 11:14:35 1998
++++ src/pathnames.h	Sat Feb 13 00:32:11 1999
+@@ -68,10 +68,10 @@
+ #define _PATH_CVT       "/opt/ftpd/lib/ftpconversions"
+ #define _PATH_PRIVATE   "/opt/ftpd/lib/ftpgroups"
+ #else
+-#define _PATH_FTPUSERS  "/usr/local/lib/ftpd/ftpusers"
+-#define _PATH_FTPACCESS "/usr/local/lib/ftpd/ftpaccess"
+-#define _PATH_CVT       "/usr/local/lib/ftpd/ftpconversions"
+-#define _PATH_PRIVATE   "/usr/local/lib/ftpd/ftpgroups"
++#define _PATH_FTPUSERS  PREFIX "/etc/ftpusers"
++#define _PATH_FTPACCESS PREFIX "/etc/ftpaccess"
++#define _PATH_CVT       PREFIX "/etc/ftpconversions"
++#define _PATH_PRIVATE   PREFIX "/etc/ftpgroups"
+ #endif
+ #endif
+ #endif
+@@ -94,10 +94,10 @@
+ #endif
+ #else
+ #ifndef _PATH_PIDNAMES
+-#define _PATH_PIDNAMES  "/usr/local/lib/ftpd/pids/%s"
++#define _PATH_PIDNAMES  "/var/run/%s"
+ #endif
+ #ifndef _PATH_XFERLOG
+-#define _PATH_XFERLOG   "/usr/local/logs/xferlog"
++#define _PATH_XFERLOG   "/var/log/xferlog"
+ #endif
+ #endif
+ 
+@@ -144,7 +144,7 @@
+ #ifdef USE_OPT_FTPD
+ #define _PATH_FTPHOSTS  "/opt/ftpd/lib/ftphosts"
+ #else
+-#define _PATH_FTPHOSTS  "/usr/local/lib/ftpd/ftphosts"
++#define _PATH_FTPHOSTS  PREFIX "/etc/ftphosts"
+ #endif
+ #endif
+ #endif
diff --git a/net/wu-ftpd/patches/patch-ac b/net/wu-ftpd/patches/patch-ac
index 0862f4f9190..a30f865033d 100644
--- a/net/wu-ftpd/patches/patch-ac
+++ b/net/wu-ftpd/patches/patch-ac
@@ -1,21 +1,19 @@
-$NetBSD: patch-ac,v 1.3 1998/08/07 11:11:04 agc Exp $
+$NetBSD: patch-ac,v 1.4 1999/02/13 09:05:02 rh Exp $
 
-*** doc/examples/ftpconversions.orig	Fri Apr  1 21:03:23 1994
---- doc/examples/ftpconversions	Mon Mar  2 19:15:23 1998
-***************
-*** 1,7 ****
-!  :.Z:  :  :/bin/compress -d -c %s:T_REG|T_ASCII:O_UNCOMPRESS:UNCOMPRESS
-!  :   : :.Z:/bin/compress -c %s:T_REG:O_COMPRESS:COMPRESS
-!  :.gz: :  :/bin/gzip -cd %s:T_REG|T_ASCII:O_UNCOMPRESS:GUNZIP
-!  :   : :.gz:/bin/gzip -9 -c %s:T_REG:O_COMPRESS:GZIP
-!  :   : :.tar:/bin/tar -c -f - %s:T_REG|T_DIR:O_TAR:TAR
-!  :   : :.tar.Z:/bin/tar -c -Z -f - %s:T_REG|T_DIR:O_COMPRESS|O_TAR:TAR+COMPRESS
-!  :   : :.tar.gz:/bin/tar -c -z -f - %s:T_REG|T_DIR:O_COMPRESS|O_TAR:TAR+GZIP
---- 1,7 ----
-!  :.Z:  :  :/usr/bin/gzip -d -c %s:T_REG|T_ASCII:O_UNCOMPRESS:UNCOMPRESS
-!  :   : :.Z:/usr/bin/compress -c %s:T_REG:O_COMPRESS:COMPRESS
-!  :.gz: :  :/usr/bin/gzip -cd %s:T_REG|T_ASCII:O_UNCOMPRESS:GUNZIP
-!  :   : :.gz:/usr/bin/gzip -9 -c %s:T_REG:O_COMPRESS:GZIP
-!  :   : :.tar:/usr/bin/tar -c -f - %s:T_REG|T_DIR:O_TAR:TAR
-!  :   : :.tar.Z:/usr/bin/tar -c -Z -f - %s:T_REG|T_DIR:O_COMPRESS|O_TAR:TAR+COMPRESS
-!  :   : :.tar.gz:/usr/bin/tar -c -z -f - %s:T_REG|T_DIR:O_COMPRESS|O_TAR:TAR+GZIP
+--- doc/examples/ftpconversions.orig	Fri Apr  1 21:03:23 1994
++++ doc/examples/ftpconversions	Sat Feb 13 00:18:05 1999
+@@ -1,7 +1,7 @@
+- :.Z:  :  :/bin/compress -d -c %s:T_REG|T_ASCII:O_UNCOMPRESS:UNCOMPRESS
+- :   : :.Z:/bin/compress -c %s:T_REG:O_COMPRESS:COMPRESS
+- :.gz: :  :/bin/gzip -cd %s:T_REG|T_ASCII:O_UNCOMPRESS:GUNZIP
+- :   : :.gz:/bin/gzip -9 -c %s:T_REG:O_COMPRESS:GZIP
+- :   : :.tar:/bin/tar -c -f - %s:T_REG|T_DIR:O_TAR:TAR
+- :   : :.tar.Z:/bin/tar -c -Z -f - %s:T_REG|T_DIR:O_COMPRESS|O_TAR:TAR+COMPRESS
+- :   : :.tar.gz:/bin/tar -c -z -f - %s:T_REG|T_DIR:O_COMPRESS|O_TAR:TAR+GZIP
++ :.Z:  :  :/usr/bin/gzip -d -c %s:T_REG|T_ASCII:O_UNCOMPRESS:UNCOMPRESS
++ :   : :.Z:/usr/bin/compress -c %s:T_REG:O_COMPRESS:COMPRESS
++ :.gz: :  :/usr/bin/gzip -cd %s:T_REG|T_ASCII:O_UNCOMPRESS:GUNZIP
++ :   : :.gz:/usr/bin/gzip -9 -c %s:T_REG:O_COMPRESS:GZIP
++ :   : :.tar:/usr/bin/tar -c -f - %s:T_REG|T_DIR:O_TAR:TAR
++ :   : :.tar.Z:/usr/bin/tar -c -Z -f - %s:T_REG|T_DIR:O_COMPRESS|O_TAR:TAR+COMPRESS
++ :   : :.tar.gz:/usr/bin/tar -c -z -f - %s:T_REG|T_DIR:O_COMPRESS|O_TAR:TAR+GZIP
diff --git a/net/wu-ftpd/patches/patch-ad b/net/wu-ftpd/patches/patch-ad
index fd831285b31..0611fa932e0 100644
--- a/net/wu-ftpd/patches/patch-ad
+++ b/net/wu-ftpd/patches/patch-ad
@@ -1,33 +1,27 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 11:11:05 agc Exp $
+$NetBSD: patch-ad,v 1.3 1999/02/13 09:05:02 rh Exp $
 
-*** doc/examples/ftpusers.orig	Fri Apr  1 21:03:23 1994
---- doc/examples/ftpusers	Mon Mar  2 19:03:10 1998
-***************
-*** 1,14 ****
-  root
-! bin
-! boot
-  daemon
-- digital
-- field
-- gateway
-- guest
-- nobody
-  operator
-! ris
-! sccs
-! sys
-  uucp
---- 1,12 ----
-  root
-! toor
-  daemon
-  operator
-! bin
-! games
-! news
-! man
-  uucp
-+ xten
-+ ingres
-+ nobody
+--- doc/examples/ftpusers.orig	Fri Apr  1 21:03:23 1994
++++ doc/examples/ftpusers	Sat Feb 13 00:18:05 1999
+@@ -1,14 +1,12 @@
+ root
+-bin
+-boot
++toor
+ daemon
+-digital
+-field
+-gateway
+-guest
+-nobody
+ operator
+-ris
+-sccs
+-sys
++bin
++games
++news
++man
+ uucp
++xten
++ingres
++nobody
diff --git a/net/wu-ftpd/patches/patch-ae b/net/wu-ftpd/patches/patch-ae
index 8c1e1f830c9..d662084510b 100644
--- a/net/wu-ftpd/patches/patch-ae
+++ b/net/wu-ftpd/patches/patch-ae
@@ -1,17 +1,13 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 11:11:05 agc Exp $
+$NetBSD: patch-ae,v 1.3 1999/02/13 09:05:02 rh Exp $
 
-*** config.h.orig	Mon Dec 22 00:01:41 1997
---- config.h	Mon Mar  2 19:03:10 1998
-***************
-*** 72,76 ****
-   * See FIXES-2.4-HOBBIT for more information on this option.
-   */
-  
-! #undef SKEY
-  
---- 72,76 ----
-   * See FIXES-2.4-HOBBIT for more information on this option.
-   */
-  
-! /* #undef SKEY */
-  
+--- config.h.orig	Mon Jul  6 11:16:49 1998
++++ config.h	Sat Feb 13 00:18:06 1999
+@@ -72,7 +72,7 @@
+  * See FIXES-2.4-HOBBIT for more information on this option.
+  */
+ 
+-#undef SKEY
++/* #undef SKEY */
+ 
+ /*
+  * ALTERNATE_CD
diff --git a/net/wu-ftpd/patches/patch-af b/net/wu-ftpd/patches/patch-af
index 6392abed7b9..a330d37e7c3 100644
--- a/net/wu-ftpd/patches/patch-af
+++ b/net/wu-ftpd/patches/patch-af
@@ -1,21 +1,13 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 11:11:05 agc Exp $
+$NetBSD: patch-af,v 1.3 1999/02/13 09:05:02 rh Exp $
 
-*** support/makefiles/Makefile.nbs.orig	Mon Mar  2 19:21:53 1998
---- support/makefiles/Makefile.nbs	Mon Mar  2 19:22:38 1998
-***************
-*** 8,14 ****
-  LIBC   = /usr/lib/libc.a
-  IFLAGS = 
-  LFLAGS = 
-! CFLAGS = -O ${IFLAGS} ${LFLAGS} -DNO_MALLOC_PROTO
-  
-  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
+--- support/makefiles/Makefile.nbs.orig	Mon Jul  6 10:57:39 1998
++++ support/makefiles/Makefile.nbs	Sat Feb 13 00:43:35 1999
+@@ -8,7 +8,7 @@
+ LIBC   = /usr/lib/libc.a
+ IFLAGS = 
+ LFLAGS = 
+-CFLAGS = -O ${IFLAGS} ${LFLAGS} -DNO_MALLOC_PROTO
++CFLAGS+= ${IFLAGS} ${LFLAGS} -DNO_MALLOC_PROTO
+ 
+ SRCS   = strcasestr.c authuser.c ftw.c
+ OBJS   = strcasestr.o authuser.o ftw.o
diff --git a/net/wu-ftpd/patches/patch-ag b/net/wu-ftpd/patches/patch-ag
index 5d4f08c932f..61c3377f294 100644
--- a/net/wu-ftpd/patches/patch-ag
+++ b/net/wu-ftpd/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.4 1998/08/07 11:11:05 agc Exp $
+$NetBSD: patch-ag,v 1.5 1999/02/13 09:05:02 rh Exp $
 
---- src/makefiles/Makefile.nbs.orig	Tue Aug 12 05:43:42 1997
-+++ src/makefiles/Makefile.nbs	Mon Mar 30 20:22:01 1998
+--- src/makefiles/Makefile.nbs.orig	Mon Jul  6 11:13:22 1998
++++ src/makefiles/Makefile.nbs	Sat Feb 13 00:21:08 1999
 @@ -5,7 +5,7 @@
- CC       = cc
+ CC       = cc -g
  IFLAGS   = -I.. -I../support
  LFLAGS   = -L../support
 -CFLAGS   = -O ${IFLAGS} ${LFLAGS}
-+CFLAGS  += ${IFLAGS} ${LFLAGS} -DPREFIX=\"${PREFIX}\"
- LIBES    = -lsupport -lcrypt
++CFLAGS   += ${IFLAGS} ${LFLAGS} -DPREFIX=\"${PREFIX}\"
+ LIBES    = ${LSKEY} -lsupport -lcrypt
  LIBC     = /usr/lib/libc.a
  LINTFLAGS=	
diff --git a/net/wu-ftpd/patches/patch-ah b/net/wu-ftpd/patches/patch-ah
index 46306834195..f17113696f1 100644
--- a/net/wu-ftpd/patches/patch-ah
+++ b/net/wu-ftpd/patches/patch-ah
@@ -1,7 +1,12 @@
-$NetBSD: patch-ah,v 1.3 1998/08/23 06:08:50 garbled Exp $
---- support/authuser.c.orig	Mon Jul 13 02:46:20 1998
-+++ support/authuser.c	Mon Jul 13 02:46:47 1998
-@@ -11,2 +11,3 @@
+$NetBSD: patch-ah,v 1.4 1999/02/13 09:05:02 rh Exp $
+
+--- support/authuser.c.orig	Mon Jul  6 11:14:52 1998
++++ support/authuser.c	Sat Feb 13 00:43:35 1999
+@@ -9,6 +9,7 @@
+ #else
+ #include <sys/types.h>
  #endif
 +#include <string.h>
  #include <stdio.h>
+ #include <ctype.h>
+ #include <errno.h>
diff --git a/net/wu-ftpd/patches/patch-ai b/net/wu-ftpd/patches/patch-ai
index 2b928b6deea..ade640100bc 100644
--- a/net/wu-ftpd/patches/patch-ai
+++ b/net/wu-ftpd/patches/patch-ai
@@ -1,11 +1,14 @@
-$NetBSD: patch-ai,v 1.3 1998/08/23 06:08:50 garbled Exp $
---- src/ftpd.c.orig	Mon Jul 13 03:00:10 1998
-+++ src/ftpd.c	Mon Jul 13 02:58:45 1998
-@@ -2847,4 +2847,5 @@
+$NetBSD: patch-ai,v 1.4 1999/02/13 09:05:02 rh Exp $
+
+--- src/ftpd.c.orig	Mon Jul  6 11:14:25 1998
++++ src/ftpd.c	Sat Feb 13 00:50:35 1999
+@@ -2930,7 +2930,9 @@
+ 	*p = '\0';
+ 
        /* send a line...(note that this overrides dolreplies!) */
--      vreply(USE_REPLY_LONG | USE_REPLY_NOTFMT, n, ptr, 0);
--
 +      VA_START(fmt);
-+      vreply(USE_REPLY_LONG | USE_REPLY_NOTFMT, n, ptr, ap);
+       vreply(USE_REPLY_LONG | USE_REPLY_NOTFMT, n, ptr, ap);
 +      VA_END; /* *NEVER* send a 0 as an ap, some machines use a *struct* for a va_list! */
+ 
        if (p)
+ 	ptr = p + 1; /* set to the next line... (\0 is handled in the while) */
diff --git a/net/wu-ftpd/patches/patch-aj b/net/wu-ftpd/patches/patch-aj
index fc78dc5f74c..9999216af5b 100644
--- a/net/wu-ftpd/patches/patch-aj
+++ b/net/wu-ftpd/patches/patch-aj
@@ -1,7 +1,12 @@
-$NetBSD: patch-aj,v 1.1 1998/08/23 06:08:51 garbled Exp $
---- support/ftw.c.orig	Mon Jul 13 03:05:49 1998
-+++ support/ftw.c	Mon Jul 13 03:06:03 1998
-@@ -32,2 +32,3 @@
+$NetBSD: patch-aj,v 1.2 1999/02/13 09:05:02 rh Exp $
+
+--- support/ftw.c.orig	Mon Jul  6 10:56:21 1998
++++ support/ftw.c	Sat Feb 13 00:54:09 1999
+@@ -30,6 +30,7 @@
+ 
+ #include <errno.h>
  
 +#include <string.h>
  #include <sys/param.h>
+ #include <sys/stat.h>
+ #include <sys/stat.h>
diff --git a/net/wu-ftpd/patches/patch-ak b/net/wu-ftpd/patches/patch-ak
index 943f365f23b..5c9b51cb376 100644
--- a/net/wu-ftpd/patches/patch-ak
+++ b/net/wu-ftpd/patches/patch-ak
@@ -1,8 +1,13 @@
-$NetBSD: patch-ak,v 1.1 1998/08/23 06:08:51 garbled Exp $
---- src/ckconfig.c.orig	Mon Jul 13 03:13:37 1998
-+++ src/ckconfig.c	Mon Jul 13 03:14:44 1998
-@@ -35,2 +35,4 @@
+$NetBSD: patch-ak,v 1.2 1999/02/13 09:05:02 rh Exp $
+
+--- src/ckconfig.c.orig	Mon Jul  6 11:14:14 1998
++++ src/ckconfig.c	Sat Feb 13 00:54:09 1999
+@@ -33,6 +33,8 @@
+ #ifndef HOST_ACCESS
+ #define  HOST_ACCESS  1
  #endif
 +
 +#include <string.h>
  #include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
diff --git a/net/wu-ftpd/patches/patch-al b/net/wu-ftpd/patches/patch-al
new file mode 100644
index 00000000000..abd68a2bc38
--- /dev/null
+++ b/net/wu-ftpd/patches/patch-al
@@ -0,0 +1,32 @@
+$NetBSD: patch-al,v 1.3 1999/02/13 09:05:02 rh Exp $
+
+--- src/realpath.c.orig	Mon Jul  6 11:14:39 1998
++++ src/realpath.c	Sat Feb 13 07:47:55 1999
+@@ -143,7 +143,13 @@
+             continue;
+         if ((last == namebuf) || (*--last != '/'))
+             strcat(namebuf, "/");
++	if (strlen(namebuf)+strlen(where) < sizeof(namebuf)) {
+         strcat(namebuf, where);
++	} else {
++	    /* path too long: bail out */
++	    strcpy(result, "\0");
++	    return (NULL);
++	}
+ 
+         where = ++ptr;
+         if (lstat(namebuf, &sbuf) == -1) {
+@@ -164,7 +170,13 @@
+                 *workpath = '\0';
+             if (*where) {
+                 strcat(linkpath, "/");
++		if (strlen(linkpath) + strlen(where) < sizeof(linkpath)) {
+                 strcat(linkpath, where);
++		} else {
++		    /* path too long: bail out */
++		    strcpy(result, "\0");
++		    return (NULL);
++		}
+             }
+             strcpy(curpath, linkpath);
+             goto loop;