security/sshguard: update to 1.6.1

5 files changed, 4 insertions, 51 deletions

diff --git a/security/sshguard/Makefile b/security/sshguard/Makefile
index 039ca3e5a921..2586b192345d 100644
--- a/security/sshguard/Makefile
+++ b/security/sshguard/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	sshguard
-PORTVERSION=	1.6.0
-PORTREVISION=	1
+PORTVERSION=	1.6.1
+PORTREVISION=	0
 CATEGORIES=	security
 MASTER_SITES=	SF/sshguard/sshguard/${PORTVERSION}
 
diff --git a/security/sshguard/distinfo b/security/sshguard/distinfo
index e490ad55e743..05e3500bf402 100644
--- a/security/sshguard/distinfo
+++ b/security/sshguard/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sshguard-1.6.0.tar.xz) = dce32b1fc3fb0f8d15b6c56b9822c300434faaa87240e5373c095dc22bfa07e4
-SIZE (sshguard-1.6.0.tar.xz) = 384376
+SHA256 (sshguard-1.6.1.tar.xz) = f431899c20fa2f41fa293605af96ff97d44823b84db41c914ee60da44f1ff6c8
+SIZE (sshguard-1.6.1.tar.xz) = 416088
diff --git a/security/sshguard/files/patch-src-parser-attack_scanner.l b/security/sshguard/files/patch-src-parser-attack_scanner.l
deleted file mode 100644
index 4c866b8ba7f5..000000000000
--- a/security/sshguard/files/patch-src-parser-attack_scanner.l
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/parser/attack_scanner.l.orig	2015-05-16 19:49:47.000000000 -0500
-+++ src/parser/attack_scanner.l	2015-05-16 19:57:07.000000000 -0500
-@@ -74,6 +74,7 @@
- IPV4MAPPED6 ((:(:0{1,4}){0,4}|0{1,4}:(:0{1,4}){1,3}|(0{1,4}:){2}(0{1,4}:0{0,4}:0{1,4}|(:0{1,4}){1,2})|(0{1,4}:){1,4}):[fF]{4}:(((2[0-4]|1[0-9]|[1-9])?[0-9]|25[0-5])\.){3}((2[0-4]|1[0-9]|[1-9])?[0-9]|25[0-5]))
- 
- HOSTADDR    localhost|([-a-zA-Z0-9]+\.)+[a-zA-Z]+|{IPV4}|{IPV6}|{IPV4MAPPED6}
-+FACLEVEL    (<[a-zA-Z0-9]+\.[a-zA-Z0-9]+>)
- 
- %%
- 
-@@ -87,13 +88,14 @@
-   */
- 
-  /* handle entries with PID and without PID from processes other than sshguard */
--({TIMESTAMP_SYSLOG}|{TIMESTAMP_ISO8601})[ ]+([a-zA-Z0-9]|{WORD}|{HOSTADDR})[ ]+{PROCESSNAME}("/"{PROCESSNAME})?"["{NUMBER}"]: "{SOLARIS_MSGID_TAG}? {
-+({TIMESTAMP_SYSLOG}|{TIMESTAMP_ISO8601})[ ]+{FACLEVEL}?[ ]*([a-zA-Z0-9]|{WORD}|{HOSTADDR})[ ]+{PROCESSNAME}("/"{PROCESSNAME})?"["{NUMBER}"]: "{SOLARIS_MSGID_TAG}? {
-         /* extract PID */
-         yylval.num = getsyslogpid(yytext, yyleng);
-         return SYSLOG_BANNER_PID;
-         }
- 
--({TIMESTAMP_SYSLOG}|{TIMESTAMP_ISO8601})[ ]+([a-zA-Z0-9]|{WORD}|{HOSTADDR})[ ]+({PROCESSNAME}("/"{PROCESSNAME})?":")?   { return SYSLOG_BANNER; }
-+({TIMESTAMP_SYSLOG}|{TIMESTAMP_ISO8601})[ ]+{FACLEVEL}?[ ]*([a-zA-Z0-9]|{WORD}|{HOSTADDR})[ ]+({PROCESSNAME}("/"{PROCESSNAME})?":")?   { return SYSLOG_BANNER; }
-+
- 
-  /* syslog style  "last message repeated N times" */
- "last message repeated "([1-9][0-9]*)" times"                   {
diff --git a/security/sshguard/files/patch-src_fwalls_hosts.c b/security/sshguard/files/patch-src_fwalls_hosts.c
deleted file mode 100644
index 52522701c36f..000000000000
--- a/security/sshguard/files/patch-src_fwalls_hosts.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/fwalls/hosts.c.orig	2015-05-05 01:56:03 UTC
-+++ src/fwalls/hosts.c
-@@ -31,6 +31,7 @@
- #include "../config.h"
- #include "../sshguard_log.h"
- #include "../sshguard_fw.h"
-+#include "parser/address.h"
- 
- #ifndef HOSTSFILE_PATH
- #   define HOSTSFILE_PATH     "/etc/hosts.allow"
diff --git a/security/sshguard/files/patch-src_fwalls_ipfw.c b/security/sshguard/files/patch-src_fwalls_ipfw.c
deleted file mode 100644
index 718046f3aeae..000000000000
--- a/security/sshguard/files/patch-src_fwalls_ipfw.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/fwalls/ipfw.c.orig	2015-05-05 01:58:28 UTC
-+++ src/fwalls/ipfw.c
-@@ -33,6 +33,7 @@
- #include "../config.h"
- #include "../sshguard_log.h"
- #include "../sshguard_fw.h"
-+#include "parser/address.h"
- 
- #define IPFWMOD_ADDRESS_BULK_REPRESENTATIVE     "FF:FF:FF:FF:FF:FF:FF:FF"
-