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

diff --git a/src/data.sh b/src/data.sh
index 1622fe8..e90abf7 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,19 +74,12 @@ 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
+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
+prelude piwi	piwi piwi-cn libprelude0 prelude-sensors-cn prelude-manager-cn
+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 postgresql-cn procmail-cn python-cn screen-cn slrn-cn strace-cn stunnel-cn sudo-cn tcpdump-cn unace-cn vim-cn wget-cn wv-cn ytalk-cn zsh-cn
 '
-# php4-gd -> libgd1 -> xlibs -> xfree86-common -> suxx
-#X Window System		xfree86-common
 
 # Check if these services are running after upgrade
 # package-cn		user		proces (pazi, regexp)			nice name