- fix start/stop script

diff --git a/spamassassin-spamd.init b/spamassassin-spamd.init
index 19dc131483e5d6156ce454b78b6fb5ac22148dd1..404ea98be474f8df1cf98f2f07d068d626c1cdee 100644 (file)
--- a/spamassassin-spamd.init
+++ b/spamassassin-spamd.init
@@ -55,7 +55,7 @@ stop() {
        fi
 
        msg_stopping "SpamAssassin"
        fi
 
        msg_stopping "SpamAssassin"

-       killproc spamd
+       killproc --pidfile spamassassin.pid spamd

        RETVAL=$?
        rm -f /var/lock/subsys/spamd
 }
        RETVAL=$?
        rm -f /var/lock/subsys/spamd
 }

diff --git a/spamassassin.spec b/spamassassin.spec
index 7b096b83de2e80bfb775bb7e4e887e357593c0a3..3e548f8ac28b697cc971ed6f45c6ed04137490fd 100644 (file)
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -13,7 +13,7 @@ Summary:      A spam filter for email which can be invoked from mail delivery agents
 Summary(pl.UTF-8):     Filtr antyspamowy, przeznaczony dla programów dostarczających pocztę (MDA)
 Name:          spamassassin
 Version:       3.4.0
 Summary(pl.UTF-8):     Filtr antyspamowy, przeznaczony dla programów dostarczających pocztę (MDA)
 Name:          spamassassin
 Version:       3.4.0

-Release:       1
+Release:       2

 License:       Apache v2.0
 Group:         Applications/Mail
 Source0:       http://ftp.ps.pl/pub/apache//spamassassin/source/%{pdir}-%{pnam}-%{version}.tar.bz2
 License:       Apache v2.0
 Group:         Applications/Mail
 Source0:       http://ftp.ps.pl/pub/apache//spamassassin/source/%{pdir}-%{pnam}-%{version}.tar.bz2

diff --git a/spamassassin.sysconfig b/spamassassin.sysconfig
index 83a17920b10c06d34369429246acf9657044a834..f8e4aca7c5eb1c7a7132304b592a20e4d8d6e740 100644 (file)
--- a/spamassassin.sysconfig
+++ b/spamassassin.sysconfig
@@ -1,4 +1,4 @@
 # Customized settings for spamassassin (spamd)
 
 # Cmdline options 
 # Customized settings for spamassassin (spamd)
 
 # Cmdline options 

-SPAMD_OPTS="-d -c"
+SPAMD_OPTS="-d -c --pidfile=/var/run/spamassassin.pid"