From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 26 Jan 2012 18:14:30 +0000 (+0100)
Subject: squid: Enable ICAP client.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0039d7b4738c448ba4770de5fe14f7a8f47925c7;p=people%2Fms%2Fipfire-2.x.git

squid: Enable ICAP client.

A patch is required to fix a C++ error.
---

diff --git a/lfs/squid b/lfs/squid
index 610154b3bc..2015080cee 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -71,6 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE)
 
+	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.1.18-bugz-3440.patch
 	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls \
 	   --datadir=/usr/lib/squid \
 	   --mandir=/usr/share/man --libexecdir=/usr/lib/squid \
@@ -105,7 +106,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	   --enable-ipf-transparent \
 	   --enable-kill-parent-hack \
 	   --disable-wccpv2 \
-	   --disable-icap-client \
+	   --enable-icap-client \
 	   --disable-esi
 
 	cd $(DIR_APP) && make $(MAKETUNING)
diff --git a/src/patches/squid-3.1.18-bugz-3440.patch b/src/patches/squid-3.1.18-bugz-3440.patch
new file mode 100644
index 0000000000..cef402ae71
--- /dev/null
+++ b/src/patches/squid-3.1.18-bugz-3440.patch
@@ -0,0 +1,50 @@
+------------------------------------------------------------
+revno: 10415
+revision-id: squid3@treenet.co.nz-20111206123135-sm3zauds1twjh9ls
+parent: squid3@treenet.co.nz-20111203061825-aslncq2igkzd88hy
+fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3440
+author: Joshua Root <josh+squid@root.id.au>
+committer: Amos Jeffries <squid3@treenet.co.nz>
+branch nick: SQUID_3_1
+timestamp: Tue 2011-12-06 05:31:35 -0700
+message:
+  Bug 3440: compile error in Adaptation
+------------------------------------------------------------
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: squid3@treenet.co.nz-20111206123135-sm3zauds1twjh9ls
+# target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
+#   /SQUID_3_1/
+# testament_sha1: 42421665894427e4edfaa3f8bfcee9a9a3ce9dab
+# timestamp: 2011-12-06 12:33:05 +0000
+# source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
+#   /SQUID_3_1
+# base_revision_id: squid3@treenet.co.nz-20111203061825-\
+#   aslncq2igkzd88hy
+# 
+# Begin patch
+=== modified file 'src/Store.h'
+--- src/Store.h	2011-12-02 12:17:07 +0000
++++ src/Store.h	2011-12-06 12:31:35 +0000
+@@ -191,7 +191,7 @@
+ 
+ #if USE_ADAPTATION
+     /// call back producer when more buffer space is available
+-    void deferProducer(const AsyncCall::Pointer &producer);
++    void deferProducer(AsyncCall::Pointer &producer);
+     /// calls back producer registered with deferProducer
+     void kickProducer();
+ #endif
+
+=== modified file 'src/store.cc'
+--- src/store.cc	2011-12-02 12:17:07 +0000
++++ src/store.cc	2011-12-06 12:31:35 +0000
+@@ -368,7 +368,7 @@
+ 
+ #if USE_ADAPTATION
+ void
+-StoreEntry::deferProducer(const AsyncCall::Pointer &producer)
++StoreEntry::deferProducer(AsyncCall::Pointer &producer)
+ {
+     if (!deferredProducer)
+         deferredProducer = producer;
+