X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=faf9cf4924cc3d7f49dc5042fe4c9353d9b0a4fb;hb=ddf20534be4f63dda63edadad5e96f76530e2969;hp=98a24b1c9f6766d4add311167426d4c58bd45f18;hpb=5b53bbacb025060b3982aa6639ad7726b22c0fde;p=spamassassin-cn.git

diff --git a/debian/postinst b/debian/postinst
index 98a24b1..faf9cf4 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -238,6 +238,13 @@ if [ -f $examdir/local.cf ]; then
         $confdir/local.cf.$$ || true
     echo "CN: Activated $trusted_networks as trusted networks"
 
+    if dpkg --compare-versions "$2" lt "2:3.3.5"; then
+      cp_check_and_sed "^bayes_auto_expire 1" \
+          "s#^bayes_auto_expire .*#bayes_auto_expire 0#g" \
+          $confdir/local.cf.$$ || true
+      echo "CN: Set bayes_auto_expire to 0"
+    fi
+        
     # different than template
     if ! cmp -s $confdir/local.cf.$$ $confdir/local.cf; then
         # backup if not zero size
@@ -367,7 +374,7 @@ if getent passwd amavis >/dev/null 2>&1; then
 fi
 
 # import SA keys
-echo "CN: Importing SpamAssassin and SARE public PGP keys"
+echo "CN: Importing SpamAssassin channels' public PGP keys"
 echo "$(date +'%d-%m-%Y %T'): Importing new SA keys..." >> \
     /var/log/sa-update.log
 if [ ! -d /etc/spamassassin/sa-update-keys ]; then
@@ -382,6 +389,8 @@ sa-update --import /etc/spamassassin/sa-keys.pgp \
 # 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
+sed -i -e '/dostech.net/d' /etc/spamassassin/sa-update.channels
 echo "CN: Please use /etc/spamassassin/sa-update.channels in future!"
     
 # get/update the rules
@@ -390,7 +399,8 @@ echo "$(date +'%d-%m-%Y %T'): Fetching new SA rules..." >> \
     /var/log/sa-update.log
 sa-update \
     --channelfile /etc/spamassassin/sa-update.channels \
-    --gpgkey 856AA88A \
+    --allowplugins \
+    --gpgkey 6C6191E3 \
     --gpgkey 24F434CE \
     --gpgkey BDE9DC10 >>/var/log/sa-update.log 2>&1 &
 echo "CN: SpamAssassin updates are now logged at /var/log/sa-update.log"
@@ -399,7 +409,7 @@ echo "CN: SpamAssassin updates are now logged at /var/log/sa-update.log"
 if [ "x$restart" = "xyes" ]; then
     if [ -x /usr/sbin/invoke-rc.d ]; then
         pkill -f /usr/sbin/spamd || true
-        invoke-rc.d --quiet spamassassin restart
+        invoke-rc.d spamassassin restart
     else
         /etc/init.d/spamassassin restart
     fi