Pullup ticket #3140 - requested by kefren

net/bftpd: security update

Revisions pulled up:
- net/bftpd/Makefile				1.11-1.12
- net/bftpd/distinfo				1.5-1.6
- net/bftpd/patches/patch-aa			1.4
- net/bftpd/patches/patch-ab			delete
- net/bftpd/patches/patch-ac			1.1
---
Module Name:	pkgsrc
Committed By:	obache
Date:		Thu May 27 14:14:30 UTC 2010

Modified Files:
	pkgsrc/net/bftpd: Makefile distinfo
	pkgsrc/net/bftpd/patches: patch-aa
Added Files:
	pkgsrc/net/bftpd/patches: patch-ac
Removed Files:
	pkgsrc/net/bftpd/patches: patch-ab

Log Message:
Update bftpd to 2.8
Based on PR#43352 by Wen Heping.

pkgsrc changes:
* set LICENSE=gnu-gpl-v2
* simplify patch-aa.
* remove patch-ab, replace with SUBST instead, and also replace /etc in manpage.
* add patch-ac for fixes standalone mode. XXX: IPv4 only
* cosmetics fixes.
---
Module Name:	pkgsrc
Committed By:	obache
Date:		Fri Jun  4 04:30:45 UTC 2010

Modified Files:
	pkgsrc/net/bftpd: Makefile distinfo

Log Message:
Update bftpd to 2.9.

Jesse Smith <jessefrgsmith@yahoo.ca> -> 2.9
	- Bftpdwill attempt to create it's utmp directory
          if that directory does not exist. Fixes issue on
	  Ubuntu where the direcotry is wiped out at each
	  reboot.
	- The ROOTDIR option now works properly for
	  anonymous users.
	  Thanks to Paul for reporting this bug.

5 files changed, 48 insertions, 39 deletions

diff --git a/net/bftpd/Makefile b/net/bftpd/Makefile
index 3e1fb877756..ada49068a6d 100644
--- a/net/bftpd/Makefile
+++ b/net/bftpd/Makefile
@@ -1,24 +1,35 @@
-# $NetBSD: Makefile,v 1.10 2008/07/10 15:52:03 joerg Exp $
+# $NetBSD: Makefile,v 1.10.20.1 2010/06/07 19:06:20 tron Exp $
 #
 
-DISTNAME=	bftpd-1.0.24
-PKGREVISION=	1
+DISTNAME=	bftpd-2.9
 CATEGORIES=	net
-MASTER_SITES=	http://bftpd.sourceforge.net/downloads/src/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bftpd/}
 
 MAINTAINER=	virtus@wanadoo.nl
 HOMEPAGE=	http://bftpd.sourceforge.net/
 COMMENT=	Small and fast FTP server
+LICENSE=	gnu-gpl-v2
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	YES
+WRKSRC=		${WRKDIR}/bftpd
 
-CFLAGS+=	-DPATH_BFTPD_CONF="\"${PKG_SYSCONFDIR}/bftpd.conf\""
 CONF_FILES=	${PREFIX}/share/examples/bftpd/bftpd.conf \
 		${PKG_SYSCONFDIR}/bftpd.conf
-MAKE_ENV+=	VARBASE=${VARBASE:Q}
+
+SUBST_CLASSES+=		varbase
+SUBST_STAGE.varbase=	post-configure
+SUBST_FILES.varbase=	bftpd.conf
+SUBST_SED.varbase=	-e 's|/var/|${VARBASE}/|g'
+
+SUBST_CLASSES+=		sysconf
+SUBST_STAGE.sysconf=	post-configure
+SUBST_FILES.sysconf=	mypaths.h bftpd.8
+SUBST_SED.sysconf=	-e 's|/etc/|${PKG_SYSCONFDIR}/|g'
 
 INSTALLATION_DIRS=	sbin ${PKGMANDIR}/man8 share/examples/bftpd
 
