Apply upstream patch by Adam Carter (bug #396163).

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 71 insertions, 5 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index edbacb9e3b09..d514803ae6c0 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-proxy/squid
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.336 2011/12/24 10:33:20 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.337 2011/12/29 17:35:31 jer Exp $
+
+  29 Dec 2011; Jeroen Roovers <jer@gentoo.org> squid-3.1.18.ebuild,
+  +files/squid-3.1.18-ecap.patch:
+  Apply upstream patch by Adam Carter (bug #396163).
 
 *squid-3.1.18 (24 Dec 2011)
 
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 92fb45ecf654..d84c58a6c7d0 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX squid-2-heimdal.patch 776 RMD160 2ced12e7682356ee2eb660d877437c3ddad6476e SHA1 3a693c2c975fe4c77ee729d8af8ef28097b11fb6 SHA256 bd0083836321c596db3fc8749152bc77d5a4bd03070d33541b7b489af59e4c25
 AUX squid-2.7.9-gentoo.patch 13118 RMD160 44d2482b9c998c1641ab3e2d5c5701a4f6fb6165 SHA1 b5007d3d2df28c35b88c814b41fd4e182ad34f2b SHA256 981588dc2d599a2b49f550a1ae111e96515b437a03c8d0dccc6f96f078009d11
 AUX squid-3.1.15-gentoo.patch 10538 RMD160 f4ac679e89bdd8d43a2cd00b1a63d555a25b9528 SHA1 63b2c8a1767019b35b75403dd9a7bf6b33c69edc SHA256 75549600815236932f549e1c4e0286b6cbb4dc26a7e545abb96b7d29f0128ab3
+AUX squid-3.1.18-ecap.patch 1798 RMD160 ab216b7317ba1c1544eca1525285ec68e2d3cd6b SHA1 965fcb17440d11620390b208e516b6824b7d0016 SHA256 576866c7fefa8c927ea029ecdcf90851ffa24fa528f2894d73667bd6a508ce63
 AUX squid.confd 540 RMD160 aa4ec5a6eebad1222667aff6b3180931cf566b13 SHA1 1c0c23b08bd0450eae14604c2b45ca67c7ac25c5 SHA256 aeef7060c50074b65c664fc106d7319ce380d25320ee2ee00f7d6021846b88ec
 AUX squid.cron 143 RMD160 0706a7ad04691b9a93a2897c319008440483ba11 SHA1 6138db0eccb7320e707b8d60c2970ef684e29336 SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f5c03933b2f
 AUX squid.initd 3331 RMD160 90579b249baaf727fad9f6ceaaf8b2a1e5f1e97f SHA1 0b6f4e10d758619101f0ea56b5146dc268b8b3e0 SHA256 7a81926479941054358bce650c8c9d3f070a7b40c886e5ed3a337668997bc0ab
@@ -14,6 +18,13 @@ DIST squid-3.1.18.tar.gz 3401300 RMD160 27bc3f868aa9d08bad7d44d23bc9c156007bf161
 EBUILD squid-2.7.9.ebuild 6175 RMD160 a235925ac773d7d569a958366923e5a03adcc17c SHA1 0dbb84b76302c265ef4ee193035f5882d46146ed SHA256 587b0f52d2fb973f2686d947893191acf3a1770d467cd8134091fa2c07f01f3d
 EBUILD squid-3.1.15.ebuild 6621 RMD160 c959b10a7905e000bcf49ea296cbb191555ddfa0 SHA1 dde6be2583ce96050a23f964ae1bed8b58170b5b SHA256 911d065d38544a59af7ce6f4299fc282fdf10aa4bd0869503b45b214fdf87bbc
 EBUILD squid-3.1.16.ebuild 6629 RMD160 d759605f7c281d2649ee95c16ee38c26e274f7a1 SHA1 e09b67d54d7889b8d72dcaada878054ab79a3514 SHA256 2bc745da81ed998762d82deaae18addd6fb8011b44425860b89e721b1d2e6b21
-EBUILD squid-3.1.18.ebuild 6638 RMD160 031d3133fc53b21eef02b31534010b06e23785ef SHA1 738acf3b5b99e8b9ebe3371fd6181207bb29cae1 SHA256 ae15351aa987a3a9b3c5628459c7c2a08daa998f3a6c4de0f49317e19d01f017
-MISC ChangeLog 70890 RMD160 c81c2a6d044ed13bbd1214349aa864a041e7c996 SHA1 53b5724335d1787b309880cb00330013cb7cb378 SHA256 4e1d4d40289b35f92efc76334bdae7c979d9a1c7e1447aefb0c4c981fcba4aaa
+EBUILD squid-3.1.18.ebuild 6676 RMD160 c6050c085705097d6cbc116067e0176461c55acd SHA1 5426ff28c92c3ec6965d56c41d55f62960aca699 SHA256 3ab64d19f8b4f3189673cacef1a4420c4181748da78baca505956f11a537ce60
+MISC ChangeLog 71042 RMD160 1ff4674eca408d4cdc4538a50a080cfa0b785956 SHA1 f21e79542d106cc7830349c3d578f3218608b0c8 SHA256 c0e8a6b3eca764ba8776a4470042bceae84edbf412987614f422c6ded6e42815
 MISC metadata.xml 1015 RMD160 03ac3fffc7b01e366b173a4c3bf1dc6be1bb9202 SHA1 3c1681981e2a143ee50d0ee5bc901ac81e7c5cc4 SHA256 06d8e8a7909b9140eb2e70193db754b84d864da260d6cdf9bde9fa58442ce34a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk78pOkACgkQVWmRsqeSphP/wQCfYE0xCSvzCtCF9UuMDuSHVfIB
+yN4AmwQPDV0R+e6HAlj0fhFZeIcJnx9m
+=QwUe
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/squid-3.1.18-ecap.patch b/net-proxy/squid/files/squid-3.1.18-ecap.patch
new file mode 100644
index 000000000000..41f716a4fe5d
--- /dev/null
+++ b/net-proxy/squid/files/squid-3.1.18-ecap.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'
+--- a/src/Store.h	2011-12-02 12:17:07 +0000
++++ b/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'
+--- a/src/store.cc	2011-12-02 12:17:07 +0000
++++ b/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;
+
diff --git a/net-proxy/squid/squid-3.1.18.ebuild b/net-proxy/squid/squid-3.1.18.ebuild
index ed382f75ed56..8860c7bff5a7 100644
--- a/net-proxy/squid/squid-3.1.18.ebuild
+++ b/net-proxy/squid/squid-3.1.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.18.ebuild,v 1.1 2011/12/24 10:33:20 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.18.ebuild,v 1.2 2011/12/29 17:35:31 jer Exp $
 
 EAPI=4
 
@@ -66,7 +66,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.1.15-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-3.1.15-gentoo.patch \
+		"${FILESDIR}"/${PN}-3.1.18-ecap.patch
 	eautoreconf
 }