Update squidclamav to latest stable. Config layout has changed.

The old config will not be restored by the update process, you have
to check you old config (still backuped) and change the config to
you needs.

diff --git a/config/rootfiles/packages/squidclamav b/config/rootfiles/packages/squidclamav
index 7dff2a6e482bd6b1cb755186eb447ce196ac3bf8..0ebab0a38459fee718842f2753c6d4cbfab66d7a 100644 (file)
--- a/config/rootfiles/packages/squidclamav
+++ b/config/rootfiles/packages/squidclamav
@@ -1,4 +1,13 @@
-usr/bin/squidclamav
 etc/squidclamav.conf
-srv/web/ipfire/html/clwarn.cgi
+usr/bin/squidclamav
+#usr/libexec/squidclamav
+#usr/libexec/squidclamav/clwarn.cgi
+#usr/libexec/squidclamav/clwarn.cgi.de_DE
+#usr/libexec/squidclamav/clwarn.cgi.en_EN
+#usr/libexec/squidclamav/clwarn.cgi.fr_FR
+#usr/libexec/squidclamav/clwarn.cgi.pt_BR
+#usr/share/man/man1/squidclamav.1
+#usr/share/squidclamav
+#usr/share/squidclamav/README
 var/ipfire/backup/addons/includes/squidclamav
+srv/web/ipfire/html/clwarn.cgi
\ No newline at end of file

diff --git a/config/squidclamav/squidclamav.conf b/config/squidclamav/squidclamav.conf
index 62b85b57b0fee070f14851e086f11f070f324877..de8e13f1d01409e6dc3998292f1223be4b5dc7fa 100644 (file)
--- a/config/squidclamav/squidclamav.conf
+++ b/config/squidclamav/squidclamav.conf
@@ -1,31 +1,40 @@
+#squid_ip 127.0.0.1
+#squid_port 3128
 proxy none
+#
 logfile /var/log/squidclamav.log
 redirect http://127.0.0.1:81/clwarn.cgi
+#
 debug 0
-force 1
 stat 0
+#
 clamd_local /var/run/clamav/clamd
-timeout 30
-abort ^.*\.pdf$
-abort ^.*\.js$
-abort ^.*\.html$
-abort ^.*\.css$
-abort ^.*\.xml$
-abort ^.*\.xsl$
-abort ^.*\.js$
-abort ^.*\.html$
-abort ^.*\.css$
-abort ^.*\.xml$
-abort ^.*\.xsl$
-abort ^.*\.js$
-abort ^.*\.jsp$
-abort ^.*\.jsp\?.*$
-aborti ^.*servlet.*$
-abort ^.*\.ico$
-aborti ^.*\.gif$
-aborti ^.*\.png$
-aborti ^.*\.jpg$
-aborti ^.*\.swf$
-abortcontenti ^.*application\/x-mms-framed.*$
-abortcontenti ^.*application\/x-javascript.*$
-content ^.*application\/.*$
+#clamd_ip 192.168.1.5
+#clamd_port 3310
+#
+maxsize 5000000
+maxredir 30
+timeout 60
+#trust_cache 1
+#
+# Do not scan standard HTTP images
+abort ^.*\.(ico|gif|png|jpg)$
+abortcontent ^image\/.*$
+#
+# Do not scan text and javascript files
+abort ^.*\.(css|xml|xsl|js|html|jsp)$
+abortcontent ^text\/.*$
+abortcontent ^application\/x-javascript$
+#
+# Do not scan streaming videos
+abortcontent ^video\/mp4$
+abortcontent ^video\/x-flv$
+#
+# Do not scan pdf and flash
+#abort ^.*\.(pdf|swf)$
+#
+# Do not scan sequence of framed Microsoft Media Server (MMS) data packets
+abortcontent ^.*application\/x-mms-framed.*$
+#
+# White list some sites
+whitelist .*\.clamav.net
\ No newline at end of file

diff --git a/lfs/squidclamav b/lfs/squidclamav
index 80e99f85bdbbe5643e5307b85a9e20f0b0e7445c..110a43b28c7da81586643754845abf13d6825388 100644 (file)
--- a/lfs/squidclamav
+++ b/lfs/squidclamav
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.1
+VER        = 5.0
 
 THISAPP    = squidclamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = squidclamav
-PAK_VER    = 8
+PAK_VER    = 9
 
 DEPS       = "clamav"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5e79064fce4dacc1af34ba21fd4f0880
+$(DL_FILE)_MD5 = fe6456c25294653cb5f19ff7afdb5f90
 
 install : $(TARGET)
 

diff --git a/src/paks/squidclamav/update.sh b/src/paks/squidclamav/update.sh
index 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..3387a89ed106b3141a72e9a9e3f70de4a1235000 100644 (file)
--- a/src/paks/squidclamav/update.sh
+++ b/src/paks/squidclamav/update.sh
@@ -17,10 +17,13 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
+# Copyright (C) 2010 IPFire-Team <info@ipfire.org>.                        #
 #                                                                          #
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ./uninstall.sh
-./install.sh
+extract_files
+# Restoring the backup  has to be excluded because config file changed
+# restore_backup ${NAME}
+/etc/init.d/squid restart