From c59439c108f7b2c1df699111f62a7a3483d2896b Mon Sep 17 00:00:00 2001 From: Ivan Rako Date: Tue, 22 Jan 2019 19:30:40 +0100 Subject: [PATCH] izbacivanje spamassassin.heinlein-support.de --- debian/changelog | 6 ++++++ debian/cron.daily | 2 +- debian/postinst | 10 +++++----- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index e9f0f73..7b48355 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +spamassassin-cn (2:3.4.0-7) stable; urgency=low + + * izbacen spamassassin.heinlein-support.de + + -- Ivan Rako Tue, 22 Jan 2019 19:30:09 +0100 + spamassassin-cn (2:3.4.0-6) stable; urgency=low * novi kljuc i sa-update zbog problema opisanih na stranici: diff --git a/debian/cron.daily b/debian/cron.daily index 2a8b57c..c577e10 100755 --- a/debian/cron.daily +++ b/debian/cron.daily @@ -12,7 +12,7 @@ if [ -e /etc/spamassassin/sa-update.channels ]; then sa-update \ --channelfile /etc/spamassassin/sa-update.channels \ --allowplugins \ - --gpghomedir /var/lib/spamassassin/sa-update-keys || \ + --gpghomedir /etc/spamassassin/sa-update-keys || \ ( echo "$(date +'%d-%m-%Y %T'): No new rules. Exiting now."; exit ) fi diff --git a/debian/postinst b/debian/postinst index 6037ae7..497a2df 100755 --- a/debian/postinst +++ b/debian/postinst @@ -354,7 +354,7 @@ if [ ! -d /etc/spamassassin/sa-update-keys ]; then /etc/spamassassin/sa-update-keys/secring.gpg chmod -R go-rwx /etc/spamassassin/sa-update-keys fi -sa-update --import /etc/spamassassin/sa-keys.pgp \ +sa-update --gpghomedir /etc/spamassassin/sa-update-keys --import /etc/spamassassin/sa-keys.pgp \ >>/var/log/sa-update.log 2>&1 || true # import http://spamassassin.apache.org/updates/GPG.KEY @@ -374,10 +374,10 @@ find /var/lib/spamassassin -iname \*_yerp_\* -print0 | xargs -0r rm -rf sed -i -e '/sought.rules.yerp.org/d' /etc/spamassassin/sa-update.channels # add spamassassin.heinlein-support.de -echo "CN: Adding spamassassin.heinlein-support.de to /etc/spamassassin/sa-update.channels..." -if ! grep -q spamassassin.heinlein-support.de /etc/spamassassin/sa-update.channels; then - echo spamassassin.heinlein-support.de >> /etc/spamassassin/sa-update.channels -fi +#echo "CN: Adding spamassassin.heinlein-support.de to /etc/spamassassin/sa-update.channels..." +#if ! grep -q spamassassin.heinlein-support.de /etc/spamassassin/sa-update.channels; then +# echo spamassassin.heinlein-support.de >> /etc/spamassassin/sa-update.channels +#fi # get/update the rules echo "CN: Downloading new SpamAssassin rules and updating in background" -- 1.7.10.4