Update wu-ftpd to 2.6.1

Changes to 2.6.0 include:
 o  Fix security leaks that could result in a root shell compromise.
 o  Fix memory leaks in internal ls (this feature still needs more testing;
    you should probably not use it on high-traffic production servers yet.)
 o  Fix up the port-allow command in ftpaccess.
 o  Merge in the virtual passwd/virtual shadow features of BeroFTPD.
 o  Some fixes to the configure script.
 o  SITE MINFO was missed in 2.6.0 when disabling SITE NEWER.
 o  Fix documentation of data-limit.

6 files changed, 46 insertions, 64 deletions

diff --git a/net/wu-ftpd/Makefile b/net/wu-ftpd/Makefile
index a891a4f342a..d89e9ffdf7f 100644
--- a/net/wu-ftpd/Makefile
+++ b/net/wu-ftpd/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2000/06/26 20:09:33 rh Exp $
+# $NetBSD: Makefile,v 1.14 2000/07/08 16:52:04 rh Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/12/24 17:45:28 ache Exp
 #
 
-DISTNAME=	wu-ftpd-2.6.0
-PKGNAME=	${DISTNAME}nb1
+DISTNAME=	wu-ftpd-2.6.1
 CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.wu-ftpd.org/pub/wu-ftpd/ \
 		ftp://ftp.landfield.com/wu-ftpd/wu-ftpd.org/wu-ftpd/ \
diff --git a/net/wu-ftpd/files/md5 b/net/wu-ftpd/files/md5
index e6c835052a1..8c1d97b88d4 100644
--- a/net/wu-ftpd/files/md5
+++ b/net/wu-ftpd/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 1999/12/27 12:13:05 rh Exp $
+$NetBSD: md5,v 1.6 2000/07/08 16:52:05 rh Exp $
 
-MD5 (wu-ftpd-2.6.0.tar.gz) = 652cfe4b59e0468eded736e7c281d16f
+MD5 (wu-ftpd-2.6.1.tar.gz) = 857ab8504998a753195eb94ac2dc39a4
diff --git a/net/wu-ftpd/files/patch-sum b/net/wu-ftpd/files/patch-sum
index bdcf28a3eb2..67d3ef6be83 100644
--- a/net/wu-ftpd/files/patch-sum
+++ b/net/wu-ftpd/files/patch-sum
@@ -1,10 +1,9 @@
-$NetBSD: patch-sum,v 1.5 2000/06/26 20:09:34 rh Exp $
+$NetBSD: patch-sum,v 1.6 2000/07/08 16:52:05 rh Exp $
 
 MD5 (patch-aa) = 4365668d156c10867e9ca700b4fdb8b7
-MD5 (patch-ab) = 972bad15ee6b2487196d6c86c2fa0081
+MD5 (patch-ab) = 122f56024954facd11bca07e7571f60a
 MD5 (patch-ac) = 25f0b246d679a3139896e7d29e2073be
 MD5 (patch-ad) = 1c030b87e02b0636892f2f63dba516b6
-MD5 (patch-ae) = 38cb444f21b8518ec3e74c3d32b1616f
 MD5 (patch-af) = 2d21677acf70f895a9fcb6327f6fae78
 MD5 (patch-ag) = 0cc37eeffd18e73ee0cfb888fba5f2b6
 MD5 (patch-ai) = e80be8c8d788f821c0cc2491f053db29
diff --git a/net/wu-ftpd/patches/patch-ab b/net/wu-ftpd/patches/patch-ab
index d77f41c713d..12112c8e042 100644
--- a/net/wu-ftpd/patches/patch-ab
+++ b/net/wu-ftpd/patches/patch-ab
@@ -1,29 +1,29 @@
-$NetBSD: patch-ab,v 1.7 1999/12/27 12:14:57 rh Exp $
+$NetBSD: patch-ab,v 1.8 2000/07/08 16:52:05 rh Exp $
 
