Index: head/security/sshguard/Makefile =================================================================== --- head/security/sshguard/Makefile (revision 385438) +++ head/security/sshguard/Makefile (revision 385439) @@ -1,42 +1,42 @@ # Created by: Mij # $FreeBSD$ PORTNAME= sshguard -PORTVERSION= 1.5 -PORTREVISION= 12 +PORTVERSION= 1.6.0 +PORTREVISION= 0 CATEGORIES= security -MASTER_SITES= SF/sshguard/sshguard/sshguard-${PORTVERSION} +MASTER_SITES= SF/sshguard/sshguard/${PORTVERSION} MAINTAINER= feld@FreeBSD.org COMMENT?= Protect hosts from brute force attacks against ssh and other services LICENSE= BSD2CLAUSE CONFLICTS?= sshguard-ipfilter-1.* sshguard-ipfw-1.* sshguard-pf-1.* -USES= tar:bzip2 +USES= autoreconf tar:xz PLIST_FILES= sbin/sshguard man/man8/sshguard.8.gz USE_RC_SUBR= sshguard MAKE_ARGS+= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-firewall=${SSHGUARDFW} SUB_LIST+= PKGMSG_FWBLOCK=${PKGMSG_FWBLOCK} SUB_FILES= pkg-message # backend type in { hosts, ipfw, pf } SSHGUARDFW?= hosts .if ${SSHGUARDFW} == pf PKGMSG_FWBLOCK=" To activate or configure PF see http://sshguard.sf.net/doc/setup/blockingpf.html" .elif ${SSHGUARDFW} == ipfw PKGMSG_FWBLOCK=" Verify that IPFW is active with \"ipfw show\"." .elif ${SSHGUARDFW} == hosts PKGMSG_FWBLOCK=" Sshguard is going to use /etc/hosts.allow. Please remember to touch /etc/hosts.allow\!" .elif ${SSHGUARDFW} == ipfilter PKGMSG_FWBLOCK=" Sshguard will use /etc/ipf.rules as ruleset." .endif .include Index: head/security/sshguard/distinfo =================================================================== --- head/security/sshguard/distinfo (revision 385438) +++ head/security/sshguard/distinfo (revision 385439) @@ -1,2 +1,2 @@ -SHA256 (sshguard-1.5.tar.bz2) = b537f8765455fdf8424f87d4bd695e5b675b88e5d164865452137947093e7e19 -SIZE (sshguard-1.5.tar.bz2) = 303767 +SHA256 (sshguard-1.6.0.tar.xz) = dce32b1fc3fb0f8d15b6c56b9822c300434faaa87240e5373c095dc22bfa07e4 +SIZE (sshguard-1.6.0.tar.xz) = 384376 Index: head/security/sshguard/files/patch-src-parser-attack_scanner.l =================================================================== --- head/security/sshguard/files/patch-src-parser-attack_scanner.l (revision 385438) +++ head/security/sshguard/files/patch-src-parser-attack_scanner.l (nonexistent) @@ -1,44 +0,0 @@ ---- src/parser/attack_scanner.l.orig 2015-03-24 02:18:57 UTC -+++ src/parser/attack_scanner.l -@@ -78,6 +78,7 @@ MINPS [0-5][0-9] - WORD [a-zA-Z0-9][-_a-zA-Z0-9]+ - NUMBER [1-9][0-9]* - HOSTADDR localhost|([-a-zA-Z0-9]+\.)+[a-zA-Z]+ -+FACLEVEL (<[a-zA-Z0-9]+\.[a-zA-Z0-9]+>) - - TIMESTAMP_SYSLOG {MONTH}\ +{DAYNO}\ +{HOUR}:{MINPS}:{MINPS} - TIMESTAMP_TAI64 [0-9A-Fa-f]{24} -@@ -107,13 +108,13 @@ IPV4MAPPED6 ((:(:0{1,4}){0,4}|0{1,4}:(:0 - */ - - /* handle entries with PID and without PID from processes other than sshguard */ --{TIMESTAMP_SYSLOG}[ ]+([a-zA-Z0-9]|{WORD}|{HOSTADDR})[ ]+{PROCESSNAME}"["{NUMBER}"]: "{SOLARIS_MSGID_TAG}? { -+{TIMESTAMP_SYSLOG}[ ]+{FACLEVEL}?[ ]*([a-zA-Z0-9]|{WORD}|{HOSTADDR})[ ]+{PROCESSNAME}"["{NUMBER}"]: "{SOLARIS_MSGID_TAG}? { - /* extract PID */ - yylval.num = getsyslogpid(yytext, yyleng); - return SYSLOG_BANNER_PID; - } - --{TIMESTAMP_SYSLOG}[ ]+([a-zA-Z0-9]|{WORD}|{HOSTADDR})[ ]+({PROCESSNAME}":")? { return SYSLOG_BANNER; } -+{TIMESTAMP_SYSLOG}[ ]+{FACLEVEL}?[ ]*([a-zA-Z0-9]|{WORD}|{HOSTADDR})[ ]+({PROCESSNAME}":")? { return SYSLOG_BANNER; } - - /* syslog style "last message repeated N times" */ - "last message repeated "([1-9][0-9]*)" times" { -@@ -127,7 +128,7 @@ IPV4MAPPED6 ((:(:0{1,4}){0,4}|0{1,4}:(:0 - - - /* SSH: invalid or rejected user (cross platform [generated by openssh]) */ --"Invalid user ".+" from " { return SSH_INVALUSERPREF; } -+[Ii]"nvalid user ".+" from " { return SSH_INVALUSERPREF; } - /* match disallowed user (not in AllowUsers/AllowGroups or in DenyUsers/DenyGroups) on Linux Ubuntu/FreeBSD */ - /* "User tinydns from 1.2.3.4 not allowed because not listed in AllowUsers" */ - "User ".+" from " { BEGIN(ssh_notallowed); return SSH_NOTALLOWEDPREF; } -@@ -175,7 +176,7 @@ IPV4MAPPED6 ((:(:0{1,4}){0,4}|0{1,4}:(:0 - - /* cyrus-imap login error */ - "badlogin: "[^\[]*"[" { BEGIN(cyrusimap_loginerr); return CYRUSIMAP_SASL_LOGINERR_PREF; } --"] ".*"SASL".*"checkpass failed" { BEGIN(INITIAL); return CYRUSIMAP_SASL_LOGINERR_SUFF; } -+"] ".*"SASL".*"failed".?$ { BEGIN(INITIAL); return CYRUSIMAP_SASL_LOGINERR_SUFF; } - - /* FreeBSD's ftpd login errors */ - "FTP LOGIN FAILED FROM " { BEGIN(freebsdftpd_loginerr); return FREEBSDFTPD_LOGINERR_PREF; } Property changes on: head/security/sshguard/files/patch-src-parser-attack_scanner.l ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/sshguard/files/patch-src_fwalls_hosts.c =================================================================== --- head/security/sshguard/files/patch-src_fwalls_hosts.c (nonexistent) +++ head/security/sshguard/files/patch-src_fwalls_hosts.c (revision 385439) @@ -0,0 +1,10 @@ +--- 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" Property changes on: head/security/sshguard/files/patch-src_fwalls_hosts.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/sshguard/files/patch-src_fwalls_ipfw.c =================================================================== --- head/security/sshguard/files/patch-src_fwalls_ipfw.c (nonexistent) +++ head/security/sshguard/files/patch-src_fwalls_ipfw.c (revision 385439) @@ -0,0 +1,10 @@ +--- 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" + Property changes on: head/security/sshguard/files/patch-src_fwalls_ipfw.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property