From cd9ce7caf32f61db9c8de51c6f58f4f3fe8c290a Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
Date: Sun, 27 Jul 2014 08:32:06 +0000
Subject: Improve default options for SSHGuard. "-f 100:/var/run/sshd.pid" in
 particular affects the detection rate badly.

Bump package revision.
---
 security/sshguard/Makefile          | 3 ++-
 security/sshguard/files/sshguard.sh | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'security/sshguard')

diff --git a/security/sshguard/Makefile b/security/sshguard/Makefile
index 6f04503515d..ca5482e1ae2 100644
--- a/security/sshguard/Makefile
+++ b/security/sshguard/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2014/07/26 19:57:44 tron Exp $
+# $NetBSD: Makefile,v 1.2 2014/07/27 08:32:06 tron Exp $
 
 DISTNAME=	sshguard-1.5
+PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sshguard/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/security/sshguard/files/sshguard.sh b/security/sshguard/files/sshguard.sh
index 34dcc3428fe..4f73cb1b5f0 100644
--- a/security/sshguard/files/sshguard.sh
+++ b/security/sshguard/files/sshguard.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: sshguard.sh,v 1.1 2014/07/26 19:57:44 tron Exp $
+# $NetBSD: sshguard.sh,v 1.2 2014/07/27 08:32:06 tron Exp $
 #
 # PROVIDE: sshguard
 # REQUIRE: DAEMON
@@ -14,7 +14,7 @@ name=sshguard
 rcvar=$name
 command="@PREFIX@/sbin/${name}"
 pidfile="@VARBASE@/run/${name}.pid"
-sshguard_flags="-f 100:@VARBASE@/run/sshd.pid -l /var/log/authlog"
+sshguard_flags="-b @VARBASE@/db/sshguard-blacklist.db -l /var/log/authlog -l /var/log/maillog"
 command_args="-i $pidfile"
 start_cmd=sshguard_start
 
@@ -31,7 +31,9 @@ then
 else
 	case ${1:-start} in
 	start)
-		sshguard_start
+		if [ -x ${command} ]; then
+			sshguard_start
+		fi
 		;;
 	stop)
 		if [ -f ${pidfile} ]; then
-- 
cgit v1.2.3