X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fsquidclamav;h=b4f79ab96843c07def908073affa241c8f24e8c1;hb=10d0489df2eb32f9c8fd8d6fb0db00e99bfaab02;hp=3ef0ff942b89eaf6a7f40eed6a10984ffe512a3c;hpb=3900a6c7b6a871d5e2c9d4fa3d3c49d760b984f2;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/squidclamav b/lfs/squidclamav
index 3ef0ff942b..b4f79ab968 100644
--- a/lfs/squidclamav
+++ b/lfs/squidclamav
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.5
+VER        = 5.11
 
 THISAPP    = squidclamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = squidclamav
-PAK_VER    = 1
+PAK_VER    = 21
 
-DEPS       = "clamav"
+DEPS       = clamav
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 955060d2cf87d5fb9ab05f6c8cf83f56
+$(DL_FILE)_MD5 = 87aef2eb48a41fa1e466c0174f2bac40
 
 install : $(TARGET)
 
@@ -77,8 +77,15 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	$(UPDATE_AUTOMAKE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squidclamav-5.11-dont_use_ipv6.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squidclamav-5.11-squid-helper-protocol.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squidclamav-5.11-source-address-parsing-issue.patch
 	cd $(DIR_APP) && ./configure --prefix=/usr
 	cd $(DIR_APP) && make install
-	cp -f  $(DIR_CONF)/squidclamav/squidclamav.conf /etc/squidclamav.conf
+	install -v -m 664 $(DIR_CONF)/squidclamav/squidclamav.conf /etc/squidclamav.conf
+	chown -v root:nobody /etc/squidclamav.conf
+	install -v -m 644 $(DIR_SRC)/config/backup/includes/squidclamav /var/ipfire/backup/addons/includes/squidclamav
+	chmod 755 /srv/web/ipfire/html/clwarn.cgi
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)