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

7 files changed, 54 insertions, 22 deletions

diff --git a/www/squid/MESSAGE.common b/www/squid/MESSAGE.common
index dbe4c68f98a..cc33e3a2756 100644
--- a/www/squid/MESSAGE.common
+++ b/www/squid/MESSAGE.common
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE.common,v 1.1 2003/12/25 16:28:14 taca Exp $
+$NetBSD: MESSAGE.common,v 1.1.24.1 2007/03/22 08:36:18 ghen Exp $
 
 You DO need running nameservice to start and run ${PKGNAME}.
 
@@ -9,6 +9,6 @@ to use it as a proxy server.
 
 Please note that to use the diskd storage method, you'll likely have to
 change SYSV-IPC parameters in the kernel config file (see
-http://www.squid-cache.org/Doc/FAQ/FAQ-22.html for details).
+http://wiki.squid-cache.org/SquidFaq/DiskDaemon for details)
 
 ===========================================================================
diff --git a/www/squid/Makefile b/www/squid/Makefile
index d758bedb3bf..36828eea7a5 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.186.2.1 2007/01/29 18:51:24 ghen Exp $
+# $NetBSD: Makefile,v 1.186.2.2 2007/03/22 08:36:18 ghen Exp $
 
-DISTNAME=	squid-2.6.STABLE9
+DISTNAME=	squid-2.6.STABLE12
 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 6b982964678..1ec987c1f78 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.124.2.1 2007/01/29 18:51:24 ghen Exp $
+$NetBSD: distinfo,v 1.124.2.2 2007/03/22 08:36:18 ghen Exp $
 
-SHA1 (squid-2.6.STABLE9.tar.bz2) = d3ada8a02b2a9fe5bf50c4caa33e2f051262fa7d
-RMD160 (squid-2.6.STABLE9.tar.bz2) = 3e591107daf6d6f0dd32a2909c598b41f2e5e89f
-Size (squid-2.6.STABLE9.tar.bz2) = 1263060 bytes
+SHA1 (squid-2.6.STABLE12.tar.bz2) = 56b98bb995bf7cd0ac35326f8659b7d0fb088487
+RMD160 (squid-2.6.STABLE12.tar.bz2) = 7649de09beaa627de901912cb39186983db77b14
+Size (squid-2.6.STABLE12.tar.bz2) = 1263085 bytes
 SHA1 (patch-aa) = bcbe4e0bf3cd632497dc8045c1b8d86842edf90c
 SHA1 (patch-ab) = e4b9213dcbae32b65d0fe69b9cf9cff49aae504e
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0
 SHA1 (patch-ad) = 8dc230430b9030951232c6881100234caffdd0d9
 SHA1 (patch-ae) = 5af05ae0ec09b7a6f3af61201f60357909b9e6c8
 SHA1 (patch-af) = a78e762c1ad928eef66b12395d48bc69542e32d9
-SHA1 (patch-ag) = 8e140c39f53764299fd8b753a4cc4c89424321b2
+SHA1 (patch-ag) = 158cf7aa07b54cf022d6f000426213009b73f863
 SHA1 (patch-aj) = e19317d35da85ad7481fdcd154c42706b605dc75
 SHA1 (patch-ak) = cec28eee3366b43ac574df6591a73a2d33be1a67
 SHA1 (patch-al) = 8f9ede6e80ba6950bf351fc75bbca8dbfbf110b6
@@ -17,5 +17,6 @@ SHA1 (patch-an) = 32aa94784f7f6e30d820ed56fc3725eae2a8856e
 SHA1 (patch-ap) = bf2223ea0ab660b2fdb6043845cedac5907bd1f0
 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/options.mk b/www/squid/options.mk
index 5b06bc7459f..ac71a3be553 100644
--- a/www/squid/options.mk
+++ b/www/squid/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2006/12/04 21:50:54 jdolecek Exp $
+# $NetBSD: options.mk,v 1.10.2.1 2007/03/22 08:36:18 ghen Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.squid
 PKG_SUPPORTED_OPTIONS=	aufs carp icmp pam-helper snmp ssl unlinkd
@@ -16,7 +16,7 @@ PKG_SUPPORTED_OPTIONS+=	linux-netfilter
 PKG_SUPPORTED_OPTIONS+=	ipf-transparent
 .endif
 
-.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
+.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly"
 PKG_SUPPORTED_OPTIONS+=	pf-transparent
 .endif
 
@@ -91,6 +91,8 @@ CONFIGURE_ARGS+=	--enable-ssl --with-openssl=${SSLBASE:Q}
 
 .if !empty(PKG_OPTIONS:Maufs)
 SQUID_BACKENDS+=	aufs
+PTHREAD_AUTO_VARS=	yes
+.include "../../mk/pthread.buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mdiskd)
diff --git a/www/squid/patches/patch-ag b/www/squid/patches/patch-ag
index cf5778e32f7..eb380fddd18 100644
--- a/www/squid/patches/patch-ag
+++ b/www/squid/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.25 2006/11/09 15:16:21 taca Exp $
+$NetBSD: patch-ag,v 1.25.2.1 2007/03/22 08:36:18 ghen Exp $
 
---- configure.orig	2006-11-03 22:20:14.000000000 +0900
+--- configure.orig	2007-01-24 02:07:43.000000000 +0000
 +++ configure
-@@ -7321,6 +7321,7 @@ for ac_header in sys/types.h \
+@@ -7323,6 +7323,7 @@ for ac_header in sys/types.h \
  	linux/netfilter_ipv4.h \
  	linux/netfilter_ipv4/ip_tproxy.h \
  	malloc.h \
@@ -10,7 +10,7 @@ $NetBSD: patch-ag,v 1.25 2006/11/09 15:16:21 taca Exp $
  	math.h \
  	memory.h \
  	mount.h \
-@@ -13789,9 +13790,9 @@ _ACEOF
+@@ -13791,9 +13792,9 @@ _ACEOF
  
  fi
  
@@ -23,7 +23,7 @@ $NetBSD: patch-ag,v 1.25 2006/11/09 15:16:21 taca Exp $
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -13820,26 +13821,63 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -13822,26 +13823,63 @@ cat >>conftest.$ac_ext <<_ACEOF
  #include <sys/bitypes.h>
  #endif
  
@@ -100,7 +100,7 @@ $NetBSD: patch-ag,v 1.25 2006/11/09 15:16:21 taca Exp $
  
  echo "$as_me:$LINENO: checking size of off_t" >&5
  echo $ECHO_N "checking size of off_t... $ECHO_C" >&6
-@@ -15807,8 +15845,8 @@ if test "$GCC" = "yes"; then
+@@ -15809,8 +15847,8 @@ if test "$GCC" = "yes"; then
  	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
  	case "$GCCVER" in
  	2.95.[123])
