View | Details | Raw Unified | Return to bug 238458 | Differences between
and this patch

Collapse All | Expand All

(-)b/security/sshguard/Makefile (+1 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	sshguard
4
PORTNAME=	sshguard
5
PORTVERSION=	2.4.0
5
PORTVERSION=	2.4.0
6
PORTREVISION=	1
6
PORTEPOCH=	1
7
PORTEPOCH=	1
7
CATEGORIES=	security
8
CATEGORIES=	security
8
MASTER_SITES=	SF/sshguard/sshguard/${PORTVERSION}
9
MASTER_SITES=	SF/sshguard/sshguard/${PORTVERSION}
(-)a/security/sshguard/files/patch-src-sshguard.in (-8 lines)
Removed Link Here
1
--- src/sshguard.in.orig	2018-07-08 18:07:01 UTC
2
+++ src/sshguard.in
3
@@ -96,4 +96,4 @@ elif [ -z "$tailcmd" ]; then
4
 fi
5
 
6
 eval $tailcmd | $libexec/sshg-parser | \
7
-    $libexec/sshg-blocker $flags | ($BACKEND; kill -PIPE $$)
8
+    $libexec/sshg-blocker $flags | ($BACKEND ; pkill -PIPE -P $$)
(-)b/security/sshguard/files/sshguard.in (-20 / +10 lines)
Lines 58-87 Link Here
58
# sshguard_flags (str):		Set additional command line arguments.
58
# sshguard_flags (str):		Set additional command line arguments.
59
#
59
#
60
60
61
62
. /etc/rc.subr
61
. /etc/rc.subr
63
62
64
name=sshguard
63
name=sshguard
65
rcvar=sshguard_enable
64
rcvar=sshguard_enable
66
65
67
load_rc_config sshguard
66
set_rcvar sshguard_blacklist "120:/var/db/sshguard/blacklist.db" "Blacklisting threshold and path to blacklist file (colon-separated)"
67
set_rcvar sshguard_danger_thresh "" "Attack threshold"
68
set_rcvar sshguard_pidfile "/var/run/sshguard.pid" "Path to PID file"
69
set_rcvar sshguard_release_interval "" "Time before releasing first-time attackers (s)"
70
set_rcvar sshguard_reset_interval "" "Time before forgetting attackers (s)"
71
set_rcvar sshguard_watch_logs "" "Log files to monitor, overriding sshguard.conf (space-separated)"
72
set_rcvar sshguard_whitelistfile "" "Path to whitelist"
68
73
69
: ${sshguard_enable:=NO}
74
load_rc_config sshguard
70
: ${sshguard_blacklist=120:/var/db/sshguard/blacklist.db}
71
: ${sshguard_danger_thresh=}
72
: ${sshguard_release_interval=}
73
: ${sshguard_reset_interval=}
74
: ${sshguard_whitelistfile=}
75
: ${sshguard_watch_logs=}
76
75
77
pidfile=${sshguard_pidfile:="/var/run/sshguard.pid"}
76
pidfile=${sshguard_pidfile}
78
77
79
command=/usr/sbin/daemon
78
command=/usr/sbin/daemon
80
actual_command="%%PREFIX%%/sbin/sshguard"
79
actual_command="%%PREFIX%%/sbin/sshguard"
81
procname="/bin/sh"
80
procname="/bin/sh"
82
start_precmd=sshguard_prestart
81
start_precmd=sshguard_prestart
83
stop_cmd=sshguard_stop
82
command_args="-c -f ${actual_command} \${sshguard_flags} \${sshguard_blacklist_params} \${sshguard_watch_params} \${sshguard_danger_params} \${sshguard_release_params} \${sshguard_reset_params} \${sshguard_whitelist_params} -i ${pidfile}"
84
command_args="-c ${actual_command} \${sshguard_flags} \${sshguard_blacklist_params} \${sshguard_watch_params} \${sshguard_danger_params} \${sshguard_release_params} \${sshguard_reset_params} \${sshguard_whitelist_params} -i ${pidfile}"
85
83
86
sshguard_prestart()
84
sshguard_prestart()
87
{
85
{
Lines 116-126 sshguard_prestart() Link Here
116
	fi
114
	fi
117
}
115
}
118
116
119
sshguard_stop()
120
{
121
	sshg_blocker="%%PREFIX%%/libexec/sshg-blocker"
122
	rc_pid="$(check_process ${sshg_blocker})"
123
	kill $sig_stop "$rc_pid"
124
}
125
126
run_rc_command "$1"
117
run_rc_command "$1"
127
- 

Return to bug 238458