From: Christian Schmidt <christian.schmidt@ipfire.org>
Date: Thu, 10 Jun 2010 18:33:30 +0000 (+0200)
Subject: Fixed squidclamav logging - this fixes bug #0000639
X-Git-Tag: v2.9-beta1~241
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=f18be3b0bf3bfcd01510813fff6c055a219df4c7

Fixed squidclamav logging - this fixes bug #0000639
---

diff --git a/config/squidclamav/squidclamav.conf b/config/squidclamav/squidclamav.conf
index de8e13f1d0..19bffa0606 100644
--- a/config/squidclamav/squidclamav.conf
+++ b/config/squidclamav/squidclamav.conf
@@ -2,7 +2,7 @@
 #squid_port 3128
 proxy none
 #
-logfile /var/log/squidclamav.log
+logfile /var/log/squid/squidclamav.log
 redirect http://127.0.0.1:81/clwarn.cgi
 #
 debug 0
diff --git a/lfs/squidclamav b/lfs/squidclamav
index 9c37753baa..e718f5d04e 100644
--- a/lfs/squidclamav
+++ b/lfs/squidclamav
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = squidclamav
-PAK_VER    = 11
+PAK_VER    = 12
 
 DEPS       = "clamav"
 
diff --git a/src/paks/squidclamav/update.sh b/src/paks/squidclamav/update.sh
index 3387a89ed1..9551602149 100644
--- a/src/paks/squidclamav/update.sh
+++ b/src/paks/squidclamav/update.sh
@@ -24,6 +24,15 @@
 . /opt/pakfire/lib/functions.sh
 ./uninstall.sh
 extract_files
-# Restoring the backup  has to be excluded because config file changed
-# restore_backup ${NAME}
+
+VERSION=$(cat /opt/pakfire/db/installed/meta-squidclamav | grep Release | cut -d" " -f2)
+
+if [ "$VERSION" -gt "10" ]; then
+ restore_backup ${NAME}
+fi
+
+if [ "$VERSION" -lt "11" ]; then
+ sed -e "s|logfile.*|logfile /var/log/squid/squidclamav.log|g" /etc/squidclamav.conf
+fi
+
 /etc/init.d/squid restart