X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=06d468fd4a3c48df6ee274b40db6ae3c719e4a54;hb=2c7c2d79513b2038897c61c1a62830a2ed83cc9d;hp=ee1136905fb3532d95584ae329ca8b2b07327d3d;hpb=7cf4d17063560538621c8d04d9fa33d5b1120733;p=spamassassin-cn.git

diff --git a/debian/postinst b/debian/postinst
index ee11369..06d468f 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -36,15 +36,17 @@ db_version 2.0
 
 umask 022
 
+# clean up old debconf questions that are no longer in this package
+if dpkg --compare-versions "$2" lt "2:3.1.7-4"; then
+    db_unregister spamassassin-cn/usedcc || true
+fi
+
 db_get spamassassin-cn/usebayes || true
 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"
 
@@ -115,7 +117,7 @@ if [ -f $examdir/local.cf ]; then
 
     # old enough
     if [ -s $confdir/local.cf ] &&
-            dpkg --compare-versions "$2" lt "2:3.0.3-3"; then
+            dpkg --compare-versions "$2" lt "2:3.2.5-4"; then
         echo "CN: Backing up old version of $confdir/local.cf in /var/backups"
         cp_backup_conffile $confdir/local.cf
         rm -f $confdir/local.cf
@@ -177,8 +179,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 +193,27 @@ 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|use_pyzor|pyzor_|use_dcc|dcc_)' \
+        $confdir/local.cf.$$ > $confdir/local.cf.$$.$$ && \
+            mv -f $confdir/local.cf.$$.$$ $confdir/local.cf.$$
+    rm -f $confdir/local.cf.$$.$$
+
+    # calculate trusted networks
+    cp_get_netaddr || true
+    netaddr="$RET"
+    trusted_networks=$(awk '/^trusted_networks/ { print $2 }' \
+        $confdir/local.cf.$$)
+    for i in "127.0.0.0/8" "$netaddr"; do
+        if ! echo "$trusted_networks" | grep -q "$i"; then
+            trusted_networks="$trusted_networks $i"
+        fi
+    done
+    cp_check_and_sed "^trusted_networks " \
+        "s#^trusted_networks .*#trusted_networks $trusted_networks#g" \
+        $confdir/local.cf.$$ || true
+    echo "CN: Activated $trusted_networks as trusted networks"
+
     # different than template
     if ! cmp -s $confdir/local.cf.$$ $confdir/local.cf; then
         # backup if not zero size
@@ -208,6 +231,40 @@ if [ -f $examdir/local.cf ]; then
     rm -f $confdir/local.cf.$$
 fi
 
+# enable/disable plugins in SA
+list=$(find /etc/spamassassin -type f -name 'v*.pre')
+for i in $list; do
+    # enable DKIM
+    cp -f $i $i.$$
+    plugin="loadplugin Mail::SpamAssassin::Plugin::DKIM"
+    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 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
 if [ "$run_service" = "true" -a \
         -f $examdir/etc-default-spamassassin-$run_as_user ]; then
@@ -260,9 +317,18 @@ fi
 
 # cleanup the AWL
 if getent passwd amavis >/dev/null 2>&1; then
-  if [ -s ~amavis/.spamassassin/auto-whitelist ]; then
+  AWL=~amavis/.spamassassin/auto-whitelist
+  if [ -s $AWL ]; then
     echo "CN: Cleaning the Amavis auto-whitelist"
-    su -c '/usr/bin/check_whitelist --clean' - amavis >/dev/null 2>&1 
+    su -c '/usr/bin/check_whitelist --clean' - amavis >/dev/null 2>&1 \
+      || true
+
+    # see if size is still unacceptable
+    SIZE=$(du -ks $AWL | awk '{print $1}')
+    if [ $SIZE -ge 51200 ]; then
+        echo "CN: Size of AWL database > 50MB, doing full cleanup"
+        cp /dev/null $AWL
+    fi
   fi
 fi