From owner-svn-ports-all@FreeBSD.ORG  Thu Jan  8 13:42:53 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CB998C42;
 Thu,  8 Jan 2015 13:42:53 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 9D94812E;
 Thu,  8 Jan 2015 13:42:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t08DgrxU083421;
 Thu, 8 Jan 2015 13:42:53 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t08DgrY6083417;
 Thu, 8 Jan 2015 13:42:53 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201501081342.t08DgrY6083417@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: feld set sender to feld@FreeBSD.org
 using -f
From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 8 Jan 2015 13:42:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r376531 - in head/security/sshguard: . 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-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jan 2015 13:42:53 -0000

Author: feld
Date: Thu Jan  8 13:42:52 2015
New Revision: 376531
URL: https://svnweb.freebsd.org/changeset/ports/376531
QAT: https://qat.redports.org/buildarchive/r376531/

Log:
  Add ability to pass additional custom arguments to sshguard daemon via
  sshguard_flags in rc.conf
  
  Declare LICENSE while here
  
  Submitted by:	wjw@digiware.nl

Modified:
  head/security/sshguard/Makefile
  head/security/sshguard/files/sshguard.in

Modified: head/security/sshguard/Makefile
==============================================================================
--- head/security/sshguard/Makefile	Thu Jan  8 13:16:07 2015	(r376530)
+++ head/security/sshguard/Makefile	Thu Jan  8 13:42:52 2015	(r376531)
@@ -3,13 +3,15 @@
 
 PORTNAME=	sshguard
 PORTVERSION=	1.5
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	security
 MASTER_SITES=	SF/sshguard/sshguard/sshguard-${PORTVERSION}
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT?=	Protect hosts from brute force attacks against ssh and other services
 
+LICENSE=	BSD2CLAUSE
+
 CONFLICTS?=	sshguard-ipfilter-1.* sshguard-ipfw-1.* sshguard-pf-1.*
 
 USES=		tar:bzip2

Modified: head/security/sshguard/files/sshguard.in
==============================================================================
--- head/security/sshguard/files/sshguard.in	Thu Jan  8 13:16:07 2015	(r376530)
+++ head/security/sshguard/files/sshguard.in	Thu Jan  8 13:42:52 2015	(r376531)
@@ -57,6 +57,8 @@
 # sshguard_whitelistfile (str):	Path to the whitelist.
 #				Set to "%%PREFIX%%/etc/sshguard.whitelist"
 #				by default.
+# sshguard_flags (str):		Set additional command line arguments.
+#
 
 
 . /etc/rc.subr
@@ -80,10 +82,14 @@ command=/usr/sbin/daemon
 actual_command="%%PREFIX%%/sbin/sshguard"
 procname="${actual_command}"
 start_precmd=sshguard_prestart
-command_args="-c ${actual_command} \${sshguard_blacklist_params} \${sshguard_watch_params} -a ${sshguard_safety_thresh} -p ${sshguard_pardon_min_interval} -s ${sshguard_prescribe_interval} -w ${sshguard_whitelistfile} -i ${pidfile}"
+command_args="-c ${actual_command} \${sshguard_flags} \${sshguard_blacklist_params} \${sshguard_watch_params} -a ${sshguard_safety_thresh} -p ${sshguard_pardon_min_interval} -s ${sshguard_prescribe_interval} -w ${sshguard_whitelistfile} -i ${pidfile}"
 
 sshguard_prestart()
 {
+	# Clear rc_flags so sshguard_flags can be passed to sshguard
+	# instaed of daemon(8)
+	rc_flags=""
+
 	if [ ! -z ${sshguard_blacklist} ]; then
 	    mkdir -p $(dirname ${sshguard_blacklist##*:})
 	    sshguard_blacklist_params="-b ${sshguard_blacklist}"