[pkgsrc/trunk]: pkgsrc/www/squid Update squid to 2.6.16 (2.6.STABLE16).

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/482bf457f352
branches:  trunk
changeset: 533013:482bf457f352
user:      taca <taca%pkgsrc.org@localhost>
date:      Fri Sep 07 10:39:35 2007 +0000

description:
Update squid to 2.6.16 (2.6.STABLE16).


Changes to squid-2.6.STABLE16 (5 Sep 2007)

        - Test for sys/capability.h linux include file to avoid failing on
          linux systems missing libcap
        - Release private objects on cache rebuild
        - Segfault in clientBuildReplyHeader when http->entry == NULL
        - Bug #2072: digest_pw_auth fails when using plaintext passwords
        - Bug #2073: assertion failed: client_side.c:4175: "buf != NULL ||
          !conn->body.request on POST
        - Adjust default pconn timeouts to avoid shutting down connection while
          child sends request
        - Bug #1980: cache_peer monitortimeout not working
        - Bug #1882: Parent responses are not cached if sibling returns 504
        - More squid.conf reordering to get the dependencies between options
          sorted proper

Changes to squid-2.6.STABLE15 (31 Aug 2007)

        - The select() I/O loop got broken by the /dev/poll addition
          (2.6.STABLE14)
        - Bug #2017: Fails to work around broken servers sending just the HTTP
          headers
        - Bug #2023: Compile error with old GCC 2.x or other ANSI-C compilers
          before C99
        - squid.conf.default updated and reorganised in more sensible groups
        - correct and document the syslog access_log format
        - Armenian error pages translation
        - digest_ldap_helper usage help updated
        - Bug #1560: ftpSendPasv: getsockname(-1,..): (9) Bad file descriptor
        - Improve delay pools in low traffic environment by checking timeouts
          at a steady 1 second interval even when there is not much activity
        - Don't request authentication on transparently intercepted
          connections
        - Cleanup linux capabilities for tproxy
        - Bug #2003: 'via' config directive doesn't affect response headers
        - Bug #1902: Adds Numeric Hit and invalid request counters to IP Cache
        - Add missing $|=1 to squid_db_auth
        - Bug #2050: Persistent connection dropped if cache has no
          Content-Length
        - Verify the URL on memory cache hits
        - Bug #2057: NTLM stop work in messengers after upgrade to 2.6.STABLE14
        - Bug #1972: Squid sets peers to down state when they are in fact
          working.
        - potential segmentation fault in storeLocateVary()
        - Bug #2066: chdir after chroot
        - Windows port: Fix compiler warnings when building Squid as
          application (not Windows service mode)
        - Spelling correction of received

diffstat:

 www/squid/Makefile         |   4 +-
 www/squid/distinfo         |  29 ++++++++++++++-------------
 www/squid/patches/patch-aa |  14 ++++++------
 www/squid/patches/patch-ab |   6 ++--
 www/squid/patches/patch-ad |   6 ++--
 www/squid/patches/patch-ae |   6 ++--
 www/squid/patches/patch-ak |   8 +++---
 www/squid/patches/patch-an |   4 +-
 www/squid/patches/patch-ap |   6 ++--
 www/squid/patches/patch-ar |   6 ++--
 www/squid/patches/patch-as |   6 ++--
 www/squid/patches/patch-au |  49 ++++++++++++++++++++++++---------------------
 www/squid/patches/patch-av |  16 +++++++++++++++
 13 files changed, 90 insertions(+), 70 deletions(-)

diffs (truncated from 370 to 300 lines):

diff -r b1e99f7a4d6b -r 482bf457f352 www/squid/Makefile
--- a/www/squid/Makefile        Fri Sep 07 10:38:44 2007 +0000
+++ b/www/squid/Makefile        Fri Sep 07 10:39:35 2007 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.195 2007/08/13 13:04:11 rillig Exp $
+# $NetBSD: Makefile,v 1.196 2007/09/07 10:39:35 taca Exp $
 
