Attachment #134718 for bug #179426




# $FreeBSD: ports/security/py-fail2ban/Makefile,v 1.19 2013/02/25 22:55:56 svnexp Exp $

PORTNAME=	fail2ban
PORTVERSION=	0.8.9
PORTREVISION=	1
CATEGORIES=	security python
MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/tarball/${PORTVERSION}/
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}


LICENSE=	GPLv2

GITVERSION=	0-g152c619
FETCH_ARGS=	-pRr
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}-1a3155a

MAKE_JOBS_SAFE=	yes



PYDISTUTILS_INSTALLARGS+=	--install-purelib=${PYTHON_SITELIBDIR} \
				--install-data=${ETCDIR}
PYDISTUTILS_PKGVERSION=	0.8.9

PORTDOCS=	README.md DEVELOP run-rootless.txt

FILES=	${WRKSRC}/fail2ban-regex \
		${WRKSRC}/man/fail2ban-client.1 \

		${WRKSRC}/client/configreader.py \
		${WRKSRC}/fail2ban-client

.include <bsd.port.options.mk>

post-patch:
	@${ECHO_CMD} ${FILES} | ${XARGS} ${REINPLACE_CMD} -e 's,/etc/fail2ban,${ETCDIR},g'
	@${REINPLACE_CMD} -e 's,/bin/grep,grep,g' \
		${WRKSRC}/config/action.d/sendmail-whois-lines.conf

post-install:
.if ${PORT_OPTIONS:MDOCS}
	@${ECHO_MSG} "===> Installing additional documentation in ${DOCSDIR}."
	@${MKDIR} ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/DEVELOP ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/README.md ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/doc/run-rootless.txt ${DOCSDIR}
.endif
	@${CAT} ${PKGMESSAGE}

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)py-fail2ban/distinfo (-2 / +2 lines)
1	SHA256 (fail2ban-fail2ban-0.8.8-0-g51a3be2.tar.gz) = 5b020aaa2316dc4348a1489187db2cb124c4cf2a13f84aed7064fc5bc948a8ab	1	SHA256 (fail2ban-fail2ban-0.8.9-0-g152c619.tar.gz) = b20c1a074620a1003ec4e48e30ac40a41cc6f4242a37eb6a78fa29daa9165bb7
2	SIZE (fail2ban-fail2ban-0.8.8-0-g51a3be2.tar.gz) = 125364	2	SIZE (fail2ban-fail2ban-0.8.9-0-g152c619.tar.gz) = 159957




--- 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
@@ -35,6 +35,9 @@
 # EXAMPLES: sshd[31607], pop(pam_unix)[4920]
 __daemon_combs_re = (?:%(__pid_re)s?:\s+%(__daemon_re)s|%(__daemon_re)s%(__pid_re)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*
 

Line 0 Link Here

(-)py-fail2ban/files/patch-setup.py (+12 lines)
	1	--- setup.py.orig 2013-06-10 03:40:55.000000000 -0400
	2	+++ setup.py 2013-06-10 03:41:17.000000000 -0400
	3	@@ -67,9 +67,6 @@
	4	),
	5	('/var/run/fail2ban',
	6	''
	7	- ),
	8	- ('/usr/share/doc/fail2ban',
	9	- ['README.md', 'DEVELOP', 'doc/run-rootless.txt']
	10	)
	11	]
	12	)

Return to bug 179426

Lines 2-9 Link Here

(-)py-fail2ban/Makefile (-5 / +15 lines)
2	# $FreeBSD: ports/security/py-fail2ban/Makefile,v 1.19 2013/02/25 22:55:56 svnexp Exp $	2	# $FreeBSD: ports/security/py-fail2ban/Makefile,v 1.19 2013/02/25 22:55:56 svnexp Exp $
3		3
4	PORTNAME= fail2ban	4	PORTNAME= fail2ban
5	PORTVERSION= 0.8.8	5	PORTVERSION= 0.8.9
6	PORTREVISION= 1
7	CATEGORIES= security python	6	CATEGORIES= security python
8	MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/tarball/${PORTVERSION}/	7	MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/tarball/${PORTVERSION}/
9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 14-22 Link Here
14		13
15	LICENSE= GPLv2	14	LICENSE= GPLv2
16		15
17	GITVERSION= 0-g51a3be2	16	GITVERSION= 0-g152c619
18	FETCH_ARGS= -pRr	17	FETCH_ARGS= -pRr
19	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAME}-ff91bd4	18	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAME}-1a3155a
20		19
21	MAKE_JOBS_SAFE= yes	20	MAKE_JOBS_SAFE= yes
22		21
Lines 28-34 Link Here
28		27
29	PYDISTUTILS_INSTALLARGS+= --install-purelib=${PYTHON_SITELIBDIR} \	28	PYDISTUTILS_INSTALLARGS+= --install-purelib=${PYTHON_SITELIBDIR} \
30	--install-data=${ETCDIR}	29	--install-data=${ETCDIR}
31	PYDISTUTILS_PKGVERSION= 0.8.8	30	PYDISTUTILS_PKGVERSION= 0.8.9
		31
		32	PORTDOCS= README.md DEVELOP run-rootless.txt
