X-Git-Url: http://ftp.carnet.hr/pub/carnet-debian/scm?a=blobdiff_plain;ds=sidebyside;f=src%2Ffunctions.sh;h=cbb8be289eac85d556410dfb209bded618917407;hb=4079aceafdc0196fde97eb596c151d19acc8d9e0;hp=7511bc2908664605644bf434db4b09165dcf7b9c;hpb=3d86bafffc213b905aa72dfcaba045d22997e7c2;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 7511bc2..cbb8be2 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -817,6 +817,8 @@ restore_configs () {
   restore_config kernel-2.6-cn libpam-modules 1.0.1-5 /etc/security/limits.conf
   restore_config samba-cn samba-common 2:3.2.5-4lenny2 /etc/samba/smb.conf
   restore_config '' base-files 5lenny2 /etc/issue /etc/issue.net
+  restore_config php5-cn php5-cli 5.2.6.dfsg.1-1+lenny2 /etc/php5/cli/php.ini
+  restore_config php5-cn libapache2-mod-php5 5.2.6.dfsg.1-1+lenny2 /etc/php5/apache2/php.ini
 
   # check if monitrc is template based
   if [ -f /etc/monit/monitrc -a ! -f /etc/monit/monitrc.$backup_ext ]; then
@@ -931,7 +933,7 @@ remove_skey () {
 # remove unsupported php version
 remove_php4 () {
   # leave the configuration just in case
-  pkgrm_only php4-common
+  pkgrm_only php4-common || true
 }
 
 # check if package is orphaned (nothing depends on it)
@@ -979,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
@@ -998,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
 }