Pullup ticket 2057 - requested by taca

security update for squid

- pkgsrc/www/squid/MESSAGE.common			1.2
- pkgsrc/www/squid/Makefile				1.189-1.191
- pkgsrc/www/squid/distinfo				1.127-1.131
- pkgsrc/www/squid/options.mk				1.11-1.12
- pkgsrc/www/squid/patches/patch-ag			1.26
- pkgsrc/www/squid/patches/patch-at			1.1
- pkgsrc/www/squid/patches/patch-bc			1.3

   Module Name:	pkgsrc
   Committed By:	joerg
   Date:		Tue Feb  6 20:22:15 UTC 2007

   Modified Files:
	   pkgsrc/www/squid: distinfo options.mk
   Added Files:
	   pkgsrc/www/squid/patches: patch-at

   Log Message:
   Allow transparent proxy support for PF on DragonFly.
---
   Module Name:	pkgsrc
   Committed By:	joerg
   Date:		Tue Feb  6 22:06:32 UTC 2007

   Modified Files:
	   pkgsrc/www/squid: distinfo
	   pkgsrc/www/squid/patches: patch-ag

   Log Message:
   don't complain if the location of the DragonFly header exists.
---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sun Feb 25 07:34:45 UTC 2007

   Modified Files:
	   pkgsrc/www/squid: MESSAGE.common options.mk

   Log Message:
   Fix build problem with aufs option on DragonFly.
   Reported by PR pkg/35656 by Kimura Fuyuki and applied patch from it.
---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sun Mar  4 11:32:59 UTC 2007

   Modified Files:
	   pkgsrc/www/squid: Makefile distinfo

   Log Message:
   Update www/squid to squid-2.6.10 (squid-2.6.STABLE10).

   Changes to squid-2.6.STABLE10 (Mar  4 2007)

	   - Upgrade HTTP/0.9 responses to our HTTP version (HTTP/1.0)
	   - various diskd bugfixes
	   - In the access.log hierarchy field log the unique peer name
	     instead of the host name
	   - unlinkdClose() should be called after (not before) storeDirSync()
	   - CLEAN_BUF_SZ was defined, but never used anywhere
	   - logging HTTP-request size
	   - Fix icmp pinger communication on FreeBSD and other not supporing
	     large dgram AF_UNIX sockets
	   - Release objects on swapin failure
	   - Bug #1787: Objects stuck in cache if origin server clock in future
	   - Bug #1420: 302 responses with an Expires header is always cached
	   - Primitive support for HTTP/1.1 chunked encoding, working around
	     broken servers
	   - Clean up relations between TCP probing and DNS checks of peers with
	     no known addresses.
	   - Fix a minor HTML coding error in ftp directory listings with // in
	     the path
	   - Bug #1875, #1420. Cleanup of refresh logics when dealing with
	     non-refreshable content
	   - Negotiate authentication fixed again. Broken since STABLE7 by the
	     patch for Bug #1792.
	   - Bug #1892: COSS tries to shut down the same directory twice on exit
	   - Bug #1908: store*DirRebuildFromSwapLog() ignores some SWAP_LOG_DEL
	     entries
	   - Added support for Subversion HTTP request methods MKACTIVITY,
	     CHECKOUT and MERGE.
---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sat Mar 17 15:14:27 UTC 2007

   Modified Files:
	   pkgsrc/www/squid: Makefile distinfo
	   pkgsrc/www/squid/patches: patch-bc

   Log Message:
   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
---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Wed Mar 21 05:25:02 UTC 2007

   Modified Files:
	   pkgsrc/www/squid: Makefile distinfo

   Log Message:
   Update squid package to 2.6.12.

   This fixes a DoS security problem.

	   http://www.squid-cache.org/Advisories/SQUID-2007_1.txt

   Changes to squid-2.6.STABLE12 (Mar 20 2007)

	   - Assertion error on TRACE

1 files changed, 7 insertions, 4 deletions

diff --git a/www/squid/patches/patch-bc b/www/squid/patches/patch-bc
index 472f5f423c7..8e889fcb3d1 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.2.4.1 2007/03/22 08:36:19 ghen 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 */