X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Fdata.sh;h=b36b2fdbee38374a7af47df64fdec9e142c6797f;hb=c6c3f07205a4eed5df6cf6d9d30ab27120f3e490;hp=1622fe846f5bf73fd22d0475d995a2af3dc9faeb;hpb=2e767d4b5b56762a785df22c2cc0de7d63aa3cff;p=carnet-upgrade.git

diff --git a/src/data.sh b/src/data.sh
index 1622fe8..b36b2fd 100644
--- a/src/data.sh
+++ b/src/data.sh
@@ -8,15 +8,17 @@ backup_ext=cn4-upgrade
 # name		wanted version
 needed_versions='
 amavisd-cn	2:20030616p10-12
-aosi-aai	1.6.3
-aosi-www-aai	1.5.7sarge0
+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
 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
@@ -26,9 +28,11 @@ 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-5
+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
 '
 
@@ -61,8 +65,7 @@ php4-xslt
 php5-cn
 postfix-cn
 spamassassin-cn	spamassassin razor dcc-client
-squirrelmail-cn
-squirrelmail-cn
+squirrelmail-cn squirrelmail
 vsftpd-cn vsftpd
 webalizer-cn
 xinetd-cn xinetd	
@@ -71,17 +74,74 @@ xinetd-cn xinetd
 # We want to remove these packages, used in remove_bloat()
 # nice name		packages to remove
 bloats='
-Autoconf	autoconf-cn autoconf
-Automake	automake-cn automake autotools-dev
-Bison		bison-cn bison
-CVS		cvs-cn cvs
-Expect		expect-cn expect
-GCC		gcc-2.95-cn gcc-2.95 g++-2.95 gcc-2.95-doc gcc-cn gcc g++ gcc-doc gcc-misc-cn gobjc gpc gcj gij chill g77
-GDB		gdb-cn gdb
-Gettext		gettext-cn gettext
-Make-cn		make-cn 
-Nessus		nessus-cn nessus nessusd
+aide		aide aide-cn
+amavis-stats	amavis-stats amavis-stats-cn
+apt-cn		apt-cn
+autoconf	autoconf autoconf-cn
+automake	automake automake-cn
+bison		bison bison-cn
+bitchx		bitchx bitchx-cn
+chkrootkit	chkrootkit chkrootkit-cn
+cvs		cvs cvs-cn
+diff-cn		diff-cn
+elinks		elinks elinks-cn
+expect		expect expect-cn
+file-cn		file-cn
+flex		flex flex-cn
+gawk		gawk gawk-cn
+gcc		gcc-2.95-cn gcc-2.95 g++-2.95 gcc-2.95-doc gcc-cn gcc g++ gcc-doc gcc-misc-cn gobjc gpc gcj gij chill g77
+gdb		gdb gdb-cn
+gettext		gettext gettext-cn
+gnupg		gnupg gnupg-cn
+grep-cn		grep-cn
+iptraf		iptraf iptraf-cn
+jed		jed jed-cn
+joe		joe joe-cn
+jre		sun-j2re1.4 sun-j2re1.4debian jre-cn
+less		less less-cn
+lftp		lftp lftp-cn
+logcheck	logcheck logcheck-cn
+logrotate-cn	logrotate-cn
+lsof		lsof lsof-cn
+ltrace		ltrace ltrace-cn
+lynx-cn		lynx-cn
+make-cn		make-cn 
+mutt-cn		mutt-cn
+nessus		libnessus2 nessus-cn
+netcat		netcat netcat-cn
+nmap		nmap nmap-cn
+ntop		ntop ntop-cn
+oidentd		oidentd oidentd-cn
+openssh-cn	openssh-cn
+openssl-cn	openssl-cn
+perl-cn		perl-cn
+phpbb2		phpbb2 phpbb2-cn
+php4-suhosin	php4-suhosin php-suhosin-cn
+postgresql	postgresql postgresql-cn
+prelude piwi	piwi piwi-cn libprelude0 prelude-sensors-cn prelude-manager-cn
+procmail	procmail procmail-cn
+proftpd		proftpd proftpd-cn
+python-cn	python-cn
+razor		razor razor-cn
+samba		samba-common samba-cn
+screen		screen screen-cn
+slrn		slrn slrn-cn
+snort		snort snort-cn snort-central-cn
+spamassassin-cn	spamassassin-cn
+squid		squid squid-cn
+strace		strace strace-cn
+stunnel		stunnel stunnel-cn
+sudo		sudo sudo-cn
+sysadmin-cn	sysadmin-cn
+tcpdump		tcpdump tcpdump-cn
+unace		unace unace-cn
+vim		vim vim-cn
+wget		wget wget-cn
+wv		wv wv-cn
+ytalk		ytalk ytalk-cn
+zsh		zsh zsh-cn
 '
+
 # php4-gd -> libgd1 -> xlibs -> xfree86-common -> suxx
 #X Window System		xfree86-common