Pullup ticket #2549 - requested by lukem

tnftpd: security update

Revisions pulled up:
- net/tnftpd/Makefile		1.18
- net/tnftpd/PLIST		1.3
- net/tnftpd/distinfo		1.10
- net/tnftpd/options.mk		1.2
- net/tnftpd/patches/patch-aa	delete
---
Module Name:	pkgsrc
Committed By:	lukem
Date:		Thu Oct  9 04:14:29 UTC 2008

Modified Files:
	pkgsrc/net/tnftpd: Makefile PLIST distinfo options.mk
Removed Files:
	pkgsrc/net/tnftpd/patches: patch-aa

Log Message:
Update to tnftpd 20081009.  Notable changes since 20061217:

* Don't split large commands into multiple commands; just fail on them.
  This prevents cross-site request forgery (CSRF)-like attacks,
  when a web browser is used to access an ftp server.
* Enhance -C to support an optional @host ('-C user[@host]'):
  checks whether user as connecting from host would be granted
  access by ftpusers(5).
* Support IPv6 in the host directive of ftpusers(5).
* Implement -n to disable hostname lookups.

* Disable SOCKS support; I don't have the ability to test it,
  and the autoconf checks were very out of date.
* Add configure --with-pam to enable PAM authentication support.
  Defaults to checking for PAM.
* Add configure --with-skey to enable S/Key authentication support.
  Incompatible with --with-pam, defaults to no.
* Fix pathnames in the installed manual pages to contain
  the appropriate $(prefix) substitution.
* Use fcntl(3) locking instead of flock(3) or lockf(3).
* Various other portability improvements.

5 files changed, 18 insertions, 40 deletions

diff --git a/net/tnftpd/Makefile b/net/tnftpd/Makefile
index 3518ff9e288..030dd513c49 100644
--- a/net/tnftpd/Makefile
+++ b/net/tnftpd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2007/03/01 14:01:21 salo Exp $
+# $NetBSD: Makefile,v 1.17.18.1 2008/10/09 11:50:35 tron Exp $
 #
 
-DISTNAME=		tnftpd-20061217
+DISTNAME=		tnftpd-20081009
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.NetBSD.org/pub/NetBSD/misc/tnftp/
 
@@ -31,9 +31,9 @@ INSTALLATION_DIRS=	libexec ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/tnftpd ${PREFIX}/libexec
-	${INSTALL_MAN} ${WRKSRC}/src/ftpd.conf.5 ${PREFIX}/${PKGMANDIR}/man5
-	${INSTALL_MAN} ${WRKSRC}/src/ftpusers.5 ${PREFIX}/${PKGMANDIR}/man5
-	${INSTALL_MAN} ${WRKSRC}/src/ftpd.8 ${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_MAN} ${WRKSRC}/src/ftpd.conf.man ${PREFIX}/${PKGMANDIR}/man5/ftpd.conf.5
+	${INSTALL_MAN} ${WRKSRC}/src/ftpusers.man ${PREFIX}/${PKGMANDIR}/man5/ftpusers.5
+	${INSTALL_MAN} ${WRKSRC}/src/tnftpd.man ${PREFIX}/${PKGMANDIR}/man8/tnftpd.8
 	${INSTALL_DATA_DIR} ${EXAMPLEDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/ftpd.conf ${EXAMPLEDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/ftpusers ${EXAMPLEDIR}
diff --git a/net/tnftpd/PLIST b/net/tnftpd/PLIST
index f6b35a4d14a..2ab50a91e7d 100644
--- a/net/tnftpd/PLIST
+++ b/net/tnftpd/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2003/12/18 01:14:59 lukem Exp $
+@comment $NetBSD: PLIST,v 1.2.42.1 2008/10/09 11:50:35 tron Exp $
 libexec/tnftpd
 man/man5/ftpd.conf.5
 man/man5/ftpusers.5
-man/man8/ftpd.8
+man/man8/tnftpd.8
 share/examples/tnftpd/ftpd.conf
 share/examples/tnftpd/ftpusers
 @dirrm share/examples/tnftpd
diff --git a/net/tnftpd/distinfo b/net/tnftpd/distinfo
index 01db2380034..db725a9fdf4 100644
--- a/net/tnftpd/distinfo
+++ b/net/tnftpd/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.9 2007/03/07 17:56:37 joerg Exp $
+$NetBSD: distinfo,v 1.9.18.1 2008/10/09 11:50:35 tron Exp $
 
-SHA1 (tnftpd-20061217.tar.gz) = a81e69c648397c15541683910495037683d87d2f
-RMD160 (tnftpd-20061217.tar.gz) = 9f098e35e549a202a7a392898095ee91f34e8604
-Size (tnftpd-20061217.tar.gz) = 187602 bytes
-SHA1 (patch-aa) = febc5e934b3bc5f83758bb966e30d5d17ca10af7
+SHA1 (tnftpd-20081009.tar.gz) = 60d00e431576c7cda75613d39820ffb97c30135d
+RMD160 (tnftpd-20081009.tar.gz) = 3fc31849159baaffc86e097b3f4e1bfdda3a9476
+Size (tnftpd-20081009.tar.gz) = 244456 bytes
diff --git a/net/tnftpd/options.mk b/net/tnftpd/options.mk
index 359be5b6737..47545b27caf 100644
--- a/net/tnftpd/options.mk
+++ b/net/tnftpd/options.mk
@@ -1,22 +1,17 @@
-# $NetBSD: options.mk,v 1.1 2005/12/02 17:03:54 wiz Exp $
+# $NetBSD: options.mk,v 1.1.28.1 2008/10/09 11:50:35 tron Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.tnftpd
-PKG_SUPPORTED_OPTIONS=		inet6
-PKG_OPTIONS_OPTIONAL_GROUPS+=	socks
-PKG_OPTIONS_GROUP.socks=	socks4 socks5
+PKG_SUPPORTED_OPTIONS=	inet6 pam
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Msocks4)
-CONFIGURE_ARGS+=	--with-socks4
-.include "../../net/socks4/buildlink3.mk"
-.elif !empty(PKG_OPTIONS:Msocks5)
-CONFIGURE_ARGS+=	--with-socks5
-.include "../../net/socks5/buildlink3.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=	--enable-ipv6
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
+
+.if !empty(PKG_OPTIONS:Mpam)
+.include "../../mk/pam.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-pam
+.endif
diff --git a/net/tnftpd/patches/patch-aa b/net/tnftpd/patches/patch-aa
deleted file mode 100644
index c1213703f4a..00000000000
--- a/net/tnftpd/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2007/03/07 17:56:37 joerg Exp $
-
---- src/ftpd.c.orig	2007-03-07 17:23:16.000000000 +0000
-+++ src/ftpd.c
-@@ -3744,7 +3744,11 @@ checkpassword(const struct passwd *pwent
- 	expire = pwent->pw_expire;
- #endif
- #if HAVE_PW_CHANGE
-+#ifdef _PASSWORD_CHGNOW
- 	change = (pwent->pw_change == _PASSWORD_CHGNOW)? now : pwent->pw_change;
-+#else
-+	change = pwent->pw_change;
-+#endif
- #endif
- #endif
-