From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 24 Nov 2012 14:00:55 +0000 (+0100)
Subject: strongswan: Remove old files from system.
X-Git-Tag: v2.13-beta1~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0338cdb0f82a5385924bdee7983556f1b8773f42;p=ipfire-2.x.git

strongswan: Remove old files from system.
---

diff --git a/config/rootfiles/core/65/update.sh b/config/rootfiles/core/65/update.sh
index 40d79a855e..45fc68f72e 100644
--- a/config/rootfiles/core/65/update.sh
+++ b/config/rootfiles/core/65/update.sh
@@ -85,6 +85,8 @@ add_to_backup etc/profile.d
 add_to_backup usr/share/terminfo
 add_to_backup etc/sysconfig/lm_sensors
 add_to_backup etc/sysconfig/rc.local
+add_to_backup usr/local/bin/vpn-watch
+add_to_backup usr/libexec/ipsec
 
 # Backup the files
 tar cJvf /var/ipfire/backup/core-upgrade_$KVER.tar.xz \
@@ -147,10 +149,17 @@ rm -rf /usr/lib/snort_*
 rm -rf /usr/share/zoneinfo
 rm -rf /lib/libncurses*
 
+# Remove old pluto binaries.
+rm -f /usr/libexec/ipsec/{pluto,_pluto_adns,whack}
+rm -f /usr/local/bin/vpn-watch
+
 #
 #Extract files
 tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
 
+# Regenerate ipsec configuration files.
+/srv/web/ipfire/cgi-bin/vpnmain.cgi
+
 #
 # Start services
 #
@@ -172,9 +181,6 @@ fi
 # Remove preloading libsafe.
 rm -f /etc/ld.so.preload
 
-# Regenerate ipsec configuration files.
-/srv/web/ipfire/cgi-bin/vpnmain.cgi
-
 #
 # Modify grub.conf
 #