summaryrefslogtreecommitdiff
path: root/www/squid31
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2009-07-20 10:49:16 +0000
committertron <tron@pkgsrc.org>2009-07-20 10:49:16 +0000
commit838ae68d72791e605aa05255a20011530bc08a2c (patch)
treede3fed6c386d6d688ae246de7c5b87cc31a13d34 /www/squid31
parent2482f1c6d45c1dbbca114b31ae41a09d13507fc3 (diff)
downloadpkgsrc-838ae68d72791e605aa05255a20011530bc08a2c.tar.gz
Use official Squid change to fix build problems under NetBSD/amd4.
Diffstat (limited to 'www/squid31')
-rw-r--r--www/squid31/distinfo4
-rw-r--r--www/squid31/patches/patch-aa9
2 files changed, 7 insertions, 6 deletions
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index 8c9cd5f3bff..c650eb0faed 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2009/07/19 23:28:03 tron Exp $
+$NetBSD: distinfo,v 1.9 2009/07/20 10:49:16 tron Exp $
SHA1 (squid-3.1.0.11.tar.bz2) = 374c2a5d664320109d92405a44926fc93dce4526
RMD160 (squid-3.1.0.11.tar.bz2) = c654e229ed6c060798e290ef7f7491cae4fa0356
Size (squid-3.1.0.11.tar.bz2) = 2381394 bytes
-SHA1 (patch-aa) = 561b64ebb89cd6fdb1ac0d22f716fb34f92f3aeb
+SHA1 (patch-aa) = a9ca6f8536262a7645f8efdcbcd05b9c190b57df
SHA1 (patch-ad) = cb2591bebcbcf22f6cb1858f243b0c808d3db589
SHA1 (patch-ae) = a1f8a6bfa49a3e7c46fc6228b22ef374f3bd3964
SHA1 (patch-ah) = e20f7b76d6d48041efbfe1a07dce756a818e6642
diff --git a/www/squid31/patches/patch-aa b/www/squid31/patches/patch-aa
index 46a8262db21..4cd27ce718a 100644
--- a/www/squid31/patches/patch-aa
+++ b/www/squid31/patches/patch-aa
@@ -1,15 +1,16 @@
-$NetBSD: patch-aa,v 1.5 2009/07/19 23:28:04 tron Exp $
+$NetBSD: patch-aa,v 1.6 2009/07/20 10:49:17 tron Exp $
-http://www.squid-cache.org/bugs/show_bug.cgi?id=2716
+Build fix for NetBSD/amd64 taken from here:
+http://www.squid-cache.org/Versions/v3/3.1/changesets/b9648.patch
--- src/client_side.cc.orig 2009-07-19 06:11:13.000000000 +0100
-+++ src/client_side.cc 2009-07-19 23:43:24.000000000 +0100
++++ src/client_side.cc 2009-07-20 11:29:30.000000000 +0100
@@ -2222,7 +2222,7 @@
// when we read chunked requests, the entire body is buffered
// XXX: this check ignores header size and its limits.
if (conn->in.dechunkingState == ConnStateData::chunkParsing)
- return conn->in.notYetUsed < Config.maxChunkedRequestBodySize;
-+ return (ssize_t)conn->in.notYetUsed < Config.maxChunkedRequestBodySize;
++ return ((int64_t)conn->in.notYetUsed) < Config.maxChunkedRequestBodySize;
return conn->in.notYetUsed >= Config.maxRequestHeaderSize ? 0 : 1;
}