From de9d7ed8cd50fc995c212075d5eac864bc10e3da Mon Sep 17 00:00:00 2001
From: Valentin Vidic <vvidic@carnet.hr>
Date: Mon, 14 Apr 2008 10:49:27 +0200
Subject: [PATCH] Force downgrade of php4-suhosin to etch version.

---
 src/functions.sh |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

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 () {
-- 
1.7.10.4