rpms/fail2ban/F-7 fail2ban-0.8.1-init.patch, NONE, 1.1 fail2ban-0.8.1-sock.patch, NONE, 1.1 fail2ban.spec, 1.8, 1.9 fail2ban-0.8.0-init.patch, 1.1, NONE

[Axel Thimm (athimm)]

Author: athimm

Update of /cvs/extras/rpms/fail2ban/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27948/F-7

Modified Files:
	fail2ban.spec 
Added Files:
	fail2ban-0.8.1-init.patch fail2ban-0.8.1-sock.patch 
Removed Files:
	fail2ban-0.8.0-init.patch 
Log Message:
Apply Jonathan Underwood's patches for addressing bug #429281

fail2ban-0.8.1-init.patch:

--- NEW FILE fail2ban-0.8.1-init.patch ---
diff -up fail2ban-0.8.1/files/redhat-initd.init fail2ban-0.8.1/files/redhat-initd
diff -up fail2ban-0.8.1/files/redhat-initd.init fail2ban-0.8.1/files/redhat-initd
--- fail2ban-0.8.1/files/redhat-initd.init	2007-07-11 23:09:45.000000000 +0100
+++ fail2ban-0.8.1/files/redhat-initd	2008-01-31 22:37:29.000000000 +0000
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# chkconfig: 345 92 08
+# chkconfig: - 92 08
 # description: Fail2ban daemon
 #              http://fail2ban.sourceforge.net/wiki/index.php/Main_Page
 # process name: fail2ban-server
@@ -27,8 +27,7 @@ start() {
     echo -n $"Starting fail2ban: "
     getpid
     if [ -z "$pid" ]; then
-	rm -rf /tmp/fail2ban.sock # in case of unclean shutdown
-        $FAIL2BAN start > /dev/null
+        $FAIL2BAN -x start > /dev/null
         RETVAL=$?
     fi
     if [ $RETVAL -eq 0 ]; then

fail2ban-0.8.1-sock.patch:

--- NEW FILE fail2ban-0.8.1-sock.patch ---
diff -up fail2ban-0.8.1/server/ssocket.py.sock fail2ban-0.8.1/server/ssocket.py
--- fail2ban-0.8.1/server/ssocket.py.sock	2008-01-31 22:44:43.000000000 +0000
+++ fail2ban-0.8.1/server/ssocket.py	2008-01-31 22:45:31.000000000 +0000
@@ -41,11 +41,11 @@ class SSocket(Thread):
 		Thread.__init__(self)
 		self.__transmit = transmitter
 		self.__isRunning = False
-		self.__socket = "/tmp/fail2ban.sock"
+		self.__socket = "/var/run/fail2ban.sock"
 		self.__ssock = None
 		logSys.debug("Created SSocket")
 	
-	def initialize(self, sock = "/tmp/fail2ban.sock", force = False):
+	def initialize(self, sock = "/var/run/fail2ban.sock", force = False):
 		self.__socket = sock
 		# Remove socket
 		if os.path.exists(sock):
diff -up fail2ban-0.8.1/config/fail2ban.conf.sock fail2ban-0.8.1/config/fail2ban.conf
--- fail2ban-0.8.1/config/fail2ban.conf.sock	2008-01-31 22:46:01.000000000 +0000
+++ fail2ban-0.8.1/config/fail2ban.conf	2008-01-31 22:46:23.000000000 +0000
@@ -28,7 +28,7 @@ logtarget = /var/log/fail2ban.log
 # Notes.: Set the socket file. This is used to communicate with the daemon. Do
 #         not remove this file when Fail2ban runs. It will not be possible to
 #         communicate with the server afterwards.
-# Values: FILE  Default:  /tmp/fail2ban.sock
+# Values: FILE  Default:  /var/run/fail2ban.sock
 #
-socket = /tmp/fail2ban.sock
+socket = /var/run/fail2ban.sock
 


Index: fail2ban.spec
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/F-7/fail2ban.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fail2ban.spec	15 Aug 2007 20:23:14 -0000	1.8
+++ fail2ban.spec	14 Feb 2008 19:38:54 -0000	1.9
@@ -4,18 +4,19 @@
 Summary: Ban IPs that make too many password failures
 Name: fail2ban
 Version: 0.8.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://fail2ban.sourceforge.net/
 Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1: fail2ban-logrotate
-Patch0: fail2ban-0.8.0-init.patch
+Patch0: fail2ban-0.8.1-init.patch
 Patch1: fail2ban-0.8.1-sshd.patch
+Patch2: fail2ban-0.8.1-sock.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel >= 2.4
 BuildArch: noarch
-Requires: iptables, tcp_wrappers, shorewall, gamin-python
+Requires: iptables, gamin-python
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -29,6 +30,7 @@
 %setup -q
 %patch0 -p1 -b .init
 %patch1 -p1 -b .sshd
+%patch2 -p1 -b .sock
 
 %build
 python setup.py build
@@ -74,6 +76,13 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/fail2ban
 
 %changelog
+* Thu Jan 31 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.8.1-11
+- Move socket file from /tmp to /var/run to prevent SElinux from stopping
+  fail2ban from starting (BZ #429281)
+- Change logic in init file to start with -x to remove the socket file in case
+  of unclean shutdown
+- Remove unecessary requires of tcpwrappers and shorewall (BZ #244275)
+
 * Wed Aug 15 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.8.1-10
 - Update to 0.8.1.
 - Remove patch fixing CVE-2007-4321 (upstream).


--- fail2ban-0.8.0-init.patch DELETED ---