@@ -111,3 +111,12 @@ $NetBSD: patch-ag,v 1.25 2006/11/09 15:16:21 taca Exp $
  		;;
  	esac
  fi
+@@ -16743,7 +16781,7 @@ if test "$PF_TRANSPARENT" ; then
+     echo "$as_me:$LINENO: checking if PF header file is installed" >&5
+ echo $ECHO_N "checking if PF header file is installed... $ECHO_C" >&6
+     # hold on to your hats...
+-    if test "$ac_cv_header_net_pfvar_h" = "yes"; then
++    if test "$ac_cv_header_net_pfvar_h" = "yes" || test -f /usr/include/net/pf/pfvar.h; then
+ 	PF_TRANSPARENT="yes"
+ 
+ cat >>confdefs.h <<\_ACEOF
diff --git a/www/squid/patches/patch-at b/www/squid/patches/patch-at
new file mode 100644
index 00000000000..f01874c8242
--- /dev/null
+++ b/www/squid/patches/patch-at
@@ -0,0 +1,17 @@
+$NetBSD: patch-at,v 1.1.2.2 2007/03/22 08:36:19 ghen Exp $
+
+--- src/client_side.c.orig	2007-02-06 20:17:33.000000000 +0000
++++ src/client_side.c
+@@ -88,8 +88,12 @@
+ #include <sys/fcntl.h>
+ #include <net/if.h>
+ #include <netinet/in.h>
++#ifdef __DragonFly__
++#include <net/pf/pfvar.h>
++#else
+ #include <net/pfvar.h>
+ #endif
++#endif
+ 
+ #if LINUX_NETFILTER
+ #include <linux/netfilter_ipv4.h>
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 */