Update squid27 package to 2.7.7 (2.7.STABLE7).

pkgsrc changes: add LICENSE.


Changes to squid-2.7.STABLE7 (17 September 2009)
	- Bug #2661 - Solaris /dev/poll support broken with EINVAL
	- Clarify external_acl_type %{Header} documentation slightly
	- Bug #2482: Remove mem_obj->old_entry in async code to avoid deep ctx
	  errors
	- GCC-4.x cleanups
	- Bug #2605: Don't call setsid() on helper childs when running in
	  daemon mode
	- Windows port: Fix PSAPI.DLL usage, is always available on Windows NT
	  and later
	- Windows port: Added support for Windows 7, Windows Server 2008 R2
	  and later
	- Bug #2602: increase MAX_URL to 8192
	- The debug mode option '-d' was not documented in LDAP helpers usage
	  message
	- Windows port: Added a note about installation on Windows Vista and
	  later
	- Bug #2642: Remove duplicate peerMonitorInit() on reconfigure
	- Bug #2515: Final chunk parsing errors on FreeBSD6+
	- Bug #2647: Reprioritise override-* and stale-while-revalidate
	- Windows port: Fix improper access permissions to registry and DNS
	  parsing from registry
	- Windows port: Fix getservbyname() usage abuse.
	- Bug #2672: cacheMemMaxSize 32-bit overflow during snmpwalk
	- Bug #2691: store_url memory leak
	- Accept PUT/POST requests without an entity-body
	- Plug request_t + HttpStateData memory leak on PUT/POST requests with
	  early response
	- Bug #2710: squid_kerb_auth non-terminated string
	- Bug #2369: squid traffic counter 32-bit overflow
	- Bug #2080: wbinfo_group.pl - false positive under certain conditions
	- Bug #2739: DNS resolver option ndots can't be parsed from
	  resolv.conf
	- Windows port: fix mswin_negotiate_auth.exe crash when executing a
	  LocalCall authentication with verbose deBug #enabled
	- Add 0.0.0.0 as an to_localhost address
	- Windows port: Update mswin_check_ad_group to version 2.0
	- Windows port: There is no "-P" command line option into
	  mswin_check_ad_group helper.
	- Correct Valgrind mempool protection
	- Bug #2451: Correct length handling on 304 responses
	- Bug #2541: Hang in 100% CPU loop while extacting header details
	  using a delimiter other than comma (external_acl_type,
	  access_log_format, external_refresh_check)
	- Bug #2768 - squid_ldap_group -K argument parsing error

10 files changed, 49 insertions, 83 deletions

diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index ad82715a588..1d4c1b13b61 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2009/09/13 01:00:16 taca Exp $
+# $NetBSD: Makefile,v 1.9 2009/09/18 02:01:35 taca Exp $
 
