Fixed squidclamav logging - this fixes bug #0000639

diff --git a/config/squidclamav/squidclamav.conf b/config/squidclamav/squidclamav.conf
index de8e13f1d01409e6dc3998292f1223be4b5dc7fa..19bffa0606d338fff91cecdcd106e5a7b8589879 100644 (file)
--- 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 9c37753baab551a31dd45d02b18006f639e5ac9b..e718f5d04ead0676759834bfc522801100eb181c 100644 (file)
--- 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 3387a89ed106b3141a72e9a9e3f70de4a1235000..95516021498f344f18c4a9abe187d50a7f238672 100644 (file)
--- 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