X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;ds=sidebyside;f=src%2Ffunctions.sh;h=4775de37b654f9809dae7c851260267197a94750;hb=bd8d48933bb57b293c40f22745277ec6027bd083;hp=00ae1ff6f2a29808d6acd366cb5dc9c040888510;hpb=8900fd17ba93aa5e74c21e700c6c903be2bb21f6;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 00ae1ff..4775de3 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -641,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 () {