[pkgsrc/trunk]: pkgsrc/www/squid Add two official fix.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/96917ada84c7
branches:  trunk
changeset: 486657:96917ada84c7
user:      taca <taca%pkgsrc.org@localhost>
date:      Fri Dec 31 13:31:35 2004 +0000

description:
Add two official fix.

* 2004-12-28 12:55 (Minor) Don't close "other" filedescriptors on startup
* 2004-12-27 18:54 (Minor Security) Confusing results on empty acl declarations

Bump package revision.

diffstat:

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

diffs (45 lines):

diff -r 199b724e6cff -r 96917ada84c7 www/squid/Makefile
--- a/www/squid/Makefile        Fri Dec 31 13:29:21 2004 +0000
+++ b/www/squid/Makefile        Fri Dec 31 13:31:35 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.121 2004/12/28 02:47:51 reed Exp $
+# $NetBSD: Makefile,v 1.122 2004/12/31 13:31:35 taca Exp $
 
 DISTNAME=      squid-2.5.STABLE7
 PKGNAME=       squid-2.5.7
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    www
 MASTER_SITES=  http://www.squid-cache.org/Versions/v2/2.5/ \
                ftp://ftp.leo.org/pub/comp/general/infosys/www/daemons/squid/squid-2/STABLE/ \
@@ -18,7 +18,9 @@
                squid-2.5.STABLE7-blank_response.patch \
                squid-2.5.STABLE7-dothost.patch \
                squid-2.5.STABLE7-httpd_accel_vport.patch \
-               squid-2.5.STABLE7-cachemgr_vmobjects.patch
+               squid-2.5.STABLE7-cachemgr_vmobjects.patch \
+               squid-2.5.STABLE7-empty_acls.patch \
+               squid-2.5.STABEL7-close_other.patch
 PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=    taca%NetBSD.org@localhost
diff -r 199b724e6cff -r 96917ada84c7 www/squid/distinfo
--- a/www/squid/distinfo        Fri Dec 31 13:29:21 2004 +0000
+++ b/www/squid/distinfo        Fri Dec 31 13:31:35 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.68 2004/12/14 14:27:07 taca Exp $
+$NetBSD: distinfo,v 1.69 2004/12/31 13:31:35 taca Exp $
 
 SHA1 (squid-2.5.7-2004101300/squid-2.5.STABLE7.tar.bz2) = 24f29e28ec62d7ab5888cd594ac7a1975ee6aa36
 Size (squid-2.5.7-2004101300/squid-2.5.STABLE7.tar.bz2) = 1051830 bytes
@@ -20,6 +20,10 @@
 Size (squid-2.5.7-2004101300/squid-2.5.STABLE7-httpd_accel_vport.patch) = 843 bytes
 SHA1 (squid-2.5.7-2004101300/squid-2.5.STABLE7-cachemgr_vmobjects.patch) = f6f651a28b8ec65e3703137d2ec8bfbc69474d20
 Size (squid-2.5.7-2004101300/squid-2.5.STABLE7-cachemgr_vmobjects.patch) = 6238 bytes
+SHA1 (squid-2.5.7-2004101300/squid-2.5.STABLE7-empty_acls.patch) = ad431e16629685ddbe244d4628d723d1c164c00e
+Size (squid-2.5.7-2004101300/squid-2.5.STABLE7-empty_acls.patch) = 4015 bytes
+SHA1 (squid-2.5.7-2004101300/squid-2.5.STABEL7-close_other.patch) = c978ee723612e2981764a44ccec101b58c12ddad
+Size (squid-2.5.7-2004101300/squid-2.5.STABEL7-close_other.patch) = 698 bytes
 SHA1 (patch-aa) = 3e6fb677125eec276fdfa62336c134f26e1e1edd
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0