X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Fdata.sh;h=6db2bf0ba7dc5c51f04dbb1e23bb3a4aaf66c5c6;hb=e964d270202710e62bc22ada8cb664aba7082fac;hp=6dde08dde0f2dc908bfdb987b4bbe16077ee6909;hpb=ddd2cffebce9e4cbf7b11472da6fbe108cebfa3a;p=carnet-upgrade.git

diff --git a/src/data.sh b/src/data.sh
index 6dde08d..6db2bf0 100644
--- a/src/data.sh
+++ b/src/data.sh
@@ -1,42 +1,38 @@
 # Backup extension
-backup_ext=cn7-upgrade
+backup_ext=cn10-upgrade
 
 # carnet-upgrade aborts if these packages are not up to date
 # name		wanted version
 needed_versions='
-amavisd-cn	3:2.6.5
-aosi-aai	3.1.5
-aosi-www-aai	1:1.8.3
-apache2-cn	2.2+3
-bind9-cn	2:9.7.3
-carnet-tools-cn	3.0.3
-clamav-cn	3:0.97.8-1
-debian-archive-keyring	2010.08.28+squeeze1
-dovecot-cn	1:1.2.15.3
-fail2ban-cn	0.8.5
-freeradius-aai	2.1.10-2
-iptables-cn	2:1.4.8
-kernel-2.6-cn	3:2.6.32.1
-mailman-cn	2:2.1.13-1
-monit-cn	1:5.1.3
-munin-cn	1.4.5
-mysql-cn	2:5.1.49.2
-ntp-cn	2:4.2.6.p2.2
-openldap-aai	2.4.23-2
-openssh-cn	2:5.5p1.3
-php-suhosin-cn	0.9.32.2
-php5-cn	5.3.3+3
-postfix-cn	2.7.1.5
-samba-cn	3.5.6-1
-spamassassin-cn	2:3.3.3
-squirrelmail-change-pass-cn	3.1.2
-squirrelmail-cn	2:1.4.21+2
-vsftpd-cn	2.3.2.2
-webalizer-cn	2.01.10+2
+amavisd-cn	3:2.10.1~cn2
+aosi-aai	3.9.3
+aosi-www-aai	1:2.9.1
+apache2-cn	2.4.25~cn1
+bind9-cn	2:9.10.3~cn0
+carnet-tools-cn	3.2.2
+clamav-cn	4:0.99.4~cn0
+debian-archive-keyring	
+dovecot-cn	1:2.2.27~cn1
+fail2ban-cn	0.9.6~cn0
+freeradius-aai	3.0.12~srce4
+iptables-cn	2:1.6.0~cn0
+kernel-cn	3:4.9.0~cn0
+mailman-cn	2:2.1.23~cn0
+monit-cn	1:5.20.0~cn0
+munin-cn	2.0.33.1
+mysql-cn	2:5.5.9999
+ntp-cn		2:4.2.8.p10
+openldap-aai	2.4.44~srce8
+openssh-cn	2:6.7p1.5
+php7.0-cn	7.0.33~cn0
+postfix-cn	3.1.8~cn2
+spamassassin-cn	2:3.4.1~cn1
+vsftpd-cn	3.0.3
+webalizer-cn	1:2.23.08~cn1
 '
 
 # URL to use for checking the latest version of carnet-upgrade itself
-packages_uri='http://ftp.carnet.hr/carnet-debian/dists/carnet-wheezy/main/binary-i386/Packages'
+packages_uri='http://ftp.carnet.hr/carnet-debian/dists/carnet-buster/main/binary-i386/Packages'
 
 # Packages to forcibly install before installing the rest with dist-upgrade,
 # because dist-upgrade would rather remove or keep them back them.
@@ -55,18 +51,16 @@ clamav-cn clamav-daemon
 dovecot-cn
 freeradius-aai freeradius
 isc-dhcp-client
-kernel-2.6-cn
+kernel-cn
 monit-cn
 munin-cn
-mysql-cn mysql-client mysql-server
+mariadb-cn mariadb-client mariadb-server
 ntp-cn
 openldap-aai
 openssh-cn openssh-server openssh-client ssh
 ossec-hids-cn
-pine-cn
 postfix-cn
 spamassassin-cn	spamassassin razor
-squirrelmail-cn squirrelmail
 vsftpd-cn
 webalizer-cn
 xinetd-cn xinetd	
@@ -88,13 +82,14 @@ usbmgr		usbmgr
 # CN services to offer for removal
 cn_bloats='
 aide-cn aide-central-cn aide
+alpine-cn alpine alpine-pico
 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
-jre-cn sun-java5-jre sun-java5-bin sun-java5-fonts
+jre-cn sun-java6-jre sun-java6-bin sun-java6-fonts
 mailman-cn mailman
 mrtg-cn mrtg
 munin-cn munin munin-node
@@ -140,13 +135,13 @@ freeradius-aai		freerad		/usr/sbin/freeradius			FreeRADIUS
 mailman-cn		list		/usr/lib/mailman/bin/mailmanctl		Mailman
 monit-cn		root		/usr/bin/monit				Monit
 munin-cn		root		munin-node				Munin
-mysql-cn		mysql		/usr/sbin/mysqld			MySQL
+mariadb-cn		mysql		/usr/sbin/mysqld			MariaDB
 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/lib/postfix/sbin/master		Postfix
 postfix-cn		root		/usr/sbin/saslauthd			SASL authentication
 samba-cn		root		/usr/sbin/smbd				Samba
 vsftpd-cn		root		/usr/sbin/vsftpd			VSFTPD