Update "squid31" package to version 3.1.4. Changes since version 3.1.3:

- Bug 2933: Verification of the max. port number for WCCP2 dynamic service
- Bug 2924: RADIUS helper compile issues
- Bug 2922: Fix assertion failed: HttpHeader.cc: "Headers[id].stat.aliveCount"
- Bug 2919: tcp_outgoing_address ACLs not obeying acl_uses_indirect_client
- Bug 2896: Fix assertion failed: comm.cc:2063: "!fd_table[fd].closing()"
- Bug 2879: pt2: 3.0 regression in headers end finding
- Bug 2877: pt2: only output zero-size warning on reverse-proxy requests
- Bug 2876: FD_SETSIZE override not working on all linux distributions
- Bug 2810: common log format generates 2 lines of syslog
- Bug 2789: Optimize unlimited memory pools, and correctly handle limits over 2GB
- Bug 2753: Fall back on IPv4 if IPv6 is not present
- Bug 2697: Adaptation leaks and extra requests after reconfiguration
- Bug 2633: Fix Ecap::HeaderRep::value(name) fails when there is no named header field
- Change LDAP helpers to default to LDAP version 3 if available
- Add Joomla and Salted Hash support to squid_db_auth helper
- Fixed IpAddress port printing for ports higher than 9999
- Disable chunked memory pooling by default.
- ... and several build errors.

4 files changed, 6 insertions, 44 deletions

diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index 8917c8bf6bc..8e2e5a1e79c 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2010/05/08 08:37:31 tron Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/11 13:41:34 tron Exp $
 
-DISTNAME=	squid-3.1.3
+DISTNAME=	squid-3.1.4
 PKGNAME=	${DISTNAME}	# Necessary for "pkgsrc/www/squid/options.mk"
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v3/3.1/ \
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index a2a2c57120d..6a3e13d6bb6 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.19 2010/05/24 16:10:54 tron Exp $
+$NetBSD: distinfo,v 1.20 2010/06/11 13:41:34 tron Exp $
 
-SHA1 (squid-3.1.3.tar.bz2) = 6745233b85ba018b5961ad736d8f2522ae6aa8ff
-RMD160 (squid-3.1.3.tar.bz2) = 79a35144d9ec938eaf65183c2020c2becacdc430
-Size (squid-3.1.3.tar.bz2) = 2389422 bytes
-SHA1 (patch-aa) = b94a6ca8a53790da41a4a93ace5e31b537e790b2
-SHA1 (patch-ab) = 8994d4d36dca5f463285264a31d40da45bcdaefd
+SHA1 (squid-3.1.4.tar.bz2) = bb83b865c081c25a5989adf689923935742315e0
+RMD160 (squid-3.1.4.tar.bz2) = f2b7e4ff5cf2ab082ae71defa289d7d703b41266
+Size (squid-3.1.4.tar.bz2) = 2391480 bytes
 SHA1 (patch-ad) = cb2591bebcbcf22f6cb1858f243b0c808d3db589
 SHA1 (patch-ae) = 88fbc7fb1a47b1baf48f7cd0f0b66cbf51e3b24b
 SHA1 (patch-aj) = 349b5d49dec49430cff2a170ad53d3a16f2a4c76
diff --git a/www/squid31/patches/patch-aa b/www/squid31/patches/patch-aa
deleted file mode 100644
index b360cdcb83c..00000000000
--- a/www/squid31/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2010/05/24 16:10:54 tron Exp $
-
-Fix build problem under NetBSD, please look here for more details:
-
-http://gnats.netbsd.org/43347
-http://bugs.squid-cache.org/show_bug.cgi?id=2934
-
---- helpers/ntlm_auth/smb_lm/smbval/rfcnb-util.c.orig	2010-05-02 11:47:07.000000000 +0100
-+++ helpers/ntlm_auth/smb_lm/smbval/rfcnb-util.c	2010-05-24 16:40:20.000000000 +0100
-@@ -23,6 +23,8 @@
-  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- 
-+#include "config.h"
-+
- #include <string.h>
- #include <stdlib.h>
- 
diff --git a/www/squid31/patches/patch-ab b/www/squid31/patches/patch-ab
deleted file mode 100644
index 7c5a203e4a8..00000000000
--- a/www/squid31/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2010/05/24 16:10:54 tron Exp $
-
-Fix build problem under NetBSD, please look here for more details:
-
-http://gnats.netbsd.org/43347
-http://bugs.squid-cache.org/show_bug.cgi?id=2934
-
---- helpers/ntlm_auth/smb_lm/smbval/session.c.orig	2010-05-02 11:47:07.000000000 +0100
-+++ helpers/ntlm_auth/smb_lm/smbval/session.c	2010-05-24 16:38:54.000000000 +0100
-@@ -23,6 +23,8 @@
-  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- 
-+#include "config.h"
-+
- #include <string.h>
- #include <stdlib.h>
-