diff --git a/sa-update.cronscript b/sa-update.cronscript index 2e8ebb9..d79c071 100644 --- a/sa-update.cronscript +++ b/sa-update.cronscript @@ -13,7 +13,7 @@ for daemon in spamd amavisd spampd; do /usr/bin/pgrep -f $daemon >& /dev/null [ $? -eq 0 ] && SAUPDATE=yes done -[ -f /var/run/mimedefang.pid ] && SAUPDATE=yes +systemctl --quiet is-active mimedefang.service; [ $? -eq 0 ] && SAUPDATE=yes # Skip sa-update if daemon not detected [ -z "$SAUPDATE" ] && exit 0 @@ -68,10 +68,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 - /sbin/service spampd condrestart >& /dev/null + systemctl condrestart spamassassin.service >& /dev/null + [ -f /usr/lib/systemd/system/amavisd.service ] && systemctl condrestart amavisd.service >& /dev/null + systemctl --quiet is-active mimedefang.service; [ $? -eq 0 ] && systemctl reload mimedefang.service >& /dev/null + [ -f /usr/lib/systemd/system/spampd.service ] && systemctl condrestart spampd.service >& /dev/null exit $status fi if [ $status -eq 1 ]; then diff --git a/spamassassin.spec b/spamassassin.spec index 9a6b444..a5ce6ea 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -63,7 +63,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents Name: spamassassin Version: 3.4.0 #Release: 0.8.%{prerev}%{?dist} -Release: 11%{?dist} +Release: 12%{?dist} License: ASL 2.0 Group: Applications/Internet URL: http://spamassassin.apache.org/ @@ -369,6 +369,9 @@ fi %endif %changelog +* Thu Sep 25 2014 Kevin Fenzi 3.4.0-12 +- Apply fix for amavisd and spampd reloading after rules updates. Fixes bug #1145654 + * Thu Aug 28 2014 Jitka Plesnikova - 3.4.0-11 - Perl 5.20 rebuild