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

diff --git a/src/functions.sh b/src/functions.sh
index d832d8f..d25ca65 100644
--- 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