Fixed postgresql upgrade problems (removed due to dependencies).

Fixed php-suhosin-cn problems (application removal by dist-upgrade).
Disabled monit during upgrade (causing problems in postinst scripts).

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 5e6aa78..d8c280e 100644 (file)
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -15,13 +15,19 @@ true                                create_sources_list
 true                           update                  # apt-get update & download
 true                           check_disk_space
 ! debconf_priority check       debconf_priority set    # utisaj debconf
+# postgresql-common/etch zahtjeva da postgresql nije instaliran
+pkg postgresql                 post_upgrade pkgadd postgresql
+pkg postgresql                 pkgrm postgresql
 true                           upgrade_libc
 true                           install_keyrings
 pkg skey-cn                    remove_skey
+# mrtg je zamjenjen sa munin
 pkg mrtg-cn                    post_upgrade pkgadd munin-cn
-pkg mrtg-cn                    pkgrm mrtg mrtg-cn      # zamjenjeno sa munin
+pkg mrtg-cn                    pkgrm mrtg mrtg-cn
 # popravi konfiguracije koje stvaraju probleme
 true                           restore_configs
+# monit stvara probleme postinst skriptama
+pkg monit-cn                   pkgrm monit-cn
 # konacno, instalacija novih paketa
 pkg amavisd-cn                 upgrade_amavis
 pkg apache2-cn                 upgrade_apache2
@@ -29,7 +35,6 @@ pkg dovecot-cn                        upgrade_dovecot
 pkg postfix-cn                 pkgadd postfix-cn
 pkg postgrey                   pkgrm postgrey          # problematican
 pkg openldap-aai               upgrade_openldap
-true                           upgrade_vsftpd
 true                           upgrade first           # neki paketi moraju rucno
 true                           upgrade second          # neke pakete zelimo ranije
 true                           dist_upgrade            # instaliraj ostatak

diff --git a/src/data.sh b/src/data.sh
index 0fce492..8041512 100644 (file)
--- a/src/data.sh
+++ b/src/data.sh
@@ -37,8 +37,9 @@ xinetd-cn     2:2.3.13-1
 '
 
 # Packages to forcibly install before installing the rest with dist-upgrade,
-# because dist-upgrade would rather remove them.
+# because dist-upgrade would rather remove or keep them back them.
 packages_first='
+libkrb5-17-heimdal postgresql-client unixodbc
 '
 
 # Packages that provide crucial services, upgrade them before the rest
@@ -59,15 +60,14 @@ mysql-cn
 ntp-cn
 oidentd
 openldap-aai
-openssh-cn openssh-server              
+openssh-cn openssh-server openssh-client ssh
 ossec-hids-cn
 php4-odbc
 php4-xslt
-php5-cn
 postfix-cn
 spamassassin-cn        spamassassin razor dcc-client
 squirrelmail-cn squirrelmail
-vsftpd-cn vsftpd
+vsftpd-cn
 webalizer-cn
 xinetd-cn xinetd       
 '

diff --git a/src/functions.sh b/src/functions.sh
index d832d8f..d25ca65 100644 (file)
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -599,7 +599,6 @@ upgrade_apache2 () {
   local package
 
   for package in \
-      libapache-mod-php4 \
       libapache2-mod-php4 \
       php4-cli \
       php4-cgi \
@@ -610,6 +609,8 @@ upgrade_apache2 () {
           pkgadd $package
       fi
   done
+
+  pkgrm php-suhosin-cn # causes removal of applications on dist-upgrade
 }
 
 upgrade_amavis () {
@@ -691,16 +692,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