32		33
33	FILES= ${WRKSRC}/fail2ban-regex \	34	FILES= ${WRKSRC}/fail2ban-regex \
34	${WRKSRC}/man/fail2ban-client.1 \	35	${WRKSRC}/man/fail2ban-client.1 \
Lines 37-48 Link Here
37	${WRKSRC}/client/configreader.py \	38	${WRKSRC}/client/configreader.py \
38	${WRKSRC}/fail2ban-client	39	${WRKSRC}/fail2ban-client
39		40
		41	.include <bsd.port.options.mk>
		42
40	post-patch:	43	post-patch:
41	@${ECHO_CMD} ${FILES} \| ${XARGS} ${REINPLACE_CMD} -e 's,/etc/fail2ban,${ETCDIR},g'	44	@${ECHO_CMD} ${FILES} \| ${XARGS} ${REINPLACE_CMD} -e 's,/etc/fail2ban,${ETCDIR},g'
42	@${REINPLACE_CMD} -e 's,/bin/grep,grep,g' \	45	@${REINPLACE_CMD} -e 's,/bin/grep,grep,g' \
43	${WRKSRC}/config/action.d/sendmail-whois-lines.conf	46	${WRKSRC}/config/action.d/sendmail-whois-lines.conf
44		47
45	post-install:	48	post-install:
		49	.if ${PORT_OPTIONS:MDOCS}
		50	@${ECHO_MSG} "===> Installing additional documentation in ${DOCSDIR}."
		51	@${MKDIR} ${DOCSDIR}
		52	${INSTALL_DATA} ${WRKSRC}/DEVELOP ${DOCSDIR}
		53	${INSTALL_DATA} ${WRKSRC}/README.md ${DOCSDIR}
		54	${INSTALL_DATA} ${WRKSRC}/doc/run-rootless.txt ${DOCSDIR}
		55	.endif
46	@${CAT} ${PKGMESSAGE}	56	@${CAT} ${PKGMESSAGE}
47		57
48	.include <bsd.port.mk>	58	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)py-fail2ban/files/patch-common.conf (-8 / +1 lines)
1	--- config/filter.d/common.conf.orig 2012-01-20 22:50:22.000000000 +0100	1	--- config/filter.d/common.conf.orig 2012-01-20 22:50:22.000000000 +0100
2	+++ config/filter.d/common.conf 2012-01-20 23:10:52.000000000 +0100	2	+++ config/filter.d/common.conf 2012-01-20 23:10:52.000000000 +0100
3	@@ -32,6 +32,9 @@	3	@@ -35,6 +35,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
Lines 10-19 Link Here
10	# Some messages have a kernel prefix with a timestamp	10	# Some messages have a kernel prefix with a timestamp
11	# EXAMPLES: kernel: [769570.846956]	11	# EXAMPLES: kernel: [769570.846956]
12	__kernel_prefix = kernel: \[\d+\.\d+\]	12	__kernel_prefix = kernel: \[\d+\.\d+\]
13	@@ -43,5 +46,5 @@
14	#
15	# [hostname] [vserver tag] daemon_id spaces
16	# this can be optional (for instance if we match named native log files)
17	-__prefix_line = \s(?:%(__hostname)s )?(?:%(__kernel_prefix)s )?(?:@vserver_\S+ )?%(__daemon_combs_re)s?\s
18	+__prefix_line = \s%(__bsd_verbose_mode)s?(?:\S+ )?(?:@vserver_\S+ )?%(__daemon_combs_re)s?\s
19

Lines 6-11 Link Here

(-)py-fail2ban/pkg-plist (+10 lines)
6	%%ETCDIR%%/action.d/ipfilter.conf	6	%%ETCDIR%%/action.d/ipfilter.conf
7	%%ETCDIR%%/action.d/ipfw.conf	7	%%ETCDIR%%/action.d/ipfw.conf
8	%%ETCDIR%%/action.d/iptables-allports.conf	8	%%ETCDIR%%/action.d/iptables-allports.conf
		9	%%ETCDIR%%/action.d/iptables-blocktype.conf
		10	%%ETCDIR%%/action.d/iptables-ipset-proto4.conf
		11	%%ETCDIR%%/action.d/iptables-ipset-proto6.conf
9	%%ETCDIR%%/action.d/iptables-multiport-log.conf	12	%%ETCDIR%%/action.d/iptables-multiport-log.conf
10	%%ETCDIR%%/action.d/iptables-multiport.conf	13	%%ETCDIR%%/action.d/iptables-multiport.conf
11	%%ETCDIR%%/action.d/iptables-new.conf	14	%%ETCDIR%%/action.d/iptables-new.conf
Lines 17-22 Link Here
17	%%ETCDIR%%/action.d/mail.conf	20	%%ETCDIR%%/action.d/mail.conf
18	%%ETCDIR%%/action.d/mynetwatchman.conf	21	%%ETCDIR%%/action.d/mynetwatchman.conf
19	%%ETCDIR%%/action.d/pf.conf	22	%%ETCDIR%%/action.d/pf.conf
		23	%%ETCDIR%%/action.d/route.conf
