Updated to version 1.1.3.

Addresses PR pkg/21410 by Jens Liebau.

- honour PKG_SYSCONFDIR
- rcd script, standalone mode support
- tcp wrappers support
- install vsftpd:vsftpd user
- new HOMEPAGE and MASTER_SITES

1.1.3:
======
- Support for tcp_wrappers.
- First stab at Solaris sendfilev() support.
- Don't bomb out the listener on SIGHUP if the config became invalid.
- End vsf_findlibs.sh with "exit 0;" - thanks Lars Hecking <lhecking@nmrc.ie>!
- Integrate with tcp_wrappers - load config based on VSFTPD_LOAD_CONF
  environment variables. Allows per-IP configurability in standalone mode.
- Fix build without tcp_wrappers.
- Fix Solaris sendfilev() support - interruption via a signal returns EINTR
  rather than a partial byte count!
- Add to EXAMPLE/ - PER_IP_CONFIG and INTERNET_SITE_NOINETD

1.1.2:
======
- Add per-IP connection limits in standalone mode.
- Add logging of refused connect due to global or IP connection limits.
- (Many thanks for testing and suggestions from Rob van Nieuwkerk
  <robn@verdi.et.tudelft.nl> and Adrian Reber <adrian@lisas.de>.
- Make connection limit exceeded messages nonblocking.
- Don't exit the listener if fork fails.

1.1.1:
======
- Fix port_promiscuous, oops! Thanks to Bjørn-Ove Heimsund
  <bjornoh@mi.uib.no>.
- Fix to support umasks which create executable files. Reported by
  "Martin, Andreas" <AMartin@hegau-klinikum.de>.
- Make the messages more.. professional :( Thanks to Steven G. Taylor
  <staylor@redhat.com>.
- Allow anon users to append to files if they can delete files! Suggestion
  from Michael Leuchtenburg <michael@slashhome.org>.
- Hopefully fix Solaris build (-lresolv)
- Replace atoll() with a homebrew - modern FreeBSD, OpenBSD lack it.
- Different solution for a umask which creates executable files:
  file_open_mode.
- First attempt at Tru64 build, working with <Sulla17@aol.com>.
- A few minor FAQ additions.
- Change date format in the log from Sep 09 -> Sep  9. Avoids breaking some
  broken log parsers.
- Make "INSTALL" better and clearer.
- Fix passwd_chroot_enable, reported by James Jones <james@richland.edu>.
- Finish Tru64 building :-)
- Add tunable_no_anon_password as asked for by Stephen Quinney
  <stephen.quinney@computing-services.oxford.ac.uk>.

1.1.0:
======
- large file (>2Gb) support).
- Fix .spec files to use /usr/local/sbin not /usr/sbin, noted by Bill Unruh
  <unruh@physics.ubc.ca>.
- Small doc tweaks and improvements(?)
- Add COPYING, the GNU GPL version 2.
- Add use_localtime config option to override the use of GMT times.
- Add tunable_check_shell (default YES) so people can disable this if they
  are not using PAM.
- AIX 5.1 build support, thanks to Jan-Frode Myklebust
  <janfrode@parallab.uib.no>.
- Add "hide_ids" option to show user/group in directory listings as "ftp".
  Request from Solar.
- Use the seemingly more portable setreuid() and setregid(), poxy HP.
- Use status 550 instead of 500 for known but disabled commands.
- Rename "dirchange.[ch]" to "banner.[ch]".
- Multiline connect banner support via "banner_file" config option.
- Minor error message changes.
- Add more FAQ entries.
- Add patch to specify PASV address - thanks to Mike McLean <mikem@redhat.com>.
- Drop the 2.4.0 kernel warning file
- Rudimentary standalone listener support - to be expanded in a later release.
- If sendfile() returns EINVAL just fall back to normal routines - handles
  non-pagecache backed files.
- Add "port_promiscuous" setting - should help enabling FXP.
- Modify anon_root and local_root to change directory _before_ applying the
  chroot().
- Open all files O_NONBLOCK to avoid pipes blocking on open.
- Support wu-ftpd style per-user chroot() via /./ in /etc/passwd HOMEDIR.
- Add SIGHUP support to new built in listener.
- Per-user config overrides, via "user_config_dir" - woohoo!
- Warning fixes, i.e. change "index" to "indexx" thanks to Olaf Kirch
  <okir@suse.de>.
- Make sure the standalone daemon doesn't leak zombies!
- Supposedly fix kernel messages about MSG_PEEK race - thanks to advice from
  Alexey <kuznet@ms2.inr.ac.ru>.
- Add global client limit for standalone mode.
- Add username that failed when we die with str_getpwnam.
- Add a bunch of documentation under EXAMPLES.

1 files changed, 38 insertions, 13 deletions

diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile
index 5180f33e813..bc364f76d81 100644
--- a/net/vsftpd/Makefile
+++ b/net/vsftpd/Makefile
@@ -1,25 +1,50 @@
-# $NetBSD: Makefile,v 1.2 2002/08/22 11:24:06 martti Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/09 23:31:38 salo Exp $
 #
 
-DISTNAME=	vsftpd-1.0.1
+DISTNAME=	vsftpd-1.1.3
 CATEGORIES=	net
-MASTER_SITES=	ftp://ferret.lmh.ox.ac.uk/pub/linux/
+MASTER_SITES=	ftp://vsftpd.beasts.org/users/cevans/
 
 MAINTAINER=	vaneth@krasnik.org
-HOMEPAGE=	http://ferret.lmh.ox.ac.uk/
+HOMEPAGE=	http://vsftpd.beasts.org/
 COMMENT=	FTP server that aims to be very secure
 
-ALL_TARGET=	#
+USE_BUILDLINK2=	YES
+USE_PKGINSTALL=	YES
 
-post-install:
+ALL_TARGET=		vsftpd
+PKG_SYSCONFSUBDIR=	vsftpd
+RCD_SCRIPTS=		vsftpd
+
+VSFTPD_USER?=	vsftpd
+VSFTPD_GROUP?=	vsftpd
+PKG_GROUPS=	${VSFTPD_GROUP}
+PKG_USERS=	${VSFTPD_USER}:${VSFTPD_GROUP}::vsftpd\\ user
+
+DOCDIR=		${PREFIX}/share/doc/vsftpd
+EGDIR=		${PREFIX}/share/examples/vsftpd
+
+CFLAGS=		-DPKG_SYSCONFDIR=\"\\\"${PKG_SYSCONFDIR}\\\"\"
+
+CONF_FILES=	${EGDIR}/vsftpd.conf.default ${PKG_SYSCONFDIR}/vsftpd.conf
+MAKE_DIRS=	/var/chroot
+OWN_DIRS=	/var/chroot/vsftpd
+
+post-patch:
+	@cd ${WRKSRC} && \
+		for f in vsftpd.8 vsftpd.conf.5 vsftpd.conf; do		\
+			${MV} $${f} $${f}.orig;				\
+			${SED} ${FILES_SUBST_SED} $${f}.orig > $${f};	\
+		done
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/vsftpd ${PREFIX}/libexec
 	${INSTALL_MAN} ${WRKSRC}/vsftpd.8 ${PREFIX}/man/man8
 	${INSTALL_MAN} ${WRKSRC}/vsftpd.conf.5 ${PREFIX}/man/man5
-	${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
+	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/vsftpd.conf ${EGDIR}/vsftpd.conf.default
+	${INSTALL_DATA_DIR} ${DOCDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} FAQ INSTALL README TUNING ${DOCDIR}
 
+.include "../../security/tcp_wrappers/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"