[spamassassin] Fix sa-update not detecting spamd running. Fixes bug #755644

[Kevin Fenzi]

commit 47aa2bac4efb86cb7521936a0ed17d55a9b7a0c5
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Fri Aug 3 13:39:45 2012 -0600

    Fix sa-update not detecting spamd running. Fixes bug #755644
    
    - Add restart=always to systemd file to work around upstream bug. Bug #812359

 sa-update.cronscript |   10 +++++-----
 spamassassin.service |    1 +
 spamassassin.spec    |    6 +++++-
 3 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/sa-update.cronscript b/sa-update.cronscript
index b88daa3..70b7158 100644
--- a/sa-update.cronscript
+++ b/sa-update.cronscript
@@ -10,7 +10,7 @@ unset SAUPDATE OPTIONS DEBUG NOTIFY_UPD
 [ -f /etc/sysconfig/sa-update ] && . /etc/sysconfig/sa-update
 [ "$SAUPDATE" = "no" ] && exit 0
 for daemon in spamd amavisd; do
-    /sbin/pidof $daemon >& /dev/null
+    /sbin/pgrep $daemon >& /dev/null
     [ $? -eq 0 ] && SAUPDATE=yes
 done
 [ -f /var/run/mimedefang.pid ] && SAUPDATE=yes
@@ -69,10 +69,10 @@ if [ $status -eq 0 ]; then
 	else
             echo "$now: SpamAssassin: Update processed successfully" >>/var/log/sa-update.log
 	fi
-	 /sbin/service spamassassin condrestart > /dev/null
-	 [ -f /etc/init.d/amavisd ] && /sbin/service amavisd condrestart > /dev/null
-	 [ -f /var/run/mimedefang.pid ] && /sbin/service mimedefang reload > /dev/null
-	 [ -f /etc/init.d/spampd ] && /etc/init.d/spampd condrestart > /dev/null
+	 /sbin/service spamassassin condrestart >& /dev/null
+	 [ -f /etc/init.d/amavisd ] && /sbin/service amavisd condrestart >& /dev/null
+	 [ -f /var/run/mimedefang.pid ] && /sbin/service mimedefang reload >& /dev/null
+	 [ -f /etc/init.d/spampd ] && /etc/init.d/spampd condrestart >& /dev/null
         exit $status
 fi
 if [ $status -eq 1 ]; then
diff --git a/spamassassin.service b/spamassassin.service
index 51c18cc..1b4b468 100644
--- a/spamassassin.service
+++ b/spamassassin.service
@@ -10,6 +10,7 @@ ExecStartPre=-/sbin/portrelease spamd
 ExecStart=/usr/bin/spamd --pidfile /var/run/spamd.pid $SPAMDOPTIONS
 StandardOutput=syslog
 StandardError=syslog
+Restart=always
 
 [Install]
 WantedBy=multi-user.target
diff --git a/spamassassin.spec b/spamassassin.spec
index 2cb22ec..5870c41 100644
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -69,7 +69,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
 Version: 3.3.2
 #Release: 0.8.%{prerev}%{?dist}
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -352,6 +352,10 @@ fi
 %endif
 
 %changelog
+* Fri Aug 03 2012 Kevin Fenzi <kevin at scrye.com> - 3.3.2-12
+- Fix sa-update not detecting spamd running. Fixes bug #755644
+- Add restart=always to systemd file to work around upstream bug. Bug #812359
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.2-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild