X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=4775de37b654f9809dae7c851260267197a94750;hb=d2d434591b7b8b5b86decd38bb9300685f2fa12c;hp=f1fbc0200dd29e9a1851fc251e32cf09ba084ef1;hpb=3644e9d0594b99d9403add0ac784270dfe3552af;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index f1fbc02..4775de3 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -634,10 +634,6 @@ upgrade_libc () {
 upgrade_apache2 () {
   local package packages
 
-  # php-suhosin-cn causes removal of applications on dist-upgrade
-  # because of php5 only dependencies
-  pkgrm php-suhosin-cn
-
   for package in \
       libapache2-mod-php4 \
       php4-cli \
@@ -645,16 +641,20 @@ upgrade_apache2 () {
       php4-cn \
       apache2-cn \
       php4-odbc \
-      php4-suhosin
+      php4-suhosin \
+      php-suhosin-cn
   do
       if pkg $package; then
           packages="$packages $package"
       fi
   done
 
-  for package in $(echo $packages); do
-      pkgadd $package
-  done
+  # enable suhosin downgrade to etch version
+  if pkg php4-suhosin; then
+      pkgrm php4-suhosin php-suhosin-cn
+  fi
+
+  eval pkgadd $packages
 }
 
 upgrade_amavis () {
@@ -667,10 +667,11 @@ upgrade_amavis () {
   fi
 
   # move old config aside
-  conf=/etc/amavis/amavisd.conf
-  if [ -e $conf -a ! -e $conf.$backup_ext ]; then
-    mv -v $conf $conf.$backup_ext
-  fi
+  for conf in /etc/amavisd.conf /etc/amavis/amavisd.conf; do
+    if [ -e $conf -a ! -e $conf.$backup_ext ]; then
+      mv -v $conf $conf.$backup_ext
+    fi
+  done
 
   # install new packages
   pkgadd amavisd-cn amavisd-new