- up to 0.9.4; fix pidfile handling

diff --git a/fail2ban.init b/fail2ban.init
index 7e72f879139b044848e0fa3eee6698390f189764..a9c69e9379de3f158e37caa7985a913511a050c0 100644 (file)
--- a/fail2ban.init
+++ b/fail2ban.init
@@ -6,7 +6,7 @@
 # description: Fail2ban daemon
 #              http://fail2ban.sourceforge.net/wiki/index.php/Main_Page
 # process name: fail2ban-server
-# pidfile:     /var/run/fail2ban.pid
+# pidfile:     /var/run/fail2ban/fail2ban.pid
 # config:      /etc/fail2ban/fail2ban.conf
 #
 
@@ -36,7 +36,7 @@ start() {
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/fail2ban ]; then
                msg_starting fail2ban
-               daemon /usr/bin/fail2ban-client start
+               daemon --pidfile /var/run/fail2ban/fail2ban.pid /usr/bin/fail2ban-client start
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/fail2ban
        else
@@ -48,8 +48,8 @@ stop() {
        # Stop daemons.
        if [ -f /var/lock/subsys/fail2ban ]; then
                msg_stopping fail2ban
-               daemon /usr/bin/fail2ban-client stop
-               rm -f /var/lock/subsys/fail2ban /var/run/fail2ban.pid >/dev/null 2>&1
+               daemon --pidfile /var/run/fail2ban/fail2ban.pid /usr/bin/fail2ban-client stop
+               rm -f /var/lock/subsys/fail2ban /var/run/fail2ban/fail2ban.pid >/dev/null 2>&1
        else
                msg_not_running fail2ban
        fi
@@ -85,7 +85,7 @@ case "$1" in
        condrestart 7
        ;;
   status)
-       status fail2ban
+       status --pidfile /var/run/fail2ban/fail2ban.pid fail2ban
        RETVAL=$?
        /usr/bin/fail2ban-client status
        ;;

diff --git a/fail2ban.spec b/fail2ban.spec
index 72a14781c037642a002a859b270156d2fd04c642..216be4b399c4cae7a585b6e9e568798e30ef3ed7 100644 (file)
--- a/fail2ban.spec
+++ b/fail2ban.spec
@@ -3,12 +3,12 @@
 Summary:       Ban IPs that make too many password failures
 Summary(pl.UTF-8):     Blokowanie IP powodujących zbyt dużo prób logowań z błędnym hasłem
 Name:          fail2ban
-Version:       0.9.1
+Version:       0.9.4
 Release:       0.1
 License:       GPL
 Group:         Daemons
 Source0:       https://github.com/fail2ban/fail2ban/archive/%{version}.tar.gz
-# Source0-md5: 3554cc3de3f06ddfd7f90f8305b765b8
+# Source0-md5: 2dc93dff03c4da9fb95d4695e07b65d8
 Source1:       %{name}.init
 Source2:       %{name}.logrotate
 Source3:       paths-pld.conf

diff --git a/logifiles.patch b/logifiles.patch
index 30c6e0de7c5ff2a51673f574ebcf2e11b466e07c..29c8b6d74e1c5e2003744e5cda8e8ecebc03bcc1 100644 (file)
--- a/logifiles.patch
+++ b/logifiles.patch
@@ -9,10 +9,3 @@
  
  # The DEFAULT allows a global definition of the options. They can be overridden
  # in each jail afterwards.
-@@ -723,4 +723,4 @@
- [portsentry]
- enabled  = false
- logpath  = /var/lib/portsentry/portsentry.history
--maxretry = 1
-\ Brak znaku nowej linii na końcu pliku
-+maxretry = 1