X-Git-Url: http://ftp.carnet.hr/pub/carnet-debian/scm?a=blobdiff_plain;ds=sidebyside;f=debian%2Fpostinst;h=385320946570e86f29b463ef342ae5c489ec2c47;hb=51889af837e4b3dd85104cabd0a76fc6532e34e3;hp=36ac9eca07b6de84175fb801b6934fd1a310ac2f;hpb=2e278d7e063df5a699aecfaaf477a4c7107e7037;p=spamassassin-cn.git

diff --git a/debian/postinst b/debian/postinst
index 36ac9ec..3853209 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -42,9 +42,6 @@ use_bayes="$RET"
 db_get spamassassin-cn/userazor2 || true
 use_razor2="$RET"
 
-db_get spamassassin-cn/usedcc || true
-use_dcc="$RET"
-
 db_get spamassassin-cn/runservice || true
 run_service="$RET"
 
@@ -177,8 +174,8 @@ if [ -f $examdir/local.cf ]; then
         rm -f $confdir/local.cf.$$.$$
     fi
 
-    # set bayes/razor2/dcc in local.cf.$$
-    for i in bayes razor2 dcc; do
+    # set bayes/razor2 in local.cf.$$
+    for i in bayes razor2; do
         use_name="use_$i"
         use_value=$(eval echo \$$use_name)
         if [ "$use_value" = "true" ]; then
@@ -191,6 +188,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
@@ -208,21 +211,9 @@ if [ -f $examdir/local.cf ]; then
     rm -f $confdir/local.cf.$$
 fi
 
-# enable requested plugins in SA
+# enable/disable plugins in SA
 list=$(find /etc/spamassassin -type f -name 'v*.pre')
 for i in $list; do
-    # enable DCC if requested
-    if [ "$use_dcc" = "true" ]; then
-        cp -f $i $i.$$
-        plugin="loadplugin Mail::SpamAssassin::Plugin::DCC"
-        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.$$
-    fi
-
     # enable DKIM
     cp -f $i $i.$$
     plugin="loadplugin Mail::SpamAssassin::Plugin::DKIM"
@@ -232,6 +223,26 @@ 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.$$
+
+    # disable DCC
+    cp -f $i $i.$$
+    plugin="loadplugin Mail::SpamAssassin::Plugin::DCC"
+    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