Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2021-09-11 22:24:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spamassassin" Sat Sep 11 22:24:28 2021 rev:86 rq:917792 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2021-04-15 16:57:28.238679362 +0200 +++ /work/SRC/openSUSE:Factory/.spamassassin.new.1899/spamassassin.changes 2021-09-11 22:24:55.947410382 +0200 @@ -1,0 +2,8 @@ +Thu Sep 9 17:03:07 UTC 2021 - Peter Varkoly <vark...@suse.com> + +- spamassassin: sa-update.timer does not work + (bsc#1175375) + Remove sence less SPAM_SA_UPDATE + Document how to use sa-update.service + +------------------------------------------------------------------- New: ---- README.SUSE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spamassassin.spec ++++++ --- /var/tmp/diff_new_pack.EFmxBj/_old 2021-09-11 22:24:56.807411229 +0200 +++ /var/tmp/diff_new_pack.EFmxBj/_new 2021-09-11 22:24:56.811411233 +0200 @@ -40,6 +40,7 @@ Source2: https://mailfud.org/iXhash2/%{IXHASH}.tar.gz Source3: https://github.com/mpaperno/spampd/archive/%{spd_version}.tar.gz#/%{SPAMPD}.tar.gz Source10: local.cf +Source11: README.SUSE Source12: sysconfig.spamd Source14: sysconfig.spampd Source15: timed-sa-update @@ -220,6 +221,7 @@ %patch6 %patch7 -p1 %patch10 +cp %{SOURCE11} ./ %build # Run substitutions in default rules @@ -263,7 +265,6 @@ install -m 0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/mail/spamassassin/local.cf ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcspamd ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcspampd -echo "Most of the documentation is at ../perl-Mail-SpamAssassin/." > README.SUSE install -D -m 0640 %{SOURCE12} %{buildroot}%{_fillupdir}/sysconfig.spamd install -m 0640 %{SOURCE14} %{buildroot}%{_fillupdir}/ test -f %{buildroot}%{_datadir}/spamassassin/user_prefs.template || { @@ -316,7 +317,7 @@ %files %defattr(-,root,root) -%doc spamd/README spamd/README.vpopmail spamd/PROTOCOL +%doc spamd/README spamd/README.vpopmail spamd/PROTOCOL README.SUSE %{_mandir}/man1/sa-* %{_mandir}/man1/spamassassin* %{_mandir}/man1/spamd.1* ++++++ README.SUSE ++++++ There is a sa-update.timer which can start daily the sa-update.service You can enable this timer by: systemctl enable sa-update.timer systemctl start sa-update.timer In /etc/sysconfig/spamd You can enable or disable some functionality of sa-update.service: * SPAM_SA_COMPILE * SPAM_SPAMD_RESTART * SPAM_AMAVISD_RESTART ++++++ sysconfig.spamd ++++++ --- /var/tmp/diff_new_pack.EFmxBj/_old 2021-09-11 22:24:56.967411387 +0200 +++ /var/tmp/diff_new_pack.EFmxBj/_new 2021-09-11 22:24:56.971411391 +0200 @@ -10,20 +10,11 @@ SPAMD_ARGS="-d -c -L" ## Path: Network/Mail/Spamassassin -## Description: Call sa-update periodicaly -## Type: yesno -## Default: "no" -# -# Set this varible to yes if you want the daily cron job -# to call sa-update. -SPAM_SA_UPDATE="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 +# Set this varible to yes if you want the sa-update.service # compile SpamAssassin ruleset into native code after # calling sa-update. SPAM_SA_COMPILE="no" @@ -33,7 +24,7 @@ ## Type: yesno ## Default: "yes" # -# Set this varible to yes if you want the daily cron job +# Set this varible to yes if you want the daily sa-update.service # restart spamd after recompiling spamassassin ruleset. SPAM_SPAMD_RESTART="yes" @@ -42,7 +33,7 @@ ## Type: yesno ## Default: "yes" # -# Set this varible to yes if you want the daily cron job +# Set this varible to yes if you want the sa-update.service # restart amavisd after recompiling spamassassin ruleset. SPAM_AMAVISD_RESTART="yes" ++++++ timed-sa-update ++++++ --- /var/tmp/diff_new_pack.EFmxBj/_old 2021-09-11 22:24:56.991411411 +0200 +++ /var/tmp/diff_new_pack.EFmxBj/_new 2021-09-11 22:24:56.991411411 +0200 @@ -13,31 +13,28 @@ . /etc/sysconfig/spamd fi -if [ "$SPAM_SA_UPDATE" = "yes" ] -then - /usr/bin/sa-update &> /dev/null - result=$? - - if [ "$SPAM_SA_COMPILE" = "yes" -a $result = 0 ] ; then - /usr/bin/sa-compile &> /dev/null - fi - - if [ "$SPAM_SPAMD_RESTART" = "yes" -a $result = 0 ] ; then - /sbin/service spamd try-restart &> /dev/null - fi - - if [ "$SPAM_AMAVISD_RESTART" = "yes" -a $result = 0 ] ; then - /sbin/service amavis try-restart &> /dev/null - fi - - if [ $result = 2 ] ; then - echo "sa-update lint check failed" | \ - logger -t timed-sa-update - fi - - if [ $result -ge 3 ] ; then - echo "sa-update failed, exitcode $result" | \ - logger -t timed-sa-update - fi +/usr/bin/sa-update &> /dev/null +result=$? + +if [ "$SPAM_SA_COMPILE" = "yes" -a $result = 0 ] ; then + /usr/bin/sa-compile &> /dev/null +fi + +if [ "$SPAM_SPAMD_RESTART" = "yes" -a $result = 0 ] ; then + /sbin/service spamd try-restart &> /dev/null +fi + +if [ "$SPAM_AMAVISD_RESTART" = "yes" -a $result = 0 ] ; then + /sbin/service amavis try-restart &> /dev/null +fi + +if [ $result = 2 ] ; then + echo "sa-update lint check failed" | \ + logger -t timed-sa-update +fi + +if [ $result -ge 3 ] ; then + echo "sa-update failed, exitcode $result" | \ + logger -t timed-sa-update fi exit 0
