Upgrade config files before kernel-2.6-cn gets them.

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

diff --git a/src/data.sh b/src/data.sh
index 916c9bc..22143c8 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
 
@@ -8,29 +5,26 @@ backup_ext=cn4-upgrade
 # name         wanted version
 needed_versions='
 amavisd-cn     2:20030616p10-12
-aosi-aai       1.6.4
-aosi-www-aai   1.5.8
-apache-cn      2:1.3.33-5
-apache2-cn     2.0-1
+aosi-aai       1.6.5
+aosi-www-aai   1.5.9
+apache2-cn     2.0-3
 bind9-cn       2:9.2.4-1
-clamav-cn      2:0.91.2-2
+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-1
-mrtg-cn        2:2.10.13-2.2
+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
 openssh-cn     2:3.8p1-8
-php4-cn        4:4.3.11-7
-postfix-cn     2.1.5-11
-procmail-cn    2:3.22-2
-razor-cn       2:2.361-0
+php4-cn        4:4.3.11-9
+postfix-cn     2.1.5-12
 samba-cn       2:3.0.10-1
 skey-cn                3:1.1.5-2
 spamassassin-cn        2:3.1.7-3
-squirrelmail-cn        2:1.4.4-6
+squirrelmail-cn        2:1.4.4-7
 vsftpd-cn      2.0.3-1
 webalizer-cn   2.01.10-1
 xinetd-cn      2:2.3.13-1
@@ -39,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 libpam-modules procps base-passwd
 '
 
 # Packages that provide crucial services, upgrade them before the rest
@@ -58,12 +52,12 @@ monit-cn
 munin-cn
 mysql-cn
 ntp-cn
-oidentd
 openldap-aai
 openssh-cn openssh-server openssh-client ssh
 ossec-hids-cn
 php4-odbc
 php4-xslt
+pine-cn
 postfix-cn
 spamassassin-cn        spamassassin razor dcc-client
 squirrelmail-cn squirrelmail
@@ -77,9 +71,9 @@ xinetd-cn xinetd
 bloats='
 gobjc gpc gcj gij chill g77            gcc-2.95-cn gcc-cn gcc-misc-cn gobjc gpc gcj gij chill g77
 nessus         libnessus2 nessus-cn
-prelude piwi   piwi piwi-cn libprelude0 prelude-sensors-cn prelude-manager-cn
+prelude piwi   piwi piwi-cn libprelude0 prelude-sensors-cn prelude-manager-cn prelude-manager
 snort          snort snort-cn snort-central-cn
-stari CN paketi        autoconf-cn automake-cn bison-cn bitchx-cn chkrootkit-cn cvs-cn diff-cn elinks-cn expect-cn file-cn flex-cn gawk-cn gdb-cn gettext-cn gnupg-cn grep-cn iptraf-cn jed-cn joe-cn jre-cn less-cn lftp-cn logcheck-cn logrotate-cn lsof-cn ltrace-cn lynx-cn make-cn mutt-cn netcat-cn nmap-cn ntop-cn openssl-cn perl-cn procmail-cn python-cn screen-cn slrn-cn strace-cn stunnel-cn sudo-cn tcpdump-cn unace-cn vim-cn wget-cn wv-cn ytalk-cn zsh-cn
+stari CN paketi        autoconf-cn automake-cn bison-cn bitchx-cn chkrootkit-cn cvs-cn diff-cn elinks-cn expect-cn file-cn flex-cn gawk-cn gdb-cn gettext-cn gnupg-cn grep-cn iptraf-cn jed-cn joe-cn jre-cn less-cn lftp-cn logcheck-cn logrotate-cn lsof-cn ltrace-cn lynx-cn make-cn mutt-cn netcat-cn nmap-cn ntop-cn openssl-cn perl-cn procmail-cn python-cn razor-cn screen-cn slrn-cn strace-cn stunnel-cn sudo-cn sys-mon-cn tcpdump-cn telnet-ssl-cn telnetd-ssl unace-cn vim-cn wget-cn wv-cn ytalk-cn zsh-cn
 '
 
 # Check if these services are running after upgrade