diff options
author | 2014-12-05 15:32:55 +0000 | |
---|---|---|
committer | 2014-12-05 15:32:55 +0000 | |
commit | 918c65b943e5baaf43f2847387a2801d0234469a (patch) | |
tree | cbb78ec4b3984ea94c0d47137773fd2fb5d1b953 /net-analyzer/fail2ban | |
parent | version bump (diff) | |
download | gentoo-2-918c65b943e5baaf43f2847387a2801d0234469a.tar.gz gentoo-2-918c65b943e5baaf43f2847387a2801d0234469a.tar.bz2 gentoo-2-918c65b943e5baaf43f2847387a2801d0234469a.zip |
Old.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-analyzer/fail2ban')
5 files changed, 7 insertions, 161 deletions
diff --git a/net-analyzer/fail2ban/ChangeLog b/net-analyzer/fail2ban/ChangeLog index 7ee0a9f696b6..2b3ea04182a5 100644 --- a/net-analyzer/fail2ban/ChangeLog +++ b/net-analyzer/fail2ban/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-analyzer/fail2ban # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/ChangeLog,v 1.154 2014/12/05 10:15:37 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/ChangeLog,v 1.155 2014/12/05 15:32:54 jer Exp $ + + 05 Dec 2014; Jeroen Roovers <jer@gentoo.org> -fail2ban-0.9.0-r2.ebuild, + -files/fail2ban-0.9.0-empty-run-dir.patch, + -files/fail2ban-0.9.0-loglevel-int.patch, + -files/fail2ban-0.9.0-python3-regex.patch: + Old. 05 Dec 2014; Agostino Sarubbo <ago@gentoo.org> fail2ban-0.9.1.ebuild: Stable for x86, wrt bug #530346 diff --git a/net-analyzer/fail2ban/fail2ban-0.9.0-r2.ebuild b/net-analyzer/fail2ban/fail2ban-0.9.0-r2.ebuild deleted file mode 100644 index 9889a3191df5..000000000000 --- a/net-analyzer/fail2ban/fail2ban-0.9.0-r2.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.9.0-r2.ebuild,v 1.2 2014/11/02 08:44:31 swift Exp $ - -EAPI=5 -PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 ) -PYTHON_REQ_USE="sqlite" - -inherit distutils-r1 systemd vcs-snapshot - -DESCRIPTION="scans log files and bans IPs that show malicious signs" -HOMEPAGE="http://www.fail2ban.org/" -SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="selinux" - -DEPEND="" -RDEPEND="net-misc/whois - virtual/mta - virtual/logger - net-firewall/iptables - selinux? ( sec-policy/selinux-fail2ban )" - -DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt ) - -src_prepare() { - # Replace /var/run with /run, but not in the top source directory - sed -i -e 's|/var\(/run/fail2ban\)|\1|g' $( find . -type f -mindepth 2 ) || die - - # Do not install /run/fail2ban - epatch "${FILESDIR}"/${P}-empty-run-dir.patch - - # Upstream patches - epatch "${FILESDIR}"/${P}-python3-regex.patch - epatch "${FILESDIR}"/${P}-loglevel-int.patch - - distutils-r1_src_prepare -} - -python_test() { - ${EPYTHON} bin/${PN}-testcases -} - -src_install() { - distutils-r1_src_install - - rm -rf "${D}"/usr/share/doc/${PN} - - # not FILESDIR - newconfd files/gentoo-confd ${PN} - newinitd files/gentoo-initd ${PN} - systemd_dounit files/${PN}.service - systemd_dotmpfilesd files/${PN}-tmpfiles.conf - doman man/*.{1,5} - - # Use INSTALL_MASK if you do not want to touch /etc/logrotate.d. - # See http://thread.gmane.org/gmane.linux.gentoo.devel/35675 - insinto /etc/logrotate.d - newins files/${PN}-logrotate ${PN} -} - -pkg_preinst() { - has_version "<${CATEGORY}/${PN}-0.7" - previous_less_than_0_7=$? -} - -pkg_postinst() { - if [[ $previous_less_than_0_7 = 0 ]] ; then - elog - elog "Configuration files are now in /etc/fail2ban/" - elog "You probably have to manually update your configuration" - elog "files before restarting Fail2ban!" - elog - elog "Fail2ban is not installed under /usr/lib anymore. The" - elog "new location is under /usr/share." - elog - elog "You are upgrading from version 0.6.x, please see:" - elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8" - fi - if ! has_version ${CATEGORY}/${PN}; then - if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then - elog "For most jail.conf configurations, it is recommended you install either" - elog "dev-python/pyinotify or app-admin/gamin (in order of preference)" - elog "to control how log file modifications are detected" - fi - if ! has_version dev-lang/python[sqlite]; then - elog "If you want to use ${PN}'s persistent database, then reinstall" - elog "dev-lang/python with USE=sqlite" - fi - if has_version sys-apps/systemd[-python]; then - elog "If you want to track logins through sys-apps/systemd's" - elog "journal backend, then reinstall sys-apps/systemd with USE=python" - fi - fi -} diff --git a/net-analyzer/fail2ban/files/fail2ban-0.9.0-empty-run-dir.patch b/net-analyzer/fail2ban/files/fail2ban-0.9.0-empty-run-dir.patch deleted file mode 100644 index 326ea9db7dc3..000000000000 --- a/net-analyzer/fail2ban/files/fail2ban-0.9.0-empty-run-dir.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -136,9 +136,6 @@ - ('/etc/fail2ban/jail.d', - '' - ), -- ('/var/run/fail2ban', -- '' -- ), - ('/var/lib/fail2ban', - '' - ), diff --git a/net-analyzer/fail2ban/files/fail2ban-0.9.0-loglevel-int.patch b/net-analyzer/fail2ban/files/fail2ban-0.9.0-loglevel-int.patch deleted file mode 100644 index ce4f50606b44..000000000000 --- a/net-analyzer/fail2ban/files/fail2ban-0.9.0-loglevel-int.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/fail2ban/client/fail2banreader.py -+++ b/fail2ban/client/fail2banreader.py -@@ -45,7 +45,7 @@ - return ConfigReader.getOptions(self, "Definition", opts) - - def getOptions(self): -- opts = [["int", "loglevel", "INFO" ], -+ opts = [["string", "loglevel", "INFO" ], - ["string", "logtarget", "STDERR"], - ["string", "dbfile", "/var/lib/fail2ban/fail2ban.sqlite3"], - ["int", "dbpurgeage", 86400]] diff --git a/net-analyzer/fail2ban/files/fail2ban-0.9.0-python3-regex.patch b/net-analyzer/fail2ban/files/fail2ban-0.9.0-python3-regex.patch deleted file mode 100644 index be69ae3b137c..000000000000 --- a/net-analyzer/fail2ban/files/fail2ban-0.9.0-python3-regex.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e193e67718b77a1603a91079d7ab4d2307570a8e Mon Sep 17 00:00:00 2001 -From: Steven Hiscocks <steven@hiscocks.me.uk> -Date: Sun, 16 Mar 2014 18:25:16 +0000 -Subject: [PATCH] BF: fail2ban-regex mix of tabs and spaces - ---- - bin/fail2ban-regex | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/bin/fail2ban-regex b/bin/fail2ban-regex -index 270b70d..4317d06 100755 ---- a/bin/fail2ban-regex -+++ b/bin/fail2ban-regex -@@ -395,7 +395,7 @@ class Fail2banRegex(object): - if lines < self._maxlines or getattr(self, '_print_all_' + ltype): - ans = [[]] - for arg in [l, regexlist]: -- ans = [ x + [y] for x in ans for y in arg ] -+ ans = [ x + [y] for x in ans for y in arg ] - b = map(lambda a: a[0] + ' | ' + a[1].getFailRegex() + ' | ' + debuggexURL(a[0], a[1].getFailRegex()), ans) - pprint_list([x.rstrip() for x in b], header) - else: -@@ -466,11 +466,11 @@ if __name__ == "__main__": - if opts.print_no_missed and opts.print_all_missed: - sys.stderr.write("ERROR: --print-no-missed and --print-all-missed are mutually exclusive.\n\n") - parser.print_help() -- sys.exit(-1) -+ sys.exit(-1) - if opts.print_no_ignored and opts.print_all_ignored: - sys.stderr.write("ERROR: --print-no-ignored and --print-all-ignored are mutually exclusive.\n\n") - parser.print_help() -- sys.exit(-1) -+ sys.exit(-1) - - print - print "Running tests" --- -1.8.5.5 - |