X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=33ac2602b04e082f7184ddf66dd60fbebc647fe3;hb=b31f79b9c72b7e548ed2a1b8e1fc7308fdad19a0;hp=168bc91d2424eacf431801aac21844122a6ebd8d;hpb=3baec6f284d37cdbd7928acc1b663c43db255e0d;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 168bc91..33ac260 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -1,4 +1,3 @@
-# last update: 2005-07-03
 # Ivan 'ico' Rako <irako@srce.hr>
 # Zoran 'jelly' Dzelajlija <jelly@srce.hr>
 
@@ -28,7 +27,7 @@ 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
@@ -130,14 +129,16 @@ dist_upgrade () {
 
 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,7 +147,9 @@ 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"
   [ "$DEBUG" ] && set +x
@@ -198,7 +201,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 +225,16 @@ 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 "
+    checkmsg=""
+    [ "$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}' $testmsg"
+      log "$(printf 'action %02d' $lineno) finished: '${action}' $checkmsg"
     else
-      log "$(printf 'action %02d' $lineno) skipping: '${action}' $testmsg"
+      log "$(printf 'action %02d' $lineno) skipping: '${action}' $checkmsg"
     fi
     [ "$lineno2" -gt "$lineno" ] && lineno=$lineno2
   done
@@ -267,9 +270,11 @@ 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."
@@ -280,13 +285,13 @@ Nakon toga ponovno pozovite ovu skriptu."
 # if apache is installed make sure it's version 2
 check_apache_version () {
 
-  if ! pkg apache2-cn && pkg apache-cn; then
+  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."
@@ -295,7 +300,7 @@ Nakon toga ponovno pozovite ovu skriptu."
 }
 
 upgrade () {
-  local to_install packages
+  local i to_install packages
   case "$1" in
     first)
       packages="$packages_first"
@@ -307,7 +312,7 @@ upgrade () {
     return 1
   esac
 
-  for i in $packages
+  for i in $(echo $packages)
   do
     pkg $i && to_install="$to_install $i"
   done
@@ -485,9 +490,10 @@ restore_config () {
 # 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 bind9 lt 1:9.3.4 && restore_config /etc/bind/named.conf.options
-  pkg dovecot-common lt 1.0 && restore_config /etc/dovecot/dovecot.conf
   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 \
@@ -523,6 +529,23 @@ restore_configs () {
           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
 }
 
 # temporary disable listchanges packages to reduce clutter during upgrade
@@ -552,7 +575,7 @@ apt_listchanges () {
 # 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
@@ -573,54 +596,36 @@ 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
-
-  # 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
-  done
+# upgrade apache2 to etch
+upgrade_apache2 () {
+  local package packages
 
-  # remove (but not purge) problematic packages
-  if [ "$delpkg" ]; then
-      eval apt-get --yes remove $delpkg
-  fi
+  # php-suhosin-cn causes removal of applications on dist-upgrade
+  # because of php5 only dependencies
+  pkgrm php-suhosin-cn
 
-  # register cn changes in apache files
-  for config in /etc/php4/cgi/php.ini \
-                /etc/php4/cli/php.ini \
-                /etc/php4/apache/php.ini \
-                /etc/php4/apache2/php.ini \
-                /etc/apache/modules.conf
-  do 
-      config_backup=$config.$backup_ext
-      if [ ! -e $config_backup ]; then
-          cp -av $config $config_backup
-          ucf $config_backup $config
+  for package in \
+      libapache2-mod-php4 \
+      php4-cli \
+      php4-cgi \
+      php4-cn \
+      apache2-cn \
+      php4-odbc \
+      php4-suhosin
+  do
+      if pkg $package; then
+          packages="$packages $package"
       fi
   done
 
-  # remove old apache
-  pkgrm apache apache-common
-
-  # install new packages
-  eval pkgadd apache2-cn apache2-mpm-prefork \
-              php4-cn libapache2-mod-php4 \
-              $delpkg
+  for package in $(echo $packages); do
+      pkgadd $package
+  done
 }
 
 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
@@ -628,7 +633,7 @@ upgrade_amavis () {
   fi
 
   # move old config aside
-  local conf=/etc/amavis/amavisd.conf
+  conf=/etc/amavis/amavisd.conf
   if [ -e $conf -a ! -e $conf.$backup_ext ]; then
     mv -v $conf $conf.$backup_ext
   fi
@@ -647,11 +652,97 @@ upgrade_amavis () {
 
 # 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 () {
+  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 /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
 }
 
 # fix /etc/dpkg/dpkg.cfg