From: Valentin Vidic <Valentin.Vidic@CARNet.hr>
Date: Tue, 28 Apr 2009 12:24:31 +0000 (+0200)
Subject: Force apache2 and php5 upgrade.
X-Git-Tag: debian/5.0.0~24
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=2220806fde634c565bbc2b1ca0be78cccacf0df6;p=carnet-upgrade.git

Force apache2 and php5 upgrade.
---

diff --git a/src/functions.sh b/src/functions.sh
index bba996c..2d3df43 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -981,18 +981,17 @@ upgrade_libc () {
   DEBIAN_FRONTEND=noninteractive pkgadd libc6 tzdata
 }
 
-# upgrade apache2 to etch
+# upgrade apache2 to lenny
 upgrade_apache2 () {
   local package packages
 
   for package in \
-      libapache2-mod-php4 \
-      php4-cli \
-      php4-cgi \
-      php4-cn \
+      libapache2-mod-php5 \
+      php5-cli \
+      php5-cn \
       apache2-cn \
-      php4-odbc \
-      php4-suhosin \
+      php5-odbc \
+      php5-suhosin \
       php-suhosin-cn
   do
       if pkg $package; then
@@ -1000,11 +999,6 @@ upgrade_apache2 () {
       fi
   done
 
-  # enable suhosin downgrade to etch version
-  if pkg php4-suhosin; then
-      pkgrm php4-suhosin php-suhosin-cn
-  fi
-
   eval pkgadd $packages
 }