svn commit: r418610 - in head/ftp/pure-ftpd: . files

[Alan Somers]

Author: asomers (src committer)
Date: Fri Jul 15 22:51:13 2016
New Revision: 418610
URL: https://svnweb.freebsd.org/changeset/ports/418610

Log:
  Make pure-ftpd flags configurable in /etc/rc.conf
  
  Recognize a "pureftpd_flags" variable in pure-ftpd's rc script. Pretty much
  anything that can be placed in /usr/local/etc/pure-ftpd.conf can be placed
  in this variable instead.
  
  ftp/pure-ftpd/Makefile
  	Bump PORTREVISION
  
  ftp/pure-ftpd/files/pure-ftpd.in
  	Handle pureftpd_flags. It needs special handling because, unlike
  	most daemons, pure-config.pl takes its mandatory argument first and
  	its optional flags last.
  
  PR:		210311
  Approved by:	maintainer-timeout
  Approved by:	brd (ports)
  Sponsored by:	Spectra Logic Corp
  Differential Revision:	https://reviews.freebsd.org/D6676

Modified:
  head/ftp/pure-ftpd/Makefile
  head/ftp/pure-ftpd/files/pure-ftpd.in

Modified: head/ftp/pure-ftpd/Makefile
==============================================================================
--- head/ftp/pure-ftpd/Makefile	Fri Jul 15 19:22:05 2016	(r418609)
+++ head/ftp/pure-ftpd/Makefile	Fri Jul 15 22:51:13 2016	(r418610)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pure-ftpd
 PORTVERSION=	1.0.42
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	http://download.pureftpd.org/pub/pure-ftpd/releases/ \
 		ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/ \

Modified: head/ftp/pure-ftpd/files/pure-ftpd.in
==============================================================================
--- head/ftp/pure-ftpd/files/pure-ftpd.in	Fri Jul 15 19:22:05 2016	(r418609)
+++ head/ftp/pure-ftpd/files/pure-ftpd.in	Fri Jul 15 22:51:13 2016	(r418610)
@@ -11,6 +11,7 @@
 # Add the following lines to /etc/rc.conf to enable pure-ftpd:
 #
 # pureftpd_enable="yes"
+# pureftpd_flags="<set as needed>"
 #
 # Add the following lines to /etc/rc.conf to enable pure-authd daemon:
 #
@@ -48,7 +49,8 @@ pidfile_uploadscript=${pidfile_uploadscr
 pureftpd_upload_enable=${pureftpd_upload_enable:-"no"}
 pureftpd_uploadscript=${pureftpd_uploadscript:-"/usr/bin/touch"}
 # command_args
-command_args="${pureftpd_config} -g${pidfile}"
+flags="${pureftpd_config} -g${pidfile}"
+command_args="${pureftpd_flags}"
 command_authd_args="-B -p ${pidfile_authd} -r ${pureftpd_authdscript} -s ${pureftpd_authsocket}"
 command_upload_args="-B -p ${pidfile_uploadscript} -r ${pureftpd_uploadscript}"