Attachment #121767 for bug #164829

View | Details | Raw Unified | Return to bug 164829
Collapse All | Expand All




#

PORTNAME=	fail2ban
PORTVERSION=	0.8.6
PORTREVISION=
CATEGORIES=	security python
MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/tarball/${PORTVERSION}/
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
DISTNAME=       ${PORTNAME}-${PORTNAME}-${PORTVERSION}-${GITVERSION}

MAINTAINER=	theis@gmx.at
COMMENT=	Scans log files and bans IP that makes too many password failures

LICENSE=        GPLv2

GITVERSION=     0-g1efe1bc
FETCH_ARGS=      -pRr
WRKSRC=         ${WRKDIR}/${PORTNAME}-${PORTNAME}-a20d1f8

MAKE_JOBS_SAFE=	yes

USE_PYTHON=	2.5-2.7
USE_PYDISTUTILS=	yes

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (fail2ban-0.8.4.tar.bz2) = 7a4fc0ea6dffde1db1d096757878e1b2c5f0b087a05ed7e7ca0202fb0b127982	1	SHA256 (fail2ban-fail2ban-0.8.6-0-g1efe1bc.tar.gz) = 24d02422c55f1b7d92bea30a7dde6f72f280eadf09d478fcca8b1dd40fb4e914
2	SIZE (fail2ban-0.8.4.tar.bz2) = 71818	2	SIZE (fail2ban-fail2ban-0.8.6-0-g1efe1bc.tar.gz) = 107029

Lines 1-6 Link Here

(-)pkg-plist (+3 lines)
1	%%ETCDIR%%/action.d/bsd-ipfw.conf	1	%%ETCDIR%%/action.d/bsd-ipfw.conf
2	%%ETCDIR%%/action.d/complain.conf	2	%%ETCDIR%%/action.d/complain.conf
3	%%ETCDIR%%/action.d/dshield.conf	3	%%ETCDIR%%/action.d/dshield.conf
		4	%%ETCDIR%%/action.d/dummy.conf
4	%%ETCDIR%%/action.d/hostsdeny.conf	5	%%ETCDIR%%/action.d/hostsdeny.conf
5	%%ETCDIR%%/action.d/ipfilter.conf	6	%%ETCDIR%%/action.d/ipfilter.conf
6	%%ETCDIR%%/action.d/ipfw.conf	7	%%ETCDIR%%/action.d/ipfw.conf
Lines 32-37 Link Here
32	%%ETCDIR%%/filter.d/courierlogin.conf	33	%%ETCDIR%%/filter.d/courierlogin.conf
33	%%ETCDIR%%/filter.d/couriersmtp.conf	34	%%ETCDIR%%/filter.d/couriersmtp.conf
34	%%ETCDIR%%/filter.d/cyrus-imap.conf	35	%%ETCDIR%%/filter.d/cyrus-imap.conf
		36	%%ETCDIR%%/filter.d/dovecot.conf
		37	%%ETCDIR%%/filter.d/dropbear.conf
35	%%ETCDIR%%/filter.d/exim.conf	38	%%ETCDIR%%/filter.d/exim.conf
36	%%ETCDIR%%/filter.d/gssftpd.conf	39	%%ETCDIR%%/filter.d/gssftpd.conf
37	%%ETCDIR%%/filter.d/lighttpd-fastcgi.conf	40	%%ETCDIR%%/filter.d/lighttpd-fastcgi.conf




--- config/filter.d/common.conf.orig	2012-01-20 22:50:22.000000000 +0100
+++ config/filter.d/common.conf	2012-01-20 23:10:52.000000000 +0100
@@ -32,6 +32,9 @@
 # EXAMPLES: sshd[31607], pop(pam_unix)[4920]
 __daemon_combs_re = (?:%(__pid_re)s?:\s+%(__daemon_re)s|%(__daemon_re)s%(__pid_re)s?:)
 
+# Logging facility and priority for BSD "-v" verbose mode
+__bsd_verbose_mode = (?:\s*\<\S+\.\S+\>\s*)
+
 # Some messages have a kernel prefix with a timestamp
 # EXAMPLES: kernel: [769570.846956]
 __kernel_prefix = kernel: \[\d+\.\d+\]
@@ -43,5 +46,5 @@
 #
 #       [hostname] [vserver tag] daemon_id spaces
 # this can be optional (for instance if we match named native log files)
