X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Fdata.sh;h=50aa6d60cbe7269e757b6cfc20519869630e3fe2;hb=f9446de5d22d74498c32ba1cb364ea20316edb0c;hp=ab5a6ad81259ee1da11b13f60b123fc825663f2d;hpb=ee97dd6a97fcb7ebf5f48f28fabcd18af9fcc408;p=carnet-upgrade.git

diff --git a/src/data.sh b/src/data.sh
index ab5a6ad..50aa6d6 100644
--- a/src/data.sh
+++ b/src/data.sh
@@ -30,10 +30,13 @@ 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 or keep them back them.
 packages_first='
-libkrb5-17-heimdal postgresql-client unixodbc iptables oidentd
+libkrb5-17-heimdal postgresql-client unixodbc iptables oidentd libpam-modules procps base-passwd
 '
 
 # Packages that provide crucial services, upgrade them before the rest
@@ -59,7 +62,7 @@ php4-odbc
 php4-xslt
 pine-cn
 postfix-cn
-spamassassin-cn	spamassassin razor dcc-client
+spamassassin-cn	spamassassin razor
 squirrelmail-cn squirrelmail
 vsftpd-cn
 webalizer-cn
@@ -74,6 +77,29 @@ nessus		libnessus2 nessus-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 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
+'
+# CN services to offer for removal
+cn_bloats='
+aide-cn aide-central-cn aide
+amavisd-cn amavisd-new
+amavis-stats-cn amavis-stats
+bind9-cn bind9
+clamav-cn clamav-daemon clamav-freshclam clamav clamav-base
+dovecot-cn dovecot dovecot-imapd dovecot-pop3d dovecot-common
+kernel-source-cn
+mailman-cn mailman
+mrtg-cn mrtg
+munin-cn munin munin-node
+mysql-cn mysql-client mysql-server mysql-common
+oidentd-cn oidentd
+samba-cn samba smbclient
+spamassassin-cn spamassassin spamc razor dcc-client
+squid-cn squid
+squirrelmail-cn squirrelmail squirrelmail-locales
+vsftpd-cn vsftpd
+webalizer-cn webalizer
+xinetd-cn xinetd
 '
 
 # Check if these services are running after upgrade
@@ -86,7 +112,6 @@ 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
@@ -104,7 +129,6 @@ postfix-cn		root		/usr/sbin/saslauthd			SASL authentication
 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