Remove obsolete code from init script. Bug #367819. Thanks to Robert Trace <bugzilla-gentoo@farcaster.org>

(Portage version: 2.1.9.47/cvs/Linux x86_64)

3 files changed, 36 insertions, 3 deletions

diff --git a/net-analyzer/fail2ban/ChangeLog b/net-analyzer/fail2ban/ChangeLog
index 3486a1ed445a..7f8bd9100fe1 100644
--- a/net-analyzer/fail2ban/ChangeLog
+++ b/net-analyzer/fail2ban/ChangeLog
@@ -1,6 +1,11 @@
 # 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.71 2011/05/14 11:41:10 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/ChangeLog,v 1.72 2011/05/18 18:05:07 hwoarang Exp $
+
+  18 May 2011; Markos Chandras <hwoarang@gentoo.org> fail2ban-0.8.4-r3.ebuild,
+  +files/fail2ban-0.8.4-gentoo-init.patch:
+  Remove obsolete code from init script. Bug #367819. Thanks to Robert Trace
+  <bugzilla-gentoo@farcaster.org>
 
   14 May 2011; Markos Chandras <hwoarang@gentoo.org> -fail2ban-0.8.4.ebuild,
   -fail2ban-0.8.4-r1.ebuild, -fail2ban-0.8.4-r2.ebuild:
diff --git a/net-analyzer/fail2ban/fail2ban-0.8.4-r3.ebuild b/net-analyzer/fail2ban/fail2ban-0.8.4-r3.ebuild
index 85388dac9020..fea1e6d07af4 100644
--- a/net-analyzer/fail2ban/fail2ban-0.8.4-r3.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.8.4-r3.ebuild
@@ -1,6 +1,6 @@
 # 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-r3.ebuild,v 1.5 2011/05/14 10:58:44 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.8.4-r3.ebuild,v 1.6 2011/05/18 18:05:07 hwoarang Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -29,7 +29,8 @@ 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}-cve2009-5023.patch \
+		"${FILESDIR}"/${P}-gentoo-init.patch 
 	distutils_src_prepare
 }
 
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
new file mode 100644
index 000000000000..1eafedf034ed
--- /dev/null
+++ b/net-analyzer/fail2ban/files/fail2ban-0.8.4-gentoo-init.patch
@@ -0,0 +1,27 @@
+diff -r ce6b6bcedb6d files/gentoo-initd
+--- a/files/gentoo-initd	Tue May 17 13:20:13 2011 -0600
++++ b/files/gentoo-initd	Tue May 17 13:36:56 2011 -0600
+@@ -19,7 +19,7 @@
+ # 
+ # $Revision: 1.1 $
+ 
+-opts="start stop restart reload showlog"
++opts="reload showlog"
+ 
+ FAIL2BAN="/usr/bin/fail2ban-client ${FAIL2BAN_OPTIONS}"
+ 
+@@ -41,14 +41,6 @@
+ 	eend $? "Failed to stop fail2ban"
+ }
+ 
+-restart() {
+-	if ! service_stopped "${SVCNAME}" ; then
+-		svc_stop || return "$?"
+-		sleep 1
+-	fi
+-	svc_start
+-}
+-
+ reload() {
+ 	ebegin "Reloading fail2ban"
+ 	${FAIL2BAN} reload > /dev/null