Thu Oct 9 11:50:35 2008 UTC ()
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.


(tron)
diff -r1.17 -r1.17.18.1 pkgsrc/net/tnftpd/Makefile
diff -r1.2 -r1.2.42.1 pkgsrc/net/tnftpd/PLIST
diff -r1.9 -r1.9.18.1 pkgsrc/net/tnftpd/distinfo
diff -r1.1 -r1.1.28.1 pkgsrc/net/tnftpd/options.mk
diff -r1.5 -r0 pkgsrc/net/tnftpd/patches/patch-aa

cvs diff -r1.17 -r1.17.18.1 pkgsrc/net/tnftpd/Makefile (expand / switch to unified diff)

--- pkgsrc/net/tnftpd/Makefile 2007/03/01 14:01:21 1.17
+++ pkgsrc/net/tnftpd/Makefile 2008/10/09 11:50:35 1.17.18.1
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.17 2007/03/01 14:01:21 salo Exp $ 1# $NetBSD: Makefile,v 1.17.18.1 2008/10/09 11:50:35 tron Exp $
2# 2#
3 3
4DISTNAME= tnftpd-20061217 4DISTNAME= tnftpd-20081009
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/tnftp/ 6MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/tnftp/
7 7
8MAINTAINER= lukem@NetBSD.org 8MAINTAINER= lukem@NetBSD.org
9COMMENT= The NetBSD FTP Daemon 9COMMENT= The NetBSD FTP Daemon
10 10
11CONFLICTS= wu-ftpd-[0-9]* 11CONFLICTS= wu-ftpd-[0-9]*
12CONFLICTS+= kth-krb4-[0-9]* 12CONFLICTS+= kth-krb4-[0-9]*
13CONFLICTS+= lukemftpd-[0-9]* 13CONFLICTS+= lukemftpd-[0-9]*
14 14
15GNU_CONFIGURE= YES 15GNU_CONFIGURE= YES
16MANCOMPRESSED_IF_MANZ= YES 16MANCOMPRESSED_IF_MANZ= YES
17USE_TOOLS+= yacc 17USE_TOOLS+= yacc
@@ -21,21 +21,21 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSC @@ -21,21 +21,21 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSC
21CONF_FILES+= ${EXAMPLEDIR}/ftpd.conf ${PKG_SYSCONFDIR}/ftpd.conf 21CONF_FILES+= ${EXAMPLEDIR}/ftpd.conf ${PKG_SYSCONFDIR}/ftpd.conf
22CONF_FILES+= ${EXAMPLEDIR}/ftpusers ${PKG_SYSCONFDIR}/ftpusers 22CONF_FILES+= ${EXAMPLEDIR}/ftpusers ${PKG_SYSCONFDIR}/ftpusers
23 23
24.include "options.mk" 24.include "options.mk"
25 25
26OPSYSVARS+= MAKE_ENV 26OPSYSVARS+= MAKE_ENV
27MAKE_ENV.SunOS+= CPPFLAGS="" 27MAKE_ENV.SunOS+= CPPFLAGS=""
28 28
29EXAMPLEDIR= ${PREFIX}/share/examples/tnftpd 29EXAMPLEDIR= ${PREFIX}/share/examples/tnftpd
30INSTALLATION_DIRS= libexec ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 30INSTALLATION_DIRS= libexec ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
31 31
32do-install: 32do-install:
33 ${INSTALL_PROGRAM} ${WRKSRC}/src/tnftpd ${PREFIX}/libexec 33 ${INSTALL_PROGRAM} ${WRKSRC}/src/tnftpd ${PREFIX}/libexec
34 ${INSTALL_MAN} ${WRKSRC}/src/ftpd.conf.5 ${PREFIX}/${PKGMANDIR}/man5 34 ${INSTALL_MAN} ${WRKSRC}/src/ftpd.conf.man ${PREFIX}/${PKGMANDIR}/man5/ftpd.conf.5
35 ${INSTALL_MAN} ${WRKSRC}/src/ftpusers.5 ${PREFIX}/${PKGMANDIR}/man5 35 ${INSTALL_MAN} ${WRKSRC}/src/ftpusers.man ${PREFIX}/${PKGMANDIR}/man5/ftpusers.5
36 ${INSTALL_MAN} ${WRKSRC}/src/ftpd.8 ${PREFIX}/${PKGMANDIR}/man8 36 ${INSTALL_MAN} ${WRKSRC}/src/tnftpd.man ${PREFIX}/${PKGMANDIR}/man8/tnftpd.8
37 ${INSTALL_DATA_DIR} ${EXAMPLEDIR} 37 ${INSTALL_DATA_DIR} ${EXAMPLEDIR}
38 ${INSTALL_DATA} ${WRKSRC}/examples/ftpd.conf ${EXAMPLEDIR} 38 ${INSTALL_DATA} ${WRKSRC}/examples/ftpd.conf ${EXAMPLEDIR}
39 ${INSTALL_DATA} ${WRKSRC}/examples/ftpusers ${EXAMPLEDIR} 39 ${INSTALL_DATA} ${WRKSRC}/examples/ftpusers ${EXAMPLEDIR}
40 40
41.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"

