Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at Mon Apr 11 10:55:03 CEST 2011.
-------- --- spamassassin/spamassassin.changes 2010-12-01 14:58:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/spamassassin/spamassassin.changes 2011-04-10 11:41:09.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Apr 10 09:40:55 UTC 2011 - [email protected] + +- bnc#676667 - sa-update cronjob should allow amavisd restart + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spamassassin.spec ++++++ --- /var/tmp/diff_new_pack.rwJEb2/_old 2011-04-11 10:53:11.000000000 +0200 +++ /var/tmp/diff_new_pack.rwJEb2/_new 2011-04-11 10:53:11.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package spamassassin (Version 3.3.1) +# spec file for package spamassassin # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,7 @@ Name: spamassassin Summary: Extensible email filter which is used to identify spam Version: %{sa_version} -Release: 8 +Release: 9 License: Apache Software License .. Group: Productivity/Networking/Email/Utilities AutoReqProv: on @@ -147,7 +147,7 @@ License: Apache License 2.0 Group: Development/Libraries/Perl Version: %{ix_version} -Release: 8 +Release: 9 %{perl_requires} Requires: perl-Mail-SpamAssassin = %{sa_version} ++++++ suse.cron-sa-update ++++++ --- /var/tmp/diff_new_pack.rwJEb2/_old 2011-04-11 10:53:12.000000000 +0200 +++ /var/tmp/diff_new_pack.rwJEb2/_new 2011-04-11 10:53:12.000000000 +0200 @@ -8,9 +8,23 @@ if [ "$SPAM_SA_UPDATE" = "yes" ] then /usr/bin/sa-update &> /dev/null - if [ "$SPAM_SA_COMPILE" = "yes" ] - then - /usr/bin/sa-compile &> /dev/null - fi + + if [ "$SPAM_SA_COMPILE" = "yes" -a $result = 0 ] ; then + /usr/bin/sa-compile &> /dev/null + fi + + if [ "$SPAM_AMAVISD_RESTART" = "yes" -a $result = 0 ] ; then + /etc/init.d/amavis restart &> /dev/null + fi + + if [ $result = 2 ] ; then + echo "sa-update lint check failed" | \ + logger -t suse.cron-sa-update + fi + + if [ $result -ge 3 ] ; then + echo "sa-update failed, exitcode $result" | \ + logger -t suse.cron-sa-update + fi fi exit 0 ++++++ sysconfig.spamd ++++++ --- /var/tmp/diff_new_pack.rwJEb2/_old 2011-04-11 10:53:12.000000000 +0200 +++ /var/tmp/diff_new_pack.rwJEb2/_new 2011-04-11 10:53:12.000000000 +0200 @@ -28,3 +28,12 @@ # calling sa-update. SPAM_SA_COMPILE="no" +## Path: Network/Mail/Spamassassin +## Description: Compile SpamAssassin ruleset into native code +## Type: yesno +## Default: "no" +# +# Set this varible to yes if you want the daily cron job +# restart SpamAssassin after calling sa-update. +SPAM_AMAVISD_RESTART="no" + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
