X-Git-Url: http://ftp.carnet.hr/pub/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=9c81fc8bc35be5961f2e6a57080c2775e7441357;hb=644358dc5f855d3829ba97d23a3c4d556f0b304d;hp=d832d8fd58c98fd96b999397a4b5687020ca154a;hpb=42e59f2c1715cc357d7f6fd0dfcae7e295e07a02;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index d832d8f..9c81fc8 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -271,9 +271,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."
@@ -289,7 +291,8 @@ check_apache_version () {
 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."
@@ -310,7 +313,7 @@ upgrade () {
     return 1
   esac
 
-  for i in $packages
+  for i in $(echo $packages)
   do
     pkg $i && to_install="$to_install $i"
   done
@@ -573,7 +576,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
@@ -596,20 +599,29 @@ upgrade_libc () {
 
 # upgrade apache2 to etch
 upgrade_apache2 () {
-  local package
+  local package packages
+
+  # php-suhosin-cn causes removal of applications on dist-upgrade
+  # because of php5 only dependencies
+  pkgrm php-suhosin-cn
 
   for package in \
-      libapache-mod-php4 \
       libapache2-mod-php4 \
       php4-cli \
       php4-cgi \
       php4-cn \
-      apache2-cn
+      apache2-cn \
+      php4-odbc \
+      php4-suhosin
   do
       if pkg $package; then
-          pkgadd $package
+          packages="$packages $package"
       fi
   done
+
+  for package in $(echo $packages); do
+      pkgadd $package
+  done
 }
 
 upgrade_amavis () {
@@ -641,11 +653,36 @@ 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
-  /etc/init.d/slapd restart
-  dpkg --configure -a # try postinst again
+  pkg openldap-aai lt 2.3 || return 0
+
+  # slapd postinst fails if move_old_database is false
+  echo 'slapd slapd/move_old_database boolean true' | debconf-set-selections 
+  pkgadd slapd
+
+  # openldap-aai postinst fails here because of database permissions
+  if ! apt-get -y install openldap-aai; then
+    chown -R openldap:openldap /var/lib/ldap  # fix slapd
+    /etc/init.d/slapd restart
+
+    # try openldap-aai postinst again (also re-enables slurpd)
+    dpkg --configure -a
+  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 () {
@@ -691,16 +728,6 @@ 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
-  fi
-
-  pkg vsftpd    && pkgadd vsftpd
-  pkg vsftpd-cn && pkgadd vsftpd-cn
-}
-
 # fix /etc/dpkg/dpkg.cfg
 comment_force_overwrite () {
   if [ -f /etc/dpkg/dpkg.cfg ]; then