pkgsrc chagnes

* install pinger program setuid to make ICMP work; the problem noted by
  Heron Gallegos via private mail.

Key changes squid-2.6.STABLE4 to 2.6.STABLE5

* Bug #1776: 2.6.STABLE4 aufs fails to compile if coss isn't enabled
* COSS improvements and cleanups
* Bug #1785: Memory leak in handling of negatively cached objects
* Bug #1780: Incorrect Vary processing in combination with collapsed_forwarding
* Bug #1779: Delay pools fairness when multiple connections compete for bandwidth
* Bug #1796: Assertion error HttpHeader.c:914: "str"
* All comm loops now use the generic event framework
* a number of other minor and cosmetic bugfixes. See the list of squid-2.6.STABLE4 changes and the ChangeLog file for details.

6 files changed, 43 insertions, 66 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index ff6968aa2ca..186f6b9cbe9 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.183 2006/09/26 03:40:20 taca Exp $
+# $NetBSD: Makefile,v 1.184 2006/11/09 15:16:21 taca Exp $
 
-DISTNAME=	squid-2.6.STABLE4
-PKGNAME=	squid-2.6.4
+DISTNAME=	squid-2.6.STABLE5
+PKGNAME=	squid-2.6.5
 #PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.6/ \
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 2c7ca2f9ff6..2c6c3eeb391 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,20 +1,21 @@
-$NetBSD: distinfo,v 1.121 2006/09/26 03:40:20 taca Exp $
+$NetBSD: distinfo,v 1.122 2006/11/09 15:16:21 taca Exp $
 
-SHA1 (squid-2.6.4/squid-2.6.STABLE4.tar.bz2) = 1adbc6e923169d2cd50967910475bf82beea63d5
-RMD160 (squid-2.6.4/squid-2.6.STABLE4.tar.bz2) = 658f08114917abd5d7101932db2042de955b06a5
-Size (squid-2.6.4/squid-2.6.STABLE4.tar.bz2) = 1250801 bytes
+SHA1 (squid-2.6.5/squid-2.6.STABLE5.tar.bz2) = 33cd0a9f4b909e80fb9e06ca7bedc62565c8d443
+RMD160 (squid-2.6.5/squid-2.6.STABLE5.tar.bz2) = d2fc604f4cf6355852148e9fc01f88136988e8c2
+Size (squid-2.6.5/squid-2.6.STABLE5.tar.bz2) = 1260850 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) = 086b9f27b8a8eb892880be84c0485d72020b9ff0
+SHA1 (patch-ag) = 8e140c39f53764299fd8b753a4cc4c89424321b2
 SHA1 (patch-aj) = e19317d35da85ad7481fdcd154c42706b605dc75
 SHA1 (patch-ak) = cec28eee3366b43ac574df6591a73a2d33be1a67
 SHA1 (patch-al) = 8f9ede6e80ba6950bf351fc75bbca8dbfbf110b6
-SHA1 (patch-an) = eb91d86926d5d25b92ec93e09c2b2da1d6f6389f
+SHA1 (patch-an) = 32aa94784f7f6e30d820ed56fc3725eae2a8856e
 SHA1 (patch-ap) = bf2223ea0ab660b2fdb6043845cedac5907bd1f0
 SHA1 (patch-ar) = a80477b24d02688f1f55ba1d4967bf340b5c04cb
+SHA1 (patch-as) = 87cfb6190bbdaa17ffbe3a877cf6f67fde3af1f1
 SHA1 (patch-bb) = 6711186c3e3e7992f9874eb47df7c0d3690649c2
 SHA1 (patch-bc) = 87d67c6d00c0734eebc1d7c6a9bcd1e3331400d9
diff --git a/www/squid/options.mk b/www/squid/options.mk
index 8da67929342..2e695c9c35b 100644
--- a/www/squid/options.mk
+++ b/www/squid/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2006/09/13 14:41:58 taca Exp $
+# $NetBSD: options.mk,v 1.9 2006/11/09 15:16:21 taca Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.squid
 PKG_SUPPORTED_OPTIONS=	aufs carp icmp pam-helper snmp ssl unlinkd
@@ -72,6 +72,7 @@ CONFIGURE_ARGS+=	--enable-carp
 
 .if !empty(PKG_OPTIONS:Micmp)
 CONFIGURE_ARGS+=	--enable-icmp
+INSTALL_TARGET+=	install install-pinger
 .endif
 
 .if !empty(PKG_OPTIONS:Mpam-helper)
diff --git a/www/squid/patches/patch-ag b/www/squid/patches/patch-ag
index 857b3c9417f..cf5778e32f7 100644
--- a/www/squid/patches/patch-ag
+++ b/www/squid/patches/patch-ag
@@ -1,25 +1,16 @@
-$NetBSD: patch-ag,v 1.24 2006/09/13 14:41:58 taca Exp $
+$NetBSD: patch-ag,v 1.25 2006/11/09 15:16:21 taca Exp $
 
---- configure.orig	2006-07-31 11:53:51.000000000 +0900
+--- configure.orig	2006-11-03 22:20:14.000000000 +0900
 +++ configure
-@@ -3970,7 +3970,7 @@ cat >>confdefs.h <<\_ACEOF
- #define SQUID_SNMP 1
- _ACEOF
- 
--    SNMPLIB='-L../snmplib -lsnmp'
-+    SNMPLIB='../snmplib/libsnmp.a'
- 
- 
- if true; then
-@@ -7057,6 +7057,7 @@ for ac_header in sys/types.h \
- 	libc.h \
+@@ -7321,6 +7321,7 @@ for ac_header in sys/types.h \
  	linux/netfilter_ipv4.h \
  	linux/netfilter_ipv4/ip_tproxy.h \
