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

diff --git a/debian/postinst b/debian/postinst
index b1516e8..0d341f6 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
 
@@ -28,17 +27,6 @@ export PATH
 . /usr/share/amavisd-cn/variables.sh
 . /usr/share/amavisd-cn/functions.sh
 
-# Place configuration tweaks done on upgrades into this function
-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
 . /usr/share/amavisd-cn/postfix.sh
 
@@ -46,7 +34,7 @@ mta=postfix
 cp_get_mx_domain
 domain=$RET
 
-update_postfix
+update_postfix $*
 
 # amavisd.conf
 if [ -f "$ACONFOLD" ]; then
@@ -71,43 +59,35 @@ if [ ! -f $ACONF -o ! -s $ACONF ]; then
   conf_from_template
 fi
 
-# check for SAVI:
-# if not there, comment it out, if there, uncomment and restart
-if ! dpkg -l libsavi-perl 2> /dev/null | egrep -q '^.i' || ! [ -f /usr/lib/libsavi.so ]; then
-  if cp_check_and_sed "^\['Sophos SAVI'" \
-     "s/^\(\['Sophos SAVI', ..sophos_savi \]\)/#\1/" $ACONF; then
-    cp_echo "CN: Disabled SAVI::Perl usage in ${ACONF}."
-    cp_echo "    To enable it, run sophos-sweep-update, uncomment and restart amavis."
-  fi
-else
-  if cp_check_and_sed "^#\['Sophos SAVI'" \
-     "s/^#\(\['Sophos SAVI', ..sophos_savi \]\)/\1/" $ACONF; then
-    cp_echo "CN: Enabled SAVI::Perl usage in ${ACONF}."
-    restart_daemon=1
-  fi
+# disable SAVI as proven problematic
+if cp_check_and_sed "^\['Sophos SAVI'" \
+ "s/^\(\['Sophos SAVI', ..sophos_savi \]\)/#\1/" $ACONF; then
+  cp_echo "CN: Disabled SAVI::Perl usage in ${ACONF}."
 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