Revision bump wrt opts deprecated in initscript (quite annoying to see as user every boot).

(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)

3 files changed, 83 insertions, 3 deletions

diff --git a/net-analyzer/fail2ban/ChangeLog b/net-analyzer/fail2ban/ChangeLog
index 299edacd273f..982fcd072528 100644
--- a/net-analyzer/fail2ban/ChangeLog
+++ b/net-analyzer/fail2ban/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/fail2ban
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/ChangeLog,v 1.73 2011/12/10 16:59:10 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/ChangeLog,v 1.74 2011/12/15 08:50:08 scarabeus Exp $
+
+*fail2ban-0.8.4-r4 (15 Dec 2011)
+
+  15 Dec 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +fail2ban-0.8.4-r4.ebuild, files/fail2ban-0.8.4-gentoo-init.patch:
+  Revision bump wrt opts deprecated in initscript (quite annoying to see as
+  user every boot).
 
   10 Dec 2011; <swift@gentoo.org> fail2ban-0.8.4-r3.ebuild:
   Add selinux use flag support
diff --git a/net-analyzer/fail2ban/fail2ban-0.8.4-r4.ebuild b/net-analyzer/fail2ban/fail2ban-0.8.4-r4.ebuild
new file mode 100644
index 000000000000..857f4f8b60fe
--- /dev/null
+++ b/net-analyzer/fail2ban/fail2ban-0.8.4-r4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.8.4-r4.ebuild,v 1.1 2011/12/15 08:50:08 scarabeus Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit distutils eutils
+
+DESCRIPTION="Bans IP that make too many password failures"
+HOMEPAGE="http://fail2ban.sourceforge.net/"
+SRC_URI="mirror://sourceforge/fail2ban/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="selinux"
+
+DEPEND="selinux? ( sec-policy/selinux-fail2ban )"
+RDEPEND="net-misc/whois
+	virtual/mta
+	net-firewall/iptables
+	selinux? ( sec-policy/selinux-fail2ban )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-hashlib.patch \
+		"${FILESDIR}"/${P}-sshd-breakin.patch \
+		"${FILESDIR}"/gentoo-initd_create_run_dir.patch \
+		"${FILESDIR}"/${P}-cve2009-5023.patch \
+		"${FILESDIR}"/${P}-gentoo-init.patch
+	distutils_src_prepare
+}
+
+src_install() {
+	distutils_src_install
+
+	newconfd files/gentoo-confd fail2ban || die
+	newinitd files/gentoo-initd fail2ban || die
+	dodoc ChangeLog README TODO || die "dodoc failed"
+	doman man/*.1 || die "doman failed"
+
+	# 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} || die
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.7"
+	previous_less_than_0_7=$?
+}
+
+pkg_postinst() {
+	distutils_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
+}
diff --git a/net-analyzer/fail2ban/files/fail2ban-0.8.4-gentoo-init.patch b/net-analyzer/fail2ban/files/fail2ban-0.8.4-gentoo-init.patch
index 1eafedf034ed..0e28c2a33694 100644
--- a/net-analyzer/fail2ban/files/fail2ban-0.8.4-gentoo-init.patch
+++ b/net-analyzer/fail2ban/files/fail2ban-0.8.4-gentoo-init.patch
@@ -3,10 +3,10 @@ diff -r ce6b6bcedb6d files/gentoo-initd
 +++ b/files/gentoo-initd	Tue May 17 13:36:56 2011 -0600
 @@ -19,7 +19,7 @@
  # 
- # $Revision: 1.1 $
+ # $Revision: 1.2 $
  
 -opts="start stop restart reload showlog"
-+opts="reload showlog"
++extra_started_commands="reload showlog"
  
  FAIL2BAN="/usr/bin/fail2ban-client ${FAIL2BAN_OPTIONS}"