[pkgsrc/trunk]: pkgsrc/www/squid Update squid pacakge to 2.6.13 (2.6.STABLE13).

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4f32c5649d23
branches:  trunk
changeset: 528733:4f32c5649d23
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun May 13 16:45:44 2007 +0000

description:
Update squid pacakge to 2.6.13 (2.6.STABLE13).


Changes to squid-2.6.STABLE13 (11 May 2007)

        - Make sure reply headers gets sent even if there is no body available
          yet, fixing RealMedia streaming over HTTP issues.
        - Undo an accidental name change of storeUnregisterAbort.
        - Kill an ancient malplaced storeUnregisterAbort call from ftp.c
        - Bug #1814: SSL memory leak on persistent SSL connections
        - Don't log ECONNREFUSED/ECONNABORTED accept failures in cache.log
        - Cosmetic fix: added missing newline in WCCPv2 configuration dump.
        - Ukrainan error messages
        - Convert various error pages from DOS to UNIX text format
        - Bug #1820: COSS assertion failure t->length == MD5_DIGEST_CHARS
        - Clarify the max-conn=n cache_peer option syntax slightly
        - Bug #1892: COSS segfault on shutdown
        - Windows port: fix undefined ECONNABORTED
        - Make refreshIsCachable handle ETag as a cache validator, not
          only last-modified
        - in_port_t is not portable, use unsigned short instead
        - Fix fs / auth / snmp dependencies
        - Portability: statfs() may reqire #include <sys/statfs.h>

diffstat:

 www/squid/Makefile         |   9 +++++----
 www/squid/distinfo         |  34 +++++++++++++++++-----------------
 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-ag |  14 +++++++-------
 www/squid/patches/patch-aj |  10 +++++-----
 www/squid/patches/patch-ak |   8 ++++----
 www/squid/patches/patch-al |   6 +++---
 www/squid/patches/patch-an |  10 +++++-----
 www/squid/patches/patch-ap |   6 +++---
 www/squid/patches/patch-ar |   6 +++---
 www/squid/patches/patch-as |   6 +++---
 www/squid/patches/patch-at |   4 ++--
 15 files changed, 73 insertions(+), 72 deletions(-)

diffs (truncated from 383 to 300 lines):

diff -r 2fbdb4dca891 -r 4f32c5649d23 www/squid/Makefile
--- a/www/squid/Makefile        Sun May 13 16:13:10 2007 +0000
+++ b/www/squid/Makefile        Sun May 13 16:45:44 2007 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.191 2007/03/21 05:25:01 taca Exp $
+# $NetBSD: Makefile,v 1.192 2007/05/13 16:45:44 taca Exp $
 