20	%%ETCDIR%%/action.d/sendmail-buffered.conf	24	%%ETCDIR%%/action.d/sendmail-buffered.conf
21	%%ETCDIR%%/action.d/sendmail-whois-lines.conf	25	%%ETCDIR%%/action.d/sendmail-whois-lines.conf
22	%%ETCDIR%%/action.d/sendmail-whois.conf	26	%%ETCDIR%%/action.d/sendmail-whois.conf
Lines 28-33 Link Here
28	%%ETCDIR%%/filter.d/apache-nohome.conf	32	%%ETCDIR%%/filter.d/apache-nohome.conf
29	%%ETCDIR%%/filter.d/apache-noscript.conf	33	%%ETCDIR%%/filter.d/apache-noscript.conf
30	%%ETCDIR%%/filter.d/apache-overflows.conf	34	%%ETCDIR%%/filter.d/apache-overflows.conf
		35	%%ETCDIR%%/filter.d/assp.conf
31	%%ETCDIR%%/filter.d/asterisk.conf	36	%%ETCDIR%%/filter.d/asterisk.conf
32	%%ETCDIR%%/filter.d/bsd-sendmail.conf	37	%%ETCDIR%%/filter.d/bsd-sendmail.conf
33	%%ETCDIR%%/filter.d/bsd-sshd.conf	38	%%ETCDIR%%/filter.d/bsd-sshd.conf
Lines 42-47 Link Here
42	%%ETCDIR%%/filter.d/gssftpd.conf	47	%%ETCDIR%%/filter.d/gssftpd.conf
43	%%ETCDIR%%/filter.d/lighttpd-auth.conf	48	%%ETCDIR%%/filter.d/lighttpd-auth.conf
44	%%ETCDIR%%/filter.d/lighttpd-fastcgi.conf	49	%%ETCDIR%%/filter.d/lighttpd-fastcgi.conf
		50	%%ETCDIR%%/filter.d/mysqld-auth.conf
45	%%ETCDIR%%/filter.d/named-refused.conf	51	%%ETCDIR%%/filter.d/named-refused.conf
46	%%ETCDIR%%/filter.d/pam-generic.conf	52	%%ETCDIR%%/filter.d/pam-generic.conf
47	%%ETCDIR%%/filter.d/php-url-fopen.conf	53	%%ETCDIR%%/filter.d/php-url-fopen.conf
Lines 50-57 Link Here
50	%%ETCDIR%%/filter.d/pure-ftpd.conf	56	%%ETCDIR%%/filter.d/pure-ftpd.conf
51	%%ETCDIR%%/filter.d/qmail.conf	57	%%ETCDIR%%/filter.d/qmail.conf
52	%%ETCDIR%%/filter.d/recidive.conf	58	%%ETCDIR%%/filter.d/recidive.conf
		59	%%ETCDIR%%/filter.d/roundcube-auth.conf
53	%%ETCDIR%%/filter.d/sasl.conf	60	%%ETCDIR%%/filter.d/sasl.conf
54	%%ETCDIR%%/filter.d/sieve.conf	61	%%ETCDIR%%/filter.d/sieve.conf
		62	%%ETCDIR%%/filter.d/sogo-auth.conf
55	%%ETCDIR%%/filter.d/sshd-ddos.conf	63	%%ETCDIR%%/filter.d/sshd-ddos.conf
56	%%ETCDIR%%/filter.d/sshd.conf	64	%%ETCDIR%%/filter.d/sshd.conf
57	%%ETCDIR%%/filter.d/vsftpd.conf	65	%%ETCDIR%%/filter.d/vsftpd.conf
Lines 83-88 Link Here
83	%%PYTHON_SITELIBDIR%%/client/jailsreader.pyc	91	%%PYTHON_SITELIBDIR%%/client/jailsreader.pyc
84	%%PYTHON_SITELIBDIR%%/common/__init__.py	92	%%PYTHON_SITELIBDIR%%/common/__init__.py
85	%%PYTHON_SITELIBDIR%%/common/__init__.pyc	93	%%PYTHON_SITELIBDIR%%/common/__init__.pyc
		94	%%PYTHON_SITELIBDIR%%/common/exceptions.py
		95	%%PYTHON_SITELIBDIR%%/common/exceptions.pyc
86	%%PYTHON_SITELIBDIR%%/common/helpers.py	96	%%PYTHON_SITELIBDIR%%/common/helpers.py
87	%%PYTHON_SITELIBDIR%%/common/helpers.pyc	97	%%PYTHON_SITELIBDIR%%/common/helpers.pyc
88	%%PYTHON_SITELIBDIR%%/common/protocol.py	98	%%PYTHON_SITELIBDIR%%/common/protocol.py