---- Makefile.in.orig	Mon Dec 27 12:38:27 1999
-+++ Makefile.in	Mon Dec 27 12:43:52 1999
-@@ -62,12 +62,13 @@
- install: all
- 	@echo installing binaries.
- 	-@mkdir -p @sbindir@
-+	-@mkdir -p @libexecdir@
- 	-@mkdir -p @bindir@
--	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpd @sbindir@/in.ftpd
-+	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpd @libexecdir@/ftpd
- 	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpshut @sbindir@/ftpshut
- 	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpcount @bindir@/ftpcount
- 	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpwho @bindir@/ftpwho
--	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ckconfig @sbindir@/ckconfig
-+	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ckconfig @sbindir@/ftpckconfig
- 	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftprestart @sbindir@/ftprestart
+--- Makefile.in.orig	Sat Jul  1 19:42:15 2000
++++ Makefile.in	Sat Jul  8 18:41:53 2000
+@@ -67,11 +67,13 @@
+ 	-@mkdir -p $(DESTDIR)/$(mandir)/man1
+ 	-@mkdir -p $(DESTDIR)/$(mandir)/man5
+ 	-@mkdir -p $(DESTDIR)/@ETCDIR@
+-	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpd $(DESTDIR)/@sbindir@/in.ftpd
++	-@mkdir -p $(DESTDIR)/@libexecdir@
++	-@mkdir -p $(DESTDIR)/@datadir@/examples/wu-ftpd
++	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpd $(DESTDIR)/@libexecdir@/ftpd
+ 	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpshut $(DESTDIR)/@sbindir@/ftpshut
+ 	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpcount $(DESTDIR)/@bindir@/ftpcount
+ 	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpwho $(DESTDIR)/@bindir@/ftpwho
+-	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ckconfig $(DESTDIR)/@sbindir@/ckconfig
++	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ckconfig $(DESTDIR)/@sbindir@/ftpckconfig
+ 	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftprestart $(DESTDIR)/@sbindir@/ftprestart
+ 	@INSTALL_PROGRAM@ -o bin -g bin -m 755 util/privatepw/privatepw $(DESTDIR)/@sbindir@/privatepw
  	@echo installing manpages.