-DISTNAME=      squid-2.6.STABLE12
+DISTNAME=      squid-2.6.STABLE13
 PKGNAME=       ${DISTNAME:S/STABLE//}
 CATEGORIES=    www
 MASTER_SITES=  http://www.squid-cache.org/Versions/v2/2.6/ \
@@ -60,7 +60,8 @@
                        --enable-removal-policies=lru,heap \
                        --enable-poll \
                        --enable-underscores \
-                       --enable-storeio=${SQUID_BACKENDS:Q}
+                       --enable-storeio=${SQUID_BACKENDS:Q} \
+                       --with-aio
 
 #
 # generic helpers
@@ -105,7 +106,7 @@
 .endfor
        ${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
        ${INSTALL_DATA_DIR} ${DOCDIR}
-       @cd ${WRKSRC};                                          \
+       cd ${WRKSRC};                                           \
        for i in ${DOCFILES}; do                                \
                ${INSTALL_DATA} $$i ${DOCDIR};                  \
        done
diff -r 2fbdb4dca891 -r 4f32c5649d23 www/squid/distinfo
--- a/www/squid/distinfo        Sun May 13 16:13:10 2007 +0000
+++ b/www/squid/distinfo        Sun May 13 16:45:44 2007 +0000
@@ -1,22 +1,22 @@
-$NetBSD: distinfo,v 1.131 2007/03/21 05:25:01 taca Exp $
+$NetBSD: distinfo,v 1.132 2007/05/13 16:45:44 taca Exp $
 
-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 (squid-2.6.STABLE13.tar.bz2) = e7e3cc93dadbfe2bdfa4d711a40259d45e360bd1
+RMD160 (squid-2.6.STABLE13.tar.bz2) = bfe7cdc6194bba93158441aaccaca3a0b0fad75d
+Size (squid-2.6.STABLE13.tar.bz2) = 1263229 bytes
+SHA1 (patch-aa) = fb8c4b6262215f2b7e7cca0e3bf9c60e7c4a3ee3
+SHA1 (patch-ab) = 68343a5094d4e333166a2404896e3370e369f0e1
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0
-SHA1 (patch-ad) = 8dc230430b9030951232c6881100234caffdd0d9
-SHA1 (patch-ae) = 5af05ae0ec09b7a6f3af61201f60357909b9e6c8
+SHA1 (patch-ad) = 0d37aaf5047fc38ea99192c3273bb2f72391d44c
+SHA1 (patch-ae) = 58cd3fda2578dccd64cb638be5829c736c489c8c
 SHA1 (patch-af) = a78e762c1ad928eef66b12395d48bc69542e32d9
-SHA1 (patch-ag) = 158cf7aa07b54cf022d6f000426213009b73f863
-SHA1 (patch-aj) = e19317d35da85ad7481fdcd154c42706b605dc75
-SHA1 (patch-ak) = cec28eee3366b43ac574df6591a73a2d33be1a67
-SHA1 (patch-al) = 8f9ede6e80ba6950bf351fc75bbca8dbfbf110b6
-SHA1 (patch-an) = 32aa94784f7f6e30d820ed56fc3725eae2a8856e
-SHA1 (patch-ap) = bf2223ea0ab660b2fdb6043845cedac5907bd1f0
-SHA1 (patch-ar) = a80477b24d02688f1f55ba1d4967bf340b5c04cb
-SHA1 (patch-as) = 87cfb6190bbdaa17ffbe3a877cf6f67fde3af1f1
-SHA1 (patch-at) = 9b0860543e3a122afdd21ff75ca7e22b2aa64458
+SHA1 (patch-ag) = 43c9ff0284367f05a667575ad8c5055294ff872b
+SHA1 (patch-aj) = fab8076c24a4e134b193fcdacc5240dfe7aa5504
+SHA1 (patch-ak) = c154f0e61f0d7874e16d595dcb4305c489bd31fa
+SHA1 (patch-al) = d0a3b639147842ca5d07114b561d2431d8800971
+SHA1 (patch-an) = 92d4b1e3018c06d0d7e40bc7d6e5e1fdde56e13e
+SHA1 (patch-ap) = 697092772e52e75dd1128790ea04a6902a5622e4
+SHA1 (patch-ar) = cb5f7100851112cf574c3002d5c6cecafb44611d
+SHA1 (patch-as) = a59f1242d2d386c019f59758db18e4f0ef52131f
+SHA1 (patch-at) = 7ce72c964345203876d56d003353a5213c327252
 SHA1 (patch-bb) = 6711186c3e3e7992f9874eb47df7c0d3690649c2
 SHA1 (patch-bc) = 0b87eb5f4ccc06a0e59ed298fc3203b1b2641969
diff -r 2fbdb4dca891 -r 4f32c5649d23 www/squid/patches/patch-aa
--- a/www/squid/patches/patch-aa        Sun May 13 16:13:10 2007 +0000
+++ b/www/squid/patches/patch-aa        Sun May 13 16:45:44 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.19 2006/09/13 14:41:58 taca Exp $
+$NetBSD: patch-aa,v 1.20 2007/05/13 16:45:44 taca Exp $
 
---- src/Makefile.in.orig       2006-07-30 17:56:18.000000000 +0900
+--- src/Makefile.in.orig       2007-05-06 07:06:55.000000000 +0900
 +++ src/Makefile.in
-@@ -590,14 +590,14 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
+@@ -617,14 +617,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
-@@ -842,20 +842,20 @@ distclean-compile:
+@@ -871,20 +871,20 @@ distclean-compile:
  uninstall-info-am:
  install-dataDATA: $(data_DATA)
        @$(NORMAL_INSTALL)
@@ -47,7 +47,7 @@
        done
  install-sysconfDATA: $(sysconf_DATA)
        @$(NORMAL_INSTALL)
-@@ -1108,8 +1108,7 @@ info-am:
+@@ -1137,8 +1137,7 @@ info-am:
  
  install-data-am: install-data-local install-dataDATA
  
@@ -57,7 +57,7 @@
  
  install-info: install-info-recursive
  
-@@ -1136,7 +1135,7 @@ ps-am:
+@@ -1165,7 +1164,7 @@ ps-am:
  
  uninstall-am: uninstall-dataDATA uninstall-info-am \
        uninstall-libexecPROGRAMS uninstall-local \
@@ -66,7 +66,7 @@
  
  uninstall-info: uninstall-info-recursive
  
-@@ -1220,20 +1219,7 @@ repl_modules.c: repl_modules.sh Makefile
+@@ -1249,20 +1248,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 2fbdb4dca891 -r 4f32c5649d23 www/squid/patches/patch-ab
--- a/www/squid/patches/patch-ab        Sun May 13 16:13:10 2007 +0000
+++ b/www/squid/patches/patch-ab        Sun May 13 16:45:44 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.7 2006/09/13 14:41:58 taca Exp $
+$NetBSD: patch-ab,v 1.8 2007/05/13 16:45:44 taca Exp $
 
---- scripts/Makefile.in.orig   2006-06-12 15:10:08.000000000 +0900
+--- scripts/Makefile.in.orig   2006-11-05 08:20:03.000000000 +0900
 +++ scripts/Makefile.in
-@@ -198,7 +198,7 @@ am__leading_dot = @am__leading_dot@
+@@ -206,7 +206,7 @@ am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
diff -r 2fbdb4dca891 -r 4f32c5649d23 www/squid/patches/patch-ad
--- a/www/squid/patches/patch-ad        Sun May 13 16:13:10 2007 +0000
+++ b/www/squid/patches/patch-ad        Sun May 13 16:45:44 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.9 2006/09/13 14:41:58 taca Exp $
+$NetBSD: patch-ad,v 1.10 2007/05/13 16:45:44 taca Exp $
 
---- errors/Makefile.in.orig    2006-06-12 15:09:43.000000000 +0900
+--- errors/Makefile.in.orig    2006-11-05 08:19:47.000000000 +0900
 +++ errors/Makefile.in
-@@ -221,7 +221,7 @@ sbindir = @sbindir@
+@@ -229,7 +229,7 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
diff -r 2fbdb4dca891 -r 4f32c5649d23 www/squid/patches/patch-ae
--- a/www/squid/patches/patch-ae        Sun May 13 16:13:10 2007 +0000
+++ b/www/squid/patches/patch-ae        Sun May 13 16:45:44 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.9 2006/09/13 14:41:58 taca Exp $
+$NetBSD: patch-ae,v 1.10 2007/05/13 16:45:44 taca Exp $
 
---- icons/Makefile.in.orig     2006-06-12 15:10:08.000000000 +0900
+--- icons/Makefile.in.orig     2006-11-05 08:20:02.000000000 +0900
 +++ icons/Makefile.in
-@@ -258,7 +258,7 @@ ICON2 = anthony-bomb.gif \
+@@ -266,7 +266,7 @@ ICON2 = anthony-bomb.gif \
                anthony-xbm.gif \
                anthony-xpm.gif
  
diff -r 2fbdb4dca891 -r 4f32c5649d23 www/squid/patches/patch-ag
--- a/www/squid/patches/patch-ag        Sun May 13 16:13:10 2007 +0000
+++ b/www/squid/patches/patch-ag        Sun May 13 16:45:44 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.26 2007/02/06 22:06:32 joerg Exp $
+$NetBSD: patch-ag,v 1.27 2007/05/13 16:45:44 taca Exp $
 
---- configure.orig     2007-01-24 02:07:43.000000000 +0000
+--- configure.orig     2007-05-11 08:59:36.000000000 +0900
 +++ configure
-@@ -7323,6 +7323,7 @@ for ac_header in sys/types.h \
+@@ -7324,6 +7324,7 @@ for ac_header in sys/types.h \
        linux/netfilter_ipv4.h \
        linux/netfilter_ipv4/ip_tproxy.h \
        malloc.h \
@@ -10,7 +10,7 @@
        math.h \
        memory.h \
        mount.h \
-@@ -13791,9 +13792,9 @@ _ACEOF
+@@ -13793,9 +13794,9 @@ _ACEOF
  
  fi
  
@@ -23,7 +23,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -13822,26 +13823,63 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -13824,26 +13825,63 @@ cat >>conftest.$ac_ext <<_ACEOF
  #include <sys/bitypes.h>
  #endif
  
@@ -100,7 +100,7 @@
  
  echo "$as_me:$LINENO: checking size of off_t" >&5
  echo $ECHO_N "checking size of off_t... $ECHO_C" >&6
-@@ -15809,8 +15847,8 @@ if test "$GCC" = "yes"; then
+@@ -15811,8 +15849,8 @@ if test "$GCC" = "yes"; then
        GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
        case "$GCCVER" in
        2.95.[123])
@@ -111,7 +111,7 @@
                ;;
        esac
  fi
-@@ -16743,7 +16781,7 @@ if test "$PF_TRANSPARENT" ; then
+@@ -16863,7 +16901,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...
diff -r 2fbdb4dca891 -r 4f32c5649d23 www/squid/patches/patch-aj
--- a/www/squid/patches/patch-aj        Sun May 13 16:13:10 2007 +0000
+++ b/www/squid/patches/patch-aj        Sun May 13 16:45:44 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.7 2006/09/13 14:41:58 taca Exp $
+$NetBSD: patch-aj,v 1.8 2007/05/13 16:45:44 taca Exp $
 
---- src/access_log.c.orig      2006-07-27 05:21:16.000000000 +0900
+--- src/access_log.c.orig      2007-02-04 06:59:24.000000000 +0900
 +++ src/access_log.c
-@@ -117,6 +117,8 @@ log_quote(const char *header)
+@@ -90,6 +90,8 @@ log_quote(const char *header)
  {
      int c;
      int i;
@@ -11,7 +11,7 @@
      char *buf;
      char *buf_cursor;
      if (header == NULL) {
-@@ -126,13 +128,41 @@ log_quote(const char *header)
+@@ -99,13 +101,41 @@ log_quote(const char *header)
      }
      buf = xcalloc(1, (strlen(header) * 3) + 1);
      buf_cursor = buf;
@@ -54,7 +54,7 @@
  #if !OLD_LOG_MIME
        if (c == '\r') {
            *buf_cursor++ = '\\';
-@@ -140,6 +170,7 @@ log_quote(const char *header)
+@@ -113,6 +143,7 @@ log_quote(const char *header)
        } else if (c == '\n') {
            *buf_cursor++ = '\\';
            *buf_cursor++ = 'n';
diff -r 2fbdb4dca891 -r 4f32c5649d23 www/squid/patches/patch-ak
--- a/www/squid/patches/patch-ak        Sun May 13 16:13:10 2007 +0000
+++ b/www/squid/patches/patch-ak        Sun May 13 16:45:44 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.10 2006/09/13 14:41:58 taca Exp $
+$NetBSD: patch-ak,v 1.11 2007/05/13 16:45:44 taca Exp $
 
---- src/cf.data.pre.orig       2006-07-31 10:31:18.000000000 +0900
+--- src/cf.data.pre.orig       2007-04-25 06:30:03.000000000 +0900
 +++ src/cf.data.pre
-@@ -1349,6 +1349,23 @@ DOC_START
+@@ -1414,6 +1414,23 @@ DOC_START
  DOC_END
  
  
@@ -26,7 +26,7 @@
  NAME: useragent_log
  TYPE: string
  LOC: Config.Log.useragent
-@@ -3245,12 +3262,12 @@ DOC_END
+@@ -3311,12 +3328,12 @@ DOC_END
  
  NAME: cache_effective_user
  TYPE: string
diff -r 2fbdb4dca891 -r 4f32c5649d23 www/squid/patches/patch-al
--- a/www/squid/patches/patch-al        Sun May 13 16:13:10 2007 +0000
+++ b/www/squid/patches/patch-al        Sun May 13 16:45:44 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.8 2006/09/13 14:41:58 taca Exp $
+$NetBSD: patch-al,v 1.9 2007/05/13 16:45:44 taca Exp $
 
---- src/structs.h.orig 2006-07-31 08:27:03.000000000 +0900
+--- src/structs.h.orig 2007-04-27 08:11:51.000000000 +0900
 +++ src/structs.h
-@@ -597,6 +597,7 @@ struct _SquidConfig {
+@@ -599,6 +599,7 @@ struct _SquidConfig {
      wordlist *mcast_group_list;
      wordlist *dns_testname_list;
      wordlist *dns_nameservers;
diff -r 2fbdb4dca891 -r 4f32c5649d23 www/squid/patches/patch-an
--- a/www/squid/patches/patch-an        Sun May 13 16:13:10 2007 +0000
+++ b/www/squid/patches/patch-an        Sun May 13 16:45:44 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.12 2006/11/09 15:16:21 taca Exp $
+$NetBSD: patch-an,v 1.13 2007/05/13 16:45:44 taca Exp $