fi
}
-# make a silent upgrade to new libc6
-upgrade_libc () {
- DEBIAN_FRONTEND=noninteractive pkgupgrade libc6 libc6-dev tzdata
-}
-
# upgrade apache2/php5
upgrade_apache2 () {
pkgrm apache-common # prevents installation of apache2-suexec
pkgrm php5-suhosin # not available for wheezy
pkgupgrade libapache2-mod-php5 php5-cli php5-cn apache2-cn \
- php5-odbc
+ php5-odbc mod-security-cn
}
upgrade_amavis () {
# upgrade the IMAP server
upgrade_dovecot() {
- if [ ! -f /etc/dovecot/conf.d/95-local ]; then
+ local local_conf=/etc/dovecot/conf.d/95-${backup_ext}.conf
+
+ if [ -f /etc/dovecot/conf.d/95-local -a ! -f $local_conf ]; then
+ mv /etc/dovecot/conf.d/95-local $local_conf
+ sed -i 's/\/usr\/lib\/dovecot\/modules\/imap/\/usr\/lib\/dovecot\/modules/g' $local_conf
+ /etc/init.d/dovecot restart
+ fi
+
+ if [ ! -f $local_conf ]; then
pkgrm dovecot-cn
# restore config
# install new version and restore local changes
pkgadd dovecot-core
- doveconf -n -c /etc/dovecot/dovecot.conf.$backup_ext > /etc/dovecot/conf.d/95-local
+ doveconf -n -c /etc/dovecot/dovecot.conf.$backup_ext > $local_conf
+ sed -i 's/\/user\/lib\/dovecot\/modules\/imap/\/usr\/lib\/dovecot\/modules/g' $local_conf
pkgadd dovecot-cn
fi
fi
}
+# manual upgrade of kernel due to new packet name
+upgrade_kernel() {
+ if pkg kernel-2.6-cn; then
+ pkgrm kernel-2.6-cn
+
+ if pkg grub-pc; then
+ pkgadd kernel-cn grub-pc
+ else
+ pkgadd kernel-cn
+ fi
+ fi
+}
+
get_variable () {
local name=$1 file=$2 val