Date: Mon, 17 Sep 2012 08:45:48 -0500 From: Mark Felder <feld@feld.me> To: FreeBSD-gnats-submit@FreeBSD.org Cc: theis@gmx.at Subject: ports/171708: [PATCH] security/py27-fail2ban: update to 0.8.7.1 Message-ID: <E1TDbe0-000EGM-Js@feld.me> Resent-Message-ID: <201209171350.q8HDoBq8036786@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 171708 >Category: ports >Synopsis: [PATCH] security/py27-fail2ban: update to 0.8.7.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Sep 17 13:50:11 UTC 2012 >Closed-Date: >Last-Modified: >Originator: feld >Release: FreeBSD 9.1-PRERELEASE amd64 >Organization: >Environment: System: FreeBSD mwi1.coffeenet.org 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #5 r239731: Mon Aug 27 09:53:18 CDT >Description: - Update to 0.8.7.1 - Fix installation so it doesn't overwrite your config files every time you upgrade the port - Fix some space/tab issues to make portlint happy - Use dirrmtry in a few places because some people have their own custom filters, actions, etc. Added file(s): - files/patch-setup.py Port maintainer (theis@gmx.at) is cc'd. Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: suffix) >How-To-Repeat: >Fix: --- py27-fail2ban-0.8.7.1.patch begins here --- diff -ruN --exclude=CVS ../py-fail2ban.orig/Makefile ./Makefile --- ../py-fail2ban.orig/Makefile 2012-02-08 12:58:36.000000000 -0600 +++ ./Makefile 2012-09-17 08:43:45.969605016 -0500 @@ -6,20 +6,20 @@ # PORTNAME= fail2ban -PORTVERSION= 0.8.6 +PORTVERSION= 0.8.7.1 CATEGORIES= security python MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/tarball/${PORTVERSION}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= ${PORTNAME}-${PORTNAME}-${PORTVERSION}-${GITVERSION} +DISTNAME= ${PORTNAME}-${PORTNAME}-${PORTVERSION}-${GITVERSION} MAINTAINER= theis@gmx.at COMMENT= Scans log files and bans IP that makes too many password failures -LICENSE= GPLv2 +LICENSE= GPLv2 -GITVERSION= 0-g1efe1bc -FETCH_ARGS= -pRr -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAME}-a20d1f8 +GITVERSION= 0-g0b5c66f +FETCH_ARGS= -pRr +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAME}-e59babb MAKE_JOBS_SAFE= yes @@ -31,6 +31,7 @@ PYDISTUTILS_INSTALLARGS+= --install-purelib=${PYTHON_SITELIBDIR} \ --install-data=${ETCDIR} +PYDISTUTILS_EGGINFO= ${PORTNAME}-0.8.7-py${PYTHON_VER}.egg-info FILES= ${WRKSRC}/fail2ban-regex \ ${WRKSRC}/man/fail2ban-client.1 \ @@ -39,6 +40,10 @@ ${WRKSRC}/client/configreader.py \ ${WRKSRC}/fail2ban-client +post-extract: + @${MV} ${WRKSRC}/config/fail2ban.conf ${WRKSRC}/config/fail2ban.conf.dist + @${MV} ${WRKSRC}/config/jail.conf ${WRKSRC}/config/jail.conf.dist + post-patch: @${ECHO_CMD} ${FILES} | ${XARGS} ${REINPLACE_CMD} -e 's,/etc/fail2ban,${ETCDIR},g' diff -ruN --exclude=CVS ../py-fail2ban.orig/distinfo ./distinfo --- ../py-fail2ban.orig/distinfo 2012-09-07 12:49:03.000000000 -0500 +++ ./distinfo 2012-09-16 15:31:25.000000000 -0500 @@ -1,2 +1,2 @@ -SHA256 (fail2ban-fail2ban-0.8.6-0-g1efe1bc.tar.gz) = 24d02422c55f1b7d92bea30a7dde6f72f280eadf09d478fcca8b1dd40fb4e914 -SIZE (fail2ban-fail2ban-0.8.6-0-g1efe1bc.tar.gz) = 107029 +SHA256 (fail2ban-fail2ban-0.8.7.1-0-g0b5c66f.tar.gz) = 2804a789347b1274e343a33fcca659b37d40bb5f99e77546997c96a425f6fc9b +SIZE (fail2ban-fail2ban-0.8.7.1-0-g0b5c66f.tar.gz) = 122529 diff -ruN --exclude=CVS ../py-fail2ban.orig/files/patch-setup.py ./files/patch-setup.py --- ../py-fail2ban.orig/files/patch-setup.py 1969-12-31 18:00:00.000000000 -0600 +++ ./files/patch-setup.py 2012-09-17 08:31:00.000000000 -0500 @@ -0,0 +1,11 @@ +--- setup.py.orig 2012-09-17 13:30:35.943536503 +0000 ++++ setup.py 2012-09-17 13:30:46.114535764 +0000 +@@ -63,7 +63,7 @@ + ], + data_files = [ + ('/etc/fail2ban', +- glob("config/*.conf") ++ glob("config/*.conf.dist") + ), + ('/etc/fail2ban/filter.d', + glob("config/filter.d/*.conf") diff -ruN --exclude=CVS ../py-fail2ban.orig/pkg-plist ./pkg-plist --- ../py-fail2ban.orig/pkg-plist 2012-09-07 12:49:03.000000000 -0500 +++ ./pkg-plist 2012-09-17 07:25:22.000000000 -0500 @@ -10,6 +10,7 @@ %%ETCDIR%%/action.d/iptables-multiport.conf %%ETCDIR%%/action.d/iptables-new.conf %%ETCDIR%%/action.d/iptables.conf +%%ETCDIR%%/action.d/iptables-xt_recent-echo.conf %%ETCDIR%%/action.d/mail-buffered.conf %%ETCDIR%%/action.d/mail-whois-lines.conf %%ETCDIR%%/action.d/mail-whois.conf @@ -21,12 +22,13 @@ %%ETCDIR%%/action.d/sendmail-whois.conf %%ETCDIR%%/action.d/sendmail.conf %%ETCDIR%%/action.d/shorewall.conf -%%ETCDIR%%/fail2ban.conf +%%ETCDIR%%/fail2ban.conf.dist %%ETCDIR%%/filter.d/apache-auth.conf %%ETCDIR%%/filter.d/apache-badbots.conf %%ETCDIR%%/filter.d/apache-nohome.conf %%ETCDIR%%/filter.d/apache-noscript.conf %%ETCDIR%%/filter.d/apache-overflows.conf +%%ETCDIR%%/filter.d/asterisk.conf %%ETCDIR%%/filter.d/bsd-sshd.conf %%ETCDIR%%/filter.d/bsdftp.conf %%ETCDIR%%/filter.d/common.conf @@ -37,6 +39,7 @@ %%ETCDIR%%/filter.d/dropbear.conf %%ETCDIR%%/filter.d/exim.conf %%ETCDIR%%/filter.d/gssftpd.conf +%%ETCDIR%%/filter.d/lighttpd-auth.conf %%ETCDIR%%/filter.d/lighttpd-fastcgi.conf %%ETCDIR%%/filter.d/named-refused.conf %%ETCDIR%%/filter.d/pam-generic.conf @@ -45,6 +48,7 @@ %%ETCDIR%%/filter.d/proftpd.conf %%ETCDIR%%/filter.d/pure-ftpd.conf %%ETCDIR%%/filter.d/qmail.conf +%%ETCDIR%%/filter.d/recidive.conf %%ETCDIR%%/filter.d/sasl.conf %%ETCDIR%%/filter.d/sieve.conf %%ETCDIR%%/filter.d/sshd-ddos.conf @@ -53,7 +57,7 @@ %%ETCDIR%%/filter.d/webmin-auth.conf %%ETCDIR%%/filter.d/wuftpd.conf %%ETCDIR%%/filter.d/xinetd-fail.conf -%%ETCDIR%%/jail.conf +%%ETCDIR%%/jail.conf.dist %%PYTHON_SITELIBDIR%%/client/__init__.py %%PYTHON_SITELIBDIR%%/client/__init__.pyc %%PYTHON_SITELIBDIR%%/client/actionreader.py @@ -106,6 +110,8 @@ %%PYTHON_SITELIBDIR%%/server/failregex.pyc %%PYTHON_SITELIBDIR%%/server/filter.py %%PYTHON_SITELIBDIR%%/server/filter.pyc +%%PYTHON_SITELIBDIR%%/server/filterpyinotify.py +%%PYTHON_SITELIBDIR%%/server/filterpyinotify.pyc %%PYTHON_SITELIBDIR%%/server/filtergamin.py %%PYTHON_SITELIBDIR%%/server/filtergamin.pyc %%PYTHON_SITELIBDIR%%/server/filterpoll.py @@ -129,9 +135,9 @@ bin/fail2ban-client bin/fail2ban-regex bin/fail2ban-server -@dirrm %%ETCDIR%%/filter.d -@dirrm %%ETCDIR%%/action.d -@dirrm %%ETCDIR%% +@dirrmtry %%ETCDIR%%/filter.d +@dirrmtry %%ETCDIR%%/action.d +@dirrmtry %%ETCDIR%% @dirrm %%PYTHON_SITELIBDIR%%/server @dirrm %%PYTHON_SITELIBDIR%%/common @dirrm %%PYTHON_SITELIBDIR%%/client --- py27-fail2ban-0.8.7.1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1TDbe0-000EGM-Js>