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.diff -r1.17 -r1.17.18.1 pkgsrc/net/tnftpd/Makefile
(tron)
@@ -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 | |||
4 | DISTNAME= tnftpd-20061217 | 4 | DISTNAME= tnftpd-20081009 | |
5 | CATEGORIES= net | 5 | CATEGORIES= net | |
6 | MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/tnftp/ | 6 | MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/tnftp/ | |
7 | 7 | |||
8 | MAINTAINER= lukem@NetBSD.org | 8 | MAINTAINER= lukem@NetBSD.org | |
9 | COMMENT= The NetBSD FTP Daemon | 9 | COMMENT= The NetBSD FTP Daemon | |
10 | 10 | |||
11 | CONFLICTS= wu-ftpd-[0-9]* | 11 | CONFLICTS= wu-ftpd-[0-9]* | |
12 | CONFLICTS+= kth-krb4-[0-9]* | 12 | CONFLICTS+= kth-krb4-[0-9]* | |
13 | CONFLICTS+= lukemftpd-[0-9]* | 13 | CONFLICTS+= lukemftpd-[0-9]* | |
14 | 14 | |||
15 | GNU_CONFIGURE= YES | 15 | GNU_CONFIGURE= YES | |
16 | MANCOMPRESSED_IF_MANZ= YES | 16 | MANCOMPRESSED_IF_MANZ= YES | |
17 | USE_TOOLS+= yacc | 17 | USE_TOOLS+= yacc | |
@@ -21,21 +21,21 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSC | @@ -21,21 +21,21 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSC | |||
21 | CONF_FILES+= ${EXAMPLEDIR}/ftpd.conf ${PKG_SYSCONFDIR}/ftpd.conf | 21 | CONF_FILES+= ${EXAMPLEDIR}/ftpd.conf ${PKG_SYSCONFDIR}/ftpd.conf | |
22 | CONF_FILES+= ${EXAMPLEDIR}/ftpusers ${PKG_SYSCONFDIR}/ftpusers | 22 | CONF_FILES+= ${EXAMPLEDIR}/ftpusers ${PKG_SYSCONFDIR}/ftpusers | |
23 | 23 | |||
24 | .include "options.mk" | 24 | .include "options.mk" | |
25 | 25 | |||
26 | OPSYSVARS+= MAKE_ENV | 26 | OPSYSVARS+= MAKE_ENV | |
27 | MAKE_ENV.SunOS+= CPPFLAGS="" | 27 | MAKE_ENV.SunOS+= CPPFLAGS="" | |
28 | 28 | |||
29 | EXAMPLEDIR= ${PREFIX}/share/examples/tnftpd | 29 | EXAMPLEDIR= ${PREFIX}/share/examples/tnftpd | |
30 | INSTALLATION_DIRS= libexec ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 | 30 | INSTALLATION_DIRS= libexec ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 | |
31 | 31 | |||
32 | do-install: | 32 | do-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" |
@@ -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 $ | |
2 | libexec/tnftpd | 2 | libexec/tnftpd | |
3 | man/man5/ftpd.conf.5 | 3 | man/man5/ftpd.conf.5 | |
4 | man/man5/ftpusers.5 | 4 | man/man5/ftpusers.5 | |
5 | man/man8/ftpd.8 | 5 | man/man8/tnftpd.8 | |
6 | share/examples/tnftpd/ftpd.conf | 6 | share/examples/tnftpd/ftpd.conf | |
7 | share/examples/tnftpd/ftpusers | 7 | share/examples/tnftpd/ftpusers | |
8 | @dirrm share/examples/tnftpd | 8 | @dirrm share/examples/tnftpd |
@@ -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 | |||
3 | SHA1 (tnftpd-20061217.tar.gz) = a81e69c648397c15541683910495037683d87d2f | 3 | SHA1 (tnftpd-20081009.tar.gz) = 60d00e431576c7cda75613d39820ffb97c30135d | |
4 | RMD160 (tnftpd-20061217.tar.gz) = 9f098e35e549a202a7a392898095ee91f34e8604 | 4 | RMD160 (tnftpd-20081009.tar.gz) = 3fc31849159baaffc86e097b3f4e1bfdda3a9476 | |
5 | Size (tnftpd-20061217.tar.gz) = 187602 bytes | 5 | Size (tnftpd-20081009.tar.gz) = 244456 bytes | |
6 | SHA1 (patch-aa) = febc5e934b3bc5f83758bb966e30d5d17ca10af7 |
@@ -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 | |||
3 | PKG_OPTIONS_VAR= PKG_OPTIONS.tnftpd | 3 | PKG_OPTIONS_VAR= PKG_OPTIONS.tnftpd | |
4 | PKG_SUPPORTED_OPTIONS= inet6 | 4 | PKG_SUPPORTED_OPTIONS= inet6 pam | |
5 | PKG_OPTIONS_OPTIONAL_GROUPS+= socks | |||
6 | PKG_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) | |||
11 | CONFIGURE_ARGS+= --with-socks4 | |||
12 | .include "../../net/socks4/buildlink3.mk" | |||
13 | .elif !empty(PKG_OPTIONS:Msocks5) | |||
14 | CONFIGURE_ARGS+= --with-socks5 | |||
15 | .include "../../net/socks5/buildlink3.mk" | |||
16 | .endif | |||
17 | ||||
18 | .if !empty(PKG_OPTIONS:Minet6) | 8 | .if !empty(PKG_OPTIONS:Minet6) | |
19 | CONFIGURE_ARGS+= --enable-ipv6 | 9 | CONFIGURE_ARGS+= --enable-ipv6 | |
20 | .else | 10 | .else | |
21 | CONFIGURE_ARGS+= --disable-ipv6 | 11 | CONFIGURE_ARGS+= --disable-ipv6 | |
22 | .endif | 12 | .endif | |
13 | ||||
14 | .if !empty(PKG_OPTIONS:Mpam) | |||
15 | .include "../../mk/pam.buildlink3.mk" | |||
16 | CONFIGURE_ARGS+= --with-pam | |||
17 | .endif |