X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Fdata.sh;h=0fa7bb98ae74a10d98a13b8ca310e0cdcbdb39b5;hb=16f9193416f7db90cf3e5678f09008e698e2fe59;hp=e4723204bc646e2cfb773b2f86727d30750d8cdb;hpb=ee79cec573d44cfe51ce58a163c181b7048efc06;p=carnet-upgrade.git

diff --git a/src/data.sh b/src/data.sh
index e472320..0fa7bb9 100644
--- a/src/data.sh
+++ b/src/data.sh
@@ -7,30 +7,33 @@ backup_ext=cn4-upgrade
 # carnet-upgrade aborts if these packages are not up to date
 # name		wanted version
 needed_versions='
-amavisd-cn	20030616p10-12
-apache-cn	1.3.33-5
-bind9-cn	9.2.4-1
-clamav-cn	0.91.2-1
+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
+bind9-cn	2:9.2.4-1
+clamav-cn	2:0.91.2-2
 dovecot-cn	0.99.14-0
-iptables-cn	1.2.11-6
-kernel-2.6-cn	2.6.22.9-1
-mysql-cn	4.0.24-10.5
-ntp-cn	4.2.0a+stable-2sarge1.1
-openssh-cn	3.8p1-8
-php4-cn	4.3.11-6
-postfix-cn	2.1.5-11
-procmail-cn	3.22-2
-razor-cn	2.361-0
-samba-cn	3.0.10-1
-spamassassin-cn	3.1.7-3
-squirrelmail-cn	1.4.4-5
-vsftpd-cn	2.0.3-1
-xinetd-cn	2.3.13-1
-aosi-aai	1.6.3
-aosi-www-aai	1.5.7sarge0
 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
+mysql-cn	2:4.0.24-10.5
+ntp-cn	2:4.2.0a+stable-2sarge1.1
 openldap-aai	2.2.23-13
-mysql-common	4.0.24-10sarge3
+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
+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
+vsftpd-cn	2.0.3-1
+webalizer-cn	2.01.10-1
+xinetd-cn	2:2.3.13-1
 '
 
 # Packages to forcibly install before installing the rest with dist-upgrade,
@@ -40,33 +43,32 @@ packages_first='
 
 # Packages that provide crucial services, upgrade them before the rest
 packages_second='
+amavis-stats-cn
 amavisd-cn
-php5-cn
-squirrelmail-cn
-mysql-cn
+aosi-aai
+aosi-www-aai
 bind9-cn bind9
-openssh-cn openssh-server		
 clamav-cn clamav-daemon
-spamassassin-cn	spamassassin razor dcc-client
-postfix-cn
 dovecot-cn
-squirrelmail-cn
-openldap-aai
 freeradius-aai freeradius
-aosi-aai
-aosi-www-aai
-ntp-cn
-vsftpd-cn vsftpd
-xinetd-cn xinetd	
+libkrb5-17-heimdal
 monit-cn
 munin-cn
-ossec-hids-cn
-amavis-stats-cn
-webalizer-cn
+mysql-cn
+ntp-cn
 oidentd
+openldap-aai
+openssh-cn openssh-server		
+ossec-hids-cn
 php4-odbc
 php4-xslt
-libkrb5-17-heimdal
+php5-cn
+postfix-cn
+spamassassin-cn	spamassassin razor dcc-client
+squirrelmail-cn squirrelmail
+vsftpd-cn vsftpd
+webalizer-cn
+xinetd-cn xinetd	
 '
 
 # We want to remove these packages, used in remove_bloat()
@@ -82,6 +84,7 @@ GDB		gdb-cn gdb
 Gettext		gettext-cn gettext
 Make-cn		make-cn 
 Nessus		nessus-cn nessus nessusd
+Piwi		piwi-cn piwi
 '
 # php4-gd -> libgd1 -> xlibs -> xfree86-common -> suxx
 #X Window System		xfree86-common