Update "squid31" package to version 3.1.0.11.

Changes since version 3.1.0.9:
- Bug 2087: Support adaptation sets and chains
- Bug 2459: dns error message broken when error handling delayed
- Support ICAP Retry
- Support ICAP retries based on the ICAP responses status code
- Support logging ICAP
- Support logging total DNS wait time
- Support logging response times of adaptation transactions
- General logging enhancements
- Dynamically form chains based on ICAP X-Next-Services header
- Support cross-transactional ICAP header exchange
- Bug 2680: Regression Crash after rotate with no helpers running
- Bug 2695: Regression in WCCPv2 L2 mask assignment
- Bug 2707: Regression in FTP anonymous auth
- Bug 422, 2706: RFC 2616 Date header requirements
- Bug 1087: ESI processor not quoting attributes correctly.
- Bug 1338: File prefetches aborted despite range_offset
- Bug 2080: wbinfo_group.pl - false positive under certain conditions
- Bug 2092: select loop 32-bit call counter overflows
- Bug 2127: delay pools class 4 crashes with ntlm auth
- Bug 2611: document fast/slow acl types
- Bug 2614: Potential loss of adapted body data from eCAP adapters
- Bug 2658: Missing TextException copy constructor
- Bug 2659: String length overflows on append, leading to segfaults
- Bug 2699: Build failure NTLM smb_lm helper
- Bug 2709: TRANSLATIONS not installed
- Bug 2710: squid_kerb_auth non-terminated string
- Delay pools 64-bit buckets and IPv6-polish
- Break forwarding loops for "transparent" or "intercept" http_ports.
- Add --disable-translation option to detatch .po from error negotiation
- Add squidclient man(1) page
- Add localhost to default permitted networks
- http_port allow-direct option to allow direct forwarding in accelerator mode
- ... and many testing infrastructure updates
- ... and much adaptation polish and improvements

7 files changed, 40 insertions, 105 deletions

diff --git a/www/squid31/DESCR b/www/squid31/DESCR
index dd8b6c05081..d0f82b23f25 100644
--- a/www/squid31/DESCR
+++ b/www/squid31/DESCR
@@ -1,4 +1,5 @@
 Squid 3.1 represents a new feature release above 3.0.
+This version is however still in release candidate testing cycle.
 
 The most important of these new features are:
 * New Version Numbering System
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index 4eee1dc698d..453f63133f5 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2009/07/12 09:45:02 tron Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/19 23:05:38 tron Exp $
 
-DISTNAME=	squid-3.1.0.9
-PKGREVISION=	1
+DISTNAME=	squid-3.1.0.11
 PKGNAME=	${DISTNAME}	# Necessary for "pkgsrc/www/squid/options.mk"
 CATEGORIES=	www
-MASTER_SITES=	${SQUID_MASTER_SITES} \
-		http://www.squid-cache.org/Versions/v3/3.1/
+MASTER_SITES=	http://www.squid-cache.org/Versions/v3/3.1/ \
+		${SQUID_MASTER_SITES}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tron@NetBSD.org
@@ -18,8 +17,6 @@ USE_TOOLS+=		perl gmake
 GNU_CONFIGURE=		yes
 PKG_DESTDIR_SUPPORT=	destdir
 
-POST_INSTALL_EXTRA=	install-error-pages
-
 .include "../../www/squid/Makefile.squid"
 
 CONFIGURE_ARGS+=	--with-default-user=${SQUID_USER}
@@ -36,17 +33,4 @@ post-build:
 	${CP} -pf ${WRKSRC}/src/squid.conf.documented \
 	  ${WRKSRC}/src/squid.conf.default
 
-install-error-pages:
-	cd ${WRKSRC}/errors &&						\
-	for DIR in *; do						\
-	  if [ -d $$DIR ]; then						\
-	    ERROR_DIR=${DESTDIR}${PREFIX}/share/squid/errors/$$DIR;	\
-	    ${INSTALL_DATA_DIR} $$ERROR_DIR;				\
-	    for FILE in $$DIR/ERR_*; do					\
-	      ${INSTALL_DATA} $$FILE $$ERROR_DIR; 			\
-	    done;							\
-	  fi;								\
-	done
-	${LN} -s en ${PREFIX}/share/squid/errors/templates
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/squid31/PLIST b/www/squid31/PLIST
index eabdf05d61a..6b379bd9e92 100644
--- a/www/squid31/PLIST
+++ b/www/squid31/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/05/04 22:29:41 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/07/19 23:05:38 tron Exp $
 bin/squidclient
 libexec/cachemgr.cgi
 ${PLIST.da_ldap}libexec/digest_ldap_auth
