Attachment 205877 Details for Bug 238458 – Updated patch

[patch] Updated patch

0001-security-sshguard-Fix-rc.d.patch (text/plain), 3.50 KB, created by Kevin Zheng on 2019-07-18 23:06:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin Zheng

Created: 2019-07-18 23:06:07 UTC

Size: 3.50 KB

patch

obsolete

>From a7628388aaeee05bddb380b0ee937121ccb0133e Mon Sep 17 00:00:00 2001
>From: Kevin Zheng <kevinz5000@gmail.com>
>Date: Thu, 18 Jul 2019 18:03:21 -0500
>Subject: [PATCH] security/sshguard: Fix rc.d
>
>---
> security/sshguard/Makefile                    |  1 +
> security/sshguard/files/patch-src-sshguard.in |  8 -----
> security/sshguard/files/sshguard.in           | 29 +++++++------------
> 3 files changed, 11 insertions(+), 27 deletions(-)
> delete mode 100644 security/sshguard/files/patch-src-sshguard.in
>
>diff --git a/security/sshguard/Makefile b/security/sshguard/Makefile
>index 8e5bc0f8295d..d5837c463597 100644
>--- a/security/sshguard/Makefile
>+++ b/security/sshguard/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	sshguard
> PORTVERSION=	2.4.0
>+PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	security
> MASTER_SITES=	SF/sshguard/sshguard/${PORTVERSION}
>diff --git a/security/sshguard/files/patch-src-sshguard.in b/security/sshguard/files/patch-src-sshguard.in
>deleted file mode 100644
>index cb196d9fe41c..000000000000
>--- a/security/sshguard/files/patch-src-sshguard.in
>+++ /dev/null
>@@ -1,8 +0,0 @@
>---- src/sshguard.in.orig	2018-07-08 18:07:01 UTC
>-+++ src/sshguard.in
>-@@ -96,4 +96,4 @@ elif [ -z "$tailcmd" ]; then
>- fi
>- 
>- eval $tailcmd | $libexec/sshg-parser | \
>--    $libexec/sshg-blocker $flags | ($BACKEND; kill -PIPE $$)
>-+    $libexec/sshg-blocker $flags | ($BACKEND ; pkill -PIPE -P $$)
>diff --git a/security/sshguard/files/sshguard.in b/security/sshguard/files/sshguard.in
>index 424f88885eed..2839b23d335e 100644
>--- a/security/sshguard/files/sshguard.in
>+++ b/security/sshguard/files/sshguard.in
>@@ -58,30 +58,28 @@
> # sshguard_flags (str):		Set additional command line arguments.
> #
> 
>-
> . /etc/rc.subr
> 
> name=sshguard
> rcvar=sshguard_enable
> 
>-load_rc_config sshguard
>+set_rcvar sshguard_blacklist "120:/var/db/sshguard/blacklist.db" "Blacklisting threshold and path to blacklist file (colon-separated)"
>+set_rcvar sshguard_danger_thresh "" "Attack threshold"
>+set_rcvar sshguard_pidfile "/var/run/sshguard.pid" "Path to PID file"
>+set_rcvar sshguard_release_interval "" "Time before releasing first-time attackers (s)"
>+set_rcvar sshguard_reset_interval "" "Time before forgetting attackers (s)"
>+set_rcvar sshguard_watch_logs "" "Log files to monitor, overriding sshguard.conf (space-separated)"
>+set_rcvar sshguard_whitelistfile "" "Path to whitelist"
> 
>-: ${sshguard_enable:=NO}
>-: ${sshguard_blacklist=120:/var/db/sshguard/blacklist.db}
>-: ${sshguard_danger_thresh=}
>-: ${sshguard_release_interval=}
>-: ${sshguard_reset_interval=}
>-: ${sshguard_whitelistfile=}
>-: ${sshguard_watch_logs=}
>+load_rc_config sshguard
> 
>-pidfile=${sshguard_pidfile:="/var/run/sshguard.pid"}
>+pidfile=${sshguard_pidfile}
> 
> command=/usr/sbin/daemon
> actual_command="%%PREFIX%%/sbin/sshguard"
> procname="/bin/sh"
> start_precmd=sshguard_prestart
>-stop_cmd=sshguard_stop
>-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}"
>+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}"
> 
> sshguard_prestart()
> {
>@@ -116,11 +114,4 @@ sshguard_prestart()
> 	fi
> }
> 
>-sshguard_stop()
>-{
>-	sshg_blocker="%%PREFIX%%/libexec/sshg-blocker"
>-	rc_pid="$(check_process ${sshg_blocker})"
>-	kill $sig_stop "$rc_pid"
>-}
>-
> run_rc_command "$1"
>-- 
>2.22.0
>

Actions: View | Diff

Attachments on bug 238458: 204949 | 205877