summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorlukem <lukem>2010-03-24 14:12:44 +0000
committerlukem <lukem>2010-03-24 14:12:44 +0000
commit62a778b738092b66d704418aa27be2149a6c32e2 (patch)
treee31c5261fe7b7bc7952bd36c1f0c71b9916f1759 /net
parent742fcf331785ebdb56f0e8cf2b70737b1e2a2f88 (diff)
downloadpkgsrc-62a778b738092b66d704418aa27be2149a6c32e2.tar.gz
Update to tnftpd-20100324:
Security fix when globbing paths. Install example configuration files.
Diffstat (limited to 'net')
-rw-r--r--net/tnftpd/Makefile14
-rw-r--r--net/tnftpd/distinfo8
2 files changed, 7 insertions, 15 deletions
diff --git a/net/tnftpd/Makefile b/net/tnftpd/Makefile
index 2a955c00f77..616c1bff394 100644
--- a/net/tnftpd/Makefile
+++ b/net/tnftpd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2010/01/28 08:30:39 lukem Exp $
+# $NetBSD: Makefile,v 1.21 2010/03/24 14:12:44 lukem Exp $
#
-DISTNAME= tnftpd-20091122
+DISTNAME= tnftpd-20100324
CATEGORIES= net
MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/tnftp/
@@ -18,7 +18,7 @@ GNU_CONFIGURE= YES
MANCOMPRESSED_IF_MANZ= YES
USE_TOOLS+= yacc
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONF_FILES+= ${EXAMPLEDIR}/ftpd.conf ${PKG_SYSCONFDIR}/ftpd.conf
CONF_FILES+= ${EXAMPLEDIR}/ftpusers ${PKG_SYSCONFDIR}/ftpusers
@@ -32,12 +32,4 @@ EXAMPLEDIR= ${PREFIX}/share/examples/tnftpd
INSTALLATION_DIRS= libexec ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 \
${EXAMPLEDIR}
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/src/tnftpd ${DESTDIR}${PREFIX}/libexec
- ${INSTALL_MAN} ${WRKSRC}/src/ftpd.conf.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/ftpd.conf.5
- ${INSTALL_MAN} ${WRKSRC}/src/ftpusers.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/ftpusers.5
- ${INSTALL_MAN} ${WRKSRC}/src/tnftpd.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/tnftpd.8
- ${INSTALL_DATA} ${WRKSRC}/examples/ftpd.conf ${DESTDIR}${EXAMPLEDIR}
- ${INSTALL_DATA} ${WRKSRC}/examples/ftpusers ${DESTDIR}${EXAMPLEDIR}
-
.include "../../mk/bsd.pkg.mk"
diff --git a/net/tnftpd/distinfo b/net/tnftpd/distinfo
index b4b52a31e08..9b6e376a5f5 100644
--- a/net/tnftpd/distinfo
+++ b/net/tnftpd/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2010/01/28 08:30:39 lukem Exp $
+$NetBSD: distinfo,v 1.12 2010/03/24 14:12:44 lukem Exp $
-SHA1 (tnftpd-20091122.tar.gz) = 82feb3cf2124eb5aa3edb2be6a468df2c05bc1b0
-RMD160 (tnftpd-20091122.tar.gz) = 8eaffa2b0d3c8fb0b33dae1e1dd9cd58c7c45afd
-Size (tnftpd-20091122.tar.gz) = 505431 bytes
+SHA1 (tnftpd-20100324.tar.gz) = f42c52fab3963f7fdef9c1dfd0e48ecd491ac9d9
+RMD160 (tnftpd-20100324.tar.gz) = 8bad2791e14868f037305e7ca1e2943f8120caf8
+Size (tnftpd-20100324.tar.gz) = 511110 bytes