Update security/py-fail2ban to version 0.8.9 Fix: Patch attached with submission follows:
Responsible Changed From-To: freebsd-ports-bugs->freebsd-python freebsd-python@ wants this port PRs (via the GNATS Auto Assign Tool)
Responsible Changed From-To: freebsd-python->culot I'll take it.
Hi Christoph, thanks for this update, however I have done a few modifications on the patch you submitted and I would like to have your agreement before committing it. In the attached patch I applied the following modifications: - additional files were added to pkg-plist (they were missing in your initial submission) - some documentation files were added with this release and to handle them I propose to: - add a post-install step to install the corresponding files - apply a patch to setup.py so that documentation files are only installed if user has specified the DOCS option Tell me if you agree with my proposal. Thanks, Frederic
Hi Frederic! Am 10.06.2013 19:48, schrieb Frederic Culot: > In the attached patch I applied the following modifications: > > - additional files were added to pkg-plist (they were missing in your > initial submission) They are OK. "make deinstall" didn't warn me about directories not being empty so I didn't look into them. I shall do that next time. > - some documentation files were added with this release and to handle > them I propose to: > - add a post-install step to install the corresponding files > - apply a patch to setup.py so that documentation files are only > installed if user has specified the DOCS option Do we need those documentation files? DEVELOP and README.md address developers and not users. And I don't know if run-rootless.txt is applicable to FreeBSD: it addresses (among other) using iptables and specific kernel properties. But if in your opinion we have to install all files I aggree with your proposal. Best regards Christoph
Hi again Christoph, and thanks for your fast answer! > Hi Frederic! > > Am 10.06.2013 19:48, schrieb Frederic Culot: > > In the attached patch I applied the following modifications: > > > > - additional files were added to pkg-plist (they were missing in your > > initial submission) > > They are OK. "make deinstall" didn't warn me about directories not being > empty so I didn't look into them. I shall do that next time. Ok fine, I will add those files then. > > > - some documentation files were added with this release and to handle > > them I propose to: > > - add a post-install step to install the corresponding files > > - apply a patch to setup.py so that documentation files are only > > installed if user has specified the DOCS option > > Do we need those documentation files? DEVELOP and README.md address > developers and not users. And I don't know if run-rootless.txt is > applicable to FreeBSD: it addresses (among other) using iptables and > specific kernel properties. But if in your opinion we have to install > all files I aggree with your proposal. I agree with you regarding run-rootless.txt: it is not really relevant for FreeBSD users. However, the README.md appears to be quite general to me (with various links to the project), and DEVELOP might be interesting to a user who would be interested in participating in the testing or development of py-fail2ban. Hence I would be motivated to keep DEVELOP and README.md, but as you suggest I would remove run-rootless.txt which might be misleading as not applicable to FreeBSD. If that is ok for you I could commit that tomorrow. Cheers, Frederic
Am 10.06.2013 21:22, schrieb Frederic Culot: >> Do we need those documentation files? DEVELOP and README.md address >> developers and not users. And I don't know if run-rootless.txt is >> applicable to FreeBSD: it addresses (among other) using iptables and >> specific kernel properties. But if in your opinion we have to install >> all files I aggree with your proposal. > > I agree with you regarding run-rootless.txt: it is not really relevant > for FreeBSD users. However, the README.md appears to be quite general to > me (with various links to the project), and DEVELOP might be interesting > to a user who would be interested in participating in the testing or > development of py-fail2ban. > > Hence I would be motivated to keep DEVELOP and README.md, but as you > suggest I would remove run-rootless.txt which might be misleading as not > applicable to FreeBSD. > > If that is ok for you I could commit that tomorrow. It's OK for me. Thanks and best regards Christoph
Author: culot Date: Tue Jun 11 14:21:48 2013 New Revision: 320563 URL: http://svnweb.freebsd.org/changeset/ports/320563 Log: - Update to 0.8.9 [1] - Make additional documentation installation conditional (note: run-rootless.txt not installed as not relevant for FreeBSD) Changes: https://raw.github.com/fail2ban/fail2ban/master/ChangeLog PR: ports/179426 [1] Submitted by: Christoph Theis <theis@gmx.at> (maintainer) Added: head/security/py-fail2ban/files/patch-setup.py (contents, props changed) Modified: head/security/py-fail2ban/Makefile head/security/py-fail2ban/distinfo head/security/py-fail2ban/files/patch-common.conf (contents, props changed) head/security/py-fail2ban/pkg-plist Modified: head/security/py-fail2ban/Makefile ============================================================================== --- head/security/py-fail2ban/Makefile Tue Jun 11 14:17:19 2013 (r320562) +++ head/security/py-fail2ban/Makefile Tue Jun 11 14:21:48 2013 (r320563) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= fail2ban -PORTVERSION= 0.8.8 -PORTREVISION= 1 +PORTVERSION= 0.8.9 CATEGORIES= security python MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/tarball/${PORTVERSION}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,9 +13,9 @@ COMMENT= Scans log files and bans IP tha LICENSE= GPLv2 -GITVERSION= 0-g51a3be2 +GITVERSION= 0-g152c619 FETCH_ARGS= -pRr -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAME}-ff91bd4 +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAME}-1a3155a MAKE_JOBS_SAFE= yes @@ -28,7 +27,9 @@ SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} PYDISTUTILS_INSTALLARGS+= --install-purelib=${PYTHON_SITELIBDIR} \ --install-data=${ETCDIR} -PYDISTUTILS_PKGVERSION= 0.8.8 +PYDISTUTILS_PKGVERSION= 0.8.9 + +PORTDOCS= README.md DEVELOP FILES= ${WRKSRC}/fail2ban-regex \ ${WRKSRC}/man/fail2ban-client.1 \ @@ -37,12 +38,21 @@ FILES= ${WRKSRC}/fail2ban-regex \ ${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} +.for f in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} +.endfor +.endif @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> Modified: head/security/py-fail2ban/distinfo ============================================================================== --- head/security/py-fail2ban/distinfo Tue Jun 11 14:17:19 2013 (r320562) +++ head/security/py-fail2ban/distinfo Tue Jun 11 14:21:48 2013 (r320563) @@ -1,2 +1,2 @@ -SHA256 (fail2ban-fail2ban-0.8.8-0-g51a3be2.tar.gz) = 5b020aaa2316dc4348a1489187db2cb124c4cf2a13f84aed7064fc5bc948a8ab -SIZE (fail2ban-fail2ban-0.8.8-0-g51a3be2.tar.gz) = 125364 +SHA256 (fail2ban-fail2ban-0.8.9-0-g152c619.tar.gz) = b20c1a074620a1003ec4e48e30ac40a41cc6f4242a37eb6a78fa29daa9165bb7 +SIZE (fail2ban-fail2ban-0.8.9-0-g152c619.tar.gz) = 159957 Modified: head/security/py-fail2ban/files/patch-common.conf ============================================================================== --- head/security/py-fail2ban/files/patch-common.conf Tue Jun 11 14:17:19 2013 (r320562) +++ head/security/py-fail2ban/files/patch-common.conf Tue Jun 11 14:21:48 2013 (r320563) @@ -1,6 +1,6 @@ --- 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 @@ +@@ -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?:) @@ -10,10 +10,3 @@ # 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* - Added: head/security/py-fail2ban/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/py-fail2ban/files/patch-setup.py Tue Jun 11 14:21:48 2013 (r320563) @@ -0,0 +1,12 @@ +--- setup.py.orig 2013-06-10 03:40:55.000000000 -0400 ++++ setup.py 2013-06-10 03:41:17.000000000 -0400 +@@ -67,9 +67,6 @@ + ), + ('/var/run/fail2ban', + '' +- ), +- ('/usr/share/doc/fail2ban', +- ['README.md', 'DEVELOP', 'doc/run-rootless.txt'] + ) + ] + ) Modified: head/security/py-fail2ban/pkg-plist ============================================================================== --- head/security/py-fail2ban/pkg-plist Tue Jun 11 14:17:19 2013 (r320562) +++ head/security/py-fail2ban/pkg-plist Tue Jun 11 14:21:48 2013 (r320563) @@ -6,6 +6,9 @@ %%ETCDIR%%/action.d/ipfilter.conf %%ETCDIR%%/action.d/ipfw.conf %%ETCDIR%%/action.d/iptables-allports.conf +%%ETCDIR%%/action.d/iptables-blocktype.conf +%%ETCDIR%%/action.d/iptables-ipset-proto4.conf +%%ETCDIR%%/action.d/iptables-ipset-proto6.conf %%ETCDIR%%/action.d/iptables-multiport-log.conf %%ETCDIR%%/action.d/iptables-multiport.conf %%ETCDIR%%/action.d/iptables-new.conf @@ -17,6 +20,7 @@ %%ETCDIR%%/action.d/mail.conf %%ETCDIR%%/action.d/mynetwatchman.conf %%ETCDIR%%/action.d/pf.conf +%%ETCDIR%%/action.d/route.conf %%ETCDIR%%/action.d/sendmail-buffered.conf %%ETCDIR%%/action.d/sendmail-whois-lines.conf %%ETCDIR%%/action.d/sendmail-whois.conf @@ -28,6 +32,7 @@ %%ETCDIR%%/filter.d/apache-nohome.conf %%ETCDIR%%/filter.d/apache-noscript.conf %%ETCDIR%%/filter.d/apache-overflows.conf +%%ETCDIR%%/filter.d/assp.conf %%ETCDIR%%/filter.d/asterisk.conf %%ETCDIR%%/filter.d/bsd-sendmail.conf %%ETCDIR%%/filter.d/bsd-sshd.conf @@ -42,6 +47,7 @@ %%ETCDIR%%/filter.d/gssftpd.conf %%ETCDIR%%/filter.d/lighttpd-auth.conf %%ETCDIR%%/filter.d/lighttpd-fastcgi.conf +%%ETCDIR%%/filter.d/mysqld-auth.conf %%ETCDIR%%/filter.d/named-refused.conf %%ETCDIR%%/filter.d/pam-generic.conf %%ETCDIR%%/filter.d/php-url-fopen.conf @@ -50,8 +56,10 @@ %%ETCDIR%%/filter.d/pure-ftpd.conf %%ETCDIR%%/filter.d/qmail.conf %%ETCDIR%%/filter.d/recidive.conf +%%ETCDIR%%/filter.d/roundcube-auth.conf %%ETCDIR%%/filter.d/sasl.conf %%ETCDIR%%/filter.d/sieve.conf +%%ETCDIR%%/filter.d/sogo-auth.conf %%ETCDIR%%/filter.d/sshd-ddos.conf %%ETCDIR%%/filter.d/sshd.conf %%ETCDIR%%/filter.d/vsftpd.conf @@ -83,6 +91,8 @@ %%PYTHON_SITELIBDIR%%/client/jailsreader.pyc %%PYTHON_SITELIBDIR%%/common/__init__.py %%PYTHON_SITELIBDIR%%/common/__init__.pyc +%%PYTHON_SITELIBDIR%%/common/exceptions.py +%%PYTHON_SITELIBDIR%%/common/exceptions.pyc %%PYTHON_SITELIBDIR%%/common/helpers.py %%PYTHON_SITELIBDIR%%/common/helpers.pyc %%PYTHON_SITELIBDIR%%/common/protocol.py _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks for your help Christoph!