diff options
author | Jeroen Roovers <jer@gentoo.org> | 2013-06-06 17:00:14 +0000 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2013-06-06 17:00:14 +0000 |
commit | 8aa1c9435ed0a87507fb05d668362178795b8375 (patch) | |
tree | eb2f5f7f767a296e0bb7d6159c2597517e1e4d8a /net-analyzer | |
parent | Drop keyword due yelp-tools DEPEND on gtk-doc and blocker against older versi... (diff) | |
download | gentoo-2-8aa1c9435ed0a87507fb05d668362178795b8375.tar.gz gentoo-2-8aa1c9435ed0a87507fb05d668362178795b8375.tar.bz2 gentoo-2-8aa1c9435ed0a87507fb05d668362178795b8375.zip |
Install upstream logrotate script. Revert that change for 0.8.8.
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-analyzer')
-rw-r--r-- | net-analyzer/fail2ban/ChangeLog | 6 | ||||
-rw-r--r-- | net-analyzer/fail2ban/fail2ban-0.8.8.ebuild | 7 | ||||
-rw-r--r-- | net-analyzer/fail2ban/fail2ban-0.8.9.ebuild | 9 | ||||
-rw-r--r-- | net-analyzer/fail2ban/files/fail2ban.conf.d | 8 |
4 files changed, 14 insertions, 16 deletions
diff --git a/net-analyzer/fail2ban/ChangeLog b/net-analyzer/fail2ban/ChangeLog index 1153f44b98a3..a7ef7bc579ad 100644 --- a/net-analyzer/fail2ban/ChangeLog +++ b/net-analyzer/fail2ban/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/fail2ban # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/ChangeLog,v 1.96 2013/06/06 16:53:14 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/ChangeLog,v 1.97 2013/06/06 17:00:14 jer Exp $ + + 06 Jun 2013; Jeroen Roovers <jer@gentoo.org> fail2ban-0.8.8.ebuild, + fail2ban-0.8.9.ebuild, -files/fail2ban.conf.d: + Install upstream logrotate script. Revert that change for 0.8.8. 06 Jun 2013; Jeroen Roovers <jer@gentoo.org> -fail2ban-0.8.6-r1.ebuild, -fail2ban-0.8.6.ebuild, -fail2ban-0.8.7.1.ebuild, diff --git a/net-analyzer/fail2ban/fail2ban-0.8.8.ebuild b/net-analyzer/fail2ban/fail2ban-0.8.8.ebuild index 946063139378..397927c9a7e9 100644 --- a/net-analyzer/fail2ban/fail2ban-0.8.8.ebuild +++ b/net-analyzer/fail2ban/fail2ban-0.8.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.8.8.ebuild,v 1.8 2013/06/06 16:53:14 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.8.8.ebuild,v 1.9 2013/06/06 17:00:14 jer Exp $ EAPI="4" PYTHON_DEPEND="2" @@ -35,8 +35,9 @@ src_prepare() { src_install() { distutils_src_install - newconfd "${FILESDIR}"/gentoo-confd fail2ban - newinitd "${FILESDIR}"/gentoo-initd fail2ban + # not FILESDIR + newconfd files/gentoo-confd fail2ban + newinitd files/gentoo-initd fail2ban dodoc ChangeLog README TODO doman man/*.1 diff --git a/net-analyzer/fail2ban/fail2ban-0.8.9.ebuild b/net-analyzer/fail2ban/fail2ban-0.8.9.ebuild index 58882fe103e6..4442990aaaf5 100644 --- a/net-analyzer/fail2ban/fail2ban-0.8.9.ebuild +++ b/net-analyzer/fail2ban/fail2ban-0.8.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.8.9.ebuild,v 1.2 2013/06/06 16:53:14 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.8.9.ebuild,v 1.3 2013/06/06 17:00:14 jer Exp $ EAPI=5 PYTHON_COMPAT=( python2_{5,6,7} ) @@ -39,14 +39,15 @@ src_install() { rm -rf "${D}"/usr/share/doc/fail2ban - newconfd "${FILESDIR}"/gentoo-confd fail2ban - newinitd "${FILESDIR}"/gentoo-initd fail2ban + # not FILESDIR + newconfd files/gentoo-confd fail2ban + newinitd files/gentoo-initd fail2ban doman man/*.1 # 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 "${FILESDIR}"/${PN}-logrotate ${PN} + newins files/${PN}-logrotate ${PN} } pkg_preinst() { diff --git a/net-analyzer/fail2ban/files/fail2ban.conf.d b/net-analyzer/fail2ban/files/fail2ban.conf.d deleted file mode 100644 index 3c957b9221ae..000000000000 --- a/net-analyzer/fail2ban/files/fail2ban.conf.d +++ /dev/null @@ -1,8 +0,0 @@ -# Config file for /etc/init.d/fail2ban - -# For information on options, see "/usr/bin/fail2ban-client -h". - -FAIL2BAN_OPTIONS="" - -# Force execution of the server even if the socket already exists: -#FAIL2BAN_OPTIONS="-x" |