- 	-@mkdir -p $(mandir)
-@@ -81,5 +82,6 @@
- #	@INSTALL_DATA@ -o bin -g bin -m 644 doc/ftpservers.5 $(mandir)/man5/ftpservers.5
- 	@INSTALL_DATA@ -o bin -g bin -m 644 doc/xferlog.5 $(mandir)/man5/xferlog.5
- 	@INSTALL_DATA@ -o bin -g bin -m 644 doc/ftprestart.8 $(mandir)/man8/ftprestart.8
--	@if test ! -f @ETCDIR@/ftpaccess; then echo "Since you didn't have a ftpaccess file, the sample has been"; echo "installed to @ETCDIR@/ftpaccess."; echo "You will probably want to edit it."; @INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpaccess @ETCDIR@/ftpaccess; fi
--	@if test ! -f @ETCDIR@/ftpconversions; then echo "Since you didn't have a ftpconversions file, the sample has been"; echo "installed to @ETCDIR@/ftpconversions."; echo "You will probably want to edit it."; @INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpconversions @ETCDIR@/ftpconversions; fi
-+	@INSTALL_DATA@ -o bin -g bin -m 644 doc/examples/ftpaccess @prefix@/etc/ftpaccess.example
-+	@INSTALL_DATA@ -o bin -g bin -m 644 doc/examples/ftpconversions @prefix@/etc/ftpconversions.example
-+	@INSTALL_DATA@ -o bin -g bin -m 644 doc/examples/ftpusers @prefix@/etc/ftpusers.example
+@@ -87,5 +89,6 @@
+ 	@INSTALL_DATA@ -o bin -g bin -m 644 doc/xferlog.5 $(DESTDIR)/$(mandir)/man5/xferlog.5
+ 	@INSTALL_DATA@ -o bin -g bin -m 644 doc/ftprestart.8 $(DESTDIR)/$(mandir)/man8/ftprestart.8
+ 	@INSTALL_DATA@ -o bin -g bin -m 644 util/privatepw/privatepw.8 $(DESTDIR)/$(mandir)/man8/privatepw.8
+-	@if test ! -f $(DESTDIR)/@ETCDIR@/ftpaccess; then echo "Since you didn't have a ftpaccess file, the sample has been"; echo "installed to $(DESTDIR)/@ETCDIR@/ftpaccess."; echo "You will probably want to edit it."; @INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpaccess $(DESTDIR)/@ETCDIR@/ftpaccess; fi
+-	@if test ! -f $(DESTDIR)/@ETCDIR@/ftpconversions; then echo "Since you didn't have a ftpconversions file, the sample has been"; echo "installed to $(DESTDIR)/@ETCDIR@/ftpconversions."; echo "You will probably want to edit it."; @INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpconversions $(DESTDIR)/@ETCDIR@/ftpconversions; fi
++	@INSTALL_DATA@ -c -o bin -g bin -m 644 doc/examples/ftpaccess $(DESTDIR)/@datadir@/examples/wu-ftpd/ftpaccess.example
++	@INSTALL_DATA@ -c -o bin -g bin -m 644 doc/examples/ftpconversions $(DESTDIR)/@datadir@/examples/wu-ftpd/ftpconversions.example
++	@INSTALL_DATA@ -c -o bin -g bin -m 644 doc/examples/ftpusers $(DESTDIR)/@datadir@/examples/wu-ftpd/ftpusers.example
diff --git a/net/wu-ftpd/patches/patch-ae b/net/wu-ftpd/patches/patch-ae
deleted file mode 100644
index 707c7a6976f..00000000000
--- a/net/wu-ftpd/patches/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2000/06/26 20:09:35 rh Exp $
-
---- src/ftpcmd.y.orig	Wed Oct 13 08:15:28 1999
-+++ src/ftpcmd.y	Thu Jun 22 22:44:41 2000
-@@ -1926,13 +1926,13 @@
- 	}
- 	if (!maxfound)
- 	    maxlines = defmaxlines;
--	lreply(200, cmd);
-+	lreply(200, "%s", cmd);
- 	while (fgets(buf, sizeof buf, cmdf)) {
- 	    size_t len = strlen(buf);
- 
- 	    if (len > 0 && buf[len - 1] == '\n')
- 		buf[--len] = '\0';
--	    lreply(200, buf);
-+	    lreply(200, "%s", buf);
- 	    if (maxlines <= 0)
- 		++lines;
- 	    else if (++lines >= maxlines) {
diff --git a/net/wu-ftpd/pkg/PLIST b/net/wu-ftpd/pkg/PLIST
index 7091e9509ae..3cdd01b32a1 100644
--- a/net/wu-ftpd/pkg/PLIST
+++ b/net/wu-ftpd/pkg/PLIST
@@ -1,19 +1,23 @@
-@comment $NetBSD: PLIST,v 1.3 1999/12/27 12:13:16 rh Exp $
-etc/ftpaccess.example
-etc/ftpconversions.example
-etc/ftpusers.example
+@comment $NetBSD: PLIST,v 1.4 2000/07/08 16:52:06 rh Exp $
+bin/ftpcount
+bin/ftpwho
 libexec/ftpd
 man/man1/ftpcount.1
 man/man1/ftpwho.1
 man/man5/ftpaccess.5
-man/man5/ftphosts.5
 man/man5/ftpconversions.5
+man/man5/ftphosts.5
+man/man5/ftpservers.5
 man/man5/xferlog.5
 man/man8/ftpd.8
-man/man8/ftpshut.8
 man/man8/ftprestart.8
-sbin/ftpshut
+man/man8/ftpshut.8
+man/man8/privatepw.8
 sbin/ftpckconfig
 sbin/ftprestart
-bin/ftpcount
-bin/ftpwho
+sbin/ftpshut
+sbin/privatepw
+share/examples/wu-ftpd/ftpaccess.example
+share/examples/wu-ftpd/ftpconversions.example
+share/examples/wu-ftpd/ftpusers.example
+@dirrm share/examples/wu-ftpd