X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;ds=sidebyside;f=debian%2Fpostinst;h=8fd8605d86106cb6b543227a5117cd34028b4e9b;hb=a4dedb185aa66f7036ce67877d69be296134cc83;hp=a1a8fe2ea92f3e55958f231f02b9dc04c9983726;hpb=ab5e282c076bb8875fc4fdbf0048b517bf0af7be;p=amavisd-cn.git

diff --git a/debian/postinst b/debian/postinst
index a1a8fe2..8fd8605 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -33,7 +33,10 @@ update_conf() {
   [ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx
   # placeholder.
   # remember to set changed_config=1 and restart_daemon=1 if necessary
-  :
+  #:
+  if dpkg --compare-versions "$1" lt 3:2.4.2-3; then
+    conf_from_template
+  fi
 }
 
 mta=postfix
@@ -87,19 +90,17 @@ fi
 check_and_add_alias virusalert root
 check_and_add_alias spamalert root
 
-if [ ! -f $AHOME/.spamassassin/user_prefs ] ; then
-  [ -d $AHOME/.spamassassin ] || mkdir -p $AHOME/.spamassassin
-  cat > $AHOME/.spamassassin/user_prefs <<-EEND
+if [ -f $AHOME/.spamassassin/user_prefs ] ; then
+  user_prefs_temp=out=$(mktemp /tmp/user_prefs.XXXXXX)
+  cat > $user_prefs_temp <<-EEND
 	bayes_path		$AHOME/.spamassassin/bayes
 	bayes_auto_expire	0
 	auto_whitelist_path	$AHOME/.spamassassin/auto-whitelist
 	EEND
-  chown_ahome=1
-fi
-
-if [ ! -f $AHOME/.spamassassin/auto-whitelist ] ; then
-  touch $AHOME/.spamassassin/auto-whitelist
-  chown_ahome=1
+  if cmp -s $user_prefs_temp $AHOME/.spamassassin/user_prefs; then
+    rm -f $AHOME/.spamassassin/user_prefs
+  fi
+  rm -f $user_prefs_temp
 fi
 
 # No sysvinit order fixes