Fix suhosin upgrade problems.

[carnet-upgrade.git] / src / data.sh

diff --git a/src/data.sh b/src/data.sh
index 8846b26..d4ccb20 100644 (file)
--- 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,8 +37,9 @@ 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
@@ -59,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       
 '
@@ -92,11 +92,12 @@ 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             root            /usr/sbin/dccifd                        DCC client
+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
 ntop-cn                        ntop            /usr/sbin/ntop                          Ntop
 ntp-cn                 ntp             /usr/sbin/ntpd                          NTP
@@ -106,12 +107,11 @@ 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/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               proxy           /usr/sbin/squid                         Squid
+squid-cn               root            /usr/sbin/squid                         Squid
 vsftpd-cn              root            /usr/sbin/vsftpd                        VSFTPD
 xinetd-cn              root            /usr/sbin/xinetd                        xinetd
 '