-__prefix_line = \s*(?:%(__hostname)s )?(?:%(__kernel_prefix)s )?(?:@vserver_\S+ )?%(__daemon_combs_re)s?\s*
+__prefix_line = \s*%(__bsd_verbose_mode)s?(?:\S+ )?(?:@vserver_\S+ )?%(__daemon_combs_re)s?\s*

Return to bug 164829

Lines 6-23 Link Here

(-)Makefile (-5 / +10 lines)
6	#	6	#
7		7
8	PORTNAME= fail2ban	8	PORTNAME= fail2ban
9	PORTVERSION= 0.8.4	9	PORTVERSION= 0.8.6
10	PORTREVISION= 2	10	PORTREVISION=
11	CATEGORIES= security python	11	CATEGORIES= security python
12	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTNAME}-${PORTVERSION}	12	MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/tarball/${PORTVERSION}/
13	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	13	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
		14	DISTNAME= ${PORTNAME}-${PORTNAME}-${PORTVERSION}-${GITVERSION}
14		15
15	MAINTAINER= theis@gmx.at	16	MAINTAINER= theis@gmx.at
16	COMMENT= Scans log files and bans IP that makes too many password failures	17	COMMENT= Scans log files and bans IP that makes too many password failures
17		18
18	MAKE_JOBS_SAFE= yes	19	LICENSE= GPLv2
		20
		21	GITVERSION= 0-g1efe1bc
		22	FETCH_ARGS= -pRr
		23	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAME}-a20d1f8
19		24
20	USE_BZIP2= yes	25	MAKE_JOBS_SAFE= yes
21		26
22	USE_PYTHON= 2.5-2.7	27	USE_PYTHON= 2.5-2.7
23	USE_PYDISTUTILS= yes	28	USE_PYDISTUTILS= yes

Lines 1-17 Link Here

(-)files/patch-common.conf (-6 / +8 lines)
1	--- config/filter.d/common.conf.orig 2011-05-25 14:25:33.000000000 +0100	1	--- config/filter.d/common.conf.orig 2012-01-20 22:50:22.000000000 +0100
2	+++ config/filter.d/common.conf 2011-05-25 14:25:42.000000000 +0100	2	+++ config/filter.d/common.conf 2012-01-20 23:10:52.000000000 +0100
3	@@ -32,10 +32,13 @@	3	@@ -32,6 +32,9 @@
4	# EXAMPLES: sshd[31607], pop(pam_unix)[4920]	4	# EXAMPLES: sshd[31607], pop(pam_unix)[4920]
5	__daemon_combs_re = (?:%(__pid_re)s?:\s+%(__daemon_re)s\|%(__daemon_re)s%(__pid_re)s?:)	5	__daemon_combs_re = (?:%(__pid_re)s?:\s+%(__daemon_re)s\|%(__daemon_re)s%(__pid_re)s?:)
6		6
7	+# Logging facility and priority for BSD "-v" verbose mode	7	+# Logging facility and priority for BSD "-v" verbose mode
8	+__bsd_verbose_mode = (?:\s\<\S+\.\S+\>\s)	8	+__bsd_verbose_mode = (?:\s\<\S+\.\S+\>\s)
9	+	9	+
10	#	10	# Some messages have a kernel prefix with a timestamp
11	# Common line prefixes (beginnings) which could be used in filters	11	# EXAMPLES: kernel: [769570.846956]
		12	__kernel_prefix = kernel: \[\d+\.\d+\]
		13	@@ -43,5 +46,5 @@
12	#	14	#
13	# [hostname] [vserver tag] daemon_id spaces	15	# [hostname] [vserver tag] daemon_id spaces
14	# this can be optional (for instance if we match named native log files)	16	# this can be optional (for instance if we match named native log files)
15	-__prefix_line = \s(?:\S+ )?(?:@vserver_\S+ )?%(__daemon_combs_re)s?\s	17	-__prefix_line = \s(?:%(__hostname)s )?(?:%(__kernel_prefix)s )?(?:@vserver_\S+ )?%(__daemon_combs_re)s?\s
16	+__prefix_line = \s%(__bsd_verbose_mode)s?(?:\S+ )?(?:@vserver_\S+ )?%(__daemon_combs_re)s?\s	18	+__prefix_line = \s%(__bsd_verbose_mode)s?(?:\S+ )?(?:@vserver_\S+ )?%(__daemon_combs_re)s?\s