Integrate the following vendor patch as published on

<http://www.squid-cache.org/Versions/v2/2.5/bugs/>:

 - Address HTTP protocol mismatch related to oversized reply headers and
   enhance cache.log on reply header parsing failures (squid bug #1216)
 - correct the search request generated by the LDAP authentication helper
 - fix a race within the NTLM authentication mechanism (squid bug #1127)
 - fix handling of failed PUT/POST requests (squid bug #1224)
 - fix problems with persistent server connections after failed PUT/POST
   requests (squid bug #1122)
 - improve handling of forged WCCP packets (squid bug #1225)

PR:		ports/76967
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)
Security:	http://vuxml.freebsd.org/bfda39de-7467-11d9-9e1e-c296ac722cb3.html

12 files changed, 120 insertions, 12 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index d5cc1843bad5..529881a2c48c 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -74,7 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.7
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -109,7 +109,13 @@ PATCHFILES=	squid-2.5.STABLE7-half_closed_POST.patch \
 		squid-2.5.STABLE7-ftp_datachannel.patch \
 		squid-2.5.STABLE7-short_icons_urls.patch \
 		squid-2.5.STABLE7-response_splitting.patch \
-		squid-2.5.STABLE7-wccp_buffer_overflow.patch
+		squid-2.5.STABLE7-wccp_buffer_overflow.patch \
+		squid-2.5.STABLE7-oversize_reply_headers.patch \
+		squid-2.5.STABLE7-ldap_search.patch \
+		squid-2.5.STABLE7-ntlm_segfault.patch \
+		squid-2.5.STABLE7-post.patch \
+		squid-2.5.STABLE7-server_post.patch \
+		squid-2.5.STABLE7-wccp_disturb.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid/distinfo b/www/squid/distinfo
index e23b387730a6..bc614b65815a 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -46,3 +46,15 @@ MD5 (squid2.5/squid-2.5.STABLE7-response_splitting.patch) = 9eb8049cd5dff0c8838e
 SIZE (squid2.5/squid-2.5.STABLE7-response_splitting.patch) = 10427
 MD5 (squid2.5/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 01b1a4a23f170723d7e2bc3846e12c73
 SIZE (squid2.5/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 505
+MD5 (squid2.5/squid-2.5.STABLE7-oversize_reply_headers.patch) = 729c626f76637546b5ded70da6e0ee20
+SIZE (squid2.5/squid-2.5.STABLE7-oversize_reply_headers.patch) = 3056
+MD5 (squid2.5/squid-2.5.STABLE7-ldap_search.patch) = f2f39856ada003854e00b91ac258e07f
+SIZE (squid2.5/squid-2.5.STABLE7-ldap_search.patch) = 3719
+MD5 (squid2.5/squid-2.5.STABLE7-ntlm_segfault.patch) = 538a534a9a1acbbcb62cb64f618e325e
+SIZE (squid2.5/squid-2.5.STABLE7-ntlm_segfault.patch) = 2076
+MD5 (squid2.5/squid-2.5.STABLE7-post.patch) = ed73f46585b90319fc36e7f85130febc
+SIZE (squid2.5/squid-2.5.STABLE7-post.patch) = 3172
+MD5 (squid2.5/squid-2.5.STABLE7-server_post.patch) = 86733a0d6052dc65b913fe7bf6357e43
+SIZE (squid2.5/squid-2.5.STABLE7-server_post.patch) = 1424
+MD5 (squid2.5/squid-2.5.STABLE7-wccp_disturb.patch) = 658cc713f3928e8a9774cb6543547c49
+SIZE (squid2.5/squid-2.5.STABLE7-wccp_disturb.patch) = 5075
diff --git a/www/squid25/Makefile b/www/squid25/Makefile
index d5cc1843bad5..529881a2c48c 100644
--- a/www/squid25/Makefile
+++ b/www/squid25/Makefile
@@ -74,7 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.7
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -109,7 +109,13 @@ PATCHFILES=	squid-2.5.STABLE7-half_closed_POST.patch \
 		squid-2.5.STABLE7-ftp_datachannel.patch \
 		squid-2.5.STABLE7-short_icons_urls.patch \
 		squid-2.5.STABLE7-response_splitting.patch \
-		squid-2.5.STABLE7-wccp_buffer_overflow.patch
+		squid-2.5.STABLE7-wccp_buffer_overflow.patch \
+		squid-2.5.STABLE7-oversize_reply_headers.patch \
+		squid-2.5.STABLE7-ldap_search.patch \
+		squid-2.5.STABLE7-ntlm_segfault.patch \
+		squid-2.5.STABLE7-post.patch \
+		squid-2.5.STABLE7-server_post.patch \
+		squid-2.5.STABLE7-wccp_disturb.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid25/distinfo b/www/squid25/distinfo
index e23b387730a6..bc614b65815a 100644
--- a/www/squid25/distinfo
+++ b/www/squid25/distinfo
@@ -46,3 +46,15 @@ MD5 (squid2.5/squid-2.5.STABLE7-response_splitting.patch) = 9eb8049cd5dff0c8838e
 SIZE (squid2.5/squid-2.5.STABLE7-response_splitting.patch) = 10427
 MD5 (squid2.5/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 01b1a4a23f170723d7e2bc3846e12c73
 SIZE (squid2.5/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 505
+MD5 (squid2.5/squid-2.5.STABLE7-oversize_reply_headers.patch) = 729c626f76637546b5ded70da6e0ee20
+SIZE (squid2.5/squid-2.5.STABLE7-oversize_reply_headers.patch) = 3056
+MD5 (squid2.5/squid-2.5.STABLE7-ldap_search.patch) = f2f39856ada003854e00b91ac258e07f
+SIZE (squid2.5/squid-2.5.STABLE7-ldap_search.patch) = 3719
+MD5 (squid2.5/squid-2.5.STABLE7-ntlm_segfault.patch) = 538a534a9a1acbbcb62cb64f618e325e
+SIZE (squid2.5/squid-2.5.STABLE7-ntlm_segfault.patch) = 2076
+MD5 (squid2.5/squid-2.5.STABLE7-post.patch) = ed73f46585b90319fc36e7f85130febc
+SIZE (squid2.5/squid-2.5.STABLE7-post.patch) = 3172
+MD5 (squid2.5/squid-2.5.STABLE7-server_post.patch) = 86733a0d6052dc65b913fe7bf6357e43
+SIZE (squid2.5/squid-2.5.STABLE7-server_post.patch) = 1424
+MD5 (squid2.5/squid-2.5.STABLE7-wccp_disturb.patch) = 658cc713f3928e8a9774cb6543547c49
+SIZE (squid2.5/squid-2.5.STABLE7-wccp_disturb.patch) = 5075
diff --git a/www/squid26/Makefile b/www/squid26/Makefile
index d5cc1843bad5..529881a2c48c 100644
--- a/www/squid26/Makefile
+++ b/www/squid26/Makefile
@@ -74,7 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.7
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -109,7 +109,13 @@ PATCHFILES=	squid-2.5.STABLE7-half_closed_POST.patch \
 		squid-2.5.STABLE7-ftp_datachannel.patch \
 		squid-2.5.STABLE7-short_icons_urls.patch \
 		squid-2.5.STABLE7-response_splitting.patch \
-		squid-2.5.STABLE7-wccp_buffer_overflow.patch
+		squid-2.5.STABLE7-wccp_buffer_overflow.patch \
+		squid-2.5.STABLE7-oversize_reply_headers.patch \
+		squid-2.5.STABLE7-ldap_search.patch \
+		squid-2.5.STABLE7-ntlm_segfault.patch \
+		squid-2.5.STABLE7-post.patch \
+		squid-2.5.STABLE7-server_post.patch \
+		squid-2.5.STABLE7-wccp_disturb.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid26/distinfo b/www/squid26/distinfo
index e23b387730a6..bc614b65815a 100644
--- a/www/squid26/distinfo
+++ b/www/squid26/distinfo
@@ -46,3 +46,15 @@ MD5 (squid2.5/squid-2.5.STABLE7-response_splitting.patch) = 9eb8049cd5dff0c8838e
 SIZE (squid2.5/squid-2.5.STABLE7-response_splitting.patch) = 10427
 MD5 (squid2.5/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 01b1a4a23f170723d7e2bc3846e12c73
 SIZE (squid2.5/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 505
+MD5 (squid2.5/squid-2.5.STABLE7-oversize_reply_headers.patch) = 729c626f76637546b5ded70da6e0ee20
+SIZE (squid2.5/squid-2.5.STABLE7-oversize_reply_headers.patch) = 3056
+MD5 (squid2.5/squid-2.5.STABLE7-ldap_search.patch) = f2f39856ada003854e00b91ac258e07f
+SIZE (squid2.5/squid-2.5.STABLE7-ldap_search.patch) = 3719
+MD5 (squid2.5/squid-2.5.STABLE7-ntlm_segfault.patch) = 538a534a9a1acbbcb62cb64f618e325e
+SIZE (squid2.5/squid-2.5.STABLE7-ntlm_segfault.patch) = 2076
+MD5 (squid2.5/squid-2.5.STABLE7-post.patch) = ed73f46585b90319fc36e7f85130febc
+SIZE (squid2.5/squid-2.5.STABLE7-post.patch) = 3172
+MD5 (squid2.5/squid-2.5.STABLE7-server_post.patch) = 86733a0d6052dc65b913fe7bf6357e43
+SIZE (squid2.5/squid-2.5.STABLE7-server_post.patch) = 1424
+MD5 (squid2.5/squid-2.5.STABLE7-wccp_disturb.patch) = 658cc713f3928e8a9774cb6543547c49
+SIZE (squid2.5/squid-2.5.STABLE7-wccp_disturb.patch) = 5075
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index d5cc1843bad5..529881a2c48c 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -74,7 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.7
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -109,7 +109,13 @@ PATCHFILES=	squid-2.5.STABLE7-half_closed_POST.patch \
 		squid-2.5.STABLE7-ftp_datachannel.patch \
 		squid-2.5.STABLE7-short_icons_urls.patch \
 		squid-2.5.STABLE7-response_splitting.patch \
-		squid-2.5.STABLE7-wccp_buffer_overflow.patch
+		squid-2.5.STABLE7-wccp_buffer_overflow.patch \
+		squid-2.5.STABLE7-oversize_reply_headers.patch \
+		squid-2.5.STABLE7-ldap_search.patch \
+		squid-2.5.STABLE7-ntlm_segfault.patch \
+		squid-2.5.STABLE7-post.patch \
+		squid-2.5.STABLE7-server_post.patch \
+		squid-2.5.STABLE7-wccp_disturb.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid27/distinfo b/www/squid27/distinfo
index e23b387730a6..bc614b65815a 100644
--- a/www/squid27/distinfo
+++ b/www/squid27/distinfo
@@ -46,3 +46,15 @@ MD5 (squid2.5/squid-2.5.STABLE7-response_splitting.patch) = 9eb8049cd5dff0c8838e
 SIZE (squid2.5/squid-2.5.STABLE7-response_splitting.patch) = 10427
 MD5 (squid2.5/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 01b1a4a23f170723d7e2bc3846e12c73
 SIZE (squid2.5/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 505
+MD5 (squid2.5/squid-2.5.STABLE7-oversize_reply_headers.patch) = 729c626f76637546b5ded70da6e0ee20
+SIZE (squid2.5/squid-2.5.STABLE7-oversize_reply_headers.patch) = 3056
+MD5 (squid2.5/squid-2.5.STABLE7-ldap_search.patch) = f2f39856ada003854e00b91ac258e07f
+SIZE (squid2.5/squid-2.5.STABLE7-ldap_search.patch) = 3719
+MD5 (squid2.5/squid-2.5.STABLE7-ntlm_segfault.patch) = 538a534a9a1acbbcb62cb64f618e325e
+SIZE (squid2.5/squid-2.5.STABLE7-ntlm_segfault.patch) = 2076
+MD5 (squid2.5/squid-2.5.STABLE7-post.patch) = ed73f46585b90319fc36e7f85130febc
+SIZE (squid2.5/squid-2.5.STABLE7-post.patch) = 3172
+MD5 (squid2.5/squid-2.5.STABLE7-server_post.patch) = 86733a0d6052dc65b913fe7bf6357e43
+SIZE (squid2.5/squid-2.5.STABLE7-server_post.patch) = 1424
+MD5 (squid2.5/squid-2.5.STABLE7-wccp_disturb.patch) = 658cc713f3928e8a9774cb6543547c49
+SIZE (squid2.5/squid-2.5.STABLE7-wccp_disturb.patch) = 5075
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index d5cc1843bad5..529881a2c48c 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -74,7 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.7
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -109,7 +109,13 @@ PATCHFILES=	squid-2.5.STABLE7-half_closed_POST.patch \
 		squid-2.5.STABLE7-ftp_datachannel.patch \
 		squid-2.5.STABLE7-short_icons_urls.patch \
 		squid-2.5.STABLE7-response_splitting.patch \
-		squid-2.5.STABLE7-wccp_buffer_overflow.patch
+		squid-2.5.STABLE7-wccp_buffer_overflow.patch \
+		squid-2.5.STABLE7-oversize_reply_headers.patch \
+		squid-2.5.STABLE7-ldap_search.patch \
+		squid-2.5.STABLE7-ntlm_segfault.patch \
+		squid-2.5.STABLE7-post.patch \
+		squid-2.5.STABLE7-server_post.patch \
+		squid-2.5.STABLE7-wccp_disturb.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid30/distinfo b/www/squid30/distinfo
index e23b387730a6..bc614b65815a 100644
--- a/www/squid30/distinfo
+++ b/www/squid30/distinfo
@@ -46,3 +46,15 @@ MD5 (squid2.5/squid-2.5.STABLE7-response_splitting.patch) = 9eb8049cd5dff0c8838e
 SIZE (squid2.5/squid-2.5.STABLE7-response_splitting.patch) = 10427
 MD5 (squid2.5/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 01b1a4a23f170723d7e2bc3846e12c73
 SIZE (squid2.5/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 505
+MD5 (squid2.5/squid-2.5.STABLE7-oversize_reply_headers.patch) = 729c626f76637546b5ded70da6e0ee20
+SIZE (squid2.5/squid-2.5.STABLE7-oversize_reply_headers.patch) = 3056
+MD5 (squid2.5/squid-2.5.STABLE7-ldap_search.patch) = f2f39856ada003854e00b91ac258e07f
+SIZE (squid2.5/squid-2.5.STABLE7-ldap_search.patch) = 3719
+MD5 (squid2.5/squid-2.5.STABLE7-ntlm_segfault.patch) = 538a534a9a1acbbcb62cb64f618e325e
+SIZE (squid2.5/squid-2.5.STABLE7-ntlm_segfault.patch) = 2076
+MD5 (squid2.5/squid-2.5.STABLE7-post.patch) = ed73f46585b90319fc36e7f85130febc
+SIZE (squid2.5/squid-2.5.STABLE7-post.patch) = 3172
+MD5 (squid2.5/squid-2.5.STABLE7-server_post.patch) = 86733a0d6052dc65b913fe7bf6357e43
+SIZE (squid2.5/squid-2.5.STABLE7-server_post.patch) = 1424
+MD5 (squid2.5/squid-2.5.STABLE7-wccp_disturb.patch) = 658cc713f3928e8a9774cb6543547c49
+SIZE (squid2.5/squid-2.5.STABLE7-wccp_disturb.patch) = 5075
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index d5cc1843bad5..529881a2c48c 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -74,7 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.7
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -109,7 +109,13 @@ PATCHFILES=	squid-2.5.STABLE7-half_closed_POST.patch \
 		squid-2.5.STABLE7-ftp_datachannel.patch \
 		squid-2.5.STABLE7-short_icons_urls.patch \
 		squid-2.5.STABLE7-response_splitting.patch \
-		squid-2.5.STABLE7-wccp_buffer_overflow.patch
+		squid-2.5.STABLE7-wccp_buffer_overflow.patch \
+		squid-2.5.STABLE7-oversize_reply_headers.patch \
+		squid-2.5.STABLE7-ldap_search.patch \
+		squid-2.5.STABLE7-ntlm_segfault.patch \
+		squid-2.5.STABLE7-post.patch \
+		squid-2.5.STABLE7-server_post.patch \
+		squid-2.5.STABLE7-wccp_disturb.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index e23b387730a6..bc614b65815a 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -46,3 +46,15 @@ MD5 (squid2.5/squid-2.5.STABLE7-response_splitting.patch) = 9eb8049cd5dff0c8838e
 SIZE (squid2.5/squid-2.5.STABLE7-response_splitting.patch) = 10427
 MD5 (squid2.5/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 01b1a4a23f170723d7e2bc3846e12c73
 SIZE (squid2.5/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 505
+MD5 (squid2.5/squid-2.5.STABLE7-oversize_reply_headers.patch) = 729c626f76637546b5ded70da6e0ee20
+SIZE (squid2.5/squid-2.5.STABLE7-oversize_reply_headers.patch) = 3056
+MD5 (squid2.5/squid-2.5.STABLE7-ldap_search.patch) = f2f39856ada003854e00b91ac258e07f
+SIZE (squid2.5/squid-2.5.STABLE7-ldap_search.patch) = 3719
+MD5 (squid2.5/squid-2.5.STABLE7-ntlm_segfault.patch) = 538a534a9a1acbbcb62cb64f618e325e
+SIZE (squid2.5/squid-2.5.STABLE7-ntlm_segfault.patch) = 2076
+MD5 (squid2.5/squid-2.5.STABLE7-post.patch) = ed73f46585b90319fc36e7f85130febc
+SIZE (squid2.5/squid-2.5.STABLE7-post.patch) = 3172
+MD5 (squid2.5/squid-2.5.STABLE7-server_post.patch) = 86733a0d6052dc65b913fe7bf6357e43
+SIZE (squid2.5/squid-2.5.STABLE7-server_post.patch) = 1424
+MD5 (squid2.5/squid-2.5.STABLE7-wccp_disturb.patch) = 658cc713f3928e8a9774cb6543547c49
+SIZE (squid2.5/squid-2.5.STABLE7-wccp_disturb.patch) = 5075