From a31371b23e956bcf49c7173558a1106023a47a98 Mon Sep 17 00:00:00 2001 From: martti Date: Thu, 22 Aug 2002 11:24:06 +0000 Subject: Updated vsftpd to 1.0.1 - Fix potential leak in PAM handling code. - Fix build in the non-PAM case - Include filename and size in bytes in the "here comes the data" 150 message. - Change link flags from "-s" to "-Wl,-s" - Tidy up vsf_findlibs.sh - Work with NFS mounted home dirs and root_squash - Add FAQ. - Improve "make install". - Fix Solaris build (nanosleep is in a separate library, typical). - Fix REST + STOR combination - Make our 150 response code match wu-ftpd - allows broken "ange-ftp" of emacs to do a percentage complete indicator. - Add anon_root and local_root --- net/vsftpd/Makefile | 6 ++++-- net/vsftpd/PLIST | 4 +++- net/vsftpd/distinfo | 8 ++++---- net/vsftpd/patches/patch-aa | 24 ++++++++++++++++++------ 4 files changed, 29 insertions(+), 13 deletions(-) (limited to 'net/vsftpd') diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile index 4bbace14ee7..5180f33e813 100644 --- a/net/vsftpd/Makefile +++ b/net/vsftpd/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/06/19 11:32:02 zuntum Exp $ +# $NetBSD: Makefile,v 1.2 2002/08/22 11:24:06 martti Exp $ # -DISTNAME= vsftpd-0.9.1 +DISTNAME= vsftpd-1.0.1 CATEGORIES= net MASTER_SITES= ftp://ferret.lmh.ox.ac.uk/pub/linux/ @@ -17,7 +17,9 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/vsftpd ${INSTALL_DATA} ${WRKSRC}/vsftpd.conf ${PREFIX}/share/examples/vsftpd ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vsftpd + ${INSTALL_DATA} ${WRKSRC}/FAQ ${PREFIX}/share/doc/vsftpd ${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/vsftpd ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/vsftpd + ${INSTALL_DATA} ${WRKSRC}/TUNING ${PREFIX}/share/doc/vsftpd .include "../../mk/bsd.pkg.mk" diff --git a/net/vsftpd/PLIST b/net/vsftpd/PLIST index fa1880df669..bf0e2cf255c 100644 --- a/net/vsftpd/PLIST +++ b/net/vsftpd/PLIST @@ -1,9 +1,11 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:59:44 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/08/22 11:24:06 martti Exp $ libexec/vsftpd man/man5/vsftpd.conf.5 man/man8/vsftpd.8 +share/doc/vsftpd/FAQ share/doc/vsftpd/INSTALL share/doc/vsftpd/README +share/doc/vsftpd/TUNING share/examples/vsftpd/vsftpd.conf @dirrm share/doc/vsftpd @dirrm share/examples/vsftpd diff --git a/net/vsftpd/distinfo b/net/vsftpd/distinfo index 9848d809bdc..edbcd1eb44a 100644 --- a/net/vsftpd/distinfo +++ b/net/vsftpd/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/06/19 11:32:02 zuntum Exp $ +$NetBSD: distinfo,v 1.2 2002/08/22 11:24:06 martti Exp $ -SHA1 (vsftpd-0.9.1.tar.gz) = 8c076fa74b05c82d9c4bce013af59757508b10f9 -Size (vsftpd-0.9.1.tar.gz) = 87136 bytes -SHA1 (patch-aa) = 152f1a73b3bb08dd36458a20bf2be47e253184bd +SHA1 (vsftpd-1.0.1.tar.gz) = e2bfc8dc670b93e449d3a7edb836b43b44edc017 +Size (vsftpd-1.0.1.tar.gz) = 92976 bytes +SHA1 (patch-aa) = 040eddd45fce6c8700731d74edca84c19b86ff3e diff --git a/net/vsftpd/patches/patch-aa b/net/vsftpd/patches/patch-aa index de8df4472ad..0db2c7f14fe 100644 --- a/net/vsftpd/patches/patch-aa +++ b/net/vsftpd/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/06/19 11:32:02 zuntum Exp $ +$NetBSD: patch-aa,v 1.2 2002/08/22 11:24:07 martti Exp $ ---- Makefile.orig Wed May 16 23:48:51 2001 -+++ Makefile +--- Makefile.orig Mon Oct 8 23:35:27 2001 ++++ Makefile Mon Jul 29 10:12:19 2002 @@ -1,8 +1,7 @@ # Makefile for systems with GNU tools -CC = gcc @@ -11,12 +11,24 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/06/19 11:32:02 zuntum Exp $ +CFLAGS += -Wall -W -Wshadow #-pedantic -Werror -Wconversion LIBS = `./vsf_findlibs.sh` - LINK = -s -@@ -21,9 +20,7 @@ + LINK = -Wl,-s +@@ -21,21 +20,7 @@ $(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) install: -- $(INSTALL) -m 755 vsftpd /usr/sbin/vsftpd +- if [ -x /usr/local/sbin ]; then \ +- $(INSTALL) -m 755 vsftpd /usr/local/sbin/vsftpd; \ +- else \ +- $(INSTALL) -m 755 vsftpd /usr/sbin/vsftpd; fi +- if [ -x /usr/local/man ]; then \ +- $(INSTALL) -m 644 vsftpd.8 /usr/local/man/man8/vsftpd.8; \ +- $(INSTALL) -m 644 vsftpd.conf.5 /usr/local/man/man5/vsftpd.conf.5; \ +- elif [ -x /usr/share/man ]; then \ +- $(INSTALL) -m 644 vsftpd.8 /usr/share/man/man8/vsftpd.8; \ +- $(INSTALL) -m 644 vsftpd.conf.5 /usr/share/man/man5/vsftpd.conf.5; \ +- else \ +- $(INSTALL) -m 644 vsftpd.8 /usr/man/man8/vsftpd.8; \ +- $(INSTALL) -m 644 vsftpd.conf.5 /usr/man/man5/vsftpd.conf.5; fi - if [ -x /etc/xinetd.d ]; then \ - $(INSTALL) -m 644 xinetd.d/vsftpd /etc/xinetd.d/vsftpd; fi + $(BSD_INSTALL_PROGRAM) vsftpd $(PREFIX)/libexec/vsftpd -- cgit v1.2.3