X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=7037e0deb1c67ce47f78399ddba3bfba44235342;hb=5bd4bb217b8017cc7da5bff5c61414b26ecc556d;hp=0fee7ca38ac0fa4b2ab36348633dcc205f107484;hpb=a15294f52fc01f32e55378ef8f3ef8973700e743;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 0fee7ca..7037e0d 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -201,6 +201,7 @@ remove_bloat() {
       fi
     done
   done
+  IFS="$oldifs"
   [ "$DEBUG" ] && echo "DEBUG: pkgs_to_remove=$pkgs_to_remove" 1>&2
   # Finally, remove those
   if [ -n "$update_selections" ]; then
@@ -479,7 +480,9 @@ reboot_required () {
   running_version=$( uname -v )
   log "Running kernel: $running_release $running_version"
 
-  if grep -q "$running_release .* $running_version" $default_kernel; then
+  if [ "$kernel_package" != "${kernel_package#linux-image-3.2.0-}" ] ||
+     grep -q "$running_release .* $running_version" $default_kernel
+  then
       log "Latest kernel version is running." 
       return 1
   else
@@ -902,8 +905,9 @@ upgrade_libc () {
 # upgrade apache2/php5
 upgrade_apache2 () {
   pkgrm apache-common # prevents installation of apache2-suexec
+  pkgrm php5-suhosin # not available for wheezy
   pkgupgrade libapache2-mod-php5 php5-cli php5-cn apache2-cn \
-    php5-odbc php5-suhosin php-suhosin-cn
+    php5-odbc
 }
 
 upgrade_amavis () {
@@ -927,7 +931,7 @@ upgrade_amavis () {
 upgrade_freeradius () {
   local password
 
-  pkg freeradius-aai lt 2.1.10-1 || return 0
+  pkg freeradius-aai lt 2.1.12~srce1 || return 0
 
   # aai team prevents a normal upgrade
   cp -av /etc/freeradius /etc/freeradius.$backup_ext
@@ -942,19 +946,19 @@ upgrade_freeradius () {
       sed -n '/^[[:space:]]*client[[:space:]]\+localhost/,/^[[:space:]]*}/ { /^[[:space:]]*secret[[:space:]]*=[[:space:]]*\([^[:space:]]*\)/s//\1/p }' /etc/freeradius/clients.conf
     )
     if [ "$password" ] \
-       && ! grep -q "^127.0.0.1[[:space:]]\+$password[[:space:]]\+" \
+       && ! grep -q "^127.0.0.1\(:[[:digit:]]\+\)\?[[:space:]]\+$password[[:space:]]\+" \
          /etc/pam_radius_auth.conf
     then
-      sed -i.$backup_ext "s/^\(127.0.0.1[[:space:]]*\)[^[:space:]]*\(.*\)/\1$password\2/" /etc/pam_radius_auth.conf
+      sed -i.$backup_ext "s/^\(127.0.0.1\(:[[:digit:]]\+\)\?[[:space:]]\+\)[^[:space:]]\+\(.*\)/\1$password\3/" /etc/pam_radius_auth.conf
     fi
   fi
 }
 
 # handle mysql 5.0 to 5.1 upgrade
 upgrade_mysql () {
-  if pkg mysql-server || pkg mysql-server-5.0; then
+  if pkg mysql-server || pkg mysql-server-5.1; then
      pkgadd mysql-server
-     dpkg -P mysql-server-5.0
+     dpkg -P mysql-server-5.1
      /etc/init.d/mysql restart
   fi
 }