-DISTNAME=	squid-2.7.STABLE6
+DISTNAME=	squid-2.7.STABLE7
 PKGNAME=	${DISTNAME:S/STABLE//}
-PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${SQUID_MASTER_SITES} \
 		http://www.squid-cache.org/Versions/v2/2.7/
@@ -11,6 +10,7 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.squid-cache.org/
 COMMENT=	Post-Harvest_cached WWW proxy cache and accelerator
+LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=		perl
 GNU_CONFIGURE=		yes
diff --git a/www/squid27/distinfo b/www/squid27/distinfo
index 8eb378e2968..91aa6a55bbd 100644
--- a/www/squid27/distinfo
+++ b/www/squid27/distinfo
@@ -1,18 +1,17 @@
-$NetBSD: distinfo,v 1.5 2009/09/13 01:00:16 taca Exp $
+$NetBSD: distinfo,v 1.6 2009/09/18 02:01:35 taca Exp $
 
-SHA1 (squid-2.7.STABLE6.tar.bz2) = b4b323be1ff3617a22070c243b2504f30d6b302d
-RMD160 (squid-2.7.STABLE6.tar.bz2) = d804175b95c6b026abed505b086eeaa2c479d2e2
-Size (squid-2.7.STABLE6.tar.bz2) = 1345472 bytes
-SHA1 (patch-aa) = 7db6c34be31ecee1dd08486de14c3fbc3b21c5aa
+SHA1 (squid-2.7.STABLE7.tar.bz2) = 0729116f309093e4f141e000136cdec39290628a
+RMD160 (squid-2.7.STABLE7.tar.bz2) = a13df321fb0831de963c77f6e33e3f374634d353
+Size (squid-2.7.STABLE7.tar.bz2) = 1341869 bytes
+SHA1 (patch-aa) = e6b112b463b1bc996490c99b91945361f0c2506a
 SHA1 (patch-ab) = 0d8e73eab50a54bd9c8662ee418c0640f30fdeea
-SHA1 (patch-ac) = 2218ce7f6abdc0a33bb6ac5f6116bb00d44bf53e
-SHA1 (patch-ad) = 3b0a8cf357d97053c52cd7429db621ea61932ba2
+SHA1 (patch-ac) = 175bc741bb2adc6b5f3452c6a8d25e594e7c3acd
+SHA1 (patch-ad) = 24e7303aa3160a3e675da333737eade458c5c197
 SHA1 (patch-ae) = a78e762c1ad928eef66b12395d48bc69542e32d9
 SHA1 (patch-af) = d8bfc5e92988ffa37d39c799e62176974fb9c27a
 SHA1 (patch-ag) = b375ecb8eefb4059642450fd25a0ec8e0d74efd7
-SHA1 (patch-ah) = 6732a21860216e58322ab084e3d525237811cc89
-SHA1 (patch-ai) = bf6438e8fb577342c782d2b729add0698bf99e9c
-SHA1 (patch-aj) = f1d18a900d7ada0985499979398bb12dace3ee40
+SHA1 (patch-ah) = c1c22c57e5e63d0d0756202224d156e47413a4d8
+SHA1 (patch-ai) = a227e6fc622f1bda3fa49406b4d588c1f1f78430
+SHA1 (patch-aj) = c5c7cd10a63a5066eee63988775f71758ed5463e
 SHA1 (patch-ak) = 6863cac0fe9100f4b8c3c05cb321324a4abf0a4c
-SHA1 (patch-al) = 43ff4508d964d273227263b7a623d67725e8b7bd
-SHA1 (patch-am) = 2d098a9da3ba83a340cd9552950cc02e3de47cf9
+SHA1 (patch-al) = a9e957a90dc6956e59668c297dd8566642baecff
diff --git a/www/squid27/patches/patch-aa b/www/squid27/patches/patch-aa
index c84dc845deb..25fd07475e0 100644
--- a/www/squid27/patches/patch-aa
+++ b/www/squid27/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2008/09/25 03:24:45 taca Exp $
+$NetBSD: patch-aa,v 1.3 2009/09/18 02:01:35 taca Exp $
 
---- Makefile.in.orig	2008-01-26 08:24:17.000000000 +0900
+--- Makefile.in.orig	2009-05-01 10:23:59.000000000 +0900
 +++ Makefile.in
-@@ -725,8 +725,8 @@ dist-hook:
+@@ -697,8 +697,8 @@ dist-hook:
  	fi
  
  install-pinger:
diff --git a/www/squid27/patches/patch-ac b/www/squid27/patches/patch-ac
index f5b378d48a4..923bd5dafbf 100644
--- a/www/squid27/patches/patch-ac
+++ b/www/squid27/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2009/02/05 13:43:06 taca Exp $
+$NetBSD: patch-ac,v 1.3 2009/09/18 02:01:35 taca Exp $
 
---- configure.orig	2009-02-04 09:44:06.000000000 +0900
+--- configure.orig	2009-09-17 07:46:50.000000000 +0900
 +++ configure
-@@ -8251,11 +8251,13 @@ for ac_header in sys/types.h \
+@@ -8222,11 +8222,13 @@ for ac_header in sys/types.h \
  	libc.h \
  	linux/netfilter_ipv4.h \
  	linux/netfilter_ipv4/ip_tproxy.h \
@@ -16,7 +16,7 @@ $NetBSD: patch-ac,v 1.2 2009/02/05 13:43:06 taca Exp $
  	net/pfvar.h \
  	netdb.h \
  	netinet/if_ether.h \
-@@ -22934,98 +22936,25 @@ _ACEOF
+@@ -22905,98 +22907,25 @@ _ACEOF
  fi
  
  
@@ -121,7 +121,7 @@ $NetBSD: patch-ac,v 1.2 2009/02/05 13:43:06 taca Exp $
    ;
    return 0;
  }
