X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=carnet-upgrade.git;a=blobdiff_plain;f=src%2Ffunctions.sh;h=27fa13d70be49857cf7237aa2cccd6a0183c0b21;hp=4512ee6f1165e10bcb7ff96151eddbceb29d46f7;hb=593a505177247c3eedf76b9018b37c2b8be10789;hpb=e4d47b97bcb241b3bacebe007ca64a37199474b2

diff --git a/src/functions.sh b/src/functions.sh
index 4512ee6..27fa13d 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -22,28 +22,17 @@ 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: $*"
-}
 
-# find first free uid/gid in range
-# find_id passwd 100 999
-find_id() {
-  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
-      echo $i
-      return 0
-    fi
-  done
-  return 1
+  umask $old_umask
+  chmod og= $logfile
 }
 
 # safe in-place s///
@@ -72,27 +61,6 @@ check_and_sed() {
   return $ret
 }
 
-#
-# Update uid for user from reserved system range (0-99) to dynamic system
-# range (100-999).  Optionally update ownerships of given directories.
-# $0 user [directory ...]
-#
-check_and_update_ugid() {
-  local user newgid newuid
-  user=$1
-  if [ "$(getent passwd $user | awk -F: '$3 >= 100 {print "ok"; exit 0}')" ]; then
-    return 0
-  fi
-  shift
-  newgid=$(find_id group 100 999)
-  newuid=$(find_id passwd 100 999)
-  # other directories/files
-  chown -R $newuid:$newgid $*
-  groupmod -g $newgid $user
-  usermod -u $newuid -g $newgid $user
-  log "Fixed $user user uid/gid."
-}
-
 pkgadd () {
   [ -n "$*" ] || return 0
   log "Installing $* ..."
@@ -105,7 +73,7 @@ pkgadd () {
 
 pkgrm () {
   [ -n "$*" ] || return 0
-  log "Removing $* ..."
+  log "Purging $* ..."
   apt-get -y$s --purge remove $* || {
     dpkg --configure -a
     apt-get -yf install
@@ -113,6 +81,17 @@ pkgrm () {
   }
 }
 
+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 || {
@@ -128,6 +107,12 @@ apt_download() {
 }
 
 dist_upgrade () {
+  log "Running upgrade ..."
+  apt-get -y$s upgrade || {
+    dpkg --configure -a
+    apt-get -y$s upgrade
+  }
+
   log "Running dist-upgrade ..."
   apt-get -y$s dist-upgrade || {
     dpkg --configure -a
@@ -135,11 +120,19 @@ dist_upgrade () {
   }
 }
 
+apt_autoremove () {
+  log "Running autoremove ..."
+  apt-get -y$s --purge autoremove || {
+    dpkg --configure -a
+    apt-get -yf install
+  }
+}
+
 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
+    pkgrm x11-common
   else
     log "Skipping X Window System removal"
   fi
@@ -202,6 +195,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
@@ -303,11 +347,11 @@ 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 nadogradnju ovih paketa:
+Prije prelaska na Debian Squeeze potrebno je napraviti nadogradnju ovih paketa:
   $upgrade
 
 Pokrenite:
@@ -323,51 +367,114 @@ Nakon toga ponovno pozovite ovu skriptu."
   fi
 }
 
-# if apache is installed make sure it's version 2
-check_apache_version () {
+# 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 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.
+check_reboot () {
+  reboot_required || return 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
+  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
 }
 
-# if grsec is installed make sure it is fresh
-check_grsec_kernel () {
-  local ver=`uname -r`
+# check if the latest kernel is booted
+reboot_required () {
+  local default_kernel kernel_package running_release running_version
+
+  # try to get default kernel from grub2
+  if [ -z "$default_kernel" -a -r "/boot/grub/grub.cfg" ]; then
+      default_kernel=$( awk '
+           $0 ~ /^set default=".*"/ { 
+               def = gensub(/default="(.*)"/, "\\1", "1", $2);
+               if (def !~ /^[0-9]+$/) { exit }
+           }
+           $1 == "menuentry" { menuentry+=1 }
+           $1 == "linux" && menuentry==def+1 { print $2; exit }' \
+           /boot/grub/grub.cfg 2>/dev/null )
+  fi
 
-  log "Kernel version: $ver"
-  if [ "$ver" = "${ver%-grsec}" ]; then
-    # not grsec variant
-    return 0
+  # try to get default kernel from grub-legacy
+  if [ -z "$default_kernel" -a -r "/boot/grub/menu.lst" ]; then
+      default_kernel=$( awk '
+           $1 == "default" { def = $2; 
+                             if (def !~ /^[0-9]+$/) { exit } }
+           $1 == "title" { title+=1 }
+           $1 == "kernel" && title==def+1 { print $2; exit }' \
+           /boot/grub/menu.lst 2>/dev/null )
   fi
 
-  if [ "$ver" = "${ver#2.6.2[4-9]}" ]; then
-    # kernel too old
-    notice "
-Prije prelaska na Debian Etch potrebno je napraviti nadogradnju na najnoviji grsec kernel.
+  # try to get default kernel from lilo
+  if [ -z "$default_kernel" ] && 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
 
-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
+  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
+      # /boot prefix might be missing
+      default_kernel="/boot/${default_kernel#/}"
+      if [ ! -e "$default_kernel" ]; then
+          log "Default kernel image doesn't exist!?"
+          return 1
+      fi
+  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 i to_install packages
+  local packages
   case "$1" in
     first)
       packages="$packages_first"
@@ -379,15 +486,13 @@ upgrade () {
     return 1
   esac
 
-  for i in $(echo $packages)
-  do
-    pkg $i && to_install="$to_install $i"
-  done
+  pkgupgrade $packages
+}
 
-  if [ -n "$to_install" ];then
-    eval pkgadd $to_install
-  else
-    return 0
+# install packages introduced in this release
+install_new () {
+  if [ "$new_packages" ]; then
+    pkgadd $new_packages
   fi
 }
 
@@ -468,7 +573,7 @@ backup_slapd_db () {
     [ -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!"
+    #notice "Backup slapd baze u $ldap_backup vec postoji!"
   fi
 }
 
@@ -492,122 +597,159 @@ backup_etc_dir () {
     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.$backup_ext.$$
-    chown --reference=/etc/default/raid2 /etc/default/raid2.$backup_ext.$$
-    chmod --reference=/etc/default/raid2 /etc/default/raid2.$backup_ext.$$
+# restore a configuration file if it contains only CN modifications
+restore_file () {
+  local file file_expect file_restore file_backup
 
-    if ! cmp -s /etc/default/raid2.$backup_ext.$$ /etc/default/raid2; then
-      log "Fixed /etc/default/raid2 AUTOSTART option."
-      mv -v /etc/default/raid2.$backup_ext.$$ /etc/default/raid2
-    else
-      rm -v /etc/default/raid2.$backup_ext.$$
-    fi
+  file=$1
+  file_expect=$2
+  file_restore=$3
+  file_backup=$file.$backup_ext
+
+  [ "$file_expect" ] || file_expect=$cnup/files/$file.expect
+  [ "$file_restore" ] || file_restore=$cnup/files/$file.restore
+
+  # check if all required files are there
+  if ! [ -e $file -a -e $file_expect -a -e $file_restore ]; then
+    log "Required files missing, skipping $file restore."
+    return 1
+  fi 
+
+  # is restore needed
+  if ! cmp $file_expect $file >/dev/null; then
+    log "Config doesn't match the template, skipping $file restore."
+    return 1
   fi
-}
 
-# restore original config file (if the new package version is not
-# installed already)
-restore_config () {
-  local file file_backup file_orig
-  local old_umask
+  # backup and restore
+  if [ ! -e $file_backup ]; then
+    log "Restoring config file $file."
 
-  # create new files safely
-  old_umask=`umask`
-  umask 0077
+    # backup local changes
+    cp -av $file $file_backup
 
-  # restore package files
-  for file in $*; do
-    file_orig=/usr/share/carnet-upgrade/files/$file
-    file_backup=$file.$backup_ext
+    # restore original
+    cp -v $file_restore $file
 
-    # is config there
-    if [ ! -e $file ]; then
-        continue
-    fi 
+    # restore succedded
+    return 0
+  else 
+    log "Backup file exists, skipping $file restore."
+    return 1
+  fi
+}
 
-    # is restore needed
-    if cmp $file_orig $file >/dev/null; then
-        continue
-    fi
+# force reconfiguration at the end if package is not upgraded automatically
+postupgrade_reconfigure () {
+  local cn_package cn_version
 
-    # backup and restore
-    if [ ! -e $file_backup ]; then
-      log "Restoring config file $file"
+  cn_package=$1
+  cn_version=$( dpkg -s "$cn_package" | awk '/^Version:/ {print $2}' )
+  post_upgrade "pkg $cn_package gt $cn_version || dpkg-reconfigure $cn_package"
+}
 
-      # backup local changes
-      mv -v $file $file_backup
+# copy template into a temporary file
+copy_template () {
+  local path file template config_new
 
-      # restore original
-      cp -av $file_orig $file
-      chown --reference $file_backup $file
-      chmod --reference $file_backup $file
-    fi
-  done
+  path=$1
+  file=$(basename $path)
+  template=$cnup/files/$path.template
+  config_new=$(mktemp /var/lib/carnet-upgrade/$file.XXXXXX)
+  cp $template $config_new
 
-  umask $old_umask
+  echo $config_new
 }
 
 # restore modified config to their package defaults
 # so the upgrade doesn't complain so much
 restore_configs () {
-  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
-  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
+  local hostname domain config_new memtotal memlimit
+
+  # restore simple configs
+  if pkg ntp-cn && pkg ntp lt 1:4.2.6.p2+dfsg-1+b1; then
+     if restore_file /etc/ntp.conf; then
+        postupgrade_reconfigure ntp-cn
+     fi
+  fi
+
+  if pkg kernel-2.6-cn && pkg procps lt 1:3.2.8-9; then
+     if restore_file /etc/sysctl.conf; then
+        postupgrade_reconfigure kernel-2.6-cn
+     fi
+  fi
+
+  if pkg kernel-2.6-cn && pkg libpam-modules lt 1.1.1-6.1; then
+     if restore_file /etc/security/limits.conf; then
+        postupgrade_reconfigure kernel-2.6-cn
+     fi
+  fi
+
+  if pkg vsftpd-cn && pkg vsftpd lt 2.3.2-3+squeeze2; then
+     if restore_file /etc/vsftpd.conf; then
+        postupgrade_reconfigure vsftpd-cn
+     fi
+  fi
+
+  if pkg squirrelmail-cn && pkg squirrelmail lt 2:1.4.21-2; then
+     if restore_file /etc/squirrelmail/apache.conf; then
+        postupgrade_reconfigure squirrelmail-cn
+     fi
+  fi
+
+  if pkg spamassassin-cn && pkg spamassassin lt 3.3.1-1; then
+     if restore_file /etc/spamassassin/v310.pre; then
+        postupgrade_reconfigure spamassassin-cn
+     fi
+  fi
+
+  if pkg amavisd-cn && pkg amavisd-new lt 1:2.6.4-3; then
+     if restore_file /etc/cron.daily/amavisd-new; then
+        rm -f /etc/cron.daily/amavisd-new.$backup_ext
+        postupgrade_reconfigure amavisd-cn
+     fi
+
+     if restore_file /etc/amavis/conf.d/15-av_scanners; then
+        rm -f /etc/amavis/conf.d/15-av_scanners.$backup_ext
+        postupgrade_reconfigure amavisd-cn
+     fi
+  fi
+
+  if pkg amavisd-cn lt 3:2.6.5; then
+     restore_file /etc/init.d/amavisd-cn
+     rm -f /etc/init.d/amavisd-cn.$backup_ext
+  fi
+
+  if pkg console-tools lt 1:0.2.3dbs-69.1; then
+     restore_file /etc/console-tools/config
+  fi
+
+  if pkg base-files lt 6.0squeeze2; then
+     restore_file /etc/issue
+     restore_file /etc/issue.net
+  fi
+
+  # dovecot won't start with these options
+  if pkg dovecot-cn && pkg dovecot-common lt 1:1.2.15-7; then
+     sed -i 's/^\( *\)\(sieve\(_storage\)\?=.*\)/\1#\2/' \
+         /etc/dovecot/dovecot.conf
+  fi
+
+  # check if monitrc is template based
+  if [ -e /etc/monit/monitrc ]; then # monit is removed at this point
+     # regenerate config from template
+     hostname=$(hostname)
+     domain=$(hostname --domain)
+     config_new=$(copy_template /etc/monit/monitrc)
+     check_and_sed "@localhost" \
+       "s/@localhost/@$hostname.$domain/g" $config_new || true
+     restore_file /etc/monit/monitrc $config_new
+     rm -f $config_new
+  fi
 }
 
 # temporary disable listchanges packages to reduce clutter during upgrade
@@ -636,23 +778,38 @@ apt_listchanges () {
 
 # make a silent installation of carnet and srce keyrings
 install_keyrings () {
-  pkgadd carnet-keyring srce-keyring
-  pkgadd dpkg apt debconf python-apt
+  pkgadd carnet-keyring srce-keyring debian-archive-keyring
 
-  dpkg-reconfigure carnet-keyring srce-keyring
+  dpkg-reconfigure carnet-keyring srce-keyring debian-archive-keyring
   apt_update
 }
 
-# remove skey (not supported anymore)
-remove_skey () {
-  pkgrm skey-cn libpam-skey
+# check if package is orphaned (nothing depends on it)
+is_orphaned () {
+  local package deps
 
-  if getent group skey > /dev/null; then
-    groupdel skey || true
-    log "groupdel skey"
+  package=$1
+  deps=$(apt-get remove -s $package | grep ^Remv | wc -l)
+  if [ "$deps" -eq 1 ]; then 
+    return 0
+  else 
+    return 1
   fi
 }
 
+# remove old and unused libraries
+remove_orphaned () {
+  local package
+
+  apt_autoremove
+
+  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 () {
@@ -669,49 +826,45 @@ disable_monit () {
   fi
 }
 
-# make a silent upgrade to new libc6
-upgrade_libc () {
-  DEBIAN_FRONTEND=noninteractive pkgadd libc6
-}
+# check which of the given packages are installed
+grep_installed () {
+  local package installed
 
-# upgrade apache2 to etch
-upgrade_apache2 () {
-  local package packages
-
-  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
+  for package in $*; do
+    if pkg $package; then
+      installed="$installed $package"
+    fi
   done
 
-  # enable suhosin downgrade to etch version
-  if pkg php4-suhosin; then
-      pkgrm php4-suhosin php-suhosin-cn
+  echo $installed
+}
+
+# only upgrade packages if they are already installed
+pkgupgrade () {
+  local packages
+
+  packages=$( grep_installed $* )
+
+  if [ "$packages" ]; then
+    eval pkgadd $packages
   fi
+}
+
+# make a silent upgrade to new libc6
+upgrade_libc () {
+  DEBIAN_FRONTEND=noninteractive pkgupgrade libc6 libc6-dev tzdata udev
+}
 
-  eval pkgadd $packages
+# upgrade apache2/php5
+upgrade_apache2 () {
+  pkgrm apache-common # prevents installation of apache2-suexec
+  pkgupgrade libapache2-mod-php5 php5-cli php5-cn apache2-cn \
+    php5-odbc php5-suhosin php-suhosin-cn
 }
 
 upgrade_amavis () {
   local conf
 
-  # remove init script diversion before upgrade
-  if pkg amavisd-cn lt 3:2.4.2-4; 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
   for conf in /etc/amavisd.conf /etc/amavis/amavisd.conf; do
     if [ -e $conf -a ! -e $conf.$backup_ext ]; then
@@ -722,54 +875,25 @@ upgrade_amavis () {
   # 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
+  /etc/init.d/amavisd-cn restart
 }
 
-# fix openldap-aai postinst user handling
-upgrade_openldap () {
-  pkg openldap-aai lt 2.3 || return 0
+# handle freerdius upgrade
+upgrade_freeradius () {
+  pkg freeradius-aai lt 2.1.10-1 || 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
+  # aai team prevents a clean upgrade
+  cp -av /etc/freeradius /etc/freeradius.$backup_ext
+  pkgrm freeradius-aai freeradius-ldap freeradius
+  pkgadd freeradius-aai
+}
 
-  # slapd postinst fails if move_old_database is false
-  echo 'slapd slapd/move_old_database boolean true' | debconf-set-selections 
+# handle openldap upgrade
+upgrade_openldap () {
+  # aai does not depend on the new openldap version
   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
-
-  # 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
+  pkgadd openldap-aai
 }
 
 # fix postgresql deinstallation during upgrade
@@ -781,13 +905,20 @@ upgrade_postgresql () {
 
 # upgrade the MTA
 upgrade_postfix () {
-  pkgadd postfix-cn
+  pkgadd sasl2-bin postfix-cn
 
   if pkg postgrey; then
      pkgrm postgrey # not used by postfix-cn anymore
   fi
 }
 
+# upgrade bind separately so DNS is not down for too long
+# or breaks postinst scripts of other cn packages that depend on
+# working resolver
+upgrade_bind() {
+  pkgadd bind9-cn
+}
+
 get_variable () {
   local name=$1 file=$2 val
 
@@ -799,57 +930,47 @@ get_variable () {
   echo $val
 }
 
-# preserve mail location on upgrade
-upgrade_dovecot () {
-  local default_mail_env mail_location
+# restore munin configs for silent upgrade
+upgrade_munin () {
+  local config backup hostname domain
 
-  # 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
+  for pkg_name in munin munin-node; do
+     pkg $pkg_name lt '1.4.5-3' || continue
 
-  # 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
+     config=/etc/munin/$pkg_name.conf
+     backup=$config.$backup_ext
+     if [ -f $config -a ! -f $backup ]; then
+        hostname=$(hostname)
+        domain=$(hostname --domain)
 
-      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
-}
+        cp -av $config $backup
+        check_and_sed "$hostname.$domain" \
+          "s/$hostname.$domain/localhost.localdomain/g" $config
+     fi
+     pkgadd $pkg_name
+  done
 
-# fix /etc/dpkg/dpkg.cfg
-comment_force_overwrite () {
-  if [ -f /etc/dpkg/dpkg.cfg ]; then
-    if check_and_sed '^force-overwrite' \
-                  's,\(^force-overwrite\),#\1,' \
-                  /etc/dpkg/dpkg.cfg; then
-      notice "$msg_comment_force_overwrite"
-    fi
-  fi
+  # force localhost -> hostname replacement in config files
+  pkgadd munin-cn
+  dpkg-reconfigure munin-cn
 }
 
+# try not to overwrite user modified issue files
 fix_issue () {
-  cat > /etc/issue <<EOF
-Debian GNU/Linux 4.0 (CARNet Debian 4.0) \\n \\l
+  if cmp /etc/issue $cnup/files/etc/issue.expect.new >/dev/null; then
+    cp -av /etc/issue /etc/issue.$backup_ext
+    cat > /etc/issue <<EOF
+Debian GNU/Linux 6.0 (CARNet Debian 6.0) \\n \\l
+
 EOF
+  fi
 
-  cat > /etc/issue.net <<EOF
-Debian GNU/Linux 4.0 (CARNet Debian 4.0) %h
+  if cmp /etc/issue.net $cnup/files/etc/issue.net.expect.new >/dev/null; then
+    cp -av /etc/issue.net /etc/issue.net.$backup_ext
+    cat > /etc/issue.net <<EOF
+Debian GNU/Linux 6.0 (CARNet Debian 6.0) %h
 EOF
+  fi
 }
 
 check_archives_space() {
@@ -873,19 +994,30 @@ check_archives_space() {
 }
 
 check_kernel_space() {
-  local available_disk_space kernel_size
+  local available_disk_space kernel_size linux_images metapkg pkg ret
   available_disk_space=$(free_space /)
-  kernel_size=$(installed_size kernel-2.6-cn)
+  linux_images=$(apt-cache show kernel-2.6-cn | grep ^Depends: \
+    | grep -o 'linux-image[^, ]*')
+  for metapkg in $linux_images; do
+    pkg=$(apt-cache show $metapkg | grep ^Depends: \
+          | grep -o 'linux-image[^, ]*' | head -1)
+    [ "$pkg" ] || continue
+
+    kernel_size=$(installed_size $pkg)
+    ret=$?
+    [ $ret -eq 0 ] && break
+  done
 
-  if [ $? -ne 0 ]; then
+  if [ $ret -ne 0 ]; then
     log "Failed to get installed size, skipping check."
     return 0
   fi
 
   log "Free space in /: ${available_disk_space}MB"
+  log "Kernel package: $pkg"
   log "Kernel size: ${kernel_size}MB"
 
-  if LC_ALL=C apt-get --yes --print-uris install kernel-2.6-cn \
+  if LC_ALL=C apt-get -s install kernel-2.6-cn 2>/dev/null \
      | grep -q '^kernel-2.6-cn is already the newest version.$'
   then
      log "Not checking free space in /: kernel-2.6-cn already installed"
@@ -970,3 +1102,12 @@ round() {
 
   echo $num
 }
+
+# make sure carnet-upgrade doesn't get upgraded until the end
+hold_carnet_upgrade() {
+  echo carnet-upgrade hold | dpkg --set-selections
+}
+
+release_carnet_upgrade() {
+  echo carnet-upgrade install | dpkg --set-selections
+}