security/sshguard: Update to 1.6.3

Changelog:	https://sourceforge.net/p/sshguard/mailman/message/34733464/

PR:		207511
Submitted by:	<dcarmich@dcarmichael.net>

4 files changed, 5 insertions, 28 deletions

diff --git a/security/sshguard/Makefile b/security/sshguard/Makefile
index 37c3dc57d112..4a348790b4dd 100644
--- a/security/sshguard/Makefile
+++ b/security/sshguard/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sshguard
-PORTVERSION=	1.6.2
+PORTVERSION=	1.6.3
 PORTREVISION=	0
 CATEGORIES=	security
 MASTER_SITES=	SF/sshguard/sshguard/${PORTVERSION}
@@ -14,7 +14,7 @@ LICENSE=	BSD2CLAUSE
 
 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
 
diff --git a/security/sshguard/distinfo b/security/sshguard/distinfo
index 5c30328818ee..ef6527cb3ec8 100644
--- a/security/sshguard/distinfo
+++ b/security/sshguard/distinfo
@@ -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 --git a/security/sshguard/files/patch-src-sshguard.c b/security/sshguard/files/patch-src-sshguard.c
deleted file mode 100644
index 641986c90dae..000000000000
--- a/security/sshguard/files/patch-src-sshguard.c
+++ /dev/null
@@ -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 --git a/security/sshguard/files/sshguard.in b/security/sshguard/files/sshguard.in
index 3db9ebc4f62e..a9cb86139264 100644
--- a/security/sshguard/files/sshguard.in
+++ b/security/sshguard/files/sshguard.in
@@ -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 @@ load_rc_config sshguard
 : ${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()
 {