aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hills <mark@xwax.org>2023-10-31 10:44:08 +0000
committerLeonardo Arena <rnalrd@gmail.com>2023-11-01 08:23:32 +0000
commitba6c3cbb37d45a842e780c3b802549f6941815d6 (patch)
treefd77cca995b3b7add17692fd55fb21f46dec48a8
parentb89a8e78a1f99f3dd378d4fb5fe5b1fa1dc4b1b8 (diff)
main/spamassassin: fix noisy cron job
run-parts: /etc/periodic/daily/spamassassin-update: exit status 1
-rw-r--r--main/spamassassin/APKBUILD4
-rwxr-xr-x[-rw-r--r--]main/spamassassin/spamd.crond12
2 files changed, 13 insertions, 3 deletions
diff --git a/main/spamassassin/APKBUILD b/main/spamassassin/APKBUILD
index fdc51d21604..9c9dd346103 100644
--- a/main/spamassassin/APKBUILD
+++ b/main/spamassassin/APKBUILD
@@ -3,7 +3,7 @@
pkgname=spamassassin
_pkgreal=Mail-SpamAssassin
pkgver=3.4.6
-pkgrel=6
+pkgrel=7
pkgdesc="The Powerful #1 Open-Source Spam Filter"
url="https://metacpan.org/pod/Mail::SpamAssassin"
arch="all"
@@ -94,7 +94,7 @@ sha512sums="
7910852f04463a7363a2fc3b70a35adadf5714552e57c5b8ca57beaa534ee18d9f06526cdbcf8bcd5781e5ca778f98d2f84ef2efd1872fa550cfe1689440364a Mail-SpamAssassin-3.4.6.tar.gz
0a22933290a3abd147689bf3a9de4b6b277628c22966f353c5da932cd98560babf1d0bb9d92c456ea24decfb5af0bbc960192d29a90d9cab437e7986c75c8278 spamd.initd
274d3aa0d9aab05e83c8d5ad3e93a457649360021a67c8cb19088365bed681ebe26889cfa86f8c46a6044c7ee969231f2a71e3227adf8ad9e38d0286b9caf48d spamd.confd
-a08854bb12fbd4a5f32e2b3176de8d70c4b64aa58ed8debb6de21a4dabc5c5a750dd89a48dd518e5a3579b3e90b09085b736cae0b1cf3790a02226aa32d44b5c spamd.crond
+2ad52adfb6eb2ab28d59311853572ef4c5858e5b3cee1b8ff8c16f1d605e537e823746376bf468b6f041d953f24d5592940686024bc91153d5ec886d65fd16b3 spamd.crond
66a6daa7e9898864497e7d8e17efc6094aabc5a9a94afbc7da08acf4cf2430fad2cb0128b8db4be637f5dcabe3fa9f03490f9d7cbba3c1cc02b7824f63cd0965 Mail-SpamAssassin.patch
6eda2d1073bcf999a976de3e4e2c928a044d46962ce1a4f169078bfc017fb7d0f39d2fc78b17734c2d936649b34638abed3cf9ebeb51614531134289eb23afa6 fix-test.patch
a2d0625b2224641abd338879044f7dcb4c47d09cbc6318c978b88e70e40d0129a7d68e97458ea2d23afcc465f99805a6359153d09e9fc9da881de31ad7a27c4a taint.patch
diff --git a/main/spamassassin/spamd.crond b/main/spamassassin/spamd.crond
index bc03499b0e4..7e281536234 100644..100755
--- a/main/spamassassin/spamd.crond
+++ b/main/spamassassin/spamd.crond
@@ -10,7 +10,17 @@ pidfile="${pidfile:-/run/spamd.pid}"
if [ -f "$pidfile" ]; then
_pid="$(cat "$pidfile")"
fi
-/usr/bin/sa-update
+/usr/bin/sa-update && R=0 || R=$?
+case "$R" in
+0)
+ ;;
+1)
+ # "No fresh updates were available"; see sa-update(1)
+ exit 0
+ ;;
+*)
+ exit $R
+esac
if [ -n "$_pid" ]; then
kill -SIGHUP "$_pid"
fi