@@ -17,6 +17,7 @@ ${PLIST.eacl_ldap_group}libexec/squid_ldap_group
 ${PLIST.eacl_unix_group}libexec/squid_unix_group
 ${PLIST.unlinkd}libexec/unlinkd
 ${PLIST.ba_YP}libexec/yp_auth
+man/man1/squidclient.1
 man/man8/cachemgr.cgi.8
 ${PLIST.ba_NCSA}man/man8/ncsa_auth.8
 ${PLIST.ba_PAM}man/man8/pam_auth.8
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index 7bd7f3a2f77..ee5cc67e83f 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.6 2009/07/12 09:45:02 tron Exp $
+$NetBSD: distinfo,v 1.7 2009/07/19 23:05:38 tron Exp $
 
-SHA1 (squid-3.1.0.9.tar.bz2) = 221cc189c1c69e61819540ceb798ded728c2579a
-RMD160 (squid-3.1.0.9.tar.bz2) = 208ec13315ba73e16f3f4051e41aa7a539d7ba45
-Size (squid-3.1.0.9.tar.bz2) = 2360740 bytes
-SHA1 (patch-aa) = 58f69e9172a218cd79d43c09b9065aafe386e8c2
-SHA1 (patch-ad) = 031e5de714610917ac0c575b42add980c0933c72
-SHA1 (patch-ae) = a512f1d521f3019e2136b5d0ad2199182e2aaabb
+SHA1 (squid-3.1.0.11.tar.bz2) = 374c2a5d664320109d92405a44926fc93dce4526
+RMD160 (squid-3.1.0.11.tar.bz2) = c654e229ed6c060798e290ef7f7491cae4fa0356
+Size (squid-3.1.0.11.tar.bz2) = 2381394 bytes
+SHA1 (patch-aa) = 6f9cb9debbe8066117e589c449c1d8f01c761b90
+SHA1 (patch-ad) = cb2591bebcbcf22f6cb1858f243b0c808d3db589
+SHA1 (patch-ae) = a1f8a6bfa49a3e7c46fc6228b22ef374f3bd3964
 SHA1 (patch-ah) = e20f7b76d6d48041efbfe1a07dce756a818e6642
 SHA1 (patch-aj) = 349b5d49dec49430cff2a170ad53d3a16f2a4c76
 SHA1 (patch-al) = 6dd09cf75ed53a92616f4eed9f3e290232ff54a5
diff --git a/www/squid31/patches/patch-aa b/www/squid31/patches/patch-aa
index 9b1e361b14b..283cd00254f 100644
--- a/www/squid31/patches/patch-aa
+++ b/www/squid31/patches/patch-aa
@@ -1,62 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2009/07/12 09:45:02 tron Exp $
+$NetBSD: patch-aa,v 1.4 2009/07/19 23:05:38 tron Exp $
 
-Fix problems with anonymous FTP, see here:
-http://www.squid-cache.org/bugs/show_bug.cgi?id=2707
-
---- src/ftp.cc.orig	2009-06-26 11:35:38.000000000 +0100
-+++ src/ftp.cc	2009-07-12 10:34:01.000000000 +0100
-@@ -93,13 +93,21 @@
- 
- /// \ingroup ServerProtocolFTPInternal
- struct _ftp_flags {
-+
-+    /* passive mode */
-+    bool pasv_supported;  ///< PASV command is allowed
-+    bool epsv_all_sent;   ///< EPSV ALL has been used. Must abort on failures.
-+    bool pasv_only;
-+
-+    /* authentication */
-+    bool authenticated;         ///< authentication success
-+    bool tried_auth_anonymous;  ///< auth has tried to use anonymous credentials already.
-+    bool tried_auth_nopass;     ///< auth tried username with no password already.
-+
-+    /* other */
-     bool isdir;
--    bool pasv_supported;
--    bool epsv_all_sent;
-     bool skip_whitespace;
-     bool rest_supported;
--    bool pasv_only;
--    bool authenticated;
-     bool http_header_sent;
-     bool tried_nlst;
-     bool need_base_href;
-@@ -1432,6 +1440,9 @@
-  *
-  * Special Case: A username-only may be provided in the URL and password in the HTTP headers.
-  *
-+ * TODO: we might be able to do something about locating username from other sources:
-+ *       ie, external ACL user=* tag or ident lookup
-+ *
-  \retval 1	if we have everything needed to complete this request.
-  \retval 0	if something is missing.
-  */
-@@ -1464,10 +1475,16 @@
-     /* Setup default FTP password settings */
-     /* this has to be done last so that we can have a no-password case above. */
-     if (!password[0]) {
--        if (strcmp(user, "anonymous") == 0)
-+        if (strcmp(user, "anonymous") == 0 && !flags.tried_auth_anonymous) {
-             xstrncpy(password, Config.Ftp.anon_user, MAX_URL);
--        else
-+            flags.tried_auth_anonymous=1;
-+            return 1;
-+        }
-+        else if (!flags.tried_auth_nopass) {
-             xstrncpy(password, null_string, MAX_URL);
-+            flags.tried_auth_nopass=1;
-+            return 1;
-+        }
-     }
+--- src/client_side.cc.orig	2009-07-19 06:11:13.000000000 +0100
++++ src/client_side.cc	2009-07-19 23:43:24.000000000 +0100
+@@ -2222,7 +2222,7 @@
+     // when we read chunked requests, the entire body is buffered
+     // XXX: this check ignores header size and its limits.
+     if (conn->in.dechunkingState == ConnStateData::chunkParsing)
+-        return conn->in.notYetUsed < Config.maxChunkedRequestBodySize;
++        return (ssize_t)conn->in.notYetUsed < Config.maxChunkedRequestBodySize;
  
-     return 0;			/* different username */
+     return conn->in.notYetUsed >= Config.maxRequestHeaderSize ? 0 : 1;
+ }
diff --git a/www/squid31/patches/patch-ad b/www/squid31/patches/patch-ad
index aa5fb00bd75..bc23bb8ad07 100644
--- a/www/squid31/patches/patch-ad
+++ b/www/squid31/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.4 2009/06/07 08:36:36 tron Exp $
+$NetBSD: patch-ad,v 1.5 2009/07/19 23:05:38 tron Exp $
 
