X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=c223076c126a57711bf66c7210ac520e49a0e383;hb=ce3d7220e258efb1036e6656e534d82fb2678104;hp=9d35ceb70a500c970d08a334169bb5b8beb4d6d5;hpb=5aae55b00e9d4d3ee608df184b4253dab7a52783;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 9d35ceb..c223076 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() {
@@ -102,7 +105,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 +113,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,6 +146,16 @@ 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 pkgs_to_remove oldifs pkglist
@@ -152,7 +180,7 @@ remove_bloat() {
   [ -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
@@ -185,6 +213,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
@@ -232,8 +311,13 @@ run_actions() {
     [ "$check" != "true" ] && checkmsg="if '$check'"
     if eval $check; then
       log "$(printf 'action %02d' $lineno) starting: '${action}' $checkmsg "
-      eval $action
-      log "$(printf 'action %02d' $lineno) finished: '${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}' $checkmsg"
     fi
@@ -243,6 +327,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,17 +365,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 nadogradnju 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."
@@ -281,15 +385,71 @@ 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 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.
+Prije prelaska na Debian Etch potrebno je napraviti nadogradnju sa Apache 1.3 na Apache 2.0.
 
 Pokrenite:
-  'apt-get install apache2-cn'
+  # apt-get update
+  # apt-get install apache2-cn
   
 Nakon toga ponovno pozovite ovu skriptu."
     log "carnet-upgrade aborted, upgrade to apache2-cn needed."
@@ -297,6 +457,92 @@ Nakon toga ponovno pozovite ovu skriptu."
   fi
 }
 
+# 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]}" ] || reboot_required; 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 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 != /^[[:digit:]]+$/) { 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"
+
+  if [ "$kernel_package" != "kernel-2.6-cn" ]; then
+      log "Default kernel package is not kernel-2.6-cn"
+      return 1
+  fi
+
+  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
   case "$1" in
@@ -310,7 +556,7 @@ upgrade () {
     return 1
   esac
 
-  for i in $packages
+  for i in $(echo $packages)
   do
     pkg $i && to_install="$to_install $i"
   done
@@ -371,7 +617,7 @@ add_group_proc () {
 
 # backup ldap database
 backup_slapd_db () {
-  local ldap_backup=/var/backups/slapcat.$backup_ext
+  local ldap_backup=/var/backups/slapcat.$backup_ext.gz
   local old_umask result
 
   if [ ! -f $ldap_backup ]; then
@@ -381,7 +627,7 @@ backup_slapd_db () {
       /etc/init.d/slapd stop || true
       old_umask=`umask`
       umask 0077 # protect the backup file
-      slapcat -l $ldap_backup
+      slapcat | gzip --best > $ldap_backup
       result=$?
       umask $old_umask
       /etc/init.d/slapd start || true
@@ -446,25 +692,45 @@ fix_etc_default_raid2 () {
 # restore original config file (if the new package version is not
 # installed already)
 restore_config () {
-  local file file_backup file_orig
-  local old_umask
+  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
 
-  # create new files safely
-  old_umask=`umask`
-  umask 0077
+  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_orig=/usr/share/carnet-upgrade/files/$file
+    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 there
-    if [ ! -e $file ]; then
+    # is config files are there
+    if ! [ -e $file -a -e $file_expect -a -e $file_restore ]; then
         continue
     fi 
 
     # is restore needed
-    if cmp $file_orig $file >/dev/null; then
+    if ! cmp $file_expect $file >/dev/null; then
         continue
     fi
 
@@ -473,77 +739,107 @@ restore_config () {
       log "Restoring config file $file"
 
       # backup local changes
-      mv -v $file $file_backup
+      cp -av $file $file_backup
 
       # restore original
-      cp -av $file_orig $file
-      chown --reference $file_backup $file
-      chmod --reference $file_backup $file
+      cp -v $file_restore $file
+
+      config_changed=1
     fi
   done
 
-  umask $old_umask
+  # 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 eq $cn_version && dpkg-reconfigure $cn_package"
+  fi
 }
 
 # restore modified config to their package defaults
 # so the upgrade doesn't complain so much
 restore_configs () {
+  local hostname domain template config_new
   local config_backup
 
-  pkg base-files lt 4 && restore_config /etc/issue /etc/issue.net
-  pkg bind9 lt 1:9.3.4 && restore_config /etc/bind/named.conf.options
-  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
+  # 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
+
+  # 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
 
-          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 \
-                /etc/php4/apache2/php.ini \
-                /etc/php4/apache/php.ini \
-                /etc/php4/cgi/php.ini \
-                /etc/php4/cli/php.ini
-  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
+#  restore_config base-files 4 /etc/issue /etc/issue.net
+#  restore_config base-files 4 /etc/issue /etc/issue.net
+#  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
@@ -572,11 +868,11 @@ apt_listchanges () {
 
 # 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
 }
 
 # remove skey (not supported anymore)
@@ -589,59 +885,71 @@ remove_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
 upgrade_libc () {
   DEBIAN_FRONTEND=noninteractive pkgadd libc6
 }
 
-# upgrade apache -> apache2
-upgrade_apache () {
-  local delpkg p
-
-  # bugfix for apache2-cn postinst
-  mkdir -p /etc/apache2
-  touch /etc/apache2/httpd.conf
-
-  # temporary remove packages conflicting with apache2
-  delpkg=""
-  for p in aosi-aai aosi-www-aai \
-           php4-cn php4-odbc php4-xslt \
-           squirrelmail-cn; do
-
-     # remember installed packages
-     if pkg $p; then
-         delpkg="$delpkg $p"
-     fi
+# 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
   done
 
-  # remove (but not purge) problematic packages
-  if [ "$delpkg" ]; then
-      eval apt-get --yes remove $delpkg
+  # enable suhosin downgrade to etch version
+  if pkg php4-suhosin; then
+      pkgrm php4-suhosin php-suhosin-cn
   fi
 
-  # remove old apache
-  pkgrm apache apache-common
-
-  # install new packages
-  eval pkgadd apache2-cn apache2-mpm-prefork \
-              php4-cn libapache2-mod-php4 \
-              $delpkg
+  eval pkgadd $packages
 }
 
 upgrade_amavis () {
   local conf
 
-  # remove init script diversion
-  if [ -L /etc/init.d/amavis -a -f /etc/init.d/amavis.amavisd-new ]; then
-    rm -vf /etc/init.d/amavis
-    dpkg-divert --quiet --remove /etc/init.d/amavis
+  # 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
-  conf=/etc/amavis/amavisd.conf
-  if [ -e $conf -a ! -e $conf.$backup_ext ]; then
-    mv -v $conf $conf.$backup_ext
-  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
@@ -651,17 +959,65 @@ upgrade_amavis () {
                 '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
 }
 
 # 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
+}
+
+# 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 () {
@@ -688,7 +1044,7 @@ upgrade_dovecot () {
   default_mail_env=$(get_variable default_mail_env /etc/dovecot/dovecot.conf)
 
   # silently upgrade package
-  restore_config /etc/dovecot/dovecot.conf
+  restore_config dovecot-cn dovecot-common 1.0 /etc/dovecot/dovecot.conf
   pkgadd dovecot-cn
 
   # insert old mail location
@@ -707,14 +1063,49 @@ upgrade_dovecot () {
   fi
 }
 
-# vsftpd.postinst tries to start vsftpd so make sure it is not running 
-upgrade_vsftpd () {
-  if [ -x /etc/init.d/vsftpd ]; then
-      /etc/init.d/vsftpd stop || true
+# 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
+        mv -v $config /etc/udev/
+     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
 
-  pkg vsftpd    && pkgadd vsftpd
-  pkg vsftpd-cn && pkgadd vsftpd-cn
+  pkgadd udev
 }
 
 # fix /etc/dpkg/dpkg.cfg
@@ -730,20 +1121,129 @@ 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
+}