Remove X if installed.

[carnet-upgrade.git] / src / data.sh

diff --git a/src/data.sh b/src/data.sh
index 6bce37d..ab5a6ad 100644 (file)
--- a/src/data.sh
+++ b/src/data.sh
@@ -1,6 +1,3 @@
-# Minimum free space on /var after the download, in MB
-min_var_space=50
-
 # Backup extension
 backup_ext=cn4-upgrade
 
@@ -10,13 +7,14 @@ needed_versions='
 amavisd-cn     2:20030616p10-12
 aosi-aai       1.6.5
 aosi-www-aai   1.5.9
-apache2-cn     2.0-1
+apache2-cn     2.0-3
 bind9-cn       2:9.2.4-1
 clamav-cn      2:0.92.1-1
 dovecot-cn     0.99.14-0
 freeradius-aai 1.1.7-0
 iptables-cn    2:1.2.11-6
 kernel-2.6-cn  2.6.24.2-2
+monit-cn       1:4.8.1-6
 mysql-cn       2:4.0.24-10.5
 ntp-cn 2:4.2.0a+stable-2sarge1.1
 openldap-aai   2.2.23-13
@@ -35,7 +33,7 @@ xinetd-cn     2:2.3.13-1
 # Packages to forcibly install before installing the rest with dist-upgrade,
 # because dist-upgrade would rather remove or keep them back them.
 packages_first='
-libkrb5-17-heimdal postgresql-client unixodbc iptables
+libkrb5-17-heimdal postgresql-client unixodbc iptables oidentd
 '
 
 # Packages that provide crucial services, upgrade them before the rest
@@ -54,7 +52,6 @@ monit-cn
 munin-cn
 mysql-cn
 ntp-cn
-oidentd
 openldap-aai
 openssh-cn openssh-server openssh-client ssh
 ossec-hids-cn