-DISTNAME=      squid-2.6.STABLE14
+DISTNAME=      squid-2.6.STABLE16
 PKGNAME=       ${DISTNAME:S/STABLE//}
 CATEGORIES=    www
 MASTER_SITES=  http://www.squid-cache.org/Versions/v2/2.6/ \
diff -r b1e99f7a4d6b -r 482bf457f352 www/squid/distinfo
--- a/www/squid/distinfo        Fri Sep 07 10:38:44 2007 +0000
+++ b/www/squid/distinfo        Fri Sep 07 10:39:35 2007 +0000
@@ -1,22 +1,23 @@
-$NetBSD: distinfo,v 1.133 2007/08/02 15:45:09 taca Exp $
+$NetBSD: distinfo,v 1.134 2007/09/07 10:39:35 taca Exp $
 
-SHA1 (squid-2.6.STABLE14.tar.bz2) = ff4801955707ff8a6bba69275951071d6ce55d33
-RMD160 (squid-2.6.STABLE14.tar.bz2) = 40037786e6b6af40904aa8d4252eb7234046687c
-Size (squid-2.6.STABLE14.tar.bz2) = 1291509 bytes
-SHA1 (patch-aa) = 9aa971e21de833b13f81ef04939c5e29e03e2e37
-SHA1 (patch-ab) = 28e7bf58edbcd504bc4c780370a7bd402e66c6b0
+SHA1 (squid-2.6.STABLE16.tar.bz2) = 3140c0df8bad7cf3350bd4a02f4ac9582e6c4406
+RMD160 (squid-2.6.STABLE16.tar.bz2) = 6383461c25f786e6497300b26ca5908ad0279ec7
+Size (squid-2.6.STABLE16.tar.bz2) = 1293078 bytes
+SHA1 (patch-aa) = 06712292968ae808494007a722da5710660d0fec
+SHA1 (patch-ab) = 42c3f2daa2294d346358c199a0c53d849d8b1c74
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0
-SHA1 (patch-ad) = 2a09337fdf74b855a21cb41636d28f018cd1218b
-SHA1 (patch-ae) = d01c35059f34c4c0fa2cae547ddffbc635d6af94
+SHA1 (patch-ad) = 8975f707dd46832011d618b5a1f623df88171f36
+SHA1 (patch-ae) = fb32c403e3613595931abf7f7a8ce7cfd86d72a7
 SHA1 (patch-af) = a78e762c1ad928eef66b12395d48bc69542e32d9
 SHA1 (patch-aj) = fab8076c24a4e134b193fcdacc5240dfe7aa5504
-SHA1 (patch-ak) = 60e199e591dc6c4e2a93e67ba53b8cf75ae49631
+SHA1 (patch-ak) = 6df607714a7a043997ece1a56e43b326876f3d22
 SHA1 (patch-al) = d0a3b639147842ca5d07114b561d2431d8800971
-SHA1 (patch-an) = cb2ced35d368a33cdd6c51bdd0f02b4383f0ada6
-SHA1 (patch-ap) = 636475a33d69589485704fb99315862c52552323
-SHA1 (patch-ar) = 39a8d47d5a4d9cb325e58fb81eb20d2d7745a38c
-SHA1 (patch-as) = b1e7c6c8ab7f36a4a772b327dac58ba5a1edbf39
+SHA1 (patch-an) = 2027360a5ae2e24802719d4fe8801b0eeeb8a681
+SHA1 (patch-ap) = 20eec1bcc0a12e3ea47fda7a6ff14d781c0334c5
+SHA1 (patch-ar) = 985c192662d41264012a76248e9bea0662cec8f5
+SHA1 (patch-as) = e09a5703cdc7343259c07e599c933a613172a9b3
 SHA1 (patch-at) = 7ce72c964345203876d56d003353a5213c327252
-SHA1 (patch-au) = db41c3fc1b7ec6dd020559aa767d488738cd4747
+SHA1 (patch-au) = 25f6c7e366e7dca2aeb55312bd2ccf51d7a7b725
+SHA1 (patch-av) = 135cac28713b806af4cd9011a0a8cf9c88b929d0
 SHA1 (patch-bb) = 6711186c3e3e7992f9874eb47df7c0d3690649c2
 SHA1 (patch-bc) = 0b87eb5f4ccc06a0e59ed298fc3203b1b2641969
diff -r b1e99f7a4d6b -r 482bf457f352 www/squid/patches/patch-aa
--- a/www/squid/patches/patch-aa        Fri Sep 07 10:38:44 2007 +0000
+++ b/www/squid/patches/patch-aa        Fri Sep 07 10:39:35 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.21 2007/08/02 15:45:10 taca Exp $
+$NetBSD: patch-aa,v 1.22 2007/09/07 10:39:35 taca Exp $
 
---- src/Makefile.in.orig       2007-06-23 09:14:56.000000000 +0900
+--- src/Makefile.in.orig       2007-08-12 21:41:07.000000000 +0900
 +++ src/Makefile.in
-@@ -622,14 +622,14 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
+@@ -628,14 +628,14 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
  DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
  DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
  DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
@@ -21,7 +21,7 @@
  DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
  
  # Don't automatically uninstall config files
-@@ -877,20 +877,20 @@ distclean-compile:
+@@ -883,20 +883,20 @@ distclean-compile:
  uninstall-info-am:
  install-dataDATA: $(data_DATA)
        @$(NORMAL_INSTALL)
@@ -47,7 +47,7 @@
        done
  install-sysconfDATA: $(sysconf_DATA)
        @$(NORMAL_INSTALL)
-@@ -1143,8 +1143,7 @@ info-am:
+@@ -1149,8 +1149,7 @@ info-am:
  
  install-data-am: install-data-local install-dataDATA
  
@@ -57,7 +57,7 @@
  
  install-info: install-info-recursive
  
-@@ -1171,7 +1170,7 @@ ps-am:
+@@ -1177,7 +1176,7 @@ ps-am:
  
  uninstall-am: uninstall-dataDATA uninstall-info-am \
        uninstall-libexecPROGRAMS uninstall-local \
@@ -66,7 +66,7 @@
  
  uninstall-info: uninstall-info-recursive
  
-@@ -1255,20 +1254,7 @@ repl_modules.c: repl_modules.sh Makefile
+@@ -1261,20 +1260,7 @@ repl_modules.c: repl_modules.sh Makefile
  auth_modules.c: auth_modules.sh Makefile
        @$(SHELL) $(srcdir)/auth_modules.sh $(AUTH_MODULES) >auth_modules.c
  
diff -r b1e99f7a4d6b -r 482bf457f352 www/squid/patches/patch-ab
--- a/www/squid/patches/patch-ab        Fri Sep 07 10:38:44 2007 +0000
+++ b/www/squid/patches/patch-ab        Fri Sep 07 10:39:35 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.9 2007/08/02 15:45:10 taca Exp $
+$NetBSD: patch-ab,v 1.10 2007/09/07 10:39:35 taca Exp $
 
---- scripts/Makefile.in.orig   2007-06-23 09:14:56.000000000 +0900
+--- scripts/Makefile.in.orig   2007-08-12 21:41:06.000000000 +0900
 +++ scripts/Makefile.in
-@@ -208,7 +208,7 @@ am__leading_dot = @am__leading_dot@
+@@ -207,7 +207,7 @@ am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
diff -r b1e99f7a4d6b -r 482bf457f352 www/squid/patches/patch-ad
--- a/www/squid/patches/patch-ad        Fri Sep 07 10:38:44 2007 +0000
+++ b/www/squid/patches/patch-ad        Fri Sep 07 10:39:35 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.11 2007/08/02 15:45:10 taca Exp $
+$NetBSD: patch-ad,v 1.12 2007/09/07 10:39:35 taca Exp $
 
---- errors/Makefile.in.orig    2007-06-23 09:14:40.000000000 +0900
+--- errors/Makefile.in.orig    2007-08-23 09:14:40.000000000 +0900
 +++ errors/Makefile.in
-@@ -231,7 +231,7 @@ sbindir = @sbindir@
+@@ -237,7 +237,7 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
diff -r b1e99f7a4d6b -r 482bf457f352 www/squid/patches/patch-ae
--- a/www/squid/patches/patch-ae        Fri Sep 07 10:38:44 2007 +0000
+++ b/www/squid/patches/patch-ae        Fri Sep 07 10:39:35 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.11 2007/08/02 15:45:10 taca Exp $
+$NetBSD: patch-ae,v 1.12 2007/09/07 10:39:35 taca Exp $
 
---- icons/Makefile.in.orig     2007-06-23 09:14:55.000000000 +0900
+--- icons/Makefile.in.orig     2007-08-12 21:41:05.000000000 +0900
 +++ icons/Makefile.in
-@@ -268,7 +268,7 @@ ICON2 = anthony-bomb.gif \
+@@ -274,7 +274,7 @@ ICON2 = anthony-bomb.gif \
                anthony-xbm.gif \
                anthony-xpm.gif
  
diff -r b1e99f7a4d6b -r 482bf457f352 www/squid/patches/patch-ak
--- a/www/squid/patches/patch-ak        Fri Sep 07 10:38:44 2007 +0000
+++ b/www/squid/patches/patch-ak        Fri Sep 07 10:39:35 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.12 2007/08/02 15:45:10 taca Exp $
+$NetBSD: patch-ak,v 1.13 2007/09/07 10:39:36 taca Exp $
 
---- src/cf.data.pre.orig       2007-06-26 08:34:57.000000000 +0900
+--- src/cf.data.pre.orig       2007-08-22 09:14:30.000000000 +0900
 +++ src/cf.data.pre
-@@ -1409,6 +1409,18 @@ DOC_START
+@@ -1318,6 +1318,18 @@ DOC_START
        formats).  To enable this logging set log_mime_hdrs to 'on'.
  DOC_END
  
