X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=cbb8be289eac85d556410dfb209bded618917407;hb=4079aceafdc0196fde97eb596c151d19acc8d9e0;hp=6ef62aa7d8805346129a4286c3273bdc6fa5e4ee;hpb=df6b014a9ea544d6b360580ee76163b77a88fe4b;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 6ef62aa..cbb8be2 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -1,13 +1,16 @@
-# last update: 2005-07-03
 # Ivan 'ico' Rako <irako@srce.hr>
 # Zoran 'jelly' Dzelajlija <jelly@srce.hr>
 
 notice () {
-  dialog --backtitle "$title" --msgbox "$*" 18 75
+  LC_MESSAGES=hr_HR dialog --backtitle "$title" --msgbox "$*" 18 75
 }
 
 first_warning () {
-  dialog --backtitle "$title" --yesno "$msg_first_warning" 18 75
+  LC_MESSAGES=hr_HR dialog --backtitle "$title" --yesno "$msg_first_warning" 18 75
+  if [ $? -ne 0 ]; then
+    log "Upgrade canceled."
+    exit 0
+  fi
 }
 
 pkg() {
@@ -19,23 +22,30 @@ pkg() {
 }
 
 log() {
+  local old_umask
   logfile=${logfile:=/var/log/carnet-upgrade.log}
-  touch $logfile
+
+  old_umask=$(umask)
+  umask 0077
+
   echo "$(date +'%Y-%m-%d %H:%M:%S') $*" >> $logfile
   echo "CN: $*"
+
+  umask $old_umask
+  chmod og= $logfile
 }
 
 # find first free uid/gid in range
 # find_id passwd 100 999
 find_id() {
-  local db first last ids
+  local i db first last ids
   db=$1
   first=$2
   last=$3
   ids=$(getent $db | awk -F: "\$3 >= $first && \$3 <= $last {print \$3}")
   for i in $(seq $first $last)
   do
-    if ! echo $ids |grep -q $i; then
+    if ! echo $ids | grep -q $i; then
       echo $i
       return 0
     fi
@@ -102,7 +112,7 @@ pkgadd () {
 
 pkgrm () {
   [ -n "$*" ] || return 0
-  log "Removing $* ..."
+  log "Purging $* ..."
   apt-get -y$s --purge remove $* || {
     dpkg --configure -a
     apt-get -yf install
@@ -110,13 +120,28 @@ pkgrm () {
   }
 }
 
-update() {
+pkgrm_only () {
+  [ -n "$*" ] || return 0
+  log "Removing $* ..."
+  apt-get -y$s remove $* || {
+    dpkg --configure -a
+    apt-get -yf install
+    apt-get -y$s remove $*
+  }
+}
+
+
+apt_update() {
   log "Running apt-get update ..."
   apt-get -y$s update || {
     apt-get -yf install
     apt-get -y$s update
   }
   apt-get autoclean
+}
+
+apt_download() {
+  log "Running apt-get download ..."
   apt-get -dy$s dist-upgrade
 }
 
@@ -128,16 +153,28 @@ dist_upgrade () {
   }
 }
 
+remove_x() {
+  LC_MESSAGES=hr_HR dialog --backtitle "$title" --yesno "$msg_remove_x" 18 75
+  if [ $? -eq 0 ]; then
+    log "Removing X Window System"
+    pkgrm xlibs
+  else
+    log "Skipping X Window System removal"
+  fi
+}
+
 remove_bloat() {
   local to_remove add_this i j n text to_show cmd tmpfile installed
-  local update_selections pkgs_to_deselect oldifs
+  local update_selections pkgs_to_deselect pkgs_to_remove oldifs pkglist
   text="$msg_remove_bloat"
 
   [ "$DEBUG" ] && set -x
   n=0
+  pkglist=$(mktemp /var/lib/carnet-upgrade/pkglist.XXXXXX)
+  COLUMNS=200 dpkg -l | awk '$1 ~ /^.i/ { print $2 }' > $pkglist
   for i in $(echo "$bloats" | sed 's/		*/	/g'| awk -F'	' '{print $2}')
   do
-    if pkg $i; then
+    if grep -q "^$i$" $pkglist; then
       installed="$installed $i"
       add_this="$(echo "$bloats" | egrep "	.*\b${i}\b" | sed 's/		*/	/g'| awk -F'	' '{print $1}')"
       if ! echo "$to_show" | grep -q "$add_this"; then
@@ -146,9 +183,11 @@ remove_bloat() {
       fi
     fi
   done
+  [ "$DEBUG" ] || rm -f $pkglist
   [ -z "$to_show" ] && return 0
+  test $n -gt 8 && n=8
   tmpfile=$(mktemp /var/lib/carnet-upgrade/dialog-tmp.XXXXXX)
-  cmd="dialog --nocancel --backtitle \""$title"\" --checklist \""$text"\" 20 75 $n $to_show"
+  cmd="LC_MESSAGES=hr_HR dialog --nocancel --backtitle \""$title"\" --checklist \""$text"\" 20 75 $n $to_show"
   [ "$DEBUG" ] && set +x
     eval $cmd 2> $tmpfile
   [ "$DEBUG" ] && set -x
@@ -181,6 +220,57 @@ remove_bloat() {
   eval pkgrm $pkgs_to_remove
 }
 
+remove_cn_bloat() {
+  local installed pkg cn_pkgs dialog_list selection cn_del to_del del_pkgs
+
+  # get installed packages
+  installed=$(mktemp /var/lib/carnet-upgrade/pkglist.XXXXXX)
+  COLUMNS=200 dpkg -l | awk '$1 ~ /^.i/ { print $2 }' >$installed
+
+  # detect installed CN packagees
+  for pkg in $(echo "$cn_bloats" | cut -d' ' -f1); do
+    if grep -qx $pkg $installed; then
+      cn_pkgs="$cn_pkgs $pkg"
+      dialog_list="$dialog_list $pkg '' off"
+    fi
+  done
+  rm -f $installed
+
+  # report status or finish if no CN packages found
+  if [ "$cn_pkgs" ]; then
+    log "Found CN packages:$cn_pkgs"
+  else
+    log "No CN packages found."
+    return
+  fi
+
+  # user selects the packages to delete
+  selection=$(mktemp /var/lib/carnet-upgrade/selection.XXXXXX)
+  eval LC_MESSAGES=hr_HR dialog --nocancel --backtitle \""$title"\" \
+    --checklist \""$msg_remove_cn_bloat"\" 20 75 6 $dialog_list 2>$selection
+
+  # expand the package list to include the services
+  for pkg in $(cat $selection); do
+    pkg=${pkg%\"}
+    pkg=${pkg#\"}
+    cn_del="$cn_del $pkg"
+    to_del=$(echo "$cn_bloats" | grep ^$pkg)
+    del_pkgs="$del_pkgs $to_del"
+  done
+  rm -f $selection
+
+  # report selection or finish if no service selected
+  if [ "$cn_del" ]; then
+    log "Removing CN services:$cn_del"
+  else
+    log "No CN services selected for removal."
+    return
+  fi
+
+  # delete the cn packages and relevant services
+  pkgrm_only $del_pkgs
+}
+
 post_upgrade() {
   touch "$post_upgrade_queuetab"
   if ! grep -q "true	$*" "$post_upgrade_queuetab"; then
@@ -198,7 +288,7 @@ run_post_upgrade() {
 ###
 
 run_actions() {
-  local line lineno lineno2 f n name action testmsg
+  local line lineno lineno2 f n name action checkmsg check
   [ "$DEBUG" ] && set -vx
   name="$1"
   f="$2"
@@ -222,16 +312,21 @@ run_actions() {
       lineno2=$(($lineno2+1))
       line=$(echo -n "$line"| sed 's/\\$//'; head -$lineno2 "$f" | tail -1)
     done
-    test=$(echo "$line" | sed 's/		*/	/g'| awk -F'	' '{print $1}')
+    check=$(echo "$line" | sed 's/		*/	/g'| awk -F'	' '{print $1}')
     action=$(echo "$line" | sed 's/		*/	/g'| awk -F'	' '{print $2}')
-    testmsg=""
-    [ "$test" != "true" ] && testmsg="if '$test'"
-    if eval $test; then
-      log "$(printf 'action %02d' $lineno) starting: '${action}' $testmsg "
-      eval $action
-      log "$(printf 'action %02d' $lineno) finished: '${action}' $testmsg"
+    checkmsg=""
+    [ "$check" != "true" ] && checkmsg="if '$check'"
+    if eval $check; then
+      log "$(printf 'action %02d' $lineno) starting: '${action}' $checkmsg "
+      if ! eval $action; then
+        log "$(printf 'action %02d' $lineno) failed: '${action}' $checkmsg "
+        display_action_failure "$action"
+        exit 1
+      else  
+        log "$(printf 'action %02d' $lineno) finished: '${action}' $checkmsg"
+      fi
     else
-      log "$(printf 'action %02d' $lineno) skipping: '${action}' $testmsg"
+      log "$(printf 'action %02d' $lineno) skipping: '${action}' $checkmsg"
     fi
     [ "$lineno2" -gt "$lineno" ] && lineno=$lineno2
   done
@@ -239,6 +334,24 @@ run_actions() {
   log "-----"
 }
 
+# report action failure
+display_action_failure () {
+  local action=$1
+
+  notice "
+Doslo je do greske prilikom izvrsavanja akcije '$action'. Detalje problema moguce je vidjeti u log datotekama:
+
+  /var/log/carnet-upgrade.log
+  /var/log/carnet-upgrade.typescript
+
+Da bi dovrsili zapocete operacije nad paketima pokrenite:
+
+  # dpkg --configure -a
+  # apt-get -f install
+
+Nakon toga ponovno pozovite carnet-upgrade skriptu."
+}
+
 # funkcija vraca popis paketa koje treba upgradeati
 what_upgrade () {
   local IFSOLD name version package
@@ -259,17 +372,19 @@ what_upgrade () {
 # funkcija za ispis paketa koje treba upgradeati
 check_upgrade () {
   local upgrade
-  upgrade="`what_upgrade`"
+  upgrade=${1:-"`what_upgrade`"}
 
   if [ "$upgrade" ]; then
     notice "
-Prije prelaska na Debian Etch potrebno je napraviti upgrade ovih paketa:
+Prije prelaska na Debian Lenny potrebno je napraviti nadogradnju ovih paketa:
   $upgrade
 
 Pokrenite:
-  'apt-get dist-upgrade'
+  # apt-get update
+  # apt-get dist-upgrade
 ili:
-  'apt-get install${upgrade}'
+  # apt-get update
+  # apt-get install${upgrade}
   
 Nakon toga ponovno pozovite ovu skriptu."
     log "carnet-upgrade aborted, upgrade of$upgrade needed."
@@ -277,8 +392,203 @@ Nakon toga ponovno pozovite ovu skriptu."
   fi
 }
 
+# update sarge urls in sources list
+fix_sarge_sources () {
+  local apt_sources='/etc/apt/sources.list'
+  local fixed_sources=$(mktemp /var/lib/carnet-upgrade/sources.list.XXXXXX)
+
+  # sarge (oldstable) was archived recently -> sources.list needs update
+  awk -v archive='http://archive.debian.org/debian' \
+      -v security='http://archive.debian.org/debian-security' \
+      '$3 == "sarge" && $2 ~ /[/]debian$/ { $2 = archive }
+       $3 == "sarge/updates" && $2 ~ /security\.debian\.org$/ { $2 = security }
+       { print }' $apt_sources > $fixed_sources
+
+  # did anything get updated
+  if ! cmp $apt_sources $fixed_sources >/dev/null; then
+      log "sources.list fixed to use archive.debian.org"
+
+      # backup current version
+      if [ ! -f "$apt_sources.$backup_ext.sarge" ]; then
+          cp -av $apt_sources "$apt_sources.$backup_ext.sarge"
+      fi
+
+      # install fixed version
+      cp -av $fixed_sources $apt_sources
+
+      # update the database
+      apt_update
+  fi
+
+  # delete temporary
+  rm -f $fixed_sources
+}
+
+# try to check if we are using the latest version of carnet-upgrade script
+check_my_version () {
+  local packages latest_version
+
+  packages=$(mktemp /var/lib/carnet-upgrade/Packages.XXXXXX)
+  if wget -q -O$packages $packages_uri; then
+    latest_version=$(sed -ne \
+        '/Package: carnet-upgrade/,/Description:/{ /Version: /s///p }' \
+        $packages)
+    rm -f $packages
+
+    if [ "$latest_version" ]; then
+      log "Running carnet-upgrade version is $version"
+      log "Latest carnet-upgrade version is $latest_version"
+      if dpkg --compare-versions "$version" lt "$latest_version"; then
+        check_upgrade " carnet-upgrade"
+      else log "Already using the latest carnet-upgrade version."; fi
+    else log "Failed to get latest version, skipping check."; fi
+  else log "Failed to download Packages file, skipping check."; fi
+
+  rm -f $packages
+}
+
+# if php is installed make sure it's version 5
+check_php_version () {
+
+  if pkg php4-cn && ! pkg php5-cn; then
+    # prepare for php upgrade by installing php5 extensions
+    install_php5_extensions
+
+    notice "
+Prije prelaska na Debian Lenny potrebno je napraviti nadogradnju sa PHP 4 na PHP 5.
+
+Pokrenite:
+  # apt-get update
+  # apt-get install php5-cn
+  
+Nakon sto provjerite da sve web aplikacije rade ispravno, ponovno pozovite ovu skriptu."
+    log "carnet-upgrade aborted, upgrade to php5-cn needed."
+    exit 1
+  fi
+}
+
+# install php5 extensions based on installed php4 extensions
+install_php5_extensions () {
+  local php4_list php5_pkg
+
+  # get a list of installed php4 packages
+  php4_list=$(mktemp /var/lib/carnet-upgrade/php4_list.XXXXXX)
+  dpkg -l php4-\* | awk '/^ii/ {
+    pkg=$2; sub("^php4", "php5", pkg); print pkg }' > $php4_list
+
+  # compare it with the list of available php5 packages
+  php5_pkg=$(apt-cache search -n ^php5- | cut -d' ' -f 1 \
+    | grep -F -x -f $php4_list | grep -F -x -v php5-cn)
+
+  # handle special cases
+  if pkg php4-xslt; then
+     php5_pkg="$php5_pkg php5-xsl"
+  fi
+
+  # install the required php5 modules
+  if [ "$php5_pkg" ]; then
+     pkgadd $php5_pkg
+  fi
+
+  # cleanup
+  rm -f $php4_list
+}
+
+# if grsec is installed make sure it is fresh
+check_grsec_kernel () {
+  local ver=`uname -r`
+
+  log "Kernel version: $ver"
+  if [ "$ver" = "${ver%-grsec}" ]; then
+    # not grsec variant
+    return 0
+  fi
+
+  if [ "$ver" = "${ver#2.6.2[4-9]}" ]; then
+    # kernel too old
+    notice "
+Prije prelaska na Debian Lenny potrebno je napraviti nadogradnju na najnoviji kernel.
+
+Pokrenite:
+  # apt-get update
+  # apt-get install kernel-2.6-cn
+  # reboot
+  
+Nakon toga ponovno pozovite ovu skriptu."
+    log "carnet-upgrade aborted, kernel upgrade needed."
+    exit 1
+  fi
+}
+
+check_reboot () {
+  reboot_required || return 0
+
+  LC_MESSAGES=hr_HR dialog --backtitle "$title" --yesno "$reboot_warning" 18 +75
+  if [ $? -eq 0 ]; then
+    log "Reboot before continuing."
+    exit 0
+  else
+    log "Proceed without reboot."
+  fi
+}
+
+# check if the latest kernel is booted
+reboot_required () {
+  local default_kernel kernel_package running_release running_version
+
+  # try to get default kernel from lilo
+  if type lilo >/dev/null 2>&1; then
+      default_kernel=$( lilo -t -v 2>/dev/null \
+                        | grep -B3 '[*]$' \
+                        | sed -n -e '/^Boot image: / { s///p; q; }' )
+  fi
+
+  # fallback to grub if lilo not installed
+  if [ -z "$default_kernel" -a -r "/boot/grub/menu.lst" ]; then
+      default_kernel=$( awk '
+           $1 == "default" { default = $2; 
+                             if (default !~ /^[0-9]+$/) { exit } }
+           $1 == "title" { title+=1 }
+           $1 == "kernel" && title==default+1 { print $2; exit }' \
+           /boot/grub/menu.lst 2>/dev/null )
+  fi
+
+  if [ -z "$default_kernel" ]; then
+      log "Could not find default kernel"
+      return 1
+  fi
+
+  log "Default kernel image: $default_kernel"
+
+  if [ ! -e "$default_kernel" ]; then
+      log "Default kernel image doesn't exist!?"
+      return 1
+  fi
+
+  kernel_package=$( dpkg -S $default_kernel | cut -d: -f 1 )
+
+  if [ -z "$kernel_package" ]; then
+      log "Default kernel not installed from a package"
+      return 1
+  fi
+
+  log "Default kernel package: $kernel_package"
+
+  running_release=$( uname -r )
+  running_version=$( uname -v )
+  log "Running kernel: $running_release $running_version"
+
+  if grep -q "$running_release .* $running_version" $default_kernel; then
+      log "Latest kernel version is running." 
+      return 1
+  else
+      log "Reboot to latest version required."
+      return 0
+  fi
+}
+
 upgrade () {
-  local to_install packages
+  local i to_install packages
   case "$1" in
     first)
       packages="$packages_first"
@@ -290,7 +600,7 @@ upgrade () {
     return 1
   esac
 
-  for i in $packages
+  for i in $(echo $packages)
   do
     pkg $i && to_install="$to_install $i"
   done
@@ -304,11 +614,24 @@ upgrade () {
 
 # funkcija utrpa ispravan sources.list
 create_sources_list () {
-    [ -f /etc/apt/sources.list -a ! -f /etc/apt/sources.list.cn4-upgrade ] && mv /etc/apt/sources.list /etc/apt/sources.list.cn4-upgrade
-    cp /usr/share/carnet-upgrade/files/etc/apt/sources.list /etc/apt
-    notice "Novi sadrzaj datoteke /etc/apt/sources.list:
+    local sl sl_new
+    sl=/etc/apt/sources.list
+    sl_new=/usr/share/carnet-upgrade/files/etc/apt/sources.list
+
+    # check if already installed
+    if ! cmp $sl $sl_new >/dev/null; then
+
+        # backup old version
+        if [ -f $sl -a ! -f $sl.$backup_ext ]; then
+            cp -av $sl $sl.$backup_ext
+        fi
+
+        # install new version
+        cp -av $sl_new $sl
+        notice "Novi sadrzaj datoteke /etc/apt/sources.list:
 
 `cat /etc/apt/sources.list`"
+    fi
 }
 
 
@@ -323,188 +646,595 @@ remove_group_proc () {
 
 add_group_proc () {
   if ! getent group proc > /dev/null; then
+    # grsec uses gid 99 for /proc files
     groupadd -g 99 proc 
     log "groupadd -g 99 proc"
 
     # update oidentd so it uses the proc group
-    if [ -x /etc/init.d/oidentd -a -f /etc/default/oidentd ]; then
-	check_and_sed 'OIDENT_GROUP.*proc' 's/\(OIDENT_GROUP\).*/\1=proc/' \
-            /etc/default/oident && /etc/init.d/oidentd restart
+    if [ -x /etc/init.d/oidentd ]; then
+        if gpasswd -a oident proc; then
+            /etc/init.d/oidentd restart
+        fi
     fi
   fi
 }
 
-# backup_slapd_db
+# backup ldap database
 backup_slapd_db () {
-  local ldap_backup=/var/backups/slapcat.cn4-upgrade
+  local ldap_backup=/var/backups/slapcat.$backup_ext.gz
+  local old_umask result
 
   if [ ! -f $ldap_backup ]; then
     [ -x /etc/init.d/freeradius ] && /etc/init.d/freeradius stop || true
 
     if [ -x /etc/init.d/slapd -a -d /var/lib/ldap ]; then
       /etc/init.d/slapd stop || true
-      if slapcat -l $ldap_backup; then
+      old_umask=`umask`
+      umask 0077 # protect the backup file
+      slapcat | gzip --best > $ldap_backup
+      result=$?
+      umask $old_umask
+      /etc/init.d/slapd start || true
+
+      if [ "$result" -eq 0 ]; then
         log "$ldap_backup created"
         notice "Napravljen backup slapd baze u $ldap_backup."
+      else
+        log "$ldap_backup was not created"
+        notice "Backup slapd baze u $ldap_backup nije uspio."
+        exit 1
       fi
-      /etc/init.d/slapd start || true
     fi
 
     [ -x /etc/init.d/freeradius ] && /etc/init.d/freeradius start || true
   else
-    log "slapd backup already at $ldap_backup, skipping"
-    notice "Backup slapd baze u $ldap_backup vec postoji!"
+    log "slapd backup already at $ldap_backup, skipping."
+    #notice "Backup slapd baze u $ldap_backup vec postoji!"
   fi
 }
 
 # backup etc direktorija
 backup_etc_dir () {
-  local etc_backup=/var/backups/etc.cn4-upgrade.tar.gz
+  local etc_backup=/var/backups/etc.$backup_ext.tar.gz
+  local old_umask
 
   if [ ! -f $etc_backup ]; then
+    old_umask=`umask`
+    umask 0077 # protect the backup file
+
     if tar cfz $etc_backup /etc 2> /dev/null; then
       log "$etc_backup created"
       notice "Napravljen backup /etc direktorija u $etc_backup."
+    else
+      log "$etc_backup was not created"
+      notice "Backup /etc direktorija u $etc_backup nije uspio."
+      exit 1
     fi
+    umask $old_umask
   else
     log "/etc backup already present in $etc_backup, skipping."
-    notice "Backup /etc direktorija u $etc_backup vec postoji!"
+    #notice "Backup /etc direktorija u $etc_backup vec postoji!"
   fi
 }
 
 # fixaj /etc/default/raid2
 fix_etc_default_raid2 () {
   if [ -f /etc/default/raid2 ]; then
-    sed "s/^AUTOSTART.*/AUTOSTART=true/g" /etc/default/raid2 > /etc/default/raid2.cn4-upgrade.$$
-    chown --reference=/etc/default/raid2 /etc/default/raid2.cn4-upgrade.$$
-    chmod --reference=/etc/default/raid2 /etc/default/raid2.cn4-upgrade.$$
+    sed "s/^AUTOSTART.*/AUTOSTART=true/g" /etc/default/raid2 > /etc/default/raid2.$backup_ext.$$
+    chown --reference=/etc/default/raid2 /etc/default/raid2.$backup_ext.$$
+    chmod --reference=/etc/default/raid2 /etc/default/raid2.$backup_ext.$$
 
-    if ! cmp -s /etc/default/raid2.cn4-upgrade.$$ /etc/default/raid2; then
+    if ! cmp -s /etc/default/raid2.$backup_ext.$$ /etc/default/raid2; then
       log "Fixed /etc/default/raid2 AUTOSTART option."
-      mv /etc/default/raid2.cn4-upgrade.$$ /etc/default/raid2
+      mv -v /etc/default/raid2.$backup_ext.$$ /etc/default/raid2
     else
-      rm /etc/default/raid2.cn4-upgrade.$$
+      rm -v /etc/default/raid2.$backup_ext.$$
     fi
   fi
 }
 
-# restore distribution config file
+# restore original config file (if the new package version is not
+# installed already)
 restore_config () {
-  local file file_backup
+  local file file_backup file_expect file_restore config_changed
+  local cn_package cn_version package version
+
+  # check if new package version is installed
+  cn_package=$1
+  package=$2
+  version=$3
+
+  if [ "$cn_package" ]; then
+     if ! pkg $cn_package; then
+        # do nothing if cn package is not installed
+        return 0
+     fi
+  fi
 
-  for file in "$@"; do
-    file_backup=$file.cn4-upgrade
-    if [ -e $file -a ! -e $file_backup ]; then
-      # backup file
-      mv $file $file_backup
+  if [ "$package" ]; then
+     if [ "$version" ]; then
+        # do nothing if package is already upgraded to new version
+        pkg $package lt $version || return 0
+     else
+        # do nothing if package is not installed
+        pkg $package || return 0
+     fi
+  fi
+  shift 3
+
+  # restore package files
+  for file in $*; do
+    file_expect=/usr/share/carnet-upgrade/files/$file.expect
+    file_restore=/usr/share/carnet-upgrade/files/$file.restore
+    file_backup=$file.$backup_ext
+
+    # is config files are there
+    if ! [ -e $file -a -e $file_expect -a -e $file_restore ]; then
+        continue
+    fi 
 
-      # install original
-      log Restoring config file $file
-      cp /usr/share/carnet-upgrade/files/$file $file
+    # is restore needed
+    if ! cmp $file_expect $file >/dev/null; then
+        continue
+    fi
+
+    # backup and restore
+    if [ ! -e $file_backup ]; then
+      log "Restoring config file $file"
+
+      # backup local changes
+      cp -av $file $file_backup
+
+      # restore original
+      cp -v $file_restore $file
+
+      config_changed=1
     fi
   done
+
+  # force reconfiguration at the end if package is not upgraded automatically
+  if [ "$config_changed" -a "$cn_package" ]; then
+     cn_version=$( dpkg -s "$cn_package" | awk '/^Version:/ {print $2}' )
+     post_upgrade "pkg $cn_package gt $cn_version || dpkg-reconfigure $cn_package"
+  fi
 }
 
 # restore modified config to their package defaults
 # so the upgrade doesn't complain so much
 restore_configs () {
-  restore_config /etc/bind/named.conf.options
-  restore_config /etc/default/ntpdate
-  restore_config /etc/default/oidentd
-  restore_config /etc/default/postgrey
-  restore_config /etc/default/saslauthd
-  restore_config /etc/default/slapd
-  restore_config /etc/dovecot/dovecot.conf
-  restore_config /etc/init.d/mysql
-  restore_config /etc/init.d/slapd
-  restore_config /etc/issue
-  restore_config /etc/issue.net
-  restore_config /etc/logrotate.d/mysql-server
-  restore_config /etc/mysql/my.cnf
-  restore_config /etc/ntp.conf
-  restore_config /etc/pam.d/login
-  restore_config /etc/php4/apache/php.ini
-  restore_config /etc/php4/cgi/php.ini
-  restore_config /etc/php4/cli/php.ini
-  restore_config /etc/postgrey/whitelist_clients
-  restore_config /etc/security/limits.conf
-  restore_config /etc/squirrelmail/apache.conf
-  restore_config /etc/sysctl.conf
-  restore_config /etc/vsftpd.conf
-  restore_config /etc/xinetd.conf
-
-  # orphaned config file - no owner
-  rm -f /etc/logcheck/ignore.d.server/imap
-
-  # aide switched to ucf, move old configs aside
-  for file in /etc/aide/aide.conf /etc/cron.daily/aide /etc/default/aide; do
-      [ ! -e "$file.cn4-upgrade" ] && mv "$file" "$file.cn4-upgrade"
-      rm -f "$file"
+  local hostname domain template config_new
+  local config_backup
+
+  # restore simple configs
+  restore_config kernel-2.6-cn procps 1:3.2.7-11 /etc/sysctl.conf
+  restore_config ntp-cn ntp 1:4.2.4p4+dfsg-8 /etc/ntp.conf
+  restore_config apache2-cn apache2.2-common 2.2.9-10+lenny2 /etc/apache2/ports.conf
+  restore_config postfix-cn sasl2-bin 2.1.22.dfsg1-23 /etc/default/saslauthd
+  restore_config bind9-cn bind9 1:9.5.1.dfsg.P1-1 /etc/bind/named.conf.options
+  restore_config amavisd-cn amavisd-new 1:2.6.1.dfsg-1 /etc/cron.daily/amavisd-new
+  rm -f /etc/cron.daily/amavisd-new.$backup_ext
+  restore_config spamassassin-cn razor 1:2.85-1 /etc/razor/razor-agent.conf
+  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
+     template=/usr/share/carnet-upgrade/files/etc/monit/monitrc.template
+     config_new=$(mktemp /var/lib/carnet-upgrade/monitrc.XXXXXX)
+     hostname=$(hostname)
+     domain=$(hostname --domain)
+
+     # generate config from template
+     cp $template $config_new
+     check_and_sed "@localhost" \
+       "s/@localhost/@$hostname.$domain/g" $config_new || true
+
+     # compare with running config
+     if cmp -s /etc/monit/monitrc $config_new; then
+        # restore if running config is generated template
+        log "Restoring config file /etc/monit/monitrc"
+        cp -av /etc/monit/monitrc /etc/monit/monitrc.$backup_ext
+        cp -v /usr/share/carnet-upgrade/files/etc/monit/monitrc.restore \
+              /etc/monit/monitrc
+     fi
+     rm -f $config_new
+  fi
+
+#  restore_config login 1:4.0.18.1 /etc/pam.d/login
+#  restore_config mysql-server 5.0.3 /etc/init.d/mysql \
+#                                    /etc/logrotate.d/mysql-server \
+#                                    /etc/mysql/my.cnf
+#  restore_config ntpdate 1:4.2.2 /etc/default/ntpdate
+#  restore_config oidentd 2.0.8 /etc/default/oidentd
+#  restore_config slapd 2.3.30 /etc/default/slapd /etc/init.d/slapd
+#  restore_config squirrelmail 2:1.4.9a /etc/squirrelmail/apache.conf
+#  restore_config vsftpd 2.0.5 /etc/vsftpd.conf
+#  restore_config xinetd 1:2.3.14 /etc/xinetd.conf
+#
+#  # orphaned config file - no owner
+#  if pkg logcheck-database lt 1.2.54; then
+#      rm -vf /etc/logcheck/ignore.d.server/imap
+#  fi
+#
+#  # aide switched to ucf, move old configs aside
+#  if pkg aide lt 0.13.1; then
+#      for file in /etc/aide/aide.conf \
+#                  /etc/cron.daily/aide \
+#                  /etc/default/aide;
+#      do
+#          if [ ! -e "$file.$backup_ext" ]; then
+#              mv -v "$file" "$file.$backup_ext"
+#          fi
+#
+#          rm -vf "$file"
+#      done
+#  fi
+#
+#  # register cn changes in ucf managed files
+#  for config in /etc/apache/modules.conf \
+#                /etc/clamav/clamd.conf \
+#                /etc/clamav/freshclam.conf
+#  do 
+#      config_backup=$config.$backup_ext
+#      if [ -e $config -a ! -e $config_backup ]; then
+#          log "Saving config file $config"
+#          cp -av $config $config_backup
+#          ucf $config_backup $config
+#      fi
+#  done
+}
+
+# temporary disable listchanges packages to reduce clutter during upgrade
+apt_listchanges () {
+  local file command=$1
+
+  for file in /etc/apt/apt.conf.d/20listchanges \
+              /etc/apt/apt.conf.d/20listchanges-cn
+  do
+      case $command in
+           disable)
+               if [ -f $file ]; then
+                   dpkg-divert --local --rename --divert $file.$backup_ext \
+                               --add $file || true
+               fi
+               ;;
+
+           enable)
+               if [ -f $file.$backup_ext ]; then
+                   dpkg-divert --remove $file || true
+               fi
+               ;;
+     esac
   done
 }
 
 # make a silent installation of carnet and srce keyrings
 install_keyrings () {
-  pkgadd carnet-keyring srce-keyring
-  pkgadd dpkg apt debconf
+  pkgadd carnet-keyring srce-keyring debian-archive-keyring
+  pkgadd dpkg apt debconf python-apt
 
-  dpkg-reconfigure carnet-keyring srce-keyring
-  update
+  dpkg-reconfigure carnet-keyring srce-keyring debian-archive-keyring
+  apt_update
 }
 
-# make a silent upgrade to new libc6
-upgrade_libc () {
-  DEBIAN_FRONTEND=noninteractive pkgadd libc6
+# remove skey (not supported anymore)
+remove_skey () {
+  pkgrm skey-cn libpam-skey
+
+  if getent group skey > /dev/null; then
+    groupdel skey || true
+    log "groupdel skey"
+  fi
 }
 
-# upgrade apache -> apache2
-upgrade_apache () {
-  # bugfix for apache2-cn postinst
-  mkdir -p /etc/apache2
-  touch /etc/apache2/httpd.conf
+# remove unsupported php version
+remove_php4 () {
+  # leave the configuration just in case
+  pkgrm_only php4-common || true
+}
 
-  pkgadd php4-odbc php4-xslt
+# check if package is orphaned (nothing depends on it)
+is_orphaned () {
+  local package deps
 
-  # apache2 conflicts with these
-  pkgrm apache aosi-aai aosi-www-aai php4-cn squirrelmail-cn
+  package=$1
+  deps=$(apt-get remove -s $package | grep ^Remv | wc -l)
+  if [ "$deps" -eq 1 ]; then 
+    return 0
+  else 
+    return 1
+  fi
+}
 
-  # apache2-cn postinst needs new mktemp
-  #pkgadd apache2-cn php5-cn aosi-aai aosi-www-aai # squirrelmail-cn
+# remove old and unused libraries
+remove_orphaned () {
+  local package
 
-  pkgadd apache2 apache2-mpm-prefork libapache2-mod-php4 ssl-cert
-  pkgadd apache2-cn php4-cn
-  pkgadd aosi-aai aosi-www-aai squirrelmail-cn
+  for package in $orphaned_packages; do
+    if is_orphaned $package; then
+      pkgrm $package
+    fi
+  done
+}
+
+# monit it causing problems for postinst scripts
+# restarting daemons so try to disable it
+disable_monit () {
+  if pkg monit-cn; then
+    pkgrm monit-cn # disables monit in prerm
+  fi
+
+  # if configured manually
+  if pkg monit; then
+    # remove the binary but leave the config
+    apt-get remove --yes monit
+    # stop the binary
+    pkill -9 monit || true
+  fi
+}
+
+# make a silent upgrade to new libc6
+upgrade_libc () {
+  DEBIAN_FRONTEND=noninteractive pkgadd libc6 tzdata
+}
+
+# upgrade apache2 to lenny
+upgrade_apache2 () {
+  local package packages
+
+  for package in \
+      libapache2-mod-php5 \
+      php5-cli \
+      php5-cn \
+      apache2-cn \
+      php5-odbc \
+      php5-suhosin \
+      php-suhosin-cn
+  do
+      if pkg $package; then
+          packages="$packages $package"
+      fi
+  done
+
+  eval pkgadd $packages
 }
 
 upgrade_amavis () {
-  # remove diversion
-  if [ -L /etc/init.d/amavis -a -f /etc/init.d/amavis.amavisd-new ]; then
-    rm -f /etc/init.d/amavis
-    dpkg-divert --quiet --remove /etc/init.d/amavis
+  local conf
+
+  # remove init script diversion before upgrade
+  if pkg amavisd-cn lt 3:2.6.1-1; then 
+    if [ -L /etc/init.d/amavis -a -f /etc/init.d/amavis.amavisd-new ]; then
+      rm -vf /etc/init.d/amavis
+      dpkg-divert --remove /etc/init.d/amavis
+    fi
   fi
 
   # move old config aside
-  local conf=/etc/amavis/amavisd.conf
-  if [ -e $conf -a ! -e $conf.cn4-upgrade ]; then
-    mv $conf $conf.cn4-upgrade
-  fi
+  for conf in /etc/amavisd.conf /etc/amavis/amavisd.conf; do
+    if [ -e $conf -a ! -e $conf.$backup_ext ]; then
+      mv -v $conf $conf.$backup_ext
+    fi
+  done
 
+  # install new packages
   pkgadd amavisd-cn amavisd-new
 
+  # fix new packages
   check_and_sed '^clamd.*5.clamav.log$' \
                 's/^\(clamd.*\)5.clamav.log$/\14\tsocket/g' \
                 /etc/init.d/amavisd-cn || true
 
+  # check if link got lost
+  if pkg amavisd-cn && [ ! -L /etc/init.d/amavis ]; then
+    apt-get install --reinstall --yes amavisd-cn
+  fi
+
+  # start new packages
   /etc/init.d/amavis restart
 }
 
+# handle freerdius config files upgrade
+upgrade_freeradius () {
+  local template config_new password realm
+
+  pkg freeradius-aai lt 2.1.3-0lenny0 || return 0
+
+  # handle static configs
+  restore_config freeradius-aai freeradius 2.1.3-0lenny0 \
+    /etc/freeradius/clients.conf \
+    /etc/freeradius/hints \
+    /etc/freeradius/ldap.attrmap \
+    /etc/freeradius/radiusd.conf
+
+  # handle template based configs
+  template=/usr/share/carnet-upgrade/files/etc/freeradius/eap.conf.template
+  config_new=$(mktemp /var/lib/carnet-upgrade/eap.conf.XXXXXX)
+  password=$(grep -s '^[[:space:]]*private_key_password[[:space:]]*=' \
+    /etc/freeradius/eap.conf)
+  cp $template $config_new
+  sed -i "s/.*#PASSWORD#.*/$password/" $config_new
+  if cmp -s $config_new /etc/freeradius/eap.conf >/dev/null; then
+     log "Restoring config file /etc/freeradius/eap.conf"
+     cp -v /usr/share/carnet-upgrade/files/etc/freeradius/eap.conf.restore \
+           /etc/freeradius/eap.conf
+  fi
+  rm -f $config_new
+  
+  template=/usr/share/carnet-upgrade/files/etc/freeradius/proxy.conf.template
+  config_new=$(mktemp /var/lib/carnet-upgrade/proxy.conf.XXXXXX)
+  realm=$(sed -n '/^[[:space:]]*suffix[[:space:]]*/ { 
+    s///; s/"//g; s/,dc=/./g; s/dc=//; s/.hr$//; p; q }' /etc/ldap/slapd.conf)
+  cp $template $config_new
+  sed -i "s/#REALM#/$realm/" $config_new
+  if cmp -s $config_new /etc/freeradius/proxy.conf >/dev/null; then
+     log "Restoring config file /etc/freeradius/proxy.conf"
+     cp -v /usr/share/carnet-upgrade/files/etc/freeradius/proxy.conf.restore \
+           /etc/freeradius/proxy.conf
+  fi
+  rm -f $config_new
+
+  # install the new packages
+  if ! apt-get -y install freeradius; then
+     # freeradius upgrade fails here, try to fix it by creating certificates
+     [ -x /etc/freeradius/certs/bootstrap ] && /etc/freeradius/certs/bootstrap
+     
+     dpkg --configure -a
+     apt-get -y -f install
+  fi
+
+  # finally try to cleanup this mess
+  pkgadd freeradius-aai
+}
+
+# prepare for slapd upgrade (caused by freeradius installation)
+prepare_openldap () {
+  pkg openldap-aai lt 2.4 || return 0
+
+  # openldap-aai expects org.ldif to exists
+  local ldif=/var/lib/ldap/org.ldif
+  local ldif_backup=/var/lib/carnet-upgrade/org.ldif
+  if [ -f $ldif ]; then
+    cp -v $ldif $ldif_backup
+  fi
+}
+
 # fix openldap-aai postinst user handling
 upgrade_openldap () {
-  #pkgrm openldap-cn # deprecated
-  apt-get -y$s install openldap-aai || true # postinst fails
-  chown -R openldap:openldap /var/lib/ldap  # fix slapd
+  pkg openldap-aai lt 2.4 || return 0
+
+  # slapd postinst fails if move_old_database is false
+  echo 'slapd slapd/move_old_database boolean true' | debconf-set-selections 
+  pkgadd slapd
+
+  # slapd removes org.ldif during switch from ldap -> openldap user
+  local ldif=/var/lib/ldap/org.ldif
+  local ldif_backup=/var/lib/carnet-upgrade/org.ldif
+  if [ -f $ldif_backup -a ! -f $ldif ]; then
+    cp -v $ldif_backup $ldif
+  fi
+
+  # openldap-aai postinst fails here because of database permissions
+  apt-get -y install openldap-aai || true
+  chown -R openldap:openldap /var/lib/ldap
   /etc/init.d/slapd restart
-  dpkg --configure -a # try postinst again
+  dpkg --configure -a
+
+  # remove ldap user if openldap works
+  if getent passwd ldap      > /dev/null && \
+     getent passwd openldap  > /dev/null && \
+     pgrep -U openldap slapd > /dev/null
+  then
+     log "userdel ldap (replaced by openldap)"
+     userdel ldap || true
+  fi
+}
+
+# fix postgresql deinstallation during upgrade
+upgrade_postgresql () {
+  if check_services show 2>&1 | grep -qw postgresql; then
+     apt-get install -y postgresql || apt-get -yf install
+  fi
+}
+
+# upgrade the MTA
+upgrade_postfix () {
+  pkgadd postfix-cn
+
+  if pkg postgrey; then
+     pkgrm postgrey # not used by postfix-cn anymore
+  fi
+}
+
+get_variable () {
+  local name=$1 file=$2 val
+
+  if [ -f "$file" ]; then
+     val=$(sed -n "/^[[:space:]]*$name[[:space:]]*=/s/[[:space:]]*//gp" $file)
+     val=${val#*=}
+  fi
+
+  echo $val
+}
+
+# preserve mail location on upgrade
+upgrade_dovecot () {
+  local default_mail_env mail_location
+
+  # check if already upgraded
+  if ! pkg dovecot-common lt 1.0; then
+      return
+  fi
+
+  # save old mail location
+  default_mail_env=$(get_variable default_mail_env /etc/dovecot/dovecot.conf)
+
+  # silently upgrade package
+  restore_config dovecot-cn dovecot-common 1.0 /etc/dovecot/dovecot.conf
+  pkgadd dovecot-cn
+
+  # insert old mail location
+  mail_location=$(get_variable mail_location /etc/dovecot/dovecot.conf)
+  if [ "$default_mail_env" -a ! "$mail_location" ]; then
+      check_and_sed '^#mail_location[[:space:]]*=' \
+                   "s|#mail_location[[:space:]]*=.*|mail_location = $default_mail_env|" /etc/dovecot/dovecot.conf || return 0
+
+      if [ -x /etc/init.d/dovecot ]; then
+          if [ -x /usr/sbin/invoke-rc.d ]; then
+              /usr/sbin/invoke-rc.d dovecot restart
+          else
+              /etc/init.d/dovecot restart
+          fi
+      fi
+  fi
+}
+
+# restore munin configs for silent upgrade
+upgrade_munin () {
+  local config backup hostname domain
+
+  for pkg_name in munin munin-node; do
+     pkg $pkg_name lt '1.2.6-10~lenny1' || continue
+
+     config=/etc/munin/$pkg_name.conf
+     backup=$config.$backup_ext
+     if [ -f $config -a ! -f $backup ]; then
+        hostname=$(hostname)
+        domain=$(hostname --domain)
+
+        cp -av $config $backup
+        check_and_sed "$hostname.$domain" \
+          "s/$hostname.$domain/localhost.localdomain/g" $config
+     fi
+     pkgadd $pkg_name
+  done
+
+  # force localhost -> hostname replacement in config files
+  pkgadd munin-cn
+  dpkg-reconfigure munin-cn
+}
+
+# udev.preinst fails if devfs configs still exist
+upgrade_udev () {
+  local config
+
+  for config in /etc/udev/rules.d/devfs.rules \
+                /etc/udev/rules.d/compat-full.rules \
+                /etc/udev/rules.d/compat.rules
+  do
+     if [ -e $config ]; then
+        rm -v -f $config
+     fi
+  done
+
+  if [ -f /etc/udev/udev.rules -a ! -f /etc/udev/rules.d/udev.rules ]; then
+     ln -sfv ../udev.rules /etc/udev/rules.d/
+  fi
+
+  pkgadd udev
 }
 
 # fix /etc/dpkg/dpkg.cfg
@@ -520,20 +1250,130 @@ comment_force_overwrite () {
 
 fix_issue () {
   cat > /etc/issue <<EOF
-Debian GNU/Linux 4.0 (CARNet Debian 4.0) \\n \\l
+Debian GNU/Linux 5.0 (CARNet Debian 5.0) \\n \\l
+
 EOF
 
   cat > /etc/issue.net <<EOF
-Debian GNU/Linux 4.0 (CARNet Debian 4.0) %h
+Debian GNU/Linux 5.0 (CARNet Debian 5.0) %h
 EOF
 }
 
-check_disk_space() {
-  local available_disk_space
-  available_disk_space=$(df -m /var|tail -1|awk '{print $4}')
-  if [ $available_disk_space -lt $min_var_space ]; then
-    log "carnet-upgrade aborted: not enough space on /var (need ${min_var_space}MB)"
-    notice "Premalo mjesta na /var particiji. Potrebno je imati barem ${min_var_space}MB."
+check_archives_space() {
+  local available_disk_space archives_size
+  available_disk_space=$(free_space /var/cache/apt/archives/)
+  archives_size=$(download_size dist-upgrade)
+
+  if [ $? -ne 0 ]; then
+    log "Failed to get download size, skipping check."
+    return 0
+  fi
+
+  log "Archives space: ${available_disk_space}MB"
+  log "Download size: ${archives_size}MB"
+
+  if [ $available_disk_space -lt $archives_size ]; then
+    log "carnet-upgrade aborted: not enough space in /var/cache/apt/archives/ (have ${available_disk_space}MB, need ${archives_size}MB)"
+    notice "Premalo slobodnog mjesta u /var/cache/apt/archives/ za skidanje paketa (potrebno je barem ${archives_size}MB). Procitajte poglavlje 'Izvanredne situacije' u dokumentaciji."
+    exit 1
+  fi
+}
+
+check_kernel_space() {
+  local available_disk_space kernel_size
+  available_disk_space=$(free_space /)
+  kernel_size=$(installed_size kernel-2.6-cn)
+
+  if [ $? -ne 0 ]; then
+    log "Failed to get installed size, skipping check."
+    return 0
+  fi
+
+  log "Free space in /: ${available_disk_space}MB"
+  log "Kernel size: ${kernel_size}MB"
+
+  if LC_ALL=C apt-get --yes --print-uris install kernel-2.6-cn \
+     | grep -q '^kernel-2.6-cn is already the newest version.$'
+  then
+     log "Not checking free space in /: kernel-2.6-cn already installed"
+     return
+  fi
+
+  if [ $available_disk_space -lt $kernel_size ]; then
+    log "carnet-upgrade aborted: not enough space in / (have ${available_disk_space}MB, need ${kernel_size}MB)"
+    notice "Premalo mjesta u / za instalaciju kernela (potrebno je barem ${kernel_size}MB). Procitajte poglavlje 'Izvanredne situacije' u dokumentaciji."
     exit 1
   fi
 }
+
+free_space() {
+  df --portability --block-size=1M "$1" | tail -1 | awk '{print $4}'
+}
+
+download_size() {
+  local size
+  size=$(LC_ALL=C apt-get --yes --print-uris "$@" | grep '^Need to get ')
+
+  if [ $? -ne 0 ]; then
+    log "Failed to get download size for 'apt-get $@'."
+    return 1
+  fi
+
+  size=${size#Need to get }
+  size=${size%%B*}
+
+  size_to_mb "${size}B"
+}
+
+installed_size() {
+  local package size
+  package=$1
+  size=$(apt-cache show $package | grep '^Installed-Size:')
+
+  if [ $? -ne 0 ]; then
+    log "Failed to get installed size for '$package'."
+    return 1
+  fi
+
+  size=${size#*: }
+
+  size_to_mb "${size}kB"
+}
+
+size_to_mb() {
+  local size
+  size=$1
+  if [ -z "$size" ]; then
+    size=0;
+  fi
+
+  if [ "${size%kB}" != "$size" ]; then
+    size=$(round ${size%kB})
+    size=$(($size/1024+1))
+  elif [ "${size%MB}" != "$size" ]; then
+    size=$(round ${size%MB})
+  elif [ "${size%GB}" != "$size" ]; then
+    size=$(round ${size%GB})
+    size=$(($size*1024))
+  elif [ "${size%[0-9]B}" != "$size" ]; then
+    size=$(round ${size%B})
+    size=$(($size/1024/1024+1))
+  else
+    log "unrecognized size unit: $size"
+    return 1
+  fi
+
+  echo $size
+}
+
+round() {
+  local num
+  num=$1
+
+  if [ "${num%.*}" != "$num" ]; then
+    num=${num%.*}
+    num=$(($num+1))
+  fi
+
+  echo $num
+}