X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Fdata.sh;h=02fc72170a45aebfbe95adcea69a52c72511feb1;hb=9b34112f8fb58bbec29f3d4603057b942352b01b;hp=baff1d296ff8141b657f773f7fc9deb0f7c90d23;hpb=5443895d59514663a492563c1c0714dae0a285c1;p=carnet-upgrade.git

diff --git a/src/data.sh b/src/data.sh
index baff1d2..02fc721 100644
--- a/src/data.sh
+++ b/src/data.sh
@@ -1,50 +1,48 @@
 # Backup extension
-backup_ext=cn5-upgrade
+backup_ext=cn6-upgrade
 
 # carnet-upgrade aborts if these packages are not up to date
 # name		wanted version
 needed_versions='
-amavis-stats-cn	0.1.12-2
-amavisd-cn	3:2.4.2-4
-aosi-aai	2.2.0
-aosi-www-aai	1:1.5.10
-apache2-cn	2.2-4
-bind9-cn	2:9.3.4-1
+amavis-stats-cn	0.1.12-3lenny1
+amavisd-cn	3:2.6.1-1
+aosi-aai	3.0.7
+aosi-www-aai	1:1.7.2
+apache2-cn	2.2-5lenny1
+bind9-cn	2:9.5.1-3
 carnet-tools-cn	2.8.3
-clamav-cn	3:0.94-7
-debian-archive-keyring	2009.01.31
-dovecot-cn	1:1.0.15-1
-fail2ban-cn	0.8.3-1
-freeradius-aai	1.1.7-2
-iptables-cn	2:1.2.11-6
-kernel-2.6-cn	3:2.6.24-2
-mailman-cn	2:2.1.9-1
-monit-cn	1:4.8.1-8
-munin-cn	1.2.3-1
-mysql-cn	2:5.0.51-1
-ntp-cn	2:4.2.2.p4-4
-openldap-aai	2.3.30-2
-openssh-cn	2:4.3p2-2
-php-suhosin-cn	0.9.20-3
-php4-cn	4:4.4.4-6
-php5-cn	5.2.0-7
-postfix-cn	2.5.5-2
-proftpd-cn	2:1.3.0-3
-samba-cn	3.0.24-1
-spamassassin-cn	2:3.2.5-6
-squirrelmail-change-pass-cn	2.7a-2
-squirrelmail-cn	2:1.4.15-1
-vsftpd-cn	2.0.5-2
-webalizer-cn	2.01.10-32
+clamav-cn	3:0.95.3-1lenny1
+debian-archive-keyring	2010.08.28~lenny1
+dovecot-cn	1:1.0.15-2lenny2
+fail2ban-cn	0.8.3-2lenny1
+freeradius-aai	2.1.3-4
+iptables-cn	2:1.4.2-1
+kernel-2.6-cn	3:2.6.26.6
+mailman-cn	2:2.1.11-1
+monit-cn	1:4.10.1.4
+munin-cn	1.2.6-1
+mysql-cn	2:5.0.51-2lenny1
+ntp-cn	2:4.2.4p4-1
+openldap-aai	2.4.11-4
+openssh-cn	2:5.1p1-1lenny1
+php-suhosin-cn	0.9.27-1
+php5-cn	5.2.6-1
+postfix-cn	2.5.5-3lenny2
+samba-cn	3.2.5-1
+spamassassin-cn	2:3.2.5-7lenny1
+squirrelmail-change-pass-cn	3.0.2
+squirrelmail-cn	2:1.4.15-2lenny1
+vsftpd-cn	2.0.7-1
+webalizer-cn	2.01.10-32.4lenny1
 '
 
 # URL to use for checking the latest version of carnet-upgrade itself
-packages_uri='http://ftp.carnet.hr/carnet-debian/dists/carnet-etch/main/binary-i386/Packages'
+packages_uri='http://ftp.carnet.hr/carnet-debian/dists/carnet-squeeze/main/binary-i386/Packages'
 
 # 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 libpam-modules procps base-passwd
+libkrb5-17-heimdal postgresql-client unixodbc iptables oidentd libpam-modules procps base-passwd dhcp3-client
 '
 
 # Packages that provide crucial services, upgrade them before the rest
@@ -57,12 +55,13 @@ bind9-cn bind9
 clamav-cn clamav-daemon
 dovecot-cn
 freeradius-aai freeradius
+isc-dhcp-client
 jre-cn
 kernel-2.6-cn
 libkrb5-17-heimdal
 monit-cn
 munin-cn
-mysql-cn
+mysql-cn mysql-client mysql-server
 ntp-cn
 openldap-aai
 openssh-cn openssh-server openssh-client ssh
@@ -114,8 +113,18 @@ xinetd-cn xinetd
 
 # simulate deborphan
 orphaned_packages='
-libsnmp9
 libsensors3
+diff
+libcompress-zlib-perl
+dhcp3-client
+dhcp3-common
+mktemp
+'
+
+# new packages to be installed
+new_packages='
+ocsinventory-agent-cn
+mlocate
 '
 
 # Check if these services are running after upgrade