-@@ -23048,38 +22977,21 @@ $as_echo "$ac_try_echo") >&5
+@@ -23019,38 +22948,21 @@ $as_echo "$ac_try_echo") >&5
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
@@ -164,7 +164,7 @@ $NetBSD: patch-ac,v 1.2 2009/02/05 13:43:06 taca Exp $
  
  # The cast to long int works around a bug in the HP C Compiler
  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-@@ -26304,8 +26216,8 @@ if test "$GCC" = "yes"; then
+@@ -26275,8 +26187,8 @@ if test "$GCC" = "yes"; then
  	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
  	case "$GCCVER" in
  	2.95.[123])
@@ -175,7 +175,7 @@ $NetBSD: patch-ac,v 1.2 2009/02/05 13:43:06 taca Exp $
  		;;
  	esac
  fi
-@@ -27437,7 +27349,7 @@ if test "$PF_TRANSPARENT" ; then
+@@ -27386,7 +27298,7 @@ if test "$PF_TRANSPARENT" ; then
      { $as_echo "$as_me:$LINENO: checking if PF header file is installed" >&5
  $as_echo_n "checking if PF header file is installed... " >&6; }
      # hold on to your hats...
diff --git a/www/squid27/patches/patch-ad b/www/squid27/patches/patch-ad
index 0c5a3d39f8c..75ac216fa46 100644
--- a/www/squid27/patches/patch-ad
+++ b/www/squid27/patches/patch-ad
@@ -1,16 +1,18 @@
-$NetBSD: patch-ad,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+$NetBSD: patch-ad,v 1.2 2009/09/18 02:01:35 taca Exp $
 
---- helpers/basic_auth/MSNT/Makefile.in.orig	2007-11-12 10:13:58.000000000 +0900
+--- helpers/basic_auth/MSNT/Makefile.in.orig	2009-05-01 10:24:06.000000000 +0900
 +++ helpers/basic_auth/MSNT/Makefile.in
-@@ -530,9 +530,9 @@ info: info-am
+@@ -484,11 +484,11 @@ info: info-am
  
  info-am:
  
 -install-data-am: install-data-local
 +install-data-am:
  
+ install-dvi: install-dvi-am
+ 
 -install-exec-am: install-libexecPROGRAMS install-sysconfDATA
 +install-exec-am: install-libexecPROGRAMS
  
- install-info: install-info-am
+ install-html: install-html-am
  
diff --git a/www/squid27/patches/patch-ah b/www/squid27/patches/patch-ah
index 682090d2449..d276a96f148 100644
--- a/www/squid27/patches/patch-ah
+++ b/www/squid27/patches/patch-ah
@@ -1,13 +1,13 @@
-$NetBSD: patch-ah,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+$NetBSD: patch-ah,v 1.2 2009/09/18 02:01:35 taca Exp $
 
---- scripts/Makefile.in.orig	2007-11-12 10:14:20.000000000 +0900
+--- scripts/Makefile.in.orig	2009-05-01 10:24:41.000000000 +0900
 +++ scripts/Makefile.in
-@@ -386,7 +386,7 @@ info-am:
+@@ -343,7 +343,7 @@ install-data-am:
  
- install-data-am:
+ install-dvi: install-dvi-am
  
 -install-exec-am: install-binSCRIPTS
 +install-exec-am:
  
- install-info: install-info-am
+ install-html: install-html-am
  
diff --git a/www/squid27/patches/patch-ai b/www/squid27/patches/patch-ai
index d5957c1196f..05e8993a7c8 100644
--- a/www/squid27/patches/patch-ai
+++ b/www/squid27/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+$NetBSD: patch-ai,v 1.2 2009/09/18 02:01:35 taca Exp $
 
---- src/Makefile.in.orig	2008-01-03 10:16:40.000000000 +0900
+--- src/Makefile.in.orig	2009-05-01 10:24:42.000000000 +0900
 +++ src/Makefile.in
