[pkgsrc/pkgsrc-2007Q3]: pkgsrc/www/squid Pullup ticket 2241 - requested by taca

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/23010ebcf874
branches:  pkgsrc-2007Q3
changeset: 534056:23010ebcf874
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Thu Dec 06 10:22:02 2007 +0000

description:
Pullup ticket 2241 - requested by taca
security update for squid

- pkgsrc/www/squid/Makefile                             1.197-1.199
- pkgsrc/www/squid/distinfo                             1.135
- pkgsrc/www/squid/patches/patch-av                     removed

   Module Name: pkgsrc
   Committed By:        wiz
   Date:                Mon Nov 12 00:15:00 UTC 2007

   Modified Files:
           pkgsrc/www/squid: Makefile

   Log Message:
   Remove ftp.leo.org from MASTER_SITES, doesn't resolve.
   From Zafer Aydogan in PR 37341.
---
   Module Name: pkgsrc
   Committed By:        wiz
   Date:                Sun Dec  2 11:46:11 UTC 2007

   Modified Files:
           pkgsrc/www/squid: Makefile

   Log Message:
   Remove Ex-MASTER_SITE. From Zafer Aydogan.
---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Sun Dec  2 14:47:08 UTC 2007

   Modified Files:
           pkgsrc/www/squid: Makefile distinfo
   Removed Files:
           pkgsrc/www/squid/patches: patch-av

   Log Message:
   Update squid package to 2.6.17 (2.6.STABLE17).

   Changes to squid-2.6.STABLE17 (26 Nov 2007)

           - Fix compile error with old GCC 2.x or other ANSI-C compilers before
             C99
           - Mention the login= cache_peer option in release notes
           - Fix bad cache_peer example in squid.conf
           - Bug #2086: Fix a compile-time memory corruption error causing cf_gen
             to fail
           - Bug #2048: Clarify high_memory_warning usage
           - Reject DNS responses which result in no data
           - Fix version number in configuration manual
           - Move cache and request/reply_header_max_size to their proper
             sections
           - Bug #2088: sbrk statistics broken when process size >2GB
           - Move logopen() much earlier to have fatal startup errors sent to the
             proper syslog facility
           - Fix HTTP/0.9 responses
           - Correct bad example config for tos_outgoing_tos
           - Fix grammar in description of mail_program squid.conf option
           - Ignore Content-Length in chunked responses instead of rejecting the
             response as invalid
           - Documented that http_port no longer have a default
           - Cleanup of cache digest documentation
           - Make aufs store rebuilding back off a little if I/O load too high
           - Bug #2100: Respect DNS ttl=0
           - Update udp_(incoming|outgoing)_address documentation to reflect
             current bahaviour.
           - Update HTCP documentation
           - Document the overlapping helper request format
           - Change priority of proxy auth and extacl provided username in
             login=*:pass
           - pack header entries on cache updates
           - Make squid_db_auth reopen the database connection on each query by
             default
           - Improve helper debug ouput, including the channel number
           - Update cachePeerEntry MIB description to mention what is used as
             index key
           - Import squid_radius_auth for authenticating to RADIUS

diffstat:

 www/squid/Makefile         |   8 +++-----
 www/squid/distinfo         |   9 ++++-----
 www/squid/patches/patch-av |  16 ----------------
 3 files changed, 7 insertions(+), 26 deletions(-)

diffs (61 lines):

diff -r 0d2db3dbb5d5 -r 23010ebcf874 www/squid/Makefile
--- a/www/squid/Makefile        Thu Dec 06 10:11:00 2007 +0000
+++ b/www/squid/Makefile        Thu Dec 06 10:22:02 2007 +0000
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.196 2007/09/07 10:39:35 taca Exp $
+# $NetBSD: Makefile,v 1.196.2.1 2007/12/06 10:22:02 ghen Exp $
 
-DISTNAME=      squid-2.6.STABLE16
+DISTNAME=      squid-2.6.STABLE17
 PKGNAME=       ${DISTNAME:S/STABLE//}
 CATEGORIES=    www
-MASTER_SITES=  http://www.squid-cache.org/Versions/v2/2.6/ \
-               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/
+MASTER_SITES=  http://www.squid-cache.org/Versions/v2/2.6/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    taca%NetBSD.org@localhost
diff -r 0d2db3dbb5d5 -r 23010ebcf874 www/squid/distinfo
--- a/www/squid/distinfo        Thu Dec 06 10:11:00 2007 +0000
+++ b/www/squid/distinfo        Thu Dec 06 10:22:02 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.134 2007/09/07 10:39:35 taca Exp $
+$NetBSD: distinfo,v 1.134.2.1 2007/12/06 10:22:02 ghen Exp $
 
-SHA1 (squid-2.6.STABLE16.tar.bz2) = 3140c0df8bad7cf3350bd4a02f4ac9582e6c4406
-RMD160 (squid-2.6.STABLE16.tar.bz2) = 6383461c25f786e6497300b26ca5908ad0279ec7
-Size (squid-2.6.STABLE16.tar.bz2) = 1293078 bytes
+SHA1 (squid-2.6.STABLE17.tar.bz2) = ca59eaf0d9a8956920611338334c38a418b49c14
+RMD160 (squid-2.6.STABLE17.tar.bz2) = c771604ce3c89b7fad9a4739f9ecd8c936a1f878
+Size (squid-2.6.STABLE17.tar.bz2) = 1303134 bytes
 SHA1 (patch-aa) = 06712292968ae808494007a722da5710660d0fec
 SHA1 (patch-ab) = 42c3f2daa2294d346358c199a0c53d849d8b1c74
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0
@@ -18,6 +18,5 @@
 SHA1 (patch-as) = e09a5703cdc7343259c07e599c933a613172a9b3
 SHA1 (patch-at) = 7ce72c964345203876d56d003353a5213c327252
 SHA1 (patch-au) = 25f6c7e366e7dca2aeb55312bd2ccf51d7a7b725
-SHA1 (patch-av) = 135cac28713b806af4cd9011a0a8cf9c88b929d0
 SHA1 (patch-bb) = 6711186c3e3e7992f9874eb47df7c0d3690649c2
 SHA1 (patch-bc) = 0b87eb5f4ccc06a0e59ed298fc3203b1b2641969
diff -r 0d2db3dbb5d5 -r 23010ebcf874 www/squid/patches/patch-av
--- a/www/squid/patches/patch-av        Thu Dec 06 10:11:00 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-av,v 1.1 2007/09/07 10:39:36 taca Exp $
-
---- src/cf_gen.c.orig  Thu Sep  6 06:50:15 2007
-+++ src/cf_gen.c
-@@ -177,9 +177,10 @@ main(int argc, char *argv[])
-     while ((NULL != fgets(buff, MAX_LINE, fp))) {
-       const char *type = strtok(buff, WS);
-       const char *dep;
-+      Type *t;
-       if (!type || type[0] == '#')
-           continue;
--      Type *t = (Type *) xcalloc(1, sizeof(*t));
-+      t = (Type *) xcalloc(1, sizeof(*t));
-       t->name = xstrdup(type);
-       while ((dep = strtok(NULL, WS)) != NULL) {
-           TypeDep *d = (TypeDep *) xcalloc(1, sizeof(*dep));