X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Fdata.sh;h=eeb02183283bd8d3d26378009e5ad5a5343bd05d;hb=HEAD;hp=5c9346b4f730621d5827b39f4ecc31deb91ed47e;hpb=c2d2a483ea84eaca3b145af1dc778c6177110d27;p=carnet-upgrade.git

diff --git a/src/data.sh b/src/data.sh
index 5c9346b..1dbd388 100644
--- a/src/data.sh
+++ b/src/data.sh
@@ -1,113 +1,162 @@
-# Minimum free space on /var after the download, in MB
-min_var_space=50
-
 # Backup extension
-backup_ext=cn4-upgrade
+backup_ext=cn11-upgrade
 
 # carnet-upgrade aborts if these packages are not up to date
 # name		wanted version
 needed_versions='
-amavisd-cn	2:20030616p10-12
-aosi-aai	1.6.5
-aosi-www-aai	1.5.9
-apache2-cn	2.0-1
-bind9-cn	2:9.2.4-1
-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.2-2
-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-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-7
-vsftpd-cn	2.0.3-1
-webalizer-cn	2.01.10-1
-xinetd-cn	2:2.3.13-1
+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-bullseye/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.
 packages_first='
-libkrb5-17-heimdal postgresql-client unixodbc iptables
+postgresql-client unixodbc iptables oidentd libpam-modules procps base-passwd ifupdown
 '
 
 # Packages that provide crucial services, upgrade them before the rest
 packages_second='
-amavisd-cn
-amavis-stats-cn
+amavisd-new
 aosi-aai
 aosi-www-aai
-bind9-cn bind9
-clamav-cn clamav-daemon
-dovecot-cn
+bind9
+clamav-daemon
+dovecot-core
 freeradius-aai freeradius
-kernel-2.6-cn
-libkrb5-17-heimdal
-monit-cn
-munin-cn
-mysql-cn
-ntp-cn
-oidentd
+isc-dhcp-client
+monit
+munin
+mariadb-client mariadb-server
+ntp
 openldap-aai
-openssh-cn openssh-server openssh-client ssh
-ossec-hids-cn
-php4-odbc
-php4-xslt
-postfix-cn
-spamassassin-cn	spamassassin razor dcc-client
-squirrelmail-cn squirrelmail
-vsftpd-cn
-webalizer-cn
-xinetd-cn xinetd	
+openssh-server openssh-client ssh
+postfix
+spamassassin
+vsftpd
+webalizer
+xinetd	
 '
 
 # We want to remove these packages, used in remove_bloat()
 # nice name		packages to remove
-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-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 tcpdump-cn unace-cn vim-cn wget-cn wv-cn ytalk-cn zsh-cn
+# Dodani su svi CN paketi osim bacula-cn i carnet-tools-cn (2023-07-06)
+#bloats='
+#apache		apache apache-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
+#ntop		ntop ntop-cn
+#prelude piwi	piwi piwi-cn libprelude0 prelude-sensors-cn prelude-manager-cn prelude-manager
+#snort		snort snort-cn snort-central-cn
+#squid		squid squid-cn
+#stari CN paketi	aide-cn alpine-cn amavisd-cn apache2-cn apt-cn bind9-cn clamav-cn dovecot-cn fail2ban-cn iptables-cn kernel-source-cn mailman-cn munin-cn mysql-cn ntp-cn ocsinventory-agent-cn oidentd-cn openssh-cn php7.3-cn postfix-cn roundcube-cn samba-cn spamassassin-cn sysadmin-cn vsftpd-cn xinetd-cn 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 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
+#'
+
+bloats='apache apache-cn gcc-2.95-cn 
+gcc-cn gcc-misc-cn nessus-cn 
+ntop-cn piwi-cn prelude-sensors-cn 
+prelude-manager-cn snort-cn snort-central-cn 
+squid-cn aide-cn alpine-cn amavisd-cn apache2-cn apt-cn bind9-cn 
+clamav-cn dovecot-cn fail2ban-cn iptables-cn kernel-source-cn mailman-cn 
+munin-cn mysql-cn ntp-cn ocsinventory-agent-cn oidentd-cn openssh-cn
+php7.3-cn postfix-cn roundcube-cn samba-cn spamassassin-cn sysadmin-cn 
+vsftpd-cn xinetd-cn 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 less-cn lftp-cn logcheck-cn 
+logrotate-cn lsof-cn ltrace-cn lynx-cn make-cn monit-cn mutt-cn netcat-cn nmap-cn 
+ntop-cn openssl-cn php-apc-cn perl-cn procmail-cn proftpd-cn python-cn razor-cn screen-cn slrn-cn 
+strace-cn stunnel-cn sudo-cn sys-mon-cn tcpdump-cn telnet-ssl-cn 
+unace-cn vim-cn vsftpd-cn wget-cn wv-cn ytalk-cn zsh-cn'
+
+# 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-java6-jre sun-java6-bin sun-java6-fonts
+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
+squirrelmail-cn squirrelmail squirrelmail-locales
+vsftpd-cn vsftpd
+webalizer-cn webalizer
+xinetd-cn xinetd
+'
+
+# simulate deborphan
+orphaned_packages='
+libsensors4
+diff
+libcompress-zlib-perl
+dhcp3-client
+dhcp3-common
+mktemp
+libxapian22
+libdb4.6
+'
+
+# new packages to be installed
+###ocsinventory-agent-cn
+new_packages='
+mlocate
 '
 
 # 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
+amavisd-new		amavis		/usr/sbin/amavisd-new [(]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
+apache2			www-data	/usr/sbin/apache2			Apache2
+bind9			bind		/usr/sbin/named				Bind
+clamav-freshclam	clamav		/usr/bin/freshclam			ClamAV update
+clamav-daemon		clamav		/usr/sbin/clamd				ClamAV
+dovecot-core		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
-ntop-cn			ntop		/usr/sbin/ntop				Ntop
-ntp-cn			ntp		/usr/sbin/ntpd				NTP
-oidentd-cn		oident		/usr/sbin/oidentd			oidentd
+mailman			list		/usr/lib/mailman/bin/mailmanctl		Mailman
+monit			root		/usr/bin/monit				Monit
+munin			root		munin-node				Munin
+mariadb-server-core-10.5	mysql		/usr/sbin/mysqld			MariaDB
+ntp			ntp		/usr/sbin/ntpd				NTP
+oidentd			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		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
+openssh-server		root		/usr/sbin/sshd				OpenSSH
+postfix			root		/usr/lib/postfix/sbin/master		Postfix
+sasl2-bin		root		/usr/sbin/saslauthd			SASL authentication
+vsftpd			root		/usr/sbin/vsftpd			VSFTPD
+xinetd			root		/usr/sbin/xinetd			xinetd
 '