Attachment 167433 Details for Bug 207511 – sshguard 1.6.3 patch.

sshguard 1.6.3 patch.

sshguard-1.6.3.diff.txt (text/plain), 3.90 KB, created by Douglas Carmichael on 2016-02-26 09:20:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Douglas Carmichael

Created: 2016-02-26 09:20:53 UTC

Size: 3.90 KB

patch

obsolete

>diff -ruN sshguard.orig/Makefile sshguard/Makefile
>--- sshguard.orig/Makefile	2016-02-14 05:35:34.127017000 -0500
>+++ sshguard/Makefile	2016-02-15 12:23:17.232994000 -0500
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/security/sshguard/Makefile 403812 2015-12-15 21:18:52Z feld $
> 
> PORTNAME=	sshguard
>-PORTVERSION=	1.6.2
>+PORTVERSION=	1.6.3
> PORTREVISION=	0
> CATEGORIES=	security
> MASTER_SITES=	SF/sshguard/sshguard/${PORTVERSION}
>@@ -14,7 +14,7 @@
> 
> CONFLICTS?=	sshguard-ipfilter-1.* sshguard-ipfw-1.* sshguard-pf-1.* sshguard-null-1.*
> 
>-USES=		autoreconf tar:xz
>+USES=		autoreconf
> 
> PLIST_FILES=	sbin/sshguard man/man8/sshguard.8.gz
> 
>@@ -27,7 +27,7 @@
> SUB_FILES=	pkg-message
> 
> # backend type in { hosts, ipfw, null, pf }
>-SSHGUARDFW?=	hosts
>+SSHGUARDFW?=	ipfw
> 
> .if ${SSHGUARDFW} == pf
> PKGMSG_FWBLOCK="  To activate or configure PF see http://www.sshguard.net/docs/setup/firewall/pf/"
>diff -ruN sshguard.orig/distinfo sshguard/distinfo
>--- sshguard.orig/distinfo	2016-02-14 05:35:34.137348000 -0500
>+++ sshguard/distinfo	2016-02-14 05:36:13.960583000 -0500
>@@ -1,2 +1,2 @@
>-SHA256 (sshguard-1.6.2.tar.xz) = 57f56724f475e81bbe5fc75dfcb573213bf7e446d7dd039dcf5ba8fa5bc2cb2b
>-SIZE (sshguard-1.6.2.tar.xz) = 405092
>+SHA256 (sshguard-1.6.3.tar.gz) = 6c4d3be2acf6349b4ac5d6fff4bbcd8fa988c82876d848cbbd0c7c99bc0438c7
>+SIZE (sshguard-1.6.3.tar.gz) = 540130
>diff -ruN sshguard.orig/files/patch-src-sshguard.c sshguard/files/patch-src-sshguard.c
>--- sshguard.orig/files/patch-src-sshguard.c	2016-02-14 05:35:34.139413000 -0500
>+++ sshguard/files/patch-src-sshguard.c	1969-12-31 19:00:00.000000000 -0500
>@@ -1,19 +0,0 @@
>---- src/sshguard.c.orig	2011-02-09 12:01:47 UTC
>-+++ src/sshguard.c
>-@@ -567,9 +567,13 @@ static void process_blacklisted_addresse
>-         /* terminate array list */
>-         addresses[i] = NULL;
>-         /* do block addresses of this kind */
>--        if (fw_block_list(addresses, addrkind, service_codes) != FWALL_OK) {
>--            sshguard_log(LOG_CRIT, "While blocking blacklisted addresses, the firewall refused to block!");
>--        }
>-+        if (addresses[0] == NULL) {
>-+            sshguard_log(LOG_DEBUG, "No %s addresses in loaded blacklist.", (addrkind == ADDRKIND_IPv4) ? "IPv4" : "IPv6");
>-+        } else {
>-+            if (fw_block_list(addresses, addrkind, service_codes) != FWALL_OK) {
>-+                sshguard_log(LOG_CRIT, "While blocking blacklisted addresses, the firewall refused to block!");
>-+            }
>-+        } 
>-     }
>-     /* free temporary arrays */
>-     free(addresses);
>diff -ruN sshguard.orig/files/sshguard.in sshguard/files/sshguard.in
>--- sshguard.orig/files/sshguard.in	2016-02-14 05:35:34.148180000 -0500
>+++ sshguard/files/sshguard.in	2016-02-26 04:14:29.585964000 -0500
>@@ -37,8 +37,6 @@
> # Add the following lines to /etc/rc.conf to enable sshguard:
> # sshguard_enable (bool):	Set to "NO" by default.
> #				Set it to "YES" to enable sshguard
>-# sshguard_pidfile (str):	Path to PID file.
>-#				Set to "/var/run/sshguard.pid" by default
> # sshguard_watch_logs (str):	Colon splitted list of logs to watch.
> #				Set to "/var/log/auth.log:/var/log/maillog"
> #				by default.
>@@ -76,13 +74,11 @@
> : ${sshguard_whitelistfile="%%PREFIX%%/etc/sshguard.whitelist"}
> : ${sshguard_watch_logs=/var/log/auth.log:/var/log/maillog}
> 
>-pidfile=${sshguard_pidfile:="/var/run/sshguard.pid"}
>-
> command=/usr/sbin/daemon
> actual_command="%%PREFIX%%/sbin/sshguard"
> procname="${actual_command}"
> start_precmd=sshguard_prestart
>-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}"
>+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}"
> 
> sshguard_prestart()
> {

Actions: View

Attachments on bug 207511: 167433