Update package info for lenny.

diff --git a/src/data.sh b/src/data.sh
index 1b278d9..4ee73e8 100644 (file)
--- a/src/data.sh
+++ b/src/data.sh
@@ -4,34 +4,40 @@ backup_ext=cn5-upgrade
 # carnet-upgrade aborts if these packages are not up to date
 # name         wanted version
 needed_versions='
-amavisd-cn     2:20030616p10-12
-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.92.1-1
-dovecot-cn     0.99.14-0
-freeradius-aai 1.1.7-0
+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.2.4-3
+clamav-cn      3:0.94-5
+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  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-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-7
-vsftpd-cn      2.0.3-1
-webalizer-cn   2.01.10-1
-xinetd-cn      2:2.3.13-1
+kernel-2.6-cn  2.6.26.3-1
+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-4
+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
 '
 
 # URL to use for checking the latest version of carnet-upgrade itself
-packages_uri='ftp://ftp.carnet.hr/carnet-debian/dists/carnet-sarge/main/binary-all/Packages'
+packages_uri='http://ftp.carnet.hr/carnet-debian/dists/carnet-etch/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.
@@ -76,7 +82,7 @@ gobjc gpc gcj gij chill g77           gcc-2.95-cn gcc-cn gcc-misc-cn gobjc gpc gcj gij ch
 nessus         libnessus2 nessus-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 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
+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 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
 usbmgr         usbmgr
 '
 # CN services to offer for removal
@@ -88,6 +94,7 @@ bind9-cn bind9
 clamav-cn clamav-daemon clamav-freshclam clamav clamav-base
 dovecot-cn dovecot dovecot-imapd dovecot-pop3d dovecot-common
 kernel-source-cn
+jre-cn sun-java5-jre sun-java5-bin sun-java5-fonts
 mailman-cn mailman
 mrtg-cn mrtg
 munin-cn munin munin-node