@@ -21,7 +21,7 @@
  NAME: useragent_log
  TYPE: string
  LOC: Config.Log.useragent
-@@ -3275,12 +3287,12 @@ DOC_END
+@@ -3352,12 +3364,12 @@ DOC_END
  
  NAME: cache_effective_user
  TYPE: string
diff -r b1e99f7a4d6b -r 482bf457f352 www/squid/patches/patch-an
--- a/www/squid/patches/patch-an        Fri Sep 07 10:38:44 2007 +0000
+++ b/www/squid/patches/patch-an        Fri Sep 07 10:39:35 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-an,v 1.14 2007/08/02 15:45:10 taca Exp $
+$NetBSD: patch-an,v 1.15 2007/09/07 10:39:36 taca Exp $
 
---- configure.in.orig  2007-07-15 23:21:59.000000000 +0900
+--- configure.in.orig  2007-08-31 23:55:13.000000000 +0900
 +++ configure.in
 @@ -1609,11 +1609,13 @@ AC_CHECK_HEADERS(
        linux/netfilter_ipv4.h \
diff -r b1e99f7a4d6b -r 482bf457f352 www/squid/patches/patch-ap
--- a/www/squid/patches/patch-ap        Fri Sep 07 10:38:44 2007 +0000
+++ b/www/squid/patches/patch-ap        Fri Sep 07 10:39:35 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.6 2007/08/02 15:45:10 taca Exp $
+$NetBSD: patch-ap,v 1.7 2007/09/07 10:39:36 taca Exp $
 
---- helpers/basic_auth/MSNT/Makefile.in.orig   2007-06-23 09:14:44.000000000 +0900
+--- helpers/basic_auth/MSNT/Makefile.in.orig   2007-08-12 21:40:48.000000000 +0900
 +++ helpers/basic_auth/MSNT/Makefile.in
-@@ -526,9 +526,9 @@ info: info-am
+@@ -532,9 +532,9 @@ info: info-am
  
  info-am:
  
diff -r b1e99f7a4d6b -r 482bf457f352 www/squid/patches/patch-ar
--- a/www/squid/patches/patch-ar        Fri Sep 07 10:38:44 2007 +0000
+++ b/www/squid/patches/patch-ar        Fri Sep 07 10:39:35 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ar,v 1.3 2007/08/02 15:45:11 taca Exp $
+$NetBSD: patch-ar,v 1.4 2007/09/07 10:39:36 taca Exp $
 
---- tools/Makefile.in.orig     2007-06-23 09:14:59.000000000 +0900
+--- tools/Makefile.in.orig     2007-08-12 21:41:09.000000000 +0900
 +++ tools/Makefile.in
-@@ -733,7 +733,7 @@ info: info-recursive
+@@ -739,7 +739,7 @@ info: info-recursive
  
  info-am:
  
diff -r b1e99f7a4d6b -r 482bf457f352 www/squid/patches/patch-as
--- a/www/squid/patches/patch-as        Fri Sep 07 10:38:44 2007 +0000
+++ b/www/squid/patches/patch-as        Fri Sep 07 10:39:35 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.3 2007/08/02 15:45:11 taca Exp $
+$NetBSD: patch-as,v 1.4 2007/09/07 10:39:36 taca Exp $
 
---- Makefile.in.orig   2007-06-23 09:14:34.000000000 +0900
+--- Makefile.in.orig   2007-08-12 21:40:44.000000000 +0900
 +++ Makefile.in
-@@ -722,7 +722,7 @@ dist-hook:
+@@ -728,7 +728,7 @@ dist-hook:
  
  install-pinger:
        chown root $(DEFAULT_PINGER) 
diff -r b1e99f7a4d6b -r 482bf457f352 www/squid/patches/patch-au
--- a/www/squid/patches/patch-au        Fri Sep 07 10:38:44 2007 +0000
+++ b/www/squid/patches/patch-au        Fri Sep 07 10:39:35 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-au,v 1.1 2007/08/02 15:45:11 taca Exp $
+$NetBSD: patch-au,v 1.2 2007/09/07 10:39:36 taca Exp $
 
---- configure.orig     2007-07-15 23:21:59.000000000 +0900
+--- configure.orig     2007-08-31 23:55:13.000000000 +0900
 +++ configure
-@@ -7342,11 +7342,13 @@ for ac_header in sys/types.h \
+@@ -8039,11 +8039,13 @@ for ac_header in sys/types.h \
        linux/netfilter_ipv4.h \
        linux/netfilter_ipv4/ip_tproxy.h \
        malloc.h \
@@ -16,12 +16,12 @@
        netdb.h \
        netinet/if_ether.h \
        netinet/tcp.h \
-@@ -21058,11 +21060,13 @@ _ACEOF
+@@ -21446,11 +21448,13 @@ _ACEOF
  fi
  
  
--echo "$as_me:$LINENO: checking for fd_mask" >&5
--echo $ECHO_N "checking for fd_mask... $ECHO_C" >&6
+-{ echo "$as_me:$LINENO: checking for fd_mask" >&5
+-echo $ECHO_N "checking for fd_mask... $ECHO_C" >&6; }
 -if test "${ac_cv_type_fd_mask+set}" = set; then
 +
 +{ echo "$as_me:$LINENO: checking for fd_set" >&5
@@ -33,7 +33,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -21070,34 +21074,13 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -21458,35 +21462,14 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -41,7 +41,7 @@
 - * in their own ways, so we need to scan a wide variety of headers to
 - * find them..
 - */
- #include <sys/types.h>
+-#include <sys/types.h>
 -#if STDC_HEADERS
 -#include <stdlib.h>
 -#include <stddef.h>
@@ -50,7 +50,7 @@
 -#include <inttypes.h>
 -#endif
 -#if HAVE_SYS_TYPES_H
--#include <sys/types.h>
+ #include <sys/types.h>
 -#endif
 -#if HAVE_SYS_BITYPES_H
 -#include <sys/bitypes.h>
@@ -59,35 +59,37 @@
 -
 +#include <sys/time.h>
 +#include <sys/unistd.h>
+ typedef fd_mask ac__type_new_;
  int
  main ()
  {
--if ((fd_mask *) 0)
+-if ((ac__type_new_ *) 0)
 -  return 0;
--if (sizeof (fd_mask))