X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Fdata.sh;h=16f5f3f057c4cf163d97519b3284c14a22ccedc4;hb=4ed1f8879ea142ce18774c32b69cad2a365a9b7d;hp=6ee9f415c642b7200682fcf000b2e3b374626e25;hpb=9a96336b6c257ed7794488ffb32d1f889507ec2d;p=carnet-upgrade.git

diff --git a/src/data.sh b/src/data.sh
index 6ee9f41..16f5f3f 100644
--- a/src/data.sh
+++ b/src/data.sh
@@ -28,6 +28,7 @@ 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-6
 vsftpd-cn	2.0.3-1
@@ -42,14 +43,15 @@ packages_first='
 
 # Packages that provide crucial services, upgrade them before the rest
 packages_second='
-amavis-stats-cn
 amavisd-cn
+amavis-stats-cn
 aosi-aai
 aosi-www-aai
 bind9-cn bind9
 clamav-cn clamav-daemon
 dovecot-cn
 freeradius-aai freeradius
+kernel-2.6-cn
 libkrb5-17-heimdal
 monit-cn
 munin-cn
@@ -73,19 +75,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