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

diff --git a/src/data.sh b/src/data.sh
index b36b2fd..b771acb 100644
--- a/src/data.sh
+++ b/src/data.sh
@@ -1,5 +1,5 @@
 # Minimum free space on /var after the download, in MB
-min_var_space=250
+min_var_space=50
 
 # Backup extension
 backup_ext=cn4-upgrade
@@ -37,20 +37,22 @@ xinetd-cn	2:2.3.13-1
 '
 
 # Packages to forcibly install before installing the rest with dist-upgrade,
-# because dist-upgrade would rather remove them.
+# because dist-upgrade would rather remove or keep them back them.
 packages_first='
+libkrb5-17-heimdal postgresql-client unixodbc
 '
 
 # 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
@@ -58,15 +60,14 @@ mysql-cn
 ntp-cn
 oidentd
 openldap-aai
-openssh-cn openssh-server		
+openssh-cn openssh-server openssh-client ssh
 ossec-hids-cn
 php4-odbc
 php4-xslt
-php5-cn
 postfix-cn
 spamassassin-cn	spamassassin razor dcc-client
 squirrelmail-cn squirrelmail
-vsftpd-cn vsftpd
+vsftpd-cn
 webalizer-cn
 xinetd-cn xinetd	
 '
@@ -74,99 +75,43 @@ xinetd-cn xinetd
 # We want to remove these packages, used in remove_bloat()
 # nice name		packages to remove
 bloats='
-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
+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
-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
+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
 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
+dcc-client		dcc		/usr/sbin/dccifd			DCC client
 dovecot-cn		root		/usr/sbin/dovecot			Dovecot
 freeradius-aai		freerad		/usr/sbin/freeradius			FreeRADIUS
+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
-ntp-cn			ntp		/usr/sbin/ntpd				ntpd
+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
 openssh-cn		root		/usr/sbin/sshd				OpenSSH
+ossec-hids-cn		ossecm		/var/ossec/bin/ossec			OSSec
 postfix-cn		root		/usr/lib/postfix/master			Postfix
 postfix-cn		root		/usr/sbin/saslauthd			SASL authentication
-postgresql-cn		postgres	/usr/lib/postgresql/bin/postmaster	PostgreSQL
-proftpd-cn		nobody		proftpd: [(]accepting connections[)]	ProFTPD (mozda se pokrece iz (x)inetd-a)
+postgresql		postgres	/usr/lib/postgresql/7.4/bin/postmaster	PostgreSQL
 samba-cn		root		/usr/sbin/smbd				Samba
+snort-cn		snort		/usr/sbin/snort				Snort
 spamassassin-cn		dcc		/usr/sbin/dccifd			DCC client
+squid-cn		root		/usr/sbin/squid				Squid
 vsftpd-cn		root		/usr/sbin/vsftpd			VSFTPD
 xinetd-cn		root		/usr/sbin/xinetd			xinetd
 '