rpms/spamassassin
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Apply fix for amavisd and spampd reloading after rules updates. Fixes bug #1145654

Browse Source
This commit is contained in:
Kevin Fenzi 2014-09-25 14:22:20 -06:00
parent 3266f5f05e
commit 60abc7f601
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sa-update.cronscript
View File

@ -13,7 +13,7 @@ for daemon in spamd amavisd spampd; do
/usr/bin/pgrep -f $daemon >& /dev/null /usr/bin/pgrep -f $daemon >& /dev/null
[ $? -eq 0 ] && SAUPDATE=yes [ $? -eq 0 ] && SAUPDATE=yes
done 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 # Skip sa-update if daemon not detected
[ -z "$SAUPDATE" ] && exit 0 [ -z "$SAUPDATE" ] && exit 0
@ -68,10 +68,10 @@ if [ $status -eq 0 ]; then
else else
echo "$now: SpamAssassin: Update processed successfully" >>/var/log/sa-update.log echo "$now: SpamAssassin: Update processed successfully" >>/var/log/sa-update.log
fi fi
/sbin/service spamassassin condrestart >& /dev/null systemctl condrestart spamassassin.service >& /dev/null
[ -f /etc/init.d/amavisd ] && /sbin/service amavisd condrestart >& /dev/null [ -f /usr/lib/systemd/system/amavisd.service ] && systemctl condrestart amavisd.service >& /dev/null
[ -f /var/run/mimedefang.pid ] && /sbin/service mimedefang reload >& /dev/null systemctl --quiet is-active mimedefang.service; [ $? -eq 0 ] && systemctl reload mimedefang.service >& /dev/null
/sbin/service spampd condrestart >& /dev/null [ -f /usr/lib/systemd/system/spampd.service ] && systemctl condrestart spampd.service >& /dev/null
exit $status exit $status
fi fi
if [ $status -eq 1 ]; then if [ $status -eq 1 ]; then

5
spamassassin.spec
View File

@ -63,7 +63,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents
Name: spamassassin Name: spamassassin
Version: 3.4.0 Version: 3.4.0
#Release: 0.8.%{prerev}%{?dist} #Release: 0.8.%{prerev}%{?dist}
Release: 11%{?dist} Release: 12%{?dist}
License: ASL 2.0 License: ASL 2.0
Group: Applications/Internet Group: Applications/Internet
URL: http://spamassassin.apache.org/ URL: http://spamassassin.apache.org/
@ -369,6 +369,9 @@ fi
%endif %endif
%changelog %changelog
* Thu Sep 25 2014 Kevin Fenzi <kevin@scrye.com> 3.4.0-12
- Apply fix for amavisd and spampd reloading after rules updates. Fixes bug #1145654
* Thu Aug 28 2014 Jitka Plesnikova <jplesnik@redhat.com> - 3.4.0-11 * Thu Aug 28 2014 Jitka Plesnikova <jplesnik@redhat.com> - 3.4.0-11
- Perl 5.20 rebuild - Perl 5.20 rebuild