* dodan 99_carnet.cf sa phishing potpisima

[spamassassin-cn.git] / debian / postinst

diff --git a/debian/postinst b/debian/postinst
index 59f1d6c..c546d27 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -37,7 +37,7 @@ db_version 2.0
 umask 022
 
 # clean up old debconf questions that are no longer in this package
-if dpkg --compare-versions "$2" lt 3.1.7-4; then
+if dpkg --compare-versions "$2" lt "2:3.1.7-4"; then
     db_unregister spamassassin-cn/usedcc || true
 fi
 
@@ -194,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.$$.$$
@@ -302,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