This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via f18be3b0bf3bfcd01510813fff6c055a219df4c7 (commit) from 2a0a67412b0ac4cea8a5fa2ef52be0f260b3c6b8 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit f18be3b0bf3bfcd01510813fff6c055a219df4c7 Author: Christian Schmidt christian.schmidt@ipfire.org Date: Thu Jun 10 20:33:30 2010 +0200

Fixed squidclamav logging - this fixes bug #0000639

-----------------------------------------------------------------------

Summary of changes: config/squidclamav/squidclamav.conf | 2 +- lfs/squidclamav | 2 +- src/paks/squidclamav/update.sh | 13 +++++++++++-- 3 files changed, 13 insertions(+), 4 deletions(-)

Difference in files: diff --git a/config/squidclamav/squidclamav.conf b/config/squidclamav/squidclamav.conf index de8e13f..19bffa0 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 9c37753..e718f5d 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 3387a89..9551602 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

hooks/post-receive -- IPFire 2.x development tree