X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Fdata.sh;h=55d8955fb7533b57b361196fd5e4b40a9108fcec;hb=9d75a6be10d4987f24d7f6d9e568bd8db5a6405f;hp=842833edcb4610ee46d61dcd528bcac3fe757cee;hpb=1e70ff3fe998033fd93c8cd177082b8cd566d2ce;p=carnet-upgrade.git

diff --git a/src/data.sh b/src/data.sh
index 842833e..55d8955 100644
--- a/src/data.sh
+++ b/src/data.sh
@@ -1,6 +1,9 @@
 # Minimum free space on /var after the download, in MB
 min_var_space=250
 
+# Backup extension
+backup_ext=cn4-upgrade
+
 # carnet-upgrade aborts if these packages are not up to date
 # name		wanted version
 needed_versions='
@@ -33,28 +36,26 @@ mysql-common	4.0.24-10sarge3
 # Packages to forcibly install before installing the rest with dist-upgrade,
 # because dist-upgrade would rather remove them.
 packages_first='
-php4-odbc
-php4-xslt
-amavisd-cn
-php5-cn
-squirrelmail-cn
-mysql-cn
 '
 
 # Packages that provide crucial services, upgrade them before the rest
 packages_second='
+amavisd-cn
+php5-cn
+squirrelmail-cn
+mysql-cn
 bind9-cn bind9
 openssh-cn openssh-server		
 clamav-cn clamav-daemon
 spamassassin-cn	spamassassin razor dcc-client
 postfix-cn
-dovecot-cn dovecot
+dovecot-cn
 squirrelmail-cn
 openldap-aai
 freeradius-aai freeradius
 aosi-aai
 aosi-www-aai
-ntp-cn ntp
+ntp-cn
 vsftpd-cn vsftpd
 xinetd-cn xinetd	
 monit-cn
@@ -62,6 +63,10 @@ munin-cn
 ossec-hids-cn
 amavis-stats-cn
 webalizer-cn
+oidentd
+php4-odbc
+php4-xslt
+libkrb5-17-heimdal
 '
 
 # We want to remove these packages, used in remove_bloat()
@@ -97,7 +102,6 @@ ntp-cn			ntp		/usr/sbin/ntpd				ntpd
 oidentd-cn		oident		/usr/sbin/oidentd			oidentd
 openldap-aai		openldap	/usr/sbin/slapd				OpenLDAP
 openssh-cn		root		/usr/sbin/sshd				OpenSSH
-postfix-cn		postgrey	/usr/sbin/postgrey			Postfix greylisting
 postfix-cn		root		/usr/lib/postfix/master			Postfix
 postfix-cn		root		/usr/sbin/saslauthd			SASL authentication
 postgresql-cn		postgres	/usr/lib/postgresql/bin/postmaster	PostgreSQL