X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=4318c671ffc4345fe2d10939d970a2b33e6eb18c;hb=61805068024f01b49ef44adb1b0f7f0e2f9524c4;hp=4ce2de2ed98696f9296a8d763738a11ee35edf2e;hpb=9881eb03821c641460350eee4ed7aa0350e5c6ca;p=amavisd-cn.git

diff --git a/debian/postinst b/debian/postinst
index 4ce2de2..4318c67 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
@@ -48,18 +51,14 @@ update_postfix
 # amavisd.conf
 if [ -f "$ACONFOLD" ]; then
   cp_echo "CN: Amavisd configuration is now in $ACONF."
-  cp_echo "    Previous location was $ACONFOLD."
-  cp_backup_conffile "$ACONFOLD"
+  noisy_backup "$ACONFOLD"
   rm -f "$ACONFOLD"
-  cp_echo "    Old file renamed to $ACONFMOVED."
-  fi
   cp_echo ""
   cp_echo "CN: Please read /usr/share/doc/amavisd-cn/README.CARNet."
 elif [ -f "$ACONFOLD.disabled" ]; then
-  cp_backup_conffile "$ACONFOLD.disabled" "$(basename $ACONFOLD)"
+  noisy_backup "$ACONFOLD.disabled" "$(basename $ACONFOLD)"
   rm -f "$ACONFOLD.disabled"
-  cp_echo "CN: Removed $ACONFOLD.disabled."
-  cp_echo "    Please read /usr/share/doc/amavisd-cn/README.CARNet."
+  cp_echo "CN: Please read /usr/share/doc/amavisd-cn/README.CARNet."
 fi
 
 if [ -f $ACONF ]; then
@@ -91,19 +90,18 @@ 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
+# ovo je rijeseno u spamassassin-cn, i ovdje nije potrebno, stoga brisemo
+if [ -f $AHOME/.spamassassin/user_prefs ] ; then
+  user_prefs_temp=$(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