From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 7 Dec 2010 17:30:53 +0000 (+0100)
Subject: Fix some squid and snort update problems.
X-Git-Tag: v2.9-beta1~19
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=1fdae9667d2bac3695ba79d912a0095d73bee3be

Fix some squid and snort update problems.
---

diff --git a/config/rootfiles/core/44/update.sh b/config/rootfiles/core/44/update.sh
index cfe864b897..4ce7025cd4 100644
--- a/config/rootfiles/core/44/update.sh
+++ b/config/rootfiles/core/44/update.sh
@@ -52,6 +52,9 @@ echo etc/mkinitcpio.d >> /opt/pakfire/tmp/ROOTFILES
 echo lib/initcpio >> /opt/pakfire/tmp/ROOTFILES
 echo sbin/mkinitcpio >> /opt/pakfire/tmp/ROOTFILES
 echo usr/bin/iw >> /opt/pakfire/tmp/ROOTFILES
+echo etc/snort >> /opt/pakfire/tmp/ROOTFILES
+echo usr/lib/snort_* >> /opt/pakfire/tmp/ROOTFILES
+echo usr/lib/squid >> /opt/pakfire/tmp/ROOTFILES
 
 # Backup the files
 tar cjvf /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \
@@ -76,6 +79,19 @@ rm -rf /usr/bin/iw
 # Backup grub.conf
 #
 cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org
+
+#
+# Stop services to save memory
+#
+/etc/init.d/snort stop
+/etc/init.d/squid stop
+#
+#
+# Remove old snort...
+rm -rf /etc/snort
+rm -rf /usr/lib/snort_*
+# Remove old squid...
+rm -rf /usr/lib/squid
 #
 # Unpack the updated files
 #
@@ -85,12 +101,6 @@ echo Unpack the updated files ...
 tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
 	--no-overwrite-dir
 
-#
-# Stop services to save memory
-#
-/etc/init.d/snort stop
-/etc/init.d/squid stop
-
 # Convert /etc/fstab entries to UUID ...
 #
 echo Convert fstab entries to UUID ...