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

diff --git a/src/data.sh b/src/data.sh
index e90abf7..8ee53be 100644
--- a/src/data.sh
+++ b/src/data.sh
@@ -1,6 +1,3 @@
-# Minimum free space on /var after the download, in MB
-min_var_space=250
-
 # Backup extension
 backup_ext=cn4-upgrade
 
@@ -8,65 +5,66 @@ backup_ext=cn4-upgrade
 # name		wanted version
 needed_versions='
 amavisd-cn	2:20030616p10-12
-aosi-aai	1.6.4
-aosi-www-aai	1.5.8
-apache-cn	2:1.3.33-5
-apache2-cn	2.0-1
+aosi-aai	1.6.5
+aosi-www-aai	1.5.9
+apache2-cn	2.0-3
 bind9-cn	2:9.2.4-1
-clamav-cn	2:0.91.2-2
+clamav-cn	2:0.92.1-1
 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
+kernel-2.6-cn	2.6.24.2-2
+monit-cn	1:4.8.1-6
 mysql-cn	2:4.0.24-10.5
 ntp-cn	2:4.2.0a+stable-2sarge1.1
 openldap-aai	2.2.23-13
 openssh-cn	2:3.8p1-8
-php4-cn	4:4.3.11-7
-postfix-cn	2.1.5-11
-procmail-cn	2:3.22-2
-razor-cn	2:2.361-0
+php4-cn	4:4.3.11-9
+postfix-cn	2.1.5-12
 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
+squirrelmail-cn	2:1.4.4-7
 vsftpd-cn	2.0.3-1
 webalizer-cn	2.01.10-1
 xinetd-cn	2:2.3.13-1
 '
 
+# URL to use for checking the latest version of carnet-upgrade itself
+packages_uri='ftp://ftp.carnet.hr/carnet-debian/dists/carnet-sarge/main/binary-all/Packages'
+
 # 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 iptables oidentd libpam-modules procps base-passwd
 '
 
 # 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
 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
+pine-cn
 postfix-cn
-spamassassin-cn	spamassassin razor dcc-client
+spamassassin-cn	spamassassin razor
 squirrelmail-cn squirrelmail
-vsftpd-cn vsftpd
+vsftpd-cn
 webalizer-cn
 xinetd-cn xinetd	
 '
@@ -76,9 +74,10 @@ xinetd-cn xinetd
 bloats='
 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
+prelude piwi	piwi piwi-cn libprelude0 prelude-sensors-cn prelude-manager-cn prelude-manager
 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
+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 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
 '
 
 # Check if these services are running after upgrade
@@ -86,23 +85,29 @@ stari CN paketi	autoconf-cn automake-cn bison-cn bitchx-cn chkrootkit-cn cvs-cn
 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
 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
-spamassassin-cn		dcc		/usr/sbin/dccifd			DCC client
+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
 '