From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 30 Oct 2014 16:49:43 +0000 (+0100)
Subject: squidclamav: Fix an error when parsing the client IP address
X-Git-Tag: v2.17-core87~103^2~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=99154ed19de35327b2fc27cb7e1c08e88d7527e7;p=ipfire-2.x.git

squidclamav: Fix an error when parsing the client IP address
---

diff --git a/lfs/squidclamav b/lfs/squidclamav
index 697b59ab03..4a7918ce09 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    = 19
+PAK_VER    = 20
 
 DEPS       = "clamav"
 
@@ -79,6 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	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
 	install -v -m 664 $(DIR_CONF)/squidclamav/squidclamav.conf /etc/squidclamav.conf
diff --git a/src/patches/squidclamav-5.11-source-address-parsing-issue.patch b/src/patches/squidclamav-5.11-source-address-parsing-issue.patch
new file mode 100644
index 0000000000..4031c733dd
--- /dev/null
+++ b/src/patches/squidclamav-5.11-source-address-parsing-issue.patch
@@ -0,0 +1,13 @@
+--- squidclamav-5.11/src/pattern.c~	2014-10-29 13:08:05.658143495 +0000
++++ squidclamav-5.11/src/pattern.c	2014-10-29 13:08:20.964642365 +0000
+@@ -151,10 +151,6 @@
+      return 1;
+   }
+   
+-  /* extract source ipaddress and source fqdn */
+-  if (parseSourceAddress(in_buff.src_address, "/") != 0) {
+-  }
+-  
+   if (debug != 0)
+ 	logit(log_file, "DEBUG Parsed request: %s %s/%s %s %s\n", in_buff.url, in_buff.ipaddress, in_buff.fqdn, in_buff.ident, in_buff.method);
+