upgrade_apache2 () {
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 \
libapache2-mod-php4 \
php4-cli \
php4-cn \
apache2-cn \
php4-odbc \
- php4-suhosin
+ php4-suhosin \
+ php-suhosin-cn
do
if pkg $package; then
packages="$packages $package"
fi
done
- for package in $(echo $packages); do
- pkgadd $package
- done
+ # enable suhosin downgrade to etch version
+ if pkg php4-suhosin; then
+ pkgrm php4-suhosin php-suhosin-cn
+ fi
+
+ eval pkgadd $packages
}
upgrade_amavis () {
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