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

diff --git a/debian/postinst b/debian/postinst
index 3853209..c546d27 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -36,6 +36,11 @@ 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"
 
@@ -189,7 +194,7 @@ if [ -f $examdir/local.cf ]; then
     done
 
     # remove obsolete options from old SA
-    egrep -v '^(bayes_use_chi2_combining|ok_languages|pyzor)' \
+    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.$$.$$
@@ -297,10 +302,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 \
       || 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