[pkgsrc/pkgsrc-2004Q4]: pkgsrc/www/squid Pullup ticket 335 - requested by Tak...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3c0b353bcf2e
branches:  pkgsrc-2004Q4
changeset: 485959:3c0b353bcf2e
user:      salo <salo%pkgsrc.org@localhost>
date:      Mon Mar 07 14:05:27 2005 +0000

description:
Pullup ticket 335 - requested by Takahiro Kambe
security fix for squid

Revisions pulled up:
- pkgsrc/www/squid/Makefile     1.139
- pkgsrc/www/squid/distinfo     1.86

   Module Name:         pkgsrc
   Committed By:        taca
   Date:                Sun Mar  6 13:30:49 UTC 2005

   Modified Files:
        pkgsrc/www/squid: Makefile distinfo

   Log Message:
   Update squid to 2.5.9nb1.

   * 2005-03-04 22:48 (Cosmetic Security)
        Unexpected access control results on configuration errors

   * 2005-03-04 11:55 (Minor)
        Links in FTP listings without / fails due to missing BASE HREF

   * 2005-03-04 11:55 (Minor)
        Fails to parse the EPLF FTP directory format

   * 2005-03-03 02:26 (Minor Security)
        Race condition related to Set-Cookie header

diffstat:

 www/squid/Makefile |  15 +++++++++------
 www/squid/distinfo |  10 +++++++++-
 2 files changed, 18 insertions(+), 7 deletions(-)

diffs (50 lines):

diff -r 7ccac7a30026 -r 3c0b353bcf2e www/squid/Makefile
--- a/www/squid/Makefile        Sat Mar 05 18:43:31 2005 +0000
+++ b/www/squid/Makefile        Mon Mar 07 14:05:27 2005 +0000
@@ -1,17 +1,20 @@
-# $NetBSD: Makefile,v 1.120.2.11 2005/03/01 12:46:14 salo Exp $
+# $NetBSD: Makefile,v 1.120.2.12 2005/03/07 14:05:27 salo Exp $
 
 DISTNAME=      squid-2.5.STABLE9
 PKGNAME=       squid-2.5.9
-PKGREVISION=
+PKGREVISION=   1
 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/ \
                ftp://ftp1.au.squid-cache.org/pub/squid/squid-2/STABLE/
 EXTRACT_SUFX=  .tar.bz2
-#
-#PATCH_SITES=  http://www.squid-cache.org/Versions/v2/2.5/bugs/
-#PATCHFILES=
-#PATCH_DIST_STRIP=       -p1
+
+PATCH_SITES=   http://www.squid-cache.org/Versions/v2/2.5/bugs/
+PATCHFILES=    squid-2.5.STABLE9-setcookie.patch \
+               squid-2.5.STABLE9-ftp_EPLF.patch \
+               squid-2.5.STABLE9-ftp_base_href.patch \
+               squid-2.5.STABLE9-acl_error.patch
+PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=    taca%NetBSD.org@localhost
 HOMEPAGE=      http://www.squid-cache.org/
diff -r 7ccac7a30026 -r 3c0b353bcf2e www/squid/distinfo
--- a/www/squid/distinfo        Sat Mar 05 18:43:31 2005 +0000
+++ b/www/squid/distinfo        Mon Mar 07 14:05:27 2005 +0000
@@ -1,7 +1,15 @@
-$NetBSD: distinfo,v 1.68.2.11 2005/03/01 12:46:14 salo Exp $
+$NetBSD: distinfo,v 1.68.2.12 2005/03/07 14:05:27 salo Exp $
 
 SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9.tar.bz2) = 9605e274f548bfc8dcb60a299b680df2846ee74b
 Size (squid-2.5.9-2005022800/squid-2.5.STABLE9.tar.bz2) = 1057776 bytes
+SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9-setcookie.patch) = 1f1a6692a32a00e81873741f4152bdb21e90b263
+Size (squid-2.5.9-2005022800/squid-2.5.STABLE9-setcookie.patch) = 5328 bytes
+SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9-ftp_EPLF.patch) = cdb2236bf58fa896fd6b70d0ee0c9aa6ff9d9334
+Size (squid-2.5.9-2005022800/squid-2.5.STABLE9-ftp_EPLF.patch) = 4108 bytes
+SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9-ftp_base_href.patch) = 1c72fd034aeee6900283b2f803ebd1eaa28c5397
+Size (squid-2.5.9-2005022800/squid-2.5.STABLE9-ftp_base_href.patch) = 709 bytes
+SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9-acl_error.patch) = fec6e7f2b82bd3a8f9f26e6044f516c8127b9120
+Size (squid-2.5.9-2005022800/squid-2.5.STABLE9-acl_error.patch) = 8499 bytes
 SHA1 (patch-aa) = 3e6fb677125eec276fdfa62336c134f26e1e1edd
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0