X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Fdata.sh;h=bbb0b6c0babf019490243eef99dee5e97fec8283;hb=4a7cd7f23e6fece6c9b2e5775ac45293de954e26;hp=51a8f09c3bef0c55f1ef2a66dd116ef2621187dc;hpb=f905d82c468d23045cdd3d3888c5850159f7ae36;p=carnet-upgrade.git

diff --git a/src/data.sh b/src/data.sh
index 51a8f09..bbb0b6c 100644
--- 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 oidentd
+libkrb5-17-heimdal postgresql-client unixodbc iptables oidentd libpam-modules procps base-passwd
 '
 
 # Packages that provide crucial services, upgrade them before the rest
@@ -61,7 +59,7 @@ php4-odbc
 php4-xslt
 pine-cn
 postfix-cn
-spamassassin-cn	spamassassin razor dcc-client
+spamassassin-cn	spamassassin razor
 squirrelmail-cn squirrelmail
 vsftpd-cn
 webalizer-cn
@@ -88,7 +86,6 @@ apache-cn		www-data	/usr/sbin/apache			Apache
 bind9-cn		bind		/usr/sbin/named				Bind
 clamav-cn		clamav		/usr/bin/freshclam			ClamAV update
 clamav-cn		clamav		/usr/sbin/clamd				ClamAV
-dcc-client		dcc		/usr/sbin/dccifd			DCC client
 dovecot-cn		root		/usr/sbin/dovecot			Dovecot
 freeradius-aai		freerad		/usr/sbin/freeradius			FreeRADIUS
 mailman-cn		list		/usr/lib/mailman/bin/mailmanctl		Mailman
@@ -106,7 +103,6 @@ postfix-cn		root		/usr/sbin/saslauthd			SASL authentication
 postgresql		postgres	/usr/lib/postgresql/7.4/bin/postmaster	PostgreSQL
 samba-cn		root		/usr/sbin/smbd				Samba
 snort-cn		snort		/usr/sbin/snort				Snort
-spamassassin-cn		dcc		/usr/sbin/dccifd			DCC client
 squid-cn		root		/usr/sbin/squid				Squid
 vsftpd-cn		root		/usr/sbin/vsftpd			VSFTPD
 xinetd-cn		root		/usr/sbin/xinetd			xinetd