Update to 3.7. Notable changes:

Default config disables anonymous login.
Directory listing no longer hangs if the directory contains a named pipe.

4 files changed, 20 insertions, 32 deletions

diff --git a/net/bftpd/Makefile b/net/bftpd/Makefile
index 2b108910528..a5a18adc995 100644
--- a/net/bftpd/Makefile
+++ b/net/bftpd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2013/03/28 23:59:03 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2013/06/01 12:13:04 shattered Exp $
 #
 
-DISTNAME=	bftpd-2.9
+DISTNAME=	bftpd-3.7
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bftpd/}
 
diff --git a/net/bftpd/distinfo b/net/bftpd/distinfo
index 3dda70fcd7a..49522f23510 100644
--- a/net/bftpd/distinfo
+++ b/net/bftpd/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2010/06/04 04:30:45 obache Exp $
+$NetBSD: distinfo,v 1.7 2013/06/01 12:13:04 shattered Exp $
 
-SHA1 (bftpd-2.9.tar.gz) = 92c7130419e7bf3898d2be9f59cc93133e6de939
-RMD160 (bftpd-2.9.tar.gz) = 27d61d8cc63a815c97d53242c9d9d0cc32939c62
-Size (bftpd-2.9.tar.gz) = 139639 bytes
-SHA1 (patch-aa) = a7dfb17cbfc203f497a98abacec4a60ea987cffd
-SHA1 (patch-ac) = 8e50b2abd98f65ee9421d3f225812f25af8bd438
+SHA1 (bftpd-3.7.tar.gz) = 6766232810927db885720792e8d4314942628b8a
+RMD160 (bftpd-3.7.tar.gz) = 9b56d31c3a087c4fb035657e6479e1ecbfb243b0
+Size (bftpd-3.7.tar.gz) = 155428 bytes
+SHA1 (patch-aa) = 3b4444d79533fd8b2ec7bc99eb53c34ca2113350
diff --git a/net/bftpd/patches/patch-aa b/net/bftpd/patches/patch-aa
index c2b35b61da1..dbe842f5e43 100644
--- a/net/bftpd/patches/patch-aa
+++ b/net/bftpd/patches/patch-aa
@@ -1,20 +1,23 @@
-$NetBSD: patch-aa,v 1.4 2010/05/27 14:14:30 obache Exp $
+$NetBSD: patch-aa,v 1.5 2013/06/01 12:13:04 shattered Exp $
 
---- Makefile.in.orig	2010-04-05 00:22:43.000000000 +0000
+--- Makefile.in.orig	2012-02-20 00:49:26.000000000 +0000
 +++ Makefile.in
-@@ -26,15 +26,9 @@ bftpd: $(OBJS)
+@@ -26,18 +26,9 @@ bftpd: $(OBJS)
  $(OBJS): $(HEADERS) Makefile
  
  install: all
+-	mkdir -p $(DESTDIR)/$(prefix)/sbin
 -	$(INSTALL) -g 0 -m 700 -o 0 bftpd $(DESTDIR)/$(prefix)/sbin
+-	mkdir -p $(DESTDIR)/$(mandir)/man8
 -	$(INSTALL) -g 0 -m 644 -o 0 bftpd.8 $(DESTDIR)/$(mandir)/man8
--	[ -f $(DESTDIR)/etc/bftpd.conf ] || \
--		$(INSTALL) -g 0 -m 600 -o 0 bftpd.conf $(DESTDIR)/etc
--	mkdir -p $(DESTDIR)/var/log
--	touch $(DESTDIR)/var/log/bftpd.log
--	chmod 644 $(DESTDIR)/var/log/bftpd.log
--	mkdir -p $(DESTDIR)/var/run/bftpd
--	chmod 755 $(DESTDIR)/var/run/bftpd
+-	mkdir -p $(DESTDIR)/$(prefix)/etc
+-	[ -f $(DESTDIR)/$(prefix)/etc/bftpd.conf ] || \
+-		$(INSTALL) -g 0 -m 600 -o 0 bftpd.conf $(DESTDIR)/$(prefix)/etc
+-	mkdir -p $(DESTDIR)/$(prefix)/var/log
+-	touch $(DESTDIR)/$(prefix)/var/log/bftpd.log
+-	chmod 644 $(DESTDIR)/$(prefix)/var/log/bftpd.log
+-	mkdir -p $(DESTDIR)/$(prefix)/var/run/bftpd
+-	chmod 755 $(DESTDIR)/$(prefix)/var/run/bftpd
 +	$(INSTALL) -m 700 bftpd $(DESTDIR)/$(prefix)/sbin
 +	$(INSTALL) -m 644 bftpd.8 $(DESTDIR)/$(mandir)/man8
 +	$(INSTALL) -m 600 bftpd.conf $(DESTDIR)/$(prefix)/share/examples/bftpd
diff --git a/net/bftpd/patches/patch-ac b/net/bftpd/patches/patch-ac
deleted file mode 100644
index aaf8237e559..00000000000
--- a/net/bftpd/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2010/05/27 14:14:30 obache Exp $
-
-Bind failed: Address famly not supported by protocol family
-
---- main.c.orig	2010-04-11 12:21:24.000000000 +0000
-+++ main.c
-@@ -248,6 +248,7 @@ int main(int argc, char **argv)
- 				   sizeof(i));
- #endif
- 		memset((void *) &myaddr, 0, sizeof(myaddr));
-+		myaddr.sin_family = AF_INET;
-         if (!((port = strtoul(config_getoption("PORT"), NULL, 10))))
-             port = DEFAULT_PORT;
- 		myaddr.sin_port = htons(port);