svn commit: r372126 - in head/security/sshguard: . files

[Mark Felder]

Author: feld
Date: Mon Nov  3 21:56:18 2014
New Revision: 372126
URL: https://svnweb.freebsd.org/changeset/ports/372126
QAT: https://qat.redports.org/buildarchive/r372126/

Log:
  Make it possible to run sshguard without blacklist database by setting
  in rc.conf:
  
   sshguard_blacklist=""
  
  This may fix reliability for some users.
  
  PR:		174018

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

Modified: head/security/sshguard/Makefile
==============================================================================
--- head/security/sshguard/Makefile	Mon Nov  3 21:32:02 2014	(r372125)
+++ head/security/sshguard/Makefile	Mon Nov  3 21:56:18 2014	(r372126)
@@ -3,7 +3,7 @@
 
 PORTNAME=	sshguard
 PORTVERSION=	1.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	security
 MASTER_SITES=	SF/sshguard/sshguard/sshguard-${PORTVERSION}
 

Modified: head/security/sshguard/files/sshguard.in
==============================================================================
--- head/security/sshguard/files/sshguard.in	Mon Nov  3 21:32:02 2014	(r372125)
+++ head/security/sshguard/files/sshguard.in	Mon Nov  3 21:56:18 2014	(r372126)
@@ -80,13 +80,18 @@ command=/usr/sbin/daemon
 actual_command="%%PREFIX%%/sbin/sshguard"
 procname="${actual_command}"
 start_precmd=sshguard_prestart
-command_args="-c ${actual_command} -b ${sshguard_blacklist} \${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_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()
 {
-	mkdir -p `dirname ${sshguard_blacklist##*:}`
+	if [ ! -z ${sshguard_blacklist} ]; then
+	    mkdir -p $(dirname ${sshguard_blacklist##*:})
+	    sshguard_blacklist_params="-b ${sshguard_blacklist}"
+	fi
+
 	[ -e ${sshguard_whitelistfile} ] || touch ${sshguard_whitelistfile}
-	sshguard_watch_params=`echo ${sshguard_watch_logs} | tr : \\\n | sed -e s/^/-l\ /g | tr \\\n \ `
+
+	sshguard_watch_params=$(echo ${sshguard_watch_logs} | tr : \\\n | sed -e s/^/-l\ /g | tr \\\n \ )
 }
 
 run_rc_command "$1"