From: Valentin Vidic <Valentin.Vidic@CARNet.hr>
Date: Mon, 13 Jun 2011 14:20:33 +0000 (+0200)
Subject: Cleanup amavis upgrade.
X-Git-Tag: debian/6.0.0~25
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=800696b31017bdaf55c8ce560ae6ec7f8cbbd5a5;p=carnet-upgrade.git

Cleanup amavis upgrade.
---

diff --git a/src/functions.sh b/src/functions.sh
index bdb78e9..26d4014 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -1050,14 +1050,6 @@ upgrade_apache2 () {
 upgrade_amavis () {
   local conf
 
-  # remove init script diversion before upgrade
-  if pkg amavisd-cn lt 3:2.6.1-1; then 
-    if [ -L /etc/init.d/amavis -a -f /etc/init.d/amavis.amavisd-new ]; then
-      rm -vf /etc/init.d/amavis
-      dpkg-divert --remove /etc/init.d/amavis
-    fi
-  fi
-
   # move old config aside
   for conf in /etc/amavisd.conf /etc/amavis/amavisd.conf; do
     if [ -e $conf -a ! -e $conf.$backup_ext ]; then
@@ -1068,18 +1060,8 @@ upgrade_amavis () {
   # install new packages
   pkgadd amavisd-cn amavisd-new
 
-  # fix new packages
-  check_and_sed '^clamd.*5.clamav.log$' \
-                's/^\(clamd.*\)5.clamav.log$/\14\tsocket/g' \
-                /etc/init.d/amavisd-cn || true
-
-  # check if link got lost
-  if pkg amavisd-cn && [ ! -L /etc/init.d/amavis ]; then
-    apt-get install --reinstall --yes amavisd-cn
-  fi
-
   # start new packages
-  /etc/init.d/amavis restart
+  /etc/init.d/amavisd-cn restart
 }
 
 # handle freerdius upgrade