-PKG_DESTDIR_SUPPORT=	user-destdir
+BUILD_DEFS+=		VARBASE
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/bftpd/distinfo b/net/bftpd/distinfo
index f0b7ac8dd4b..2888ab10dc4 100644
--- a/net/bftpd/distinfo
+++ b/net/bftpd/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2008/07/10 15:52:03 joerg Exp $
+$NetBSD: distinfo,v 1.4.20.1 2010/06/07 19:06:20 tron Exp $
 
-SHA1 (bftpd-1.0.24.tar.gz) = 4a047778e9435fc9221d02c1093f040186bb88d7
-RMD160 (bftpd-1.0.24.tar.gz) = 6eb162a5d692c5df2811c24fd07d40193e77d095
-Size (bftpd-1.0.24.tar.gz) = 75995 bytes
-SHA1 (patch-aa) = 5ddab875688e1c2b7ba82171a3a776503ffd7af7
-SHA1 (patch-ab) = faef48266dd0fb7b095738207be2b26ee34e9359
+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
diff --git a/net/bftpd/patches/patch-aa b/net/bftpd/patches/patch-aa
index 00d133f48e9..b26f2e29445 100644
--- a/net/bftpd/patches/patch-aa
+++ b/net/bftpd/patches/patch-aa
@@ -1,16 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2008/07/10 15:52:03 joerg Exp $
+$NetBSD: patch-aa,v 1.3.20.1 2010/06/07 19:06:20 tron Exp $
 
---- Makefile.in.orig	2003-05-09 16:47:48.000000000 -0500
+--- Makefile.in.orig	2010-04-05 00:22:43.000000000 +0000
 +++ Makefile.in
-@@ -4,6 +4,7 @@ INSTALL=@INSTALL@
- CFLAGS=@CFLAGS@ @DEFS@ -Wall -I. -DVERSION=\"$(VERSION)\" @DEBUG@
- LIBS=@LIBS@
- prefix=@prefix@
-+datadir=@datadir@
- mandir=@mandir@
- sbindir=@sbindir@
- DESTDIR=
-@@ -26,14 +27,9 @@ bftpd: $(OBJS)
+@@ -26,15 +26,9 @@ bftpd: $(OBJS)
  $(OBJS): $(HEADERS) Makefile
  
  install: all
@@ -18,13 +10,14 @@ $NetBSD: patch-aa,v 1.3 2008/07/10 15:52:03 joerg Exp $
 -	$(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
--	touch /var/log/bftpd.log
--	chmod 644 /var/log/bftpd.log
--	mkdir -p /var/run/bftpd
--	chmod 755 /var/run/bftpd
+-	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
 +	$(INSTALL) -m 700 bftpd $(DESTDIR)/$(prefix)/sbin
 +	$(INSTALL) -m 644 bftpd.8 $(DESTDIR)/$(mandir)/man8
-+	$(INSTALL) -m 600 bftpd.conf $(DESTDIR)/$(datadir)/examples/bftpd
++	$(INSTALL) -m 600 bftpd.conf $(DESTDIR)/$(prefix)/share/examples/bftpd
  
  clean distclean:
- 	rm -f *~ $(OBJS) bftpd mksources.finished
+ 	rm -f *~ $(OBJS) bftpd mksources.finished config.cache
diff --git a/net/bftpd/patches/patch-ab b/net/bftpd/patches/patch-ab
deleted file mode 100644
index 7e09d7c60fa..00000000000
--- a/net/bftpd/patches/patch-ab
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/06/02 13:13:15 jmmv Exp $
-
---- mypaths.h.orig	2003-05-09 23:47:48.000000000 +0200
-+++ mypaths.h
-@@ -1,2 +1,4 @@
-+#ifndef PATH_BFTPD_CONF
- #define PATH_BFTPD_CONF "/etc/bftpd.conf"
-+#endif
- #define PATH_STATUSLOG "/dev/null"
diff --git a/net/bftpd/patches/patch-ac b/net/bftpd/patches/patch-ac
new file mode 100644
index 00000000000..7d0546a40a0
--- /dev/null
+++ b/net/bftpd/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1.2.2 2010/06/07 19:06:20 tron 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);