From owner-svn-ports-head@freebsd.org  Fri Jul 15 22:51:14 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DD285B99364;
 Fri, 15 Jul 2016 22:51:14 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 922AF114A;
 Fri, 15 Jul 2016 22:51:14 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6FMpD7W064645;
 Fri, 15 Jul 2016 22:51:13 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6FMpDgI064643;
 Fri, 15 Jul 2016 22:51:13 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201607152251.u6FMpDgI064643@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
 asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Fri, 15 Jul 2016 22:51:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r418610 - in head/ftp/pure-ftpd: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Jul 2016 22:51:15 -0000

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}"