X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=0af728bf701decf0cbe1aadd0dfe5e9b1084cb6b;hb=a97320a33fcf92f0c683b0830dbf700b88726a99;hp=f98489aa121bd0670500fb53233eea8976127feb;hpb=e6229d5597b864d2ab85212bedbeddd7bc47d980;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index f98489a..0af728b 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() {
@@ -28,14 +31,14 @@ log() {
 # 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
@@ -110,13 +113,17 @@ pkgrm () {
   }
 }
 
-update() {
+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 +135,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 +165,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
@@ -198,7 +219,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 +243,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 +265,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
@@ -263,13 +307,15 @@ check_upgrade () {
 
   if [ "$upgrade" ]; then
     notice "
-Prije prelaska na Debian Etch potrebno je napraviti upgrade ovih paketa:
+Prije prelaska na Debian Etch 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 +323,25 @@ Nakon toga ponovno pozovite ovu skriptu."
   fi
 }
 
+# if apache is installed make sure it's version 2
+check_apache_version () {
+
+  if pkg apache-cn && ! pkg apache2-cn; then
+    notice "
+Prije prelaska na Debian Etch potrebno je napraviti nadogradnju sa Apache 1.3 na Apache 2.0.
+
+Pokrenite:
+  # apt-get update
+  # apt-get install apache2-cn
+  
+Nakon toga ponovno pozovite ovu skriptu."
+    log "carnet-upgrade aborted, upgrade to apache2-cn needed."
+    exit 1
+  fi
+}
+
 upgrade () {
-  local to_install packages
+  local i to_install packages
   case "$1" in
     first)
       packages="$packages_first"
@@ -290,7 +353,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 +367,24 @@ upgrade () {
 
 # funkcija utrpa ispravan sources.list
 create_sources_list () {
-    [ -f /etc/apt/sources.list -a ! -f /etc/apt/sources.list.cn3-upgrade ] && mv /etc/apt/sources.list /etc/apt/sources.list.cn3-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,47 +399,71 @@ 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"
-    if [ -x /etc/init.d/oidentd -a -f /etc/default/oidentd ] && \
-       egrep -q 'OIDENT_GROUP.*proc' /etc/default/oidentd; then
-      /etc/init.d/oidentd restart || true
+
+    # update oidentd so it uses the proc group
+    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.cn3-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"
+    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.cn3-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!"
@@ -373,81 +473,174 @@ backup_etc_dir () {
 # 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.cn3-upgrade.$$
-    chown --reference=/etc/default/raid2 /etc/default/raid2.cn3-upgrade.$$
-    chmod --reference=/etc/default/raid2 /etc/default/raid2.cn3-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.cn3-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.cn3-upgrade.$$ /etc/default/raid2
+      mv -v /etc/default/raid2.$backup_ext.$$ /etc/default/raid2
     else
-      rm /etc/default/raid2.cn3-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_orig
+  local old_umask
+
+  # create new files safely
+  old_umask=`umask`
+  umask 0077
+
+  # restore package files
+  for file in $*; do
+    file_orig=/usr/share/carnet-upgrade/files/$file
+    file_backup=$file.$backup_ext
+
+    # is config there
+    if [ ! -e $file ]; then
+        continue
+    fi 
+
+    # is restore needed
+    if cmp $file_orig $file >/dev/null; then
+        continue
+    fi
+
+    # backup and restore
+    if [ ! -e $file_backup ]; then
+      log "Restoring config file $file"
 
-  for file in "$@"; do
-    file_backup=$file.cn3-upgrade
-    if [ -e $file -a ! -e $file_backup ]; then
-      # backup file
-      mv $file $file_backup
+      # backup local changes
+      mv -v $file $file_backup
 
-      # install original
-      log Restoring config file $file
-      cp /usr/share/carnet-upgrade/files/$file $file
+      # restore original
+      cp -av $file_orig $file
+      chown --reference $file_backup $file
+      chmod --reference $file_backup $file
     fi
   done
+
+  umask $old_umask
 }
 
 # 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
+  local config_backup
+
+  pkg base-files lt 4 && restore_config /etc/issue /etc/issue.net
+  pkg libpam-modules lt 0.79 && restore_config /etc/security/limits.conf
+  pkg login lt 1:4.0.18.1 && restore_config /etc/pam.d/login
+  pkg mysql-server lt 5.0.3 && restore_config /etc/init.d/mysql \
+                                    /etc/logrotate.d/mysql-server \
+                                    /etc/mysql/my.cnf
+  pkg ntp lt 1:4.2.2 && restore_config /etc/ntp.conf
+  pkg ntpdate lt 1:4.2.2 && restore_config /etc/default/ntpdate
+  pkg oidentd lt 2.0.8 && restore_config /etc/default/oidentd
+  pkg postgrey lt 1.27 && restore_config /etc/default/postgrey \
+                               /etc/postgrey/whitelist_clients
+  pkg procps lt 1:3.2.7 && restore_config /etc/sysctl.conf
+  pkg sasl2-bin lt 2.1.22 && restore_config /etc/default/saslauthd
+  pkg slapd lt 2.3.30 && restore_config /etc/default/slapd /etc/init.d/slapd
+  pkg squirrelmail lt 2:1.4.9a && restore_config /etc/squirrelmail/apache.conf
+  pkg vsftpd lt 2.0.5 && restore_config /etc/vsftpd.conf
+  pkg xinetd lt 1:2.3.14 && restore_config /etc/xinetd.conf
 
   # orphaned config file - no owner
-  rm -f /etc/logcheck/ignore.d.server/imap
+  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
-  for file in /etc/aide/aide.conf /etc/cron.daily/aide /etc/default/aide; do
-      [ ! -e "$file.cn3-upgrade" ] && mv "$file" "$file.cn3-upgrade"
-      rm -f "$file"
+  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 dpkg apt debconf python-apt
 
   dpkg-reconfigure carnet-keyring srce-keyring
-  update
+  apt_update
+}
+
+# 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
+}
+
+# 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
@@ -455,86 +648,154 @@ upgrade_libc () {
   DEBIAN_FRONTEND=noninteractive pkgadd libc6
 }
 
-# upgrade apache -> apache2
-upgrade_apache () {
-  # bugfix for apache2-cn postinst
-  mkdir -p /etc/apache2
-  touch /etc/apache2/httpd.conf
-
-  pkgadd php4-odbc php4-xslt
+# upgrade apache2 to etch
+upgrade_apache2 () {
+  local package packages
 
-  # apache2 conflicts with these
-  pkgrm apache aosi-aai aosi-www-aai php4-cn squirrelmail-cn
+  for package in \
+      libapache2-mod-php4 \
+      php4-cli \
+      php4-cgi \
+      php4-cn \
+      apache2-cn \
+      php4-odbc \
+      php4-suhosin \
+      php-suhosin-cn
+  do
+      if pkg $package; then
+          packages="$packages $package"
+      fi
+  done
 
-  # apache2-cn postinst needs new mktemp
-  #pkgadd apache2-cn php5-cn aosi-aai aosi-www-aai # squirrelmail-cn
+  # enable suhosin downgrade to etch version
+  if pkg php4-suhosin; then
+      pkgrm php4-suhosin php-suhosin-cn
+  fi
 
-  pkgadd apache2 apache2-mpm-prefork libapache2-mod-php4 ssl-cert
-  pkgadd apache2-cn php4-cn
-  pkgadd aosi-aai aosi-www-aai squirrelmail-cn
+  eval pkgadd $packages
 }
 
 upgrade_amavis () {
-  # remove diversion
+  local conf
+
+  # remove init script diversion
   if [ -L /etc/init.d/amavis -a -f /etc/init.d/amavis.amavisd-new ]; then
-    rm -f /etc/init.d/amavis
+    rm -vf /etc/init.d/amavis
     dpkg-divert --quiet --remove /etc/init.d/amavis
   fi
 
   # move old config aside
-  local conf=/etc/amavis/amavisd.conf
-  if [ -e $conf -a ! -e $conf.cn3-upgrade ]; then
-    mv $conf $conf.cn3-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
 
+  # start new packages
   /etc/init.d/amavis restart
 }
 
 # 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.3 || 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
+
+  # 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
+  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
 }
 
-# instaliraj zadnji freeradius; uvjeti u queue fileovima
-install_freeradius () {
-  pkgadd --force-yes freeradius-cn freeradius=1.0.5-0 freeradius-ldap=1.0.5-0
+# 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
 }
 
-# tentatively remove obsolete option in xinetd.conf
-fix_xinetd_conf () {
-  if [ -f /etc/xinetd.conf ]; then
-    check_and_sed 'log_on_failure.*RECORD' \
-                   's/\(log_on_failure.*\)RECORD/\1/g' \
-                   /etc/xinetd.conf || true
+# upgrade the MTA
+upgrade_postfix () {
+  pkgadd postfix-cn
+
+  if pkg postgrey; then
+     pkgrm postgrey # not used by postfix-cn anymore
   fi
 }
 
-# temporarily disable mod_ssl.conf in apache so that upgrade works
-fix_mod_ssl_include() {
-  if [ -f /etc/apache/mod_ssl.conf ]; then
-    check_and_sed '^Include /etc/apache/mod_ssl\.conf' \
-                  's,\(^Include[ 	][ 	]*/etc/apache/mod_ssl\.conf\),#\1,' \
-                  /etc/apache/httpd.conf || true
+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
 }
 
-fix_proftpd_conf() {
-  if [ -f /etc/proftpd.conf ]; then
-    check_and_sed '^LsDefaultOptions' \
-                  's,^LsDefaultOptions,ListOptions,' \
-                  /etc/proftpd.conf || true
+# 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 /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
-  [ -x /etc/init.d/proftpd ] && /etc/init.d/proftpd restart || true
 }
 
 # fix /etc/dpkg/dpkg.cfg
@@ -548,106 +809,108 @@ comment_force_overwrite () {
   fi
 }
 
-fix_aidexfer_conf() {
-  if [ -f /etc/aide/aidexfer.conf ]; then
-    check_and_sed '/usr/local/lib/aidexfer' \
-                  's,/usr/local/lib/aidexfer,/usr/share/aidexfer,' \
-                  /etc/aide/aidexfer.conf || true
-  fi
-}
-
 fix_issue () {
   cat > /etc/issue <<EOF
-Debian GNU/Linux 4.0 (CARNet Debian 3.0) \\n \\l
+Debian GNU/Linux 4.0 (CARNet Debian 4.0) \\n \\l
 EOF
 
   cat > /etc/issue.net <<EOF
-Debian GNU/Linux 4.0 (CARNet Debian 3.0) %h
+Debian GNU/Linux 4.0 (CARNet Debian 4.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)
+
+  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
 }
 
-fix_webalizer_conf () {
-  if [ -f /etc/webalizer.conf ]; then
-    check_and_sed '^/' \
-                  's,^/,#,' \
-                  /etc/webalizer.conf || true
-  fi
-}
+check_kernel_space() {
+  local available_disk_space kernel_size
+  available_disk_space=$(free_space /)
+  kernel_size=$(installed_size kernel-2.6-cn)
 
-# like in sendmail-cn
-fix_smtp_auth() {
-  local tmpl conf tmpldir confdir mv_in_sasl
+  log "Free space in /: ${available_disk_space}MB"
+  log "Kernel size: ${kernel_size}MB"
 
-  # all of these should be installed after dist-upgrade
-  # if we had SMTP AUTH previously
-  if pkg sasl2-bin && pkg sasl-bin && pkg sendmail-cn ge 2:8.13.1-2; then
-    :
-  else
-    return 0
+  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
 
-  tmpldir=/usr/share/sendmail/examples/sasl
-  tmpl=$tmpldir/Sendmail.conf.2
-  confdir=/etc/mail/sasl
-  conf=$confdir/Sendmail.conf.2
-  if [ "$(sasldblistusers | wc -l)" -gt 0 ]; then
-    if [ "$(sasldblistusers2 | wc -l)" -eq 0 ]; then
-      echo | sasldbconverter2 /etc/sasldb
-      log "Converted /etc/sasldb to /etc/sasldb2."
-    else
-      log "Found users in both /etc/sasldb and /etc/sasldb2, doing nothing!"
-    fi
-  fi
-  if [ -f $conf -a -f $tmpl ] && \
-    ! cmp -s $conf $tmpl; then
-    mv $conf $conf.cn3-upgrade
-    mv_in_sasl=1
-  fi
-  if [ -f $confdir/Sendmail.conf ]; then
-    mv $confdir/Sendmail.conf $confdir/Sendmail.conf.cn3-upgrade
-    mv_in_sasl=1
-  fi
-  if [ -f $confdir/sasl.m4 ] && \
-    ! cmp -s $confdir/sasl.m4 $tmpldir/sasl.m4; then
-    mv -f $confdir/sasl.m4 $confdir/sasl.m4.cn3-upgrade
-    mv_in_sasl=1
+  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
-  [ "$mv_in_sasl" ] && \
-    log "Renamed old files in $confdir."
+}
+
+free_space() {
+  df --portability --block-size=1M "$1" | tail -1 | awk '{print $4}'
+}
 
-  # Regenerate sasl.m4 and friends.
-  /usr/share/sendmail/update_auth | egrep '^(Created template)' || true
+download_size() {
+  local size
+  size=$(LC_ALL=C apt-get --yes --print-uris "$@" \
+         | sed -n '/^Need to get / {s///; s/B\/.*//; p}')
 
-  # Hope noone else uses this file. (see doc/sendmail/README.Debian.gz)
-  dpkg-statoverride --remove /etc/sasldb2
-  dpkg-statoverride --update --add smmta smmsp 660 /etc/sasldb2
-  # needed for PLAIN, LOGIN
-  dpkg-statoverride --remove /var/run/saslauthd
-  dpkg-statoverride --update --add root sasl 711 /var/run/saslauthd
+  size_to_mb "${size}B"
+}
+
+installed_size() {
+  local package size
+  package=$1
+  size=$(apt-cache show $package \
+         | awk '$1 == "Installed-Size:" {print $2; exit}')
+
+  size_to_mb "${size}kB"
+}
 
-  # Enable saslauthd, used by default Debian config
-  if ! egrep -q '^START=yes' /etc/default/saslauthd; then
-    check_and_sed START 's/#\ +START=yes$/START=yes/' /etc/default/saslauthd
-    /etc/init.d/saslauthd restart
+size_to_mb() {
+  local size
+  size=$1
+  if [ -z "$size" ]; then
+    size=0;
   fi
 
-  /etc/init.d/sendmail reload || true
+  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
 }
 
-sources_list() {
-  if [ ! -e /var/lib/carnet-upgrade/stamp-sources_list ]; then
-    install-carnet-sources.list
-    apt-get -y update
-    touch /var/lib/carnet-upgrade/stamp-sources_list
+round() {
+  local num
+  num=$1
+
+  if [ "${num%.*}" != "$num" ]; then
+    num=${num%.*}
+    num=$(($num+1))
   fi
+
+  echo $num
 }