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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fe710220889f
branches:  pkgsrc-2004Q4
changeset: 485849:fe710220889f
user:      snj <snj%pkgsrc.org@localhost>
date:      Thu Jan 27 04:58:58 2005 +0000

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

Revisions pulled up:
- pkgsrc/www/squid/Makefile     1.129
- pkgsrc/www/squid/distinfo     1.75

   Module Name:    pkgsrc
   Committed By:   taca
   Date:           Wed Jan 26 15:29:03 UTC 2005

   Modified Files:
           pkgsrc/www/squid: Makefile distinfo

   Log Message:
   Update new and disabled official patches.  The new patch includes
   security fix.

   o 2005-01-21 12:10 (Minor)
           Disable Path-MTU discovery on intercepted requests

   o 2005-01-21 12:43 (Security issue)
           Strengthen Squid from HTTP response splitting cache pollution attack

   Bump package revision.

diffstat:

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

diffs (47 lines):

diff -r a222849e819d -r fe710220889f www/squid/Makefile
--- a/www/squid/Makefile        Sun Jan 23 18:07:20 2005 +0000
+++ b/www/squid/Makefile        Thu Jan 27 04:58:58 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.120.2.3 2005/01/21 14:37:07 salo Exp $
+# $NetBSD: Makefile,v 1.120.2.4 2005/01/27 04:58:58 snj Exp $
 
 DISTNAME=      squid-2.5.STABLE7
 PKGNAME=       squid-2.5.7
-PKGREVISION=   8
+PKGREVISION=   9
 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/ \
@@ -27,10 +27,11 @@
                squid-2.5.STABLE7-dns_memleak.patch \
                squid-2.5.STABLE7-fqdn_truncated.patch \
                squid-2.5.STABLE7-ldap_spaces.patch \
+               squid-2.5.STABLE7-header_parsing.patch \
+               squid-2.5.STABLE7-httpd_accel_no_pmtu_disc.patch \
                squid-2.5.STABLE7-ftp_datachannel.patch \
                squid-2.5.STABLE7-short_icons_urls.patch \
                squid-2.5.STABLE7-response_splitting.patch
-#              squid-2.5.STABLE7-httpd_accel_no_pmtu_disc.patch # not yet
 PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=    taca%NetBSD.org@localhost
diff -r a222849e819d -r fe710220889f www/squid/distinfo
--- a/www/squid/distinfo        Sun Jan 23 18:07:20 2005 +0000
+++ b/www/squid/distinfo        Thu Jan 27 04:58:58 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.68.2.3 2005/01/21 14:37:07 salo Exp $
+$NetBSD: distinfo,v 1.68.2.4 2005/01/27 04:58:58 snj Exp $
 
 SHA1 (squid-2.5.7-2005010100/squid-2.5.STABLE7.tar.bz2) = 24f29e28ec62d7ab5888cd594ac7a1975ee6aa36
 Size (squid-2.5.7-2005010100/squid-2.5.STABLE7.tar.bz2) = 1051830 bytes
@@ -36,6 +36,10 @@
 Size (squid-2.5.7-2005010100/squid-2.5.STABLE7-fqdn_truncated.patch) = 4484 bytes
 SHA1 (squid-2.5.7-2005010100/squid-2.5.STABLE7-ldap_spaces.patch) = f0ae7e6dbb9580186f2e091d840ccf3bda348abc
 Size (squid-2.5.7-2005010100/squid-2.5.STABLE7-ldap_spaces.patch) = 1974 bytes
+SHA1 (squid-2.5.7-2005010100/squid-2.5.STABLE7-header_parsing.patch) = f3fd99e7a373050b5c2d34619d9f309335bb642e
+Size (squid-2.5.7-2005010100/squid-2.5.STABLE7-header_parsing.patch) = 44080 bytes
+SHA1 (squid-2.5.7-2005010100/squid-2.5.STABLE7-httpd_accel_no_pmtu_disc.patch) = 924a906c98cd5cff66115771b9e4f9d5ae5820a9
+Size (squid-2.5.7-2005010100/squid-2.5.STABLE7-httpd_accel_no_pmtu_disc.patch) = 4113 bytes
 SHA1 (squid-2.5.7-2005010100/squid-2.5.STABLE7-ftp_datachannel.patch) = 1022f7166a7bd4d83c93d7d4014865f98efefea1
 Size (squid-2.5.7-2005010100/squid-2.5.STABLE7-ftp_datachannel.patch) = 4825 bytes
 SHA1 (squid-2.5.7-2005010100/squid-2.5.STABLE7-short_icons_urls.patch) = e7cf53c5a7db396d8fe89cf3c585fd591cb17903