Remove obsolete packages.

diff --git a/src/data.sh b/src/data.sh
index 1b421cf..88b9b0a 100644 (file)
--- a/src/data.sh
+++ b/src/data.sh
@@ -41,7 +41,7 @@ packages_uri='http://ftp.carnet.hr/carnet-debian/dists/carnet-wheezy/main/binary
 # 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 libpam-modules procps base-passwd ifupdown
+postgresql-client unixodbc iptables oidentd libpam-modules procps base-passwd ifupdown
 '
 
 # Packages that provide crucial services, upgrade them before the rest
@@ -55,9 +55,7 @@ clamav-cn clamav-daemon
 dovecot-cn
 freeradius-aai freeradius
 isc-dhcp-client
-jre-cn
 kernel-2.6-cn
-libkrb5-17-heimdal
 monit-cn
 munin-cn
 mysql-cn mysql-client mysql-server
@@ -65,8 +63,6 @@ ntp-cn
 openldap-aai
 openssh-cn openssh-server openssh-client ssh
 ossec-hids-cn
-php4-odbc
-php4-xslt
 pine-cn
 postfix-cn
 spamassassin-cn        spamassassin razor

diff --git a/src/functions.sh b/src/functions.sh
index a0431a4..8df87cc 100644 (file)
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -903,8 +903,9 @@ upgrade_libc () {
 # upgrade apache2/php5
 upgrade_apache2 () {
   pkgrm apache-common # prevents installation of apache2-suexec
+  pkgrm php5-suhosin # not available for wheezy
   pkgupgrade libapache2-mod-php5 php5-cli php5-cn apache2-cn \
-    php5-odbc php5-suhosin php-suhosin-cn
+    php5-odbc
 }
 
 upgrade_amavis () {