Force downgrade of php4-suhosin to etch version.

[carnet-upgrade.git] / src / functions.sh

diff --git a/src/functions.sh b/src/functions.sh
index b0ebdb3..4775de3 100644 (file)
--- 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 () {