git: 5d22a6665ba6 - main - security/sshguard: Upgrade to 2.4.2

[Rodrigo Osorio]

The branch main has been updated by rodrigo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5d22a6665ba6b780de84b398427ba87361952e57

commit 5d22a6665ba6b780de84b398427ba87361952e57
Author:     Rodrigo Osorio <rodrigo at FreeBSD.org>
AuthorDate: 2021-06-14 21:10:46 +0000
Commit:     Rodrigo Osorio <rodrigo at FreeBSD.org>
CommitDate: 2021-06-14 21:20:14 +0000

    security/sshguard: Upgrade to 2.4.2
    
    Major changes:
        * Recognize rejections from Postfix's postscreen daemon
        * The parser can now be changed using the PARSER and POST_PARSER options
        * Remove some false positive attack signatures for SSH and Cyrus
        * Adjust log verbosity of some log messages
        * The firewalld backend now uses firewall-cmd instead of iptables to flush block lists
    
    Full changelog : https://bitbucket.org/sshguard/sshguard/src/v2.4.2/CHANGELOG.rst
    
    PR:                     256575
    Reported by:    <sirdice at gmail.com>
    Approved by:    Kevin Zheng <kevinz5000 at gmail.com> (maintainer)
---
 security/sshguard/Makefile                    |  2 +-
 security/sshguard/distinfo                    |  6 +++---
 security/sshguard/files/patch-src_sshguard.in | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/security/sshguard/Makefile b/security/sshguard/Makefile
index d0c879902dd6..ba84072408b4 100644
--- a/security/sshguard/Makefile
+++ b/security/sshguard/Makefile
@@ -1,7 +1,7 @@
 # Created by: Mij <mij at bitchx.it>
 
 PORTNAME=	sshguard
-PORTVERSION=	2.4.1
+PORTVERSION=	2.4.2
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	SF/sshguard/sshguard/${PORTVERSION}
diff --git a/security/sshguard/distinfo b/security/sshguard/distinfo
index 7ae5f27eac21..df01aba97817 100644
--- a/security/sshguard/distinfo
+++ b/security/sshguard/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1596260072
-SHA256 (sshguard-2.4.1.tar.gz) = 875d02e6e67dced614790ed5e36aef1160edea940f353a79306cbb1852af3c67
-SIZE (sshguard-2.4.1.tar.gz) = 723940
+TIMESTAMP = 1622991099
+SHA256 (sshguard-2.4.2.tar.gz) = 2770b776e5ea70a9bedfec4fd84d57400afa927f0f7522870d2dcbbe1ace37e8
+SIZE (sshguard-2.4.2.tar.gz) = 835431
diff --git a/security/sshguard/files/patch-src_sshguard.in b/security/sshguard/files/patch-src_sshguard.in
index 6881e162028f..0a73967144a5 100644
--- a/security/sshguard/files/patch-src_sshguard.in
+++ b/security/sshguard/files/patch-src_sshguard.in
@@ -1,10 +1,10 @@
---- src/sshguard.in.orig	2019-05-23 22:25:17 UTC
+--- src/sshguard.in.orig	2021-06-06 14:54:07 UTC
 +++ src/sshguard.in
-@@ -97,14 +97,8 @@ elif [ -z "$tailcmd" ]; then
+@@ -98,14 +98,8 @@ elif [ -z "$tailcmd" ]; then
      exit 1
  fi
  
--if [ ! -z "$PID_FILE" ]; then
+-if [ -n "$PID_FILE" ]; then
 -    if [ ! -e "$PID_FILE" ]; then
 -        echo "$$" > $PID_FILE
 -    else
@@ -15,5 +15,5 @@
 +# Already checked by rc(8)
 +echo "$$" > $PID_FILE
  
- # Make sure to kill entire process group (subshell) on exit/interrupts.
- trap "clean_and_exit" INT TERM
+ # Select PARSER from configuration file or use default. Add POST_PARSER from
+ # configuration file if it exists.