[pkgsrc/pkgsrc-2006Q4]: pkgsrc/www/squid Pullup ticket 2005 - requested by taca

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dbfe8304fe2d
branches:  pkgsrc-2006Q4
changeset: 522990:dbfe8304fe2d
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Mon Jan 29 18:51:24 2007 +0000

description:
Pullup ticket 2005 - requested by taca
security update for squid

- pkgsrc/www/squid/Makefile                             1.187-1.88
- pkgsrc/www/squid/distinfo                             1.125-1.126
- pkgsrc/www/squid/patches/patch-bd                     removed

   Module Name: pkgsrc
   Committed By:        taca
   Date:                Sun Jan 14 04:12:12 UTC 2007

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

   Log Message:
   Update squid package to 2.6.7 (2.6.STABLE7).

   o arp-acl is now supported on NetBSD contributed by Jaromir Dolecek <jdolecek@>.

   Changes to squid-2.6.STABLE7 (Jan 13 2007)

           - Windows port: Fix intermittent build error using Visual Studio
           - Add missing tproxy info from the dump of http port configuration
           - Bug #1853: Support for ARP ACL on NetBSD
           - clientNatLookup(): fix wrong function name in debug messages
           - Convert ncsa_auth man page from DOS to Unix text format.
           - Bug #1858: digest_ldap_auth had some remains of old hash format
           - Correct the select_loops counter when using select(). Was counted twice
           - Clarify the http_port vhost option a bit
           - Fix cache-control: max-stale without value or bad value
           - Bug #1857: Segmentation fault on certain types of ftp:// requests
           - Bug #1848: external_acl crashes with an infinite loop under high load
           - Bug #1792: max_user_ip not working with NTLM authentication
           - Bug #1865: deny_info redirection with authentication related acls
           - Small example on how to use the squid_session helper
           - Bug #1863: cache_peer monitorurl, monitorsize and monitorinterval not working properly
           - Clarify the transparent http_port option a bit more
           - Bug #1828: squid.conf docutemtation error for proxy_auth digest
           - Bug #1867: squid.pid isn't removed on shutdown
---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Sun Jan 28 05:39:24 UTC 2007

   Modified Files:
           pkgsrc/www/squid: Makefile distinfo

   Log Message:
   Update squid to 2.6.9 (2.6.STABLE9). I deleted DIST_SUBDIR for now.

   Changes to squid-2.6.STABLE9 (Jan 24 2007)

           - Bug #1878: If-Modified-Since broken in 2.6.STABLE8
           - Bug #1877 diskd bug in storeDiskdIOCallback()

   Changes to squid-2.6.STABLE8 (Jan 21 2007)

           - Bug #1873: authenticateNTLMFixErrorHeader: state 4.
           - Document the https_port vhost option, useful in combination with
             a wildcard certificate
           - Document the existence of connection pinning / forwarding of NTLM
             auth and a few other features overlooked in the release notes.
           - Spelling correction of the ssl cache_peer option
           - Add back the optional "accel" http_port option. Makes accelerator
             mode configurations easier to read.
           - Bug #1872: Date parsing error causing objects to get unexpectedly
             cached.
           - Cleanup to have the access.log tags autogenerated from enums.h
           - Bug #1783: STALE: Entry's timestamp greater than check time. Clock
             going backwards?
           - Don't update object timestamps on a failed revalidation.
           - Fix how ftp://user@host URLs is rendered when Squid is built with
             leak checking enabled

diffstat:

 www/squid/Makefile         |   8 +++-----
 www/squid/distinfo         |   9 ++++-----
 www/squid/patches/patch-bd |  40 ----------------------------------------
 3 files changed, 7 insertions(+), 50 deletions(-)

diffs (88 lines):

diff -r 70c976b3f7f6 -r dbfe8304fe2d www/squid/Makefile
--- a/www/squid/Makefile        Sun Jan 28 20:37:59 2007 +0000
+++ b/www/squid/Makefile        Mon Jan 29 18:51:24 2007 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.186 2006/12/12 14:46:56 taca Exp $
+# $NetBSD: Makefile,v 1.186.2.1 2007/01/29 18:51:24 ghen Exp $
 