---- tools/Makefile.in.orig	2009-05-23 13:31:26.000000000 +0100
-+++ tools/Makefile.in	2009-06-06 17:34:58.000000000 +0100
-@@ -752,7 +752,7 @@
+--- tools/Makefile.in.orig	2009-07-19 06:11:36.000000000 +0100
++++ tools/Makefile.in	2009-07-19 15:20:43.000000000 +0100
+@@ -805,7 +805,7 @@
  
  info-am:
  
--install-data-am: install-data-local
-+install-data-am:
+-install-data-am: install-data-local install-man
++install-data-am: install-man
  
  install-dvi: install-dvi-recursive
  
diff --git a/www/squid31/patches/patch-ae b/www/squid31/patches/patch-ae
index 1a958cc6092..e05c6e62b05 100644
--- a/www/squid31/patches/patch-ae
+++ b/www/squid31/patches/patch-ae
@@ -1,26 +1,24 @@
-$NetBSD: patch-ae,v 1.2 2009/07/07 18:25:13 tron Exp $
+$NetBSD: patch-ae,v 1.3 2009/07/19 23:05:38 tron Exp $
 
---- errors/Makefile.in.orig	2009-06-26 11:35:52.000000000 +0100
-+++ errors/Makefile.in	2009-06-30 18:58:13.000000000 +0100
-@@ -408,13 +408,13 @@
- 		done; \
+--- errors/Makefile.in.orig	2009-07-19 06:11:27.000000000 +0100
++++ errors/Makefile.in	2009-07-19 15:21:48.000000000 +0100
+@@ -418,13 +418,13 @@
  	  fi \
  	done; \
+ 	$(INSTALL_DATA) $(srcdir)/TRANSLATORS $(DESTDIR)TRANSLATORS; \
 -	$(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET).default; \
 -	if test -f $(DESTDIR)$(DEFAULT_STYLESHEET) ; then \
--		echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_STYLESHEET)" ; \
++#	$(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET).default; \
++#	if test -f $(DESTDIR)$(DEFAULT_STYLESHEET) ; then \
+ 		echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_STYLESHEET)" ; \
 -	else \
 -		echo "$(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET)"; \
 -		$(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET); \
 -	fi ; \
-+#	$(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET).default; \
-+#	if test -f $(DESTDIR)$(DEFAULT_STYLESHEET) ; then \
-+#		echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_STYLESHEET)" ; \
 +#	else \
 +#		echo "$(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET)"; \
 +#		$(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET); \
 +#	fi ; \
-	$(SHELL) $(srcdir)/alias-link.sh "$(LN)" "$(RM)" "$(DESTDIR)$(DEFAULT_ERROR_DIR)" "$(srcdir)/aliases" || exit 1 ;
+ 	$(SHELL) $(srcdir)/alias-link.sh "$(LN)" "$(RM)" "$(DESTDIR)$(DEFAULT_ERROR_DIR)" "$(srcdir)/aliases" || exit 1 ;
  
  uninstall-local:
- 	for l in $(TRANSLATIONS); do \