-@@ -657,7 +657,7 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
+@@ -617,7 +617,7 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
  DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
  DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
  DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
@@ -11,16 +11,18 @@ $NetBSD: patch-ai,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
  DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state
  DEFAULT_SWAP_DIR = $(localstatedir)/cache
  DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
-@@ -1190,10 +1190,9 @@ info: info-recursive
+@@ -1148,12 +1148,11 @@ info: info-recursive
  
  info-am:
  
 -install-data-am: install-data-local install-dataDATA
 +install-data-am: install-dataDATA
  
+ install-dvi: install-dvi-recursive
+ 
 -install-exec-am: install-libexecPROGRAMS install-sbinPROGRAMS \
 -	install-sysconfDATA
 +install-exec-am: install-libexecPROGRAMS install-sbinPROGRAMS
  
- install-info: install-info-recursive
+ install-html: install-html-recursive
  
diff --git a/www/squid27/patches/patch-aj b/www/squid27/patches/patch-aj
index 8e0cdd069f6..efd89e2c8d7 100644
--- a/www/squid27/patches/patch-aj
+++ b/www/squid27/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+$NetBSD: patch-aj,v 1.2 2009/09/18 02:01:35 taca Exp $
 
---- src/cf.data.pre.orig	2008-06-25 07:54:18.000000000 +0900
+--- src/cf.data.pre.orig	2009-08-17 06:52:42.000000000 +0900
 +++ src/cf.data.pre
-@@ -3753,12 +3753,12 @@ DOC_END
+@@ -3787,12 +3787,12 @@ DOC_END
  
  NAME: cache_effective_user
  TYPE: string
diff --git a/www/squid27/patches/patch-al b/www/squid27/patches/patch-al
index 5f96ba67d76..9b0b9043a5b 100644
--- a/www/squid27/patches/patch-al
+++ b/www/squid27/patches/patch-al
@@ -1,13 +1,13 @@
-$NetBSD: patch-al,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+$NetBSD: patch-al,v 1.2 2009/09/18 02:01:35 taca Exp $
 
---- tools/Makefile.in.orig	2007-11-12 10:14:28.000000000 +0900
+--- tools/Makefile.in.orig	2009-05-01 10:24:45.000000000 +0900
 +++ tools/Makefile.in
-@@ -737,7 +737,7 @@ info: info-recursive
+@@ -698,7 +698,7 @@ info: info-recursive
  
  info-am:
  
 -install-data-am: install-data-local
 +install-data-am:
  
- install-exec-am: install-binPROGRAMS install-libexecPROGRAMS
+ install-dvi: install-dvi-recursive
  
diff --git a/www/squid27/patches/patch-am b/www/squid27/patches/patch-am
deleted file mode 100644
index c360266a301..00000000000
--- a/www/squid27/patches/patch-am
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-am,v 1.1 2009/09/13 01:00:16 taca Exp $
-
-* A patch for CVE-2009-2855 DoS fix from squid's repositry: PatchSet 12541.
-
---- src/HttpHeaderTools.c.orig	2008-04-02 10:00:11.000000000 +0900
-+++ src/HttpHeaderTools.c
-@@ -239,6 +239,10 @@ int
- strListGetItem(const String * str, char del, const char **item, int *ilen, const char **pos)
- {
-     size_t len;
-+    /* ',' is always enabled as field delimiter as this is required for
-+     * processing merged header values properly, even if Cookie normally
-+     * uses ';' as delimiter.
-+     */
-     static char delim[3][8] =
-     {
- 	"\"?,",
-@@ -261,16 +265,15 @@ strListGetItem(const String * str, char 
-     /* find next delimiter */
-     do {
- 	*pos += strcspn(*pos, delim[quoted]);
--	if (**pos == del)
--	    break;
- 	if (**pos == '"') {
- 	    quoted = !quoted;
- 	    *pos += 1;
--	}
--	if (quoted && **pos == '\\') {
-+	} else if (quoted && **pos == '\\') {
- 	    *pos += 1;
- 	    if (**pos)
- 		*pos += 1;
-+	} else {
-+		break;		/* Delimiter found, marking the end of this value */
- 	}
-     } while (**pos);
-     len = *pos - *item;		/* *pos points to del or '\0' */