[pkgsrc/trunk]: pkgsrc/www/squid Update squid package to squid-2.5.4nb3.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c9c302b55066
branches:  trunk
changeset: 464367:c9c302b55066
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun Dec 07 16:48:20 2003 +0000

description:
Update squid package to squid-2.5.4nb3.
Apply two offcial patches.

* FQDN lookups sometimes returns garbage

        synopsis        FQDN lookups sometimes give garbage after the result.
                        This can be seen as junk in access.log when using
                        log_fqdn or false access control results when using
                        dstdomain acl type and the user requests a URL by IP
                        address.
        severity        Minor
        date            2003-12-04 10:04
        bugzilla        #846, #834, #433
        versions        Squid-2.5 and earlier
        platforms       All
        workaround      Don't use log_fqdn or alternatively compile Squid with
                        --disable-internal-dns

* Cleanup of connect & dns timeouts etc

        synopsis        Several minor errors related to how Squid finds a
                        connection where to forward requests. This patch

                        o Adds a new configuration parameter "forward_timeout"
                          to control how long Squid tries to find a method to
                          find a path where to forward the request before
                          giving up.  Defaults to 2 minutes.
                        o The default connect_timeout tuned down from 2 minutes
                          to 1 minute to allow for two attempts to find a
                          suitable path within the forward_timeout
                        o fqdncache/ipcache restructured to allow for DNS code
                          to allow the queried name to be logged in cache.log
                          on errors.
                        o negative_dns_ttl now overloaded to also specify the
                          minimum ttl used when caching DNS responses, and
                          tuned down from 5 minutes to 1 minute.
                        o default dns_timeout tuned down from 5 minutes to
                          2 minutes
                        o some minor compilation warnings on
                          --disable-internal-dns corrected
                        o properly report DNS timeouts as timeouts and not just
                          "No DNS records"
        severity        Minor
        date            2003-12-06 17:06
        bugzilla        #848, #849, #851, #852
        versions        Squid-2.5 and earlier
        platforms       All

diffstat:

 www/squid/Makefile |  8 +++++---
 www/squid/distinfo |  6 +++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r 8971cff124c6 -r c9c302b55066 www/squid/Makefile
--- a/www/squid/Makefile        Sun Dec 07 16:32:59 2003 +0000
+++ b/www/squid/Makefile        Sun Dec 07 16:48:20 2003 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.95 2003/11/30 14:08:31 taca Exp $
+# $NetBSD: Makefile,v 1.96 2003/12/07 16:48:20 taca Exp $
 
 DISTNAME=      squid-2.5.STABLE4
 PKGNAME=       squid-2.5.4
-PKGREVISION=   2
+PKGREVISION=   3
 WRKSRC=                ${WRKDIR}/${DISTNAME:S/-src//}
 CATEGORIES=    www
 MASTER_SITES=  http://www.squid-cache.org/Versions/v2/2.5/ \
@@ -26,7 +26,9 @@
                squid-2.5.STABLE4-positive_dns_ttl.patch \
                squid-2.5.STABLE4-gopherhtml.patch \
                squid-2.5.STABLE4-netroute.patch \
-               squid-2.5.STABLE4-synflood.patch
+               squid-2.5.STABLE4-synflood.patch \
+               squid-2.5.STABLE4-fqdn.patch \
+               squid-2.5.STABLE4-connect_cleanup.patch
 PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=    taca%NetBSD.org@localhost
diff -r 8971cff124c6 -r c9c302b55066 www/squid/distinfo
--- a/www/squid/distinfo        Sun Dec 07 16:32:59 2003 +0000
+++ b/www/squid/distinfo        Sun Dec 07 16:48:20 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2003/11/30 14:08:31 taca Exp $
+$NetBSD: distinfo,v 1.42 2003/12/07 16:48:20 taca Exp $
 
 SHA1 (squid-2.5.4/squid-2.5.STABLE4.tar.bz2) = 470a2697625cf6edb83ad6fe59af2e147f557e24
 Size (squid-2.5.4/squid-2.5.STABLE4.tar.bz2) = 1036704 bytes
@@ -34,6 +34,10 @@
 Size (squid-2.5.4/squid-2.5.STABLE4-netroute.patch) = 592 bytes
 SHA1 (squid-2.5.4/squid-2.5.STABLE4-synflood.patch) = a1138fb535a3f41a67c01e3e9eca8c11fcc8d72d
 Size (squid-2.5.4/squid-2.5.STABLE4-synflood.patch) = 12861 bytes
+SHA1 (squid-2.5.4/squid-2.5.STABLE4-fqdn.patch) = fc0113ebef713234ec9905359a57c1e80f03d211
+Size (squid-2.5.4/squid-2.5.STABLE4-fqdn.patch) = 713 bytes
+SHA1 (squid-2.5.4/squid-2.5.STABLE4-connect_cleanup.patch) = 80f0444ed75b8c2c9965e8ba9fcce8741de56014
+Size (squid-2.5.4/squid-2.5.STABLE4-connect_cleanup.patch) = 32515 bytes
 SHA1 (patch-aa) = 2e0d96f6ccb9d0c42db2da49e76846edad09624f
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0