-+ 	machine/byte_swap.h \
  	malloc.h \
++  	machine/byte_swap.h \
  	math.h \
  	memory.h \
-@@ -13512,9 +13513,9 @@ _ACEOF
+ 	mount.h \
+@@ -13789,9 +13790,9 @@ _ACEOF
  
  fi
  
@@ -32,30 +23,10 @@ $NetBSD: patch-ag,v 1.24 2006/09/13 14:41:58 taca Exp $
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -13523,46 +13524,64 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--
--/* What a mess.. many systems have added the (now standard) bit types
-- * in their own ways, so we need to scan a wide variety of headers to
-- * find them..
-- */
--#include <sys/types.h>
--#if STDC_HEADERS
--#include <stdlib.h>
--#include <stddef.h>
--#endif
--#if HAVE_INTTYPES_H
--#include <inttypes.h>
--#endif
--#if HAVE_SYS_TYPES_H
- #include <sys/types.h>
--#endif
--#if HAVE_SYS_BITYPES_H
--#include <sys/bitypes.h>
--#endif
--
+@@ -13820,26 +13821,63 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #include <sys/bitypes.h>
+ #endif
+ 
 +#include <sys/time.h>
 +#include <sys/unistd.h>
 +int
@@ -129,7 +100,7 @@ $NetBSD: patch-ag,v 1.24 2006/09/13 14:41:58 taca Exp $
  
  echo "$as_me:$LINENO: checking size of off_t" >&5
  echo $ECHO_N "checking size of off_t... $ECHO_C" >&6
-@@ -15530,8 +15549,8 @@ if test "$GCC" = "yes"; then
+@@ -15807,8 +15845,8 @@ if test "$GCC" = "yes"; then
  	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
  	case "$GCCVER" in
  	2.95.[123])
diff --git a/www/squid/patches/patch-an b/www/squid/patches/patch-an
index c349c49f2a5..b98102bbe13 100644
--- a/www/squid/patches/patch-an
+++ b/www/squid/patches/patch-an
@@ -1,25 +1,16 @@
-$NetBSD: patch-an,v 1.11 2006/09/13 14:41:58 taca Exp $
+$NetBSD: patch-an,v 1.12 2006/11/09 15:16:21 taca Exp $
 
---- configure.in.orig	2006-07-31 11:53:51.000000000 +0900
+--- configure.in.orig	2006-11-03 22:20:14.000000000 +0900
 +++ configure.in
-@@ -586,7 +586,7 @@ AC_ARG_ENABLE(snmp,
- [ if test "$enableval" = "yes" ; then
-     echo "SNMP monitoring enabled"
-     AC_DEFINE(SQUID_SNMP, 1, [Define to enable SNMP monitoring of Squid])
--    SNMPLIB='-L../snmplib -lsnmp'
-+    SNMPLIB='../snmplib/libsnmp.a'
-     AM_CONDITIONAL(USE_SNMP, true)
-     SNMP_MAKEFILE=./snmplib/Makefile
-     makesnmplib=snmplib
-@@ -1534,6 +1534,7 @@ AC_CHECK_HEADERS(
- 	libc.h \
+@@ -1591,6 +1591,7 @@ AC_CHECK_HEADERS(
  	linux/netfilter_ipv4.h \
  	linux/netfilter_ipv4/ip_tproxy.h \
-+ 	machine/byte_swap.h \
  	malloc.h \
++  	machine/byte_swap.h \
  	math.h \
  	memory.h \
-@@ -1888,7 +1889,16 @@ AC_CHECK_SYSTYPE(size_t, unsigned int)
+ 	mount.h \
+@@ -1955,7 +1956,16 @@ AC_CHECK_SYSTYPE(size_t, unsigned int)
  AC_CHECK_SYSTYPE(ssize_t, int)
  AC_CHECK_SYSTYPE(off_t, int)
  AC_CHECK_SYSTYPE(mode_t, unsigned short)
@@ -37,7 +28,7 @@ $NetBSD: patch-an,v 1.11 2006/09/13 14:41:58 taca Exp $
  
  AC_CHECK_SIZEOF_SYSTYPE(off_t, 4)
  AC_CHECK_SIZEOF_SYSTYPE(size_t, 4)
-@@ -2167,8 +2177,8 @@ if test "$GCC" = "yes"; then
+@@ -2234,8 +2244,8 @@ if test "$GCC" = "yes"; then
  	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
  	case "$GCCVER" in
  	[2.95.[123]])
diff --git a/www/squid/patches/patch-as b/www/squid/patches/patch-as
new file mode 100644
index 00000000000..9d793c2dc92
--- /dev/null
+++ b/www/squid/patches/patch-as
@@ -0,0 +1,13 @@
+$NetBSD: patch-as,v 1.1 2006/11/09 15:16:21 taca Exp $
+
+--- Makefile.in.orig	2006-10-30 11:21:09.000000000 +0900
++++ Makefile.in
+@@ -721,7 +721,7 @@ dist-hook:
+ 
+ install-pinger:
+ 	chown root $(DEFAULT_PINGER) 
+-	chmod 4711 $(DEFAULT_PINGER)
++	chmod 4511 $(DEFAULT_PINGER)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT: