X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=9e3b82e641889ff7bbff2964c78a897b298bd8e8;hb=f79a8b07f4b60324b7663f33ba10d057a7fa5e26;hp=b1516e825d59389be06cc36df84db15d85452412;hpb=15d1b0baa8fb2c1b0ff425952949012e773c5445;p=amavisd-cn.git

diff --git a/debian/postinst b/debian/postinst
index b1516e8..9e3b82e 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,5 +1,4 @@
 #!/bin/sh
-# last update: zoran.dzelajlija@carnet.hr  Fri, 19 Oct 2007 00:34:32 +0200
 
 set -e
 
@@ -34,7 +33,7 @@ update_conf() {
   # 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
+  if dpkg --compare-versions "$1" lt $MASTTMPLVERSION; then
     conf_from_template
   fi
 }
@@ -90,24 +89,26 @@ 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
 :
 
+# Fix missing redirection in cron files for amavisd-new-cronjob
+add_redirection /etc/cron.d/amavisd-new /etc/cron.daily/amavisd-new
+
 # Cleanup and finalization
 if dpkg --compare-versions "$2" lt 2:20030616p10-4; then
   update-rc.d -f amavisd remove > /dev/null