X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=carnet-upgrade.git;a=blobdiff_plain;f=src%2Fdata.sh;h=983ff86831eb8ae495e079ce1acc2c2aa0368d9c;hp=4b609581ce3d36d814ec7de0b85138ff82e3e387;hb=a6d312227bbc2de9212a0e07a3d7811be0ae38f4;hpb=04fd8d64cb4c80e4b8f8f96beb7d1cc29c96707f

diff --git a/src/data.sh b/src/data.sh
index 4b60958..983ff86 100644
--- a/src/data.sh
+++ b/src/data.sh
@@ -6,8 +6,8 @@ backup_ext=cn6-upgrade
 needed_versions='
 amavis-stats-cn	0.1.12-3lenny1
 amavisd-cn	3:2.6.1-1
-aosi-aai	2.2.0
-aosi-www-aai	1:1.5.10
+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
@@ -15,7 +15,7 @@ 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	1.1.7-2
+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
@@ -23,7 +23,7 @@ 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.3.30-2
+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
@@ -80,10 +80,13 @@ xinetd-cn xinetd
 # We want to remove these packages, used in remove_bloat()
 # nice name		packages to remove
 bloats='
+apache		apache apache-cn
 gobjc gpc gcj gij chill g77		gcc-2.95-cn gcc-cn gcc-misc-cn gobjc gpc gcj gij chill g77
 nessus		libnessus2 nessus-cn
+ntop		ntop ntop-cn
 prelude piwi	piwi piwi-cn libprelude0 prelude-sensors-cn prelude-manager-cn prelude-manager
 snort		snort snort-cn snort-central-cn
+squid		squid squid-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
 '
@@ -104,7 +107,6 @@ mysql-cn mysql-client mysql-server mysql-common
 oidentd-cn oidentd
 samba-cn samba smbclient
 spamassassin-cn spamassassin spamc razor dcc-client
-squid-cn squid
 squirrelmail-cn squirrelmail squirrelmail-locales
 vsftpd-cn vsftpd
 webalizer-cn webalizer
@@ -133,7 +135,6 @@ services_to_check='
 amavisd-cn		amavis		amavisd [(]master[)]			Amavis
 aosi-aai		aosi		/usr/sbin/aosi				AOSI
 apache2-cn		www-data	/usr/sbin/apache2			Apache2
-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
@@ -143,7 +144,6 @@ mailman-cn		list		/usr/lib/mailman/bin/mailmanctl		Mailman
 monit-cn		root		/usr/sbin/monit				Monit
 munin-cn		root		/usr/sbin/munin-node			Munin
 mysql-cn		mysql		/usr/sbin/mysqld			MySQL
-ntop-cn			ntop		/usr/sbin/ntop				Ntop
 ntp-cn			ntp		/usr/sbin/ntpd				NTP
 oidentd-cn		oident		/usr/sbin/oidentd			oidentd
 openldap-aai		openldap	/usr/sbin/slapd				OpenLDAP
@@ -153,8 +153,6 @@ postfix-cn		root		/usr/lib/postfix/master			Postfix
 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
-squid-cn		root		/usr/sbin/squid				Squid
 vsftpd-cn		root		/usr/sbin/vsftpd			VSFTPD
 xinetd-cn		root		/usr/sbin/xinetd			xinetd
 '