Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 8 Jan 2015 13:42:53 +0000 (UTC)
From:      Mark Felder <feld@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r376531 - in head/security/sshguard: . files
Message-ID:  <201501081342.t08DgrY6083417@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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}"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501081342.t08DgrY6083417>