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

diff --git a/debian/postinst b/debian/postinst
index 9e3b82e..0d341f6 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -27,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 $MASTTMPLVERSION; then
-    conf_from_template
-  fi
-}
-
 mta=postfix
 . /usr/share/amavisd-cn/postfix.sh
 
@@ -45,7 +34,7 @@ mta=postfix
 cp_get_mx_domain
 domain=$RET
 
-update_postfix
+update_postfix $*
 
 # amavisd.conf
 if [ -f "$ACONFOLD" ]; then
@@ -70,20 +59,10 @@ 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