From a5b549381ab0a32d36c99b9742b5475fb9248258 Mon Sep 17 00:00:00 2001
From: taca <taca>
Date: Sat, 17 Mar 2007 15:14:27 +0000
Subject: Update squid to 2.6.11 (squid-2.6.STABLE11).

Changes to squid-2.6.STABLE11 (Mar 17 2007)

	- Bug #1915: assertion failed: client_side.c:4055: "buf != NULL ||
	  !conn->body.request"
	- Handle garbage helper responses better in concurrent protocol format
	- Fix kqueue when overflowing the changes queue
	- Make sure the child worker process commits suicide if it could
	  not start up
	- Don't log short responses at debug level 1
	- Fix bswap16 & bwsap32 error on NetBSD
	- Fix collapsed_forwarding for non-GET requests
---
 www/squid/Makefile         |  4 ++--
 www/squid/distinfo         | 10 +++++-----
 www/squid/patches/patch-bc | 11 +++++++----
 3 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'www/squid')

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 56283d368eb..318d33276d1 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.189 2007/03/04 11:32:59 taca Exp $
+# $NetBSD: Makefile,v 1.190 2007/03/17 15:14:27 taca Exp $
 
-DISTNAME=	squid-2.6.STABLE10
+DISTNAME=	squid-2.6.STABLE11
 PKGNAME=	${DISTNAME:S/STABLE//}
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.6/ \
diff --git a/www/squid/distinfo b/www/squid/distinfo
index f008dc466b0..c857ff46deb 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.129 2007/03/04 11:32:59 taca Exp $
+$NetBSD: distinfo,v 1.130 2007/03/17 15:14:27 taca Exp $
 
-SHA1 (squid-2.6.STABLE10.tar.bz2) = 50ee869929f2cff340aa4f7e399b42340fae2d00
-RMD160 (squid-2.6.STABLE10.tar.bz2) = bbce19d234aba5bf37bea6bc7857ae4538c11937
-Size (squid-2.6.STABLE10.tar.bz2) = 1263023 bytes
+SHA1 (squid-2.6.STABLE11.tar.bz2) = 7ee4c3be1f7221c0ff6b45788085cb3177c04fa4
+RMD160 (squid-2.6.STABLE11.tar.bz2) = 421e06e0dfd6d4321754aa4c0927fbad908d5c2e
+Size (squid-2.6.STABLE11.tar.bz2) = 1263864 bytes
 SHA1 (patch-aa) = bcbe4e0bf3cd632497dc8045c1b8d86842edf90c
 SHA1 (patch-ab) = e4b9213dcbae32b65d0fe69b9cf9cff49aae504e
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0
@@ -19,4 +19,4 @@ SHA1 (patch-ar) = a80477b24d02688f1f55ba1d4967bf340b5c04cb
 SHA1 (patch-as) = 87cfb6190bbdaa17ffbe3a877cf6f67fde3af1f1
 SHA1 (patch-at) = 9b0860543e3a122afdd21ff75ca7e22b2aa64458
 SHA1 (patch-bb) = 6711186c3e3e7992f9874eb47df7c0d3690649c2
-SHA1 (patch-bc) = 87d67c6d00c0734eebc1d7c6a9bcd1e3331400d9
+SHA1 (patch-bc) = 0b87eb5f4ccc06a0e59ed298fc3203b1b2641969
diff --git a/www/squid/patches/patch-bc b/www/squid/patches/patch-bc
index 472f5f423c7..f4c4c30c9f5 100644
--- a/www/squid/patches/patch-bc
+++ b/www/squid/patches/patch-bc
@@ -1,18 +1,21 @@
-$NetBSD: patch-bc,v 1.2 2006/09/13 14:41:58 taca Exp $
+$NetBSD: patch-bc,v 1.3 2007/03/17 15:14:27 taca Exp $
 
---- include/ntlmauth.h.orig	2005-05-18 01:56:35.000000000 +0900
+--- include/ntlmauth.h.orig	2007-03-13 11:12:39.000000000 +0900
 +++ include/ntlmauth.h
-@@ -70,10 +70,14 @@
+@@ -70,6 +70,9 @@
  #define bswap16(x) bswap_16(x)
  #define bswap32(x) bswap_32(x)
  #else	 /* HAVE_BISTWAP_H */
 +#ifdef HAVE_MACHINE_BYTE_SWAP_H
 +#include <machine/byte_swap.h>
 +#else	/* HAVE_MACHINE_BYTE_SWAP_H */
+ #ifndef bswap16
  #define bswap16(x) (((((u_int16_t)x) >> 8) & 0xff) | ((((u_int16_t)x) & 0xff) << 8))
- #define bswap32(x) \
+ #endif
+@@ -78,6 +81,7 @@
      (((((u_int32_t)x) & 0xff000000) >> 24) | ((((u_int32_t)x) & 0x00ff0000) >>  8) | \
       ((((u_int32_t)x) & 0x0000ff00) <<  8) | ((((u_int32_t)x) & 0x000000ff) << 24))
+ #endif
 +#endif	/* HAVE_MACHINE_BYTE_SWAP_H */
  #endif /* HAVE_BITSWAP_H */
  
-- 
cgit v1.2.3