[pkgsrc/pkgsrc-2009Q4]: pkgsrc/www/squid27 Pullup ticket #2896 - requested by...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c1be903eae50
branches:  pkgsrc-2009Q4
changeset: 569237:c1be903eae50
user:      tron <tron%pkgsrc.org@localhost>
date:      Tue Feb 02 17:29:58 2010 +0000

description:
Pullup ticket #2896 - requested by taca
squid27: security patch

Revisions pulled up:
- www/squid27/Makefile                          1.11
- www/squid27/distinfo                          1.7
- www/squid27/patches/patch-an                  1.1
---
Module Name:    pkgsrc
Committed By:   taca
Date:           Tue Feb  2 14:43:57 UTC 2010

Modified Files:
        pkgsrc/www/squid27: Makefile distinfo
Added Files:
        pkgsrc/www/squid27/patches: patch-an

Log Message:
Add security patch noted as
http://www.squid-cache.org/Advisories/SQUID-2010_1.txt.

Bump PKGREVISION.

diffstat:

 www/squid27/Makefile         |   4 ++--
 www/squid27/distinfo         |   3 ++-
 www/squid27/patches/patch-an |  24 ++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)

diffs (56 lines):

diff -r 8ca84a9fc8a5 -r c1be903eae50 www/squid27/Makefile
--- a/www/squid27/Makefile      Tue Feb 02 17:15:32 2010 +0000
+++ b/www/squid27/Makefile      Tue Feb 02 17:29:58 2010 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2009/11/02 15:45:01 taca Exp $
+# $NetBSD: Makefile,v 1.10.2.1 2010/02/02 17:29:58 tron Exp $
 
 DISTNAME=      squid-2.7.STABLE7
 PKGNAME=       ${DISTNAME:S/STABLE//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  ${SQUID_MASTER_SITES} \
                http://www.squid-cache.org/Versions/v2/2.7/
diff -r 8ca84a9fc8a5 -r c1be903eae50 www/squid27/distinfo
--- a/www/squid27/distinfo      Tue Feb 02 17:15:32 2010 +0000
+++ b/www/squid27/distinfo      Tue Feb 02 17:29:58 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2009/09/18 02:01:35 taca Exp $
+$NetBSD: distinfo,v 1.6.4.1 2010/02/02 17:29:58 tron Exp $
 
 SHA1 (squid-2.7.STABLE7.tar.bz2) = 0729116f309093e4f141e000136cdec39290628a
 RMD160 (squid-2.7.STABLE7.tar.bz2) = a13df321fb0831de963c77f6e33e3f374634d353
@@ -15,3 +15,4 @@
 SHA1 (patch-aj) = c5c7cd10a63a5066eee63988775f71758ed5463e
 SHA1 (patch-ak) = 6863cac0fe9100f4b8c3c05cb321324a4abf0a4c
 SHA1 (patch-al) = a9e957a90dc6956e59668c297dd8566642baecff
+SHA1 (patch-an) = 9170bdd57f5428e7b64b4db2e1ffdee3c032643e
diff -r 8ca84a9fc8a5 -r c1be903eae50 www/squid27/patches/patch-an
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid27/patches/patch-an      Tue Feb 02 17:29:58 2010 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-an,v 1.1.2.2 2010/02/02 17:29:58 tron Exp $
+
+This is fix for security problem:
+
+http://www.squid-cache.org/Advisories/SQUID-2010_1.txt
+
+Since the announced patch contains RCS style revision string, it never
+applied to clearly.
+
+http://www.squid-cache.org/Versions/v2/HEAD/changesets/12597.patch.
+
+--- lib/rfc1035.c.orig 2008-06-19 01:11:44.000000000 +0000
++++ lib/rfc1035.c
+@@ -286,7 +286,9 @@ rfc1035NameUnpack(const char *buf, size_
+     size_t len;
+     assert(ns > 0);
+     do {
+-      assert((*off) < sz);
++      if ((*off) >= sz) {
++          return 1;
++      }
+       c = *(buf + (*off));
+       if (c > 191) {
+           /* blasted compression */