-DISTNAME=      squid-2.6.STABLE6
-PKGNAME=       squid-2.6.6
-#PKGREVISION=
+DISTNAME=      squid-2.6.STABLE9
+PKGNAME=       ${DISTNAME:S/STABLE//}
 CATEGORIES=    www
 MASTER_SITES=  http://www.squid-cache.org/Versions/v2/2.6/ \
                ftp://ftp.leo.org/pub/comp/general/infosys/www/daemons/squid/squid-2/STABLE/ \
@@ -14,7 +13,6 @@
 COMMENT=       Post-Harvest_cached WWW proxy cache and accelerator
 
 WRKSRC=                ${WRKDIR}/${DISTNAME:S/-src//}
-DIST_SUBDIR=   ${PKGNAME_NOREV}
 
 DOCDIR=                ${PREFIX}/share/doc/squid
 EXAMPLESDIR=   ${PREFIX}/share/examples/squid
diff -r 70c976b3f7f6 -r dbfe8304fe2d www/squid/distinfo
--- a/www/squid/distinfo        Sun Jan 28 20:37:59 2007 +0000
+++ b/www/squid/distinfo        Mon Jan 29 18:51:24 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.124 2006/12/12 14:46:56 taca Exp $
+$NetBSD: distinfo,v 1.124.2.1 2007/01/29 18:51:24 ghen Exp $
 
-SHA1 (squid-2.6.6/squid-2.6.STABLE6.tar.bz2) = c731b77df70fb1c6870c0ec6064271316ed75e27
-RMD160 (squid-2.6.6/squid-2.6.STABLE6.tar.bz2) = 12b536f39c7a5b1822d3a68286ca267a5da9e8a3
-Size (squid-2.6.6/squid-2.6.STABLE6.tar.bz2) = 1261599 bytes
+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 (patch-aa) = bcbe4e0bf3cd632497dc8045c1b8d86842edf90c
 SHA1 (patch-ab) = e4b9213dcbae32b65d0fe69b9cf9cff49aae504e
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0
@@ -19,4 +19,3 @@
 SHA1 (patch-as) = 87cfb6190bbdaa17ffbe3a877cf6f67fde3af1f1
 SHA1 (patch-bb) = 6711186c3e3e7992f9874eb47df7c0d3690649c2
 SHA1 (patch-bc) = 87d67c6d00c0734eebc1d7c6a9bcd1e3331400d9
-SHA1 (patch-bd) = caff973dcceaf80c9c4b9104561f4f3b0eeb7150
diff -r 70c976b3f7f6 -r dbfe8304fe2d www/squid/patches/patch-bd
--- a/www/squid/patches/patch-bd        Sun Jan 28 20:37:59 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-$NetBSD: patch-bd,v 1.3 2006/12/04 21:50:54 jdolecek Exp $
-
---- src/acl.c.orig     2006-10-16 22:11:41.000000000 +0200
-+++ src/acl.c
-@@ -3083,7 +3083,7 @@ struct arpreq {
-  * token namespace crashing any structures or classes having members
-  * of the same names.
-  */
--#ifdef _SQUID_OPENBSD_
-+#if defined(_SQUID_NETBSD_) || defined(_SQUID_OPENBSD_)
- #undef free
- #endif
- #include <sys/sysctl.h>
-@@ -3096,7 +3096,7 @@ struct arpreq {
- #include <net/route.h>
- #endif
- #include <net/if.h>
--#if defined(_SQUID_FREEBSD_) || defined(_SQUID_OPENBSD_)
-+#if defined(_SQUID_FREEBSD_) || defined(_SQUID_NETBSD_) || defined(_SQUID_OPENBSD_)
- #include <net/if_arp.h>
- #endif
- #if HAVE_NETINET_IF_ETHER_H
-@@ -3318,7 +3318,7 @@ aclMatchArp(void *dataptr, struct in_add
-           inet_ntoa(c), splayLastResult ? "NOT found" : "found");
-       return (0 == splayLastResult);
-     }
--#elif defined(_SQUID_FREEBSD_) || defined(_SQUID_OPENBSD_)
-+#elif defined(_SQUID_FREEBSD_) || defined(_SQUID_NETBSD_) || defined(_SQUID_OPENBSD_)
- 
-     struct arpreq arpReq;
-     struct sockaddr_in ipAddr;
-@@ -3475,7 +3475,7 @@ aclArpCompare(const void *a, const void 
-       return (d1[4] > d2[4]) ? 1 : -1;
-     if (d1[5] != d2[5])
-       return (d1[5] > d2[5]) ? 1 : -1;
--#elif defined(_SQUID_FREEBSD_) || defined(_SQUID_OPENBSD_)
-+#elif defined(_SQUID_FREEBSD_) || defined(_SQUID_OPENBSD_) || defined(_SQUID_NETBSD_)
-     const unsigned char *d1 = a;
-     const unsigned char *d2 = b;
-     if (d1[0] != d2[0])