projects
/
carnet-upgrade.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed postgresql upgrade problems (removed due to dependencies).
[carnet-upgrade.git]
/
src
/
functions.sh
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 \
local package
for package in \
- libapache-mod-php4 \
libapache2-mod-php4 \
php4-cli \
php4-cgi \
libapache2-mod-php4 \
php4-cli \
php4-cgi \
@@
-610,6
+609,8
@@
upgrade_apache2 () {
pkgadd $package
fi
done
pkgadd $package
fi
done
+
+ pkgrm php-suhosin-cn # causes removal of applications on dist-upgrade
}
upgrade_amavis () {
}
upgrade_amavis () {
@@
-691,16
+692,6
@@
upgrade_dovecot () {
fi
}
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
# fix /etc/dpkg/dpkg.cfg
comment_force_overwrite () {
if [ -f /etc/dpkg/dpkg.cfg ]; then