Wed Mar 24 14:12:44 2010 UTC ()
Update to tnftpd-20100324:
 Security fix when globbing paths.
 Install example configuration files.


(lukem)
diff -r1.20 -r1.21 pkgsrc/net/tnftpd/Makefile
diff -r1.11 -r1.12 pkgsrc/net/tnftpd/distinfo
cvs diff -r1.20 -r1.21 pkgsrc/net/tnftpd/Makefile (expand / switch to unified diff)

--- pkgsrc/net/tnftpd/Makefile 2010/01/28 08:30:39 1.20
+++ pkgsrc/net/tnftpd/Makefile 2010/03/24 14:12:44 1.21
@@ -1,43 +1,35 @@ @@ -1,43 +1,35 @@
1# $NetBSD: Makefile,v 1.20 2010/01/28 08:30:39 lukem Exp $ 1# $NetBSD: Makefile,v 1.21 2010/03/24 14:12:44 lukem Exp $
2# 2#
3 3
4DISTNAME= tnftpd-20091122 4DISTNAME= tnftpd-20100324
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
11PKG_DESTDIR_SUPPORT= user-destdir 11PKG_DESTDIR_SUPPORT= user-destdir
12 12
13CONFLICTS= wu-ftpd-[0-9]* 13CONFLICTS= wu-ftpd-[0-9]*
14CONFLICTS+= kth-krb4-[0-9]* 14CONFLICTS+= kth-krb4-[0-9]*
15CONFLICTS+= lukemftpd-[0-9]* 15CONFLICTS+= lukemftpd-[0-9]*
16 16
17GNU_CONFIGURE= YES 17GNU_CONFIGURE= YES
18MANCOMPRESSED_IF_MANZ= YES 18MANCOMPRESSED_IF_MANZ= YES
19USE_TOOLS+= yacc 19USE_TOOLS+= yacc
20 20
21CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 21CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
22 22
23CONF_FILES+= ${EXAMPLEDIR}/ftpd.conf ${PKG_SYSCONFDIR}/ftpd.conf 23CONF_FILES+= ${EXAMPLEDIR}/ftpd.conf ${PKG_SYSCONFDIR}/ftpd.conf
24CONF_FILES+= ${EXAMPLEDIR}/ftpusers ${PKG_SYSCONFDIR}/ftpusers 24CONF_FILES+= ${EXAMPLEDIR}/ftpusers ${PKG_SYSCONFDIR}/ftpusers
25 25
26.include "options.mk" 26.include "options.mk"
27 27
28OPSYSVARS+= MAKE_ENV 28OPSYSVARS+= MAKE_ENV
29MAKE_ENV.SunOS+= CPPFLAGS="" 29MAKE_ENV.SunOS+= CPPFLAGS=""
30 30
31EXAMPLEDIR= ${PREFIX}/share/examples/tnftpd 31EXAMPLEDIR= ${PREFIX}/share/examples/tnftpd
32INSTALLATION_DIRS= libexec ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 \ 32INSTALLATION_DIRS= libexec ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 \
33 ${EXAMPLEDIR} 33 ${EXAMPLEDIR}
34 34
35do-install: 
36 ${INSTALL_PROGRAM} ${WRKSRC}/src/tnftpd ${DESTDIR}${PREFIX}/libexec 
37 ${INSTALL_MAN} ${WRKSRC}/src/ftpd.conf.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/ftpd.conf.5 
38 ${INSTALL_MAN} ${WRKSRC}/src/ftpusers.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/ftpusers.5 
39 ${INSTALL_MAN} ${WRKSRC}/src/tnftpd.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/tnftpd.8 
40 ${INSTALL_DATA} ${WRKSRC}/examples/ftpd.conf ${DESTDIR}${EXAMPLEDIR} 
41 ${INSTALL_DATA} ${WRKSRC}/examples/ftpusers ${DESTDIR}${EXAMPLEDIR} 
42 
43.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/net/tnftpd/distinfo (expand / switch to unified diff)

--- pkgsrc/net/tnftpd/distinfo 2010/01/28 08:30:39 1.11
+++ pkgsrc/net/tnftpd/distinfo 2010/03/24 14:12:44 1.12
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.11 2010/01/28 08:30:39 lukem Exp $ 1$NetBSD: distinfo,v 1.12 2010/03/24 14:12:44 lukem Exp $
2 2
3SHA1 (tnftpd-20091122.tar.gz) = 82feb3cf2124eb5aa3edb2be6a468df2c05bc1b0 3SHA1 (tnftpd-20100324.tar.gz) = f42c52fab3963f7fdef9c1dfd0e48ecd491ac9d9
4RMD160 (tnftpd-20091122.tar.gz) = 8eaffa2b0d3c8fb0b33dae1e1dd9cd58c7c45afd 4RMD160 (tnftpd-20100324.tar.gz) = 8bad2791e14868f037305e7ca1e2943f8120caf8
5Size (tnftpd-20091122.tar.gz) = 505431 bytes 5Size (tnftpd-20100324.tar.gz) = 511110 bytes