[Midnightbsd-cvs] mports: security/sshguard: update to 1.2

[laffer1 at midnightbsd.org]

Log Message:
-----------
update to 1.2

Modified Files:
--------------
    mports/security/sshguard:
        Makefile (r1.3 -> r1.4)
        distinfo (r1.1 -> r1.2)

Removed Files:
-------------
    mports/security/sshguard/files:
        patch-attack_scanner.l
        patch-sshguard.c

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/security/sshguard/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L security/sshguard/Makefile -L security/sshguard/Makefile -u -r1.3 -r1.4
--- security/sshguard/Makefile
+++ security/sshguard/Makefile
@@ -7,30 +7,28 @@
 #
 
 PORTNAME=	sshguard
-DISTVERSION=	1.0
-PORTREVISION=	2
+DISTVERSION=	1.2
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT?=	Protect hosts from brute force attacks against ssh
 LICENSE=	gpl2
 #author says bsdl on site, but can't find it. There seems to be GPL code.
 
-CONFLICTS?=	sshguard-ipfw-1.0* sshguard-pf-1.0*
+CONFLICTS?=	sshguard-ipfw-1.[0-9]* sshguard-pf-1.[0-9]*
 
 PLIST_FILES=	sbin/sshguard
 
 MAN8=		sshguard.8
 MANCOMPRESSED=	no
+USE_AUTOTOOLS=	autoconf:261
 USE_BZIP2=	yes
 MAKE_ARGS+=     ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}"
 HAS_CONFIGURE=	yes
 
 # sublist will be set afterward
 SUB_FILES=	pkg-message
-#SUB_LIST=
 
 # backend type in { hosts, ipfw, pf }
 SSHGUARDFW?=	hosts
@@ -41,10 +39,15 @@
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 .endif
 
+# set path for manpages
+CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man
+
 .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} == ipfilter
+PKGMSG_FWBLOCK="Sshguard will use /etc/ipf.rules as ruleset."
 .elif ${SSHGUARDFW} == hosts
 PKGMSG_FWBLOCK="  Sshguard is going to use /etc/hosts.allow, I have touched it for you."
 .endif
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/security/sshguard/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L security/sshguard/distinfo -L security/sshguard/distinfo -u -r1.1 -r1.2
--- security/sshguard/distinfo
+++ security/sshguard/distinfo
@@ -1,3 +1,3 @@
-MD5 (sshguard-1.0.tar.bz2) = 77b5a3a9d74542c487b8d5453d53d572
-SHA256 (sshguard-1.0.tar.bz2) = 33a9fe9d2360e9a5c357e269353d4157270171ff975bcf649f5f99b1aa8dcc08
-SIZE (sshguard-1.0.tar.bz2) = 118988
+MD5 (sshguard-1.2.tar.bz2) = c4b6e4b2d33990f07a173142caa074f2
+SHA256 (sshguard-1.2.tar.bz2) = 985a8d96cd150dee0ef8f7c5fb7ec4ec66549fbbec38fc76446236f759eb5b2b
+SIZE (sshguard-1.2.tar.bz2) = 145258
--- security/sshguard/files/patch-attack_scanner.l
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/attack_scanner.l.orig	Wed May 23 20:53:53 2007
-+++ src/attack_scanner.l	Sat Jun 16 17:45:43 2007
-@@ -46,7 +46,7 @@ NUMBER      [1-9][0-9]*
-  /* an IPv4 address */
- (25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]([0-9])?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]([0-9])?|0)){3} { yylval.str = yytext; return IPv4; }
-  /* an IPv6 address */
--((([a-fA-F0-9]{1,4}:){2}(:[a-fA-F0-9]{1,4}){1,5})|(:(:[a-fA-F0-9]{1,4}){1,6}|([a-fA-F0-9]{1,4}:)(:[a-fA-F0-9]{1,4}){1,6}|([a-fA-F0-9]{1,4}:){2}(:[a-fA-F0-9]{1,4}){1,5}|([a-fA-F0-9]{1,4}:){3}(:[a-fA-F0-9]{1,4}){1,4}|([a-fA-F0-9]{1,4}:){4}(:[a-fA-F0-9]{1,4}){1,3}|([a-fA-F0-9]{1,4}:){5}(:[a-fA-F0-9]{1,4}){1,2}|([a-fA-F0-9]{1,4}:){6}:[a-fA-F0-9]{1,4}))           { yylval.str = yytext; return IPv6;  }
-+(([a-fA-F0-9]{1,4}(:[a-fA-F0-9]{1,4}){7})|(([a-fA-F0-9]{1,4}:){2}(:[a-fA-F0-9]{1,4}){1,5})|(:(:[a-fA-F0-9]{1,4}){1,6}|([a-fA-F0-9]{1,4}:)(:[a-fA-F0-9]{1,4}){1,6}|([a-fA-F0-9]{1,4}:){2}(:[a-fA-F0-9]{1,4}){1,5}|([a-fA-F0-9]{1,4}:){3}(:[a-fA-F0-9]{1,4}){1,4}|([a-fA-F0-9]{1,4}:){4}(:[a-fA-F0-9]{1,4}){1,3}|([a-fA-F0-9]{1,4}:){5}(:[a-fA-F0-9]{1,4}){1,2}|([a-fA-F0-9]{1,4}:){6}:[a-fA-F0-9]{1,4}))           { yylval.str = yytext; return IPv6;  }
- 
-  /* an host address (PTR) */
- localhost|([-a-zA-Z0-9]+\.)+[a-zA-Z]+                           { yylval.str = yytext; return HOSTADDR; }
--- security/sshguard/files/patch-sshguard.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/sshguard.c.orig	Mon May 19 00:32:32 2008
-+++ src/sshguard.c	Mon May 19 00:33:24 2008
-@@ -150,11 +150,7 @@
-         report_address(attackparser_targetaddr, attackparser_targetaddrkind, attackparser_service);
-     }
- 
--    if (fw_fin() != FWALL_OK) sshguard_log(LOG_ERR, "Cound not finalize firewall.");
--
--    sshguard_log_fin();
--
--    return 0;
-+    exit(0);
- }
- 
-