Update "squid31" package to version 3.1.0.12.

Changes since version 3.1.0.11:
- Bug 2716: Chunked request Signed/Unsigned build error
- Bug 2674: Remove limit on HTTP headers read.
- Bug 2620: Invalid HTTP response codes causes segfault
- Fix FTP EPSV negotiation parser.
- Fix Via string when leak checking is enabled (valgrind etc)
- ... and several documentation and testing additions

This update also fixes the security vulnerabilites reported in
the SQUID-2009:2 advisory.

4 files changed, 6 insertions, 61 deletions

diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index 6b3e62de54d..1aade2ae17a 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2009/07/20 13:56:31 tron Exp $
+# $NetBSD: Makefile,v 1.13 2009/07/27 16:35:55 tron Exp $
 
-DISTNAME=	squid-3.1.0.11
+DISTNAME=	squid-3.1.0.12
 PKGNAME=	${DISTNAME}	# Necessary for "pkgsrc/www/squid/options.mk"
-PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v3/3.1/ \
 		${SQUID_MASTER_SITES}
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index 42343071f98..3dc6a1c2e95 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.10 2009/07/20 13:56:31 tron Exp $
+$NetBSD: distinfo,v 1.11 2009/07/27 16:35:55 tron Exp $
 
-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) = a9ca6f8536262a7645f8efdcbcd05b9c190b57df
-SHA1 (patch-ab) = 122834b04e8ab4983bbe7a5ce08c41db775357a7
+SHA1 (squid-3.1.0.12.tar.bz2) = b652c3ce85fc47c1928d160f39d5f918ff3e8305
+RMD160 (squid-3.1.0.12.tar.bz2) = 9f322f2dd5fa9073e7d59be58d80753b6189657e
+Size (squid-3.1.0.12.tar.bz2) = 2383839 bytes
 SHA1 (patch-ad) = cb2591bebcbcf22f6cb1858f243b0c808d3db589
 SHA1 (patch-ae) = a1f8a6bfa49a3e7c46fc6228b22ef374f3bd3964
 SHA1 (patch-ah) = e20f7b76d6d48041efbfe1a07dce756a818e6642
diff --git a/www/squid31/patches/patch-aa b/www/squid31/patches/patch-aa
deleted file mode 100644
index 4cd27ce718a..00000000000
--- a/www/squid31/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2009/07/20 10:49:17 tron Exp $
-
-Build fix for NetBSD/amd64 taken from here:
-http://www.squid-cache.org/Versions/v3/3.1/changesets/b9648.patch
-
---- src/client_side.cc.orig	2009-07-19 06:11:13.000000000 +0100
-+++ src/client_side.cc	2009-07-20 11:29:30.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 ((int64_t)conn->in.notYetUsed) < Config.maxChunkedRequestBodySize;
- 
-     return conn->in.notYetUsed >= Config.maxRequestHeaderSize ? 0 : 1;
- }
diff --git a/www/squid31/patches/patch-ab b/www/squid31/patches/patch-ab
deleted file mode 100644
index a7c9364b210..00000000000
--- a/www/squid31/patches/patch-ab
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2009/07/20 13:56:31 tron Exp $
-
-Fix for Squid bug 2395, taken from here:
-
-http://www.squid-cache.org/bugs/show_bug.cgi?id=2395
-http://www.squid-cache.org/bugs/attachment.cgi?id=2017
-
---- src/ftp.cc.orig	2009-07-19 06:11:14.000000000 +0100
-+++ src/ftp.cc	2009-07-20 14:44:35.000000000 +0100
-@@ -2447,9 +2447,13 @@
-         /* server response with list of supported methods   */
-         /*   522 Network protocol not supported, use (1)    */
-         /*   522 Network protocol not supported, use (1,2)  */
-+        /* TODO: handle the (1,2) case. We might get it back after EPSV ALL 
-+         * which means close data + control without self-destructing and re-open from scratch. */
-         debugs(9, 5, HERE << "scanning: " << ftpState->ctrl.last_reply);
-+        buf = ftpState->ctrl.last_reply;
-+        while (buf != NULL && *buf != '\0' && *buf != '\n' && *buf != '(') ++buf;
-+        if (buf != NULL && *buf == '\n') ++buf;
- 
--        buf = ftpState->ctrl.last_reply + strcspn(ftpState->ctrl.last_reply, "(1,2)");
-         if (buf == NULL || *buf == '\0') {
-             /* handle broken server (RFC 2428 says MUST specify supported protocols in 522) */
-             debugs(9, DBG_IMPORTANT, "Broken FTP Server at " << fd_table[ftpState->ctrl.fd].ipaddr << ". 522 error missing protocol negotiation hints");
-@@ -2473,6 +2477,11 @@
-             ftpSendPassive(ftpState);
- #endif
-         }
-+        else {
-+            /* handle broken server (RFC 2428 says MUST specify supported protocols in 522) */
-+            debugs(9, DBG_IMPORTANT, "WARNING: Server at " << fd_table[ftpState->ctrl.fd].ipaddr << " sent unknown protocol negotiation hint: " << buf);
-+            ftpSendPassive(ftpState);
-+        }
-         return;
-     }
-