From f19d8cc50b8d66b8919267da54dd02daa0c85f0d Mon Sep 17 00:00:00 2001
From: Gernot Tenchio <gernot.tenchio@securepoint.de>
Date: Mon, 23 Jan 2012 14:58:39 +0100
Subject: [PATCH] squid: Updated (3.1.12 -> 3.1.18)

---
 network/squid/squid.3.1.18-build.patch | 40 ++++++++++++++++++++++++++
 network/squid/squid.desc               |  6 ++--
 2 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 network/squid/squid.3.1.18-build.patch

diff --git a/network/squid/squid.3.1.18-build.patch b/network/squid/squid.3.1.18-build.patch
new file mode 100644
index 000000000..db7fa6c1b
--- /dev/null
+++ b/network/squid/squid.3.1.18-build.patch
@@ -0,0 +1,40 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../squid/squid.3.1.18-build.patch
+# Copyright (C) 2012 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+diff -up squid-3.1.18/src/store.cc.fix squid-3.1.18/src/store.cc
+--- squid-3.1.18/src/store.cc.fix	2012-01-23 14:46:39.000000000 +0100
++++ squid-3.1.18/src/store.cc	2012-01-23 14:47:17.000000000 +0100
+@@ -368,7 +368,7 @@ StoreEntry::StoreEntry(const char *aUrl,
+ 
+ #if USE_ADAPTATION
+ void
+-StoreEntry::deferProducer(const AsyncCall::Pointer &producer)
++StoreEntry::deferProducer(AsyncCall::Pointer &producer)
+ {
+     if (!deferredProducer)
+         deferredProducer = producer;
+diff -up squid-3.1.18/src/Store.h.fix squid-3.1.18/src/Store.h
+--- squid-3.1.18/src/Store.h.fix	2012-01-23 14:48:23.000000000 +0100
++++ squid-3.1.18/src/Store.h	2012-01-23 14:48:31.000000000 +0100
+@@ -191,7 +191,7 @@ public:
+ 
+ #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
diff --git a/network/squid/squid.desc b/network/squid/squid.desc
index b5bb65732..aee4d2e72 100644
--- a/network/squid/squid.desc
+++ b/network/squid/squid.desc
@@ -2,7 +2,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../squid/squid.desc
-[COPY] Copyright (C) 2006 - 2011 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2012 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY] Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY]
@@ -30,7 +30,7 @@
 
 [L] GPL
 [S] Stable
-[V] 3.1.12
+[V] 3.1.18
 [P] X -----5---9 123.700
 
-[D] 2384496018 squid-3.1.12.tar.bz2 http://www.squid-cache.org/Versions/v3/3.1/
+[D] 1669954491 squid-3.1.18.tar.bz2 http://www.squid-cache.org/Versions/v3/3.1/