Attachment 134803 Details for Bug 179528 – py-fail2ban.diff.txt

py-fail2ban.diff.txt

py-fail2ban.diff.txt (text/plain; charset=windows-1252), 5.78 KB, created by Christoph Theis on 2013-08-25 10:25:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christoph Theis

Created: 2013-08-25 10:25:17 UTC

Size: 5.78 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 325331)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	fail2ban
>-PORTVERSION=	0.8.9
>+PORTVERSION=	0.8.10
> CATEGORIES=	security python
> MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/tarball/${PORTVERSION}/
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,9 +13,9 @@
> 
> LICENSE=	GPLv2
> 
>-GITVERSION=	0-g152c619
>+GITVERSION=	0-g921d9a8
> FETCH_ARGS=	-pRr
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}-1a3155a
>+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}-d56f01a
> 
> 
> USE_PYTHON=	-2.7
>@@ -26,7 +26,7 @@
> 
> PYDISTUTILS_INSTALLARGS+=	--install-purelib=${PYTHON_SITELIBDIR} \
> 				--install-data=${ETCDIR}
>-PYDISTUTILS_PKGVERSION=	0.8.9
>+PYDISTUTILS_PKGVERSION=	0.8.10
> 
> PORTDOCS=	README.md DEVELOP
> 
>@@ -43,6 +43,8 @@
> 	@${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
>+	@${REINPLACE_CMD} -e 's,/var/log/sshd.log,/var/log/auth.log,g' \
>+		${WRKSRC}/config/jail.conf
> 
> post-install:
> .if ${PORT_OPTIONS:MDOCS}
>Index: distinfo
>===================================================================
>--- distinfo	(revision 325331)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (fail2ban-fail2ban-0.8.9-0-g152c619.tar.gz) = b20c1a074620a1003ec4e48e30ac40a41cc6f4242a37eb6a78fa29daa9165bb7
>-SIZE (fail2ban-fail2ban-0.8.9-0-g152c619.tar.gz) = 159957
>+SHA256 (fail2ban-fail2ban-0.8.10-0-g921d9a8.tar.gz) = 7bed38372a24e35268d9c9ff5b272f7e88e91074f9bb24d5be5c70196f19e7be
>+SIZE (fail2ban-fail2ban-0.8.10-0-g921d9a8.tar.gz) = 161952
>Index: files/patch-bsd-ipfw.conf
>===================================================================
>--- files/patch-bsd-ipfw.conf	(revision 325331)
>+++ files/patch-bsd-ipfw.conf	(working copy)
>@@ -1,75 +0,0 @@
>---- /dev/null	2012-11-27 18:04:17.000000000 +0100
>-+++ config/action.d/bsd-ipfw.conf	2012-11-27 18:06:29.000000000 +0100
>-@@ -0,0 +1,72 @@
>-+# Fail2Ban configuration file
>-+#
>-+# Author: Nick Munger
>-+# Modified by: Ken Menzel
>-+#
>-+
>-+[Definition]
>-+
>-+# Option:  actionstart
>-+# Notes.:  command executed once at the start of Fail2Ban.
>-+# Values:  CMD
>-+#
>-+actionstart = 
>-+
>-+
>-+# Option:  actionstop
>-+# Notes.:  command executed once at the end of Fail2Ban
>-+# Values:  CMD
>-+#
>-+actionstop = 
>-+
>-+
>-+# Option:  actioncheck
>-+# Notes.:  command executed once before each actionban command
>-+# Values:  CMD
>-+#
>-+actioncheck = 
>-+
>-+
>-+# Option:  actionban
>-+# Notes.:  command executed when banning an IP. Take care that the
>-+#          command is executed with Fail2Ban user rights.
>-+# Tags:    <ip>  IP address
>-+#          <failures>  number of failures
>-+#          <time>  unix timestamp of the ban time
>-+#          <table> ipfw table to use
>-+# Values:  CMD
>-+#
>-+# requires an ipfw rule like "deny ip from table(1) to me"
>-+actionban = ipfw table <table> add <ip>
>-+
>-+
>-+# Option:  actionunban
>-+# Notes.:  command executed when unbanning an IP. Take care that the
>-+#          command is executed with Fail2Ban user rights.
>-+# Tags:    <ip>  IP address
>-+#          <failures>  number of failures
>-+#          <time>  unix timestamp of the ban time
>-+#          <table> ipfw table to use
>-+# Values:  CMD
>-+#
>-+actionunban = ipfw table <table> delete <ip>
>-+
>-+[Init]
>-+
>-+# Option:  port
>-+# Notes.:  specifies port to monitor
>-+# Values:  [ NUM | STRING ]
>-+#
>-+#port = ssh
>-+port = ftp
>-+
>-+# Option:  localhost
>-+# Notes.:  the local IP address of the network interface
>-+# Values:  IP
>-+#
>-+localhost = 127.0.0.1
>-+
>-+# Option:  table
>-+# Notes:   the ipfw table to use
>-+# Values:  NUM
>-+table = 1
>Index: files/patch-pf.conf
>===================================================================
>--- files/patch-pf.conf	(revision 325331)
>+++ files/patch-pf.conf	(working copy)
>@@ -1,59 +0,0 @@
>---- /dev/null   2010-01-12 16:33:00.000000000 -0500
>-+++ ./config/action.d/pf.conf     2010-01-12 16:26:51.000000000 -0500
>-@@ -0,0 +1,56 @@
>-+# Fail2Ban configuration file
>-+#
>-+# OpenBSD pf ban/unban
>-+#
>-+# Author: Nick Hilliard <nick@foobar.org>
>-+#
>-+#
>-+
>-+[Definition]
>-+
>-+# Option:  actionstart
>-+# Notes.:  command executed once at the start of Fail2Ban.
>-+# Values:  CMD
>-+#
>-+# we don't enable PF automatically, as it will be enabled elsewhere
>-+actionstart = 
>-+
>-+
>-+# Option:  actionstop
>-+# Notes.:  command executed once at the end of Fail2Ban
>-+# Values:  CMD
>-+#
>-+# we don't disable PF automatically either
>-+actionstop = 
>-+
>-+
>-+# Option:  actioncheck
>-+# Notes.:  command executed once before each actionban command
>-+# Values:  CMD
>-+#
>-+actioncheck = 
>-+
>-+
>-+# Option:  actionban
>-+# Notes.:  command executed when banning an IP. Take care that the
>-+#          command is executed with Fail2Ban user rights.
>-+# Tags:    <ip>  IP address
>-+#          <failures>  number of failures
>-+#          <time>  unix timestamp of the ban time
>-+# Values:  CMD
>-+#
>-+actionban = /sbin/pfctl -t fail2ban -T add <ip>/32
>-+
>-+
>-+# Option:  actionunban
>-+# Notes.:  command executed when unbanning an IP. Take care that the
>-+#          command is executed with Fail2Ban user rights.
>-+# Tags:    <ip>  IP address
>-+#          <failures>  number of failures
>-+#          <time>  unix timestamp of the ban time
>-+# Values:  CMD
>-+#
>-+# note -r option used to remove matching rule
>-+actionunban = /sbin/pfctl -t fail2ban -T delete <ip>/32
>-+
>-+[Init]
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 325331)
>+++ pkg-plist	(working copy)
>@@ -29,6 +29,7 @@
> %%ETCDIR%%/fail2ban.conf
> %%ETCDIR%%/filter.d/apache-auth.conf
> %%ETCDIR%%/filter.d/apache-badbots.conf
>+%%ETCDIR%%/filter.d/apache-common.conf
> %%ETCDIR%%/filter.d/apache-nohome.conf
> %%ETCDIR%%/filter.d/apache-noscript.conf
> %%ETCDIR%%/filter.d/apache-overflows.conf

Actions: View

Attachments on bug 179528: 134802 | 134803