cvs diff -r1.2 -r1.2.42.1 pkgsrc/net/tnftpd/PLIST (expand / switch to unified diff)

--- pkgsrc/net/tnftpd/PLIST 2003/12/18 01:14:59 1.2
+++ pkgsrc/net/tnftpd/PLIST 2008/10/09 11:50:35 1.2.42.1
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1@comment $NetBSD: PLIST,v 1.2 2003/12/18 01:14:59 lukem Exp $ 1@comment $NetBSD: PLIST,v 1.2.42.1 2008/10/09 11:50:35 tron Exp $
2libexec/tnftpd 2libexec/tnftpd
3man/man5/ftpd.conf.5 3man/man5/ftpd.conf.5
4man/man5/ftpusers.5 4man/man5/ftpusers.5
5man/man8/ftpd.8 5man/man8/tnftpd.8
6share/examples/tnftpd/ftpd.conf 6share/examples/tnftpd/ftpd.conf
7share/examples/tnftpd/ftpusers 7share/examples/tnftpd/ftpusers
8@dirrm share/examples/tnftpd 8@dirrm share/examples/tnftpd

cvs diff -r1.9 -r1.9.18.1 pkgsrc/net/tnftpd/distinfo (expand / switch to unified diff)

--- pkgsrc/net/tnftpd/distinfo 2007/03/07 17:56:37 1.9
+++ pkgsrc/net/tnftpd/distinfo 2008/10/09 11:50:35 1.9.18.1
@@ -1,6 +1,5 @@ @@ -1,6 +1,5 @@
1$NetBSD: distinfo,v 1.9 2007/03/07 17:56:37 joerg Exp $ 1$NetBSD: distinfo,v 1.9.18.1 2008/10/09 11:50:35 tron Exp $
2 2
3SHA1 (tnftpd-20061217.tar.gz) = a81e69c648397c15541683910495037683d87d2f 3SHA1 (tnftpd-20081009.tar.gz) = 60d00e431576c7cda75613d39820ffb97c30135d
4RMD160 (tnftpd-20061217.tar.gz) = 9f098e35e549a202a7a392898095ee91f34e8604 4RMD160 (tnftpd-20081009.tar.gz) = 3fc31849159baaffc86e097b3f4e1bfdda3a9476
5Size (tnftpd-20061217.tar.gz) = 187602 bytes 5Size (tnftpd-20081009.tar.gz) = 244456 bytes
6SHA1 (patch-aa) = febc5e934b3bc5f83758bb966e30d5d17ca10af7 

cvs diff -r1.1 -r1.1.28.1 pkgsrc/net/tnftpd/options.mk (expand / switch to unified diff)

--- pkgsrc/net/tnftpd/options.mk 2005/12/02 17:03:54 1.1
+++ pkgsrc/net/tnftpd/options.mk 2008/10/09 11:50:35 1.1.28.1
@@ -1,22 +1,17 @@ @@ -1,22 +1,17 @@
1# $NetBSD: options.mk,v 1.1 2005/12/02 17:03:54 wiz Exp $ 1# $NetBSD: options.mk,v 1.1.28.1 2008/10/09 11:50:35 tron Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.tnftpd 3PKG_OPTIONS_VAR= PKG_OPTIONS.tnftpd
4PKG_SUPPORTED_OPTIONS= inet6 4PKG_SUPPORTED_OPTIONS= inet6 pam
5PKG_OPTIONS_OPTIONAL_GROUPS+= socks 
6PKG_OPTIONS_GROUP.socks= socks4 socks5 
7 5
8.include "../../mk/bsd.options.mk" 6.include "../../mk/bsd.options.mk"
9 7
10.if !empty(PKG_OPTIONS:Msocks4) 
11CONFIGURE_ARGS+= --with-socks4 
12.include "../../net/socks4/buildlink3.mk" 
13.elif !empty(PKG_OPTIONS:Msocks5) 
14CONFIGURE_ARGS+= --with-socks5 
15.include "../../net/socks5/buildlink3.mk" 
16.endif 
17 
18.if !empty(PKG_OPTIONS:Minet6) 8.if !empty(PKG_OPTIONS:Minet6)
19CONFIGURE_ARGS+= --enable-ipv6 9CONFIGURE_ARGS+= --enable-ipv6
20.else 10.else
21CONFIGURE_ARGS+= --disable-ipv6 11CONFIGURE_ARGS+= --disable-ipv6
22.endif 12.endif
 13
 14.if !empty(PKG_OPTIONS:Mpam)
 15.include "../../mk/pam.buildlink3.mk"
 16CONFIGURE_ARGS+= --with-pam
 17.endif

File Deleted: pkgsrc/net/tnftpd/patches/Attic/patch-aa