X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=85f6874bb8343b59bfeb8aa9ca99f277bdbe793a;hb=ab6bc87ddbd3b118d5d87654d2dd66edf4ff233f;hp=36ac9eca07b6de84175fb801b6934fd1a310ac2f;hpb=2e278d7e063df5a699aecfaaf477a4c7107e7037;p=spamassassin-cn.git

diff --git a/debian/postinst b/debian/postinst
index 36ac9ec..85f6874 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -191,6 +191,12 @@ if [ -f $examdir/local.cf ]; then
             $confdir/local.cf.$$ || true
     done
 
+    # remove obsolete options from old SA
+    egrep -v '^(bayes_use_chi2_combining|ok_languages|pyzor)' \
+        $confdir/local.cf.$$ > $confdir/local.cf.$$.$$ && \
+            mv -f $confdir/local.cf.$$.$$ $confdir/local.cf.$$
+    rm -f $confdir/local.cf.$$.$$
+
     # different than template
     if ! cmp -s $confdir/local.cf.$$ $confdir/local.cf; then
         # backup if not zero size
@@ -232,6 +238,16 @@ for i in $list; do
         mv -f $i.$$ $i
     fi
     rm -f $i.$$
+
+    # disable Pyzor
+    cp -f $i $i.$$
+    plugin="loadplugin Mail::SpamAssassin::Plugin::Pyzor"
+    cp_check_and_sed "^$plugin.*$" \
+        "s/^$plugin.*$/#$plugin/g" $i.$$ || true
+    if ! cmp -s $i.$$ $i; then
+        mv -f $i.$$ $i
+    fi
+    rm -f $i.$$
 done
 
 # check and replace /etc/default/spamasassin if needed