From 7e6b694a198aa603ae66061e5ab8f7f273e28d6c Mon Sep 17 00:00:00 2001 From: Ivan Rako Date: Fri, 28 Jun 2019 12:12:06 +0200 Subject: [PATCH] dodane izmjene iz paketa za jessie --- debian/changelog | 10 ++++++++++ debian/cron.daily | 5 ++--- debian/postinst | 26 ++++++++++++++++++-------- 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9b63444..b7318eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +spamassassin-cn (2:3.4.1~cn1) stable; urgency=low + + * dodane stvari iz paketa za jessie: + - izbacen spamassassin.heinlein-support.de + - novi kljuc i sa-update zbog problema opisanih na stranici: + https://sysportal.carnet.hr/node/1793 + - izmjene prema https://sysportal.carnet.hr/node/1793 + + -- Ivan Rako Fri, 28 Jun 2019 12:07:31 +0200 + spamassassin-cn (2:3.4.1~cn0) stable; urgency=low * Prva verzija za stretch diff --git a/debian/cron.daily b/debian/cron.daily index 4acf67e..6de4ce5 100755 --- a/debian/cron.daily +++ b/debian/cron.daily @@ -1,5 +1,6 @@ #!/bin/sh # Dinko Korunic +# Modified by Ivan Rako exec 1>> /var/log/sa-update.log exec 2>&1 @@ -12,9 +13,7 @@ if [ -e /etc/spamassassin/sa-update.channels ]; then sa-update \ --channelfile /etc/spamassassin/sa-update.channels \ --allowplugins \ - --gpgkey 6C6191E3 \ - --gpgkey 24F434CE \ - --gpgkey BDE9DC10 || \ + --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 845fe4b..497a2df 100755 --- a/debian/postinst +++ b/debian/postinst @@ -354,30 +354,40 @@ 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 echo "CN: Importing new http://spamassassin.apache.org/updates/GPG.KEY..." -sa-update --import /usr/share/spamassassin-cn/GPG.KEY +sa-update --gpghomedir /etc/spamassassin/sa-update-keys --import /usr/share/spamassassin-cn/GPG.KEY # clean old RulesDuJour rules echo "CN: Cleaning old RulesDuJour and SARE rules..." rm -rf /etc/spamassassin/*_sare_*.cf /etc/spamassassin/RulesDuJour -find /var/lib/spamassassin -iname \*_sare_\* -print0| xargs -0r rm -rf +find /var/lib/spamassassin -iname \*_sare_\* -print0 | xargs -0r rm -rf sed -i -e '/dostech.net/d' /etc/spamassassin/sa-update.channels echo "CN: Please use /etc/spamassassin/sa-update.channels in future!" - + +# clean old sought.rules.yerp.org +echo "CN: Cleaning old YERP rules..." +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 + # get/update the rules echo "CN: Downloading new SpamAssassin rules and updating in background" echo "$(date +'%d-%m-%Y %T'): Fetching new SA rules..." >> \ /var/log/sa-update.log sa-update \ --channelfile /etc/spamassassin/sa-update.channels \ - --allowplugins \ - --gpgkey 6C6191E3 \ - --gpgkey 24F434CE \ - --gpgkey BDE9DC10 >>/var/log/sa-update.log 2>&1 & + --gpghomedir /etc/spamassassin/sa-update-keys \ + --allowplugins >>/var/log/sa-update.log 2>&1 & + echo "CN: SpamAssassin updates are now logged at /var/log/sa-update.log" # restart the spamasassin -- 1.7.10.4