* Integrate a vendor patch for a possible DOS against the NTLM

  authentication helpers, see squid bug #1045.
* Bump PORTREVISION.

PR:		ports/70707
Submitted by:	maintainer

12 files changed, 30 insertions, 12 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 4ac3a23ca96..505ef0b791e 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -74,7 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -99,7 +99,8 @@ PATCHFILES=	squid-2.5.STABLE6-ufs_no_valid_dir.patch \
 		squid-2.5.STABLE6-client_db_gc.patch \
 		squid-2.5.STABLE6-ntlmtruncated.patch \
 		squid-2.5.STABLE6-errorpage_quote.patch \
-		squid-2.5.STABLE6-heap_segfault.patch
+		squid-2.5.STABLE6-heap_segfault.patch \
+		squid-2.5.STABLE6-ntlm_fetch_string.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 64c59d203fc..fa496248099 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -26,3 +26,5 @@ MD5 (squid2.5/squid-2.5.STABLE6-errorpage_quote.patch) = b9f329cdf98c7c5a048cdad
 SIZE (squid2.5/squid-2.5.STABLE6-errorpage_quote.patch) = 377
 MD5 (squid2.5/squid-2.5.STABLE6-heap_segfault.patch) = c82d9f3972419833b757c0c116c216f8
 SIZE (squid2.5/squid-2.5.STABLE6-heap_segfault.patch) = 867
+MD5 (squid2.5/squid-2.5.STABLE6-ntlm_fetch_string.patch) = dbf1826522c14dc64c0c37430bb27b2e
+SIZE (squid2.5/squid-2.5.STABLE6-ntlm_fetch_string.patch) = 1606
diff --git a/www/squid25/Makefile b/www/squid25/Makefile
index 4ac3a23ca96..505ef0b791e 100644
--- a/www/squid25/Makefile
+++ b/www/squid25/Makefile
@@ -74,7 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -99,7 +99,8 @@ PATCHFILES=	squid-2.5.STABLE6-ufs_no_valid_dir.patch \
 		squid-2.5.STABLE6-client_db_gc.patch \
 		squid-2.5.STABLE6-ntlmtruncated.patch \
 		squid-2.5.STABLE6-errorpage_quote.patch \
-		squid-2.5.STABLE6-heap_segfault.patch
+		squid-2.5.STABLE6-heap_segfault.patch \
+		squid-2.5.STABLE6-ntlm_fetch_string.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid25/distinfo b/www/squid25/distinfo
index 64c59d203fc..fa496248099 100644
--- a/www/squid25/distinfo
+++ b/www/squid25/distinfo
@@ -26,3 +26,5 @@ MD5 (squid2.5/squid-2.5.STABLE6-errorpage_quote.patch) = b9f329cdf98c7c5a048cdad
 SIZE (squid2.5/squid-2.5.STABLE6-errorpage_quote.patch) = 377
 MD5 (squid2.5/squid-2.5.STABLE6-heap_segfault.patch) = c82d9f3972419833b757c0c116c216f8
 SIZE (squid2.5/squid-2.5.STABLE6-heap_segfault.patch) = 867
+MD5 (squid2.5/squid-2.5.STABLE6-ntlm_fetch_string.patch) = dbf1826522c14dc64c0c37430bb27b2e
+SIZE (squid2.5/squid-2.5.STABLE6-ntlm_fetch_string.patch) = 1606
diff --git a/www/squid26/Makefile b/www/squid26/Makefile
index 4ac3a23ca96..505ef0b791e 100644
--- a/www/squid26/Makefile
+++ b/www/squid26/Makefile
@@ -74,7 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -99,7 +99,8 @@ PATCHFILES=	squid-2.5.STABLE6-ufs_no_valid_dir.patch \
 		squid-2.5.STABLE6-client_db_gc.patch \
 		squid-2.5.STABLE6-ntlmtruncated.patch \
 		squid-2.5.STABLE6-errorpage_quote.patch \
-		squid-2.5.STABLE6-heap_segfault.patch
+		squid-2.5.STABLE6-heap_segfault.patch \
+		squid-2.5.STABLE6-ntlm_fetch_string.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid26/distinfo b/www/squid26/distinfo
index 64c59d203fc..fa496248099 100644
--- a/www/squid26/distinfo
+++ b/www/squid26/distinfo
@@ -26,3 +26,5 @@ MD5 (squid2.5/squid-2.5.STABLE6-errorpage_quote.patch) = b9f329cdf98c7c5a048cdad
 SIZE (squid2.5/squid-2.5.STABLE6-errorpage_quote.patch) = 377
 MD5 (squid2.5/squid-2.5.STABLE6-heap_segfault.patch) = c82d9f3972419833b757c0c116c216f8
 SIZE (squid2.5/squid-2.5.STABLE6-heap_segfault.patch) = 867
+MD5 (squid2.5/squid-2.5.STABLE6-ntlm_fetch_string.patch) = dbf1826522c14dc64c0c37430bb27b2e
+SIZE (squid2.5/squid-2.5.STABLE6-ntlm_fetch_string.patch) = 1606
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index 4ac3a23ca96..505ef0b791e 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -74,7 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -99,7 +99,8 @@ PATCHFILES=	squid-2.5.STABLE6-ufs_no_valid_dir.patch \
 		squid-2.5.STABLE6-client_db_gc.patch \
 		squid-2.5.STABLE6-ntlmtruncated.patch \
 		squid-2.5.STABLE6-errorpage_quote.patch \
-		squid-2.5.STABLE6-heap_segfault.patch
+		squid-2.5.STABLE6-heap_segfault.patch \
+		squid-2.5.STABLE6-ntlm_fetch_string.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid27/distinfo b/www/squid27/distinfo
index 64c59d203fc..fa496248099 100644
--- a/www/squid27/distinfo
+++ b/www/squid27/distinfo
@@ -26,3 +26,5 @@ MD5 (squid2.5/squid-2.5.STABLE6-errorpage_quote.patch) = b9f329cdf98c7c5a048cdad
 SIZE (squid2.5/squid-2.5.STABLE6-errorpage_quote.patch) = 377
 MD5 (squid2.5/squid-2.5.STABLE6-heap_segfault.patch) = c82d9f3972419833b757c0c116c216f8
 SIZE (squid2.5/squid-2.5.STABLE6-heap_segfault.patch) = 867
+MD5 (squid2.5/squid-2.5.STABLE6-ntlm_fetch_string.patch) = dbf1826522c14dc64c0c37430bb27b2e
+SIZE (squid2.5/squid-2.5.STABLE6-ntlm_fetch_string.patch) = 1606
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index 4ac3a23ca96..505ef0b791e 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -74,7 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -99,7 +99,8 @@ PATCHFILES=	squid-2.5.STABLE6-ufs_no_valid_dir.patch \
 		squid-2.5.STABLE6-client_db_gc.patch \
 		squid-2.5.STABLE6-ntlmtruncated.patch \
 		squid-2.5.STABLE6-errorpage_quote.patch \
-		squid-2.5.STABLE6-heap_segfault.patch
+		squid-2.5.STABLE6-heap_segfault.patch \
+		squid-2.5.STABLE6-ntlm_fetch_string.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid30/distinfo b/www/squid30/distinfo
index 64c59d203fc..fa496248099 100644
--- a/www/squid30/distinfo
+++ b/www/squid30/distinfo
@@ -26,3 +26,5 @@ MD5 (squid2.5/squid-2.5.STABLE6-errorpage_quote.patch) = b9f329cdf98c7c5a048cdad
 SIZE (squid2.5/squid-2.5.STABLE6-errorpage_quote.patch) = 377
 MD5 (squid2.5/squid-2.5.STABLE6-heap_segfault.patch) = c82d9f3972419833b757c0c116c216f8
 SIZE (squid2.5/squid-2.5.STABLE6-heap_segfault.patch) = 867
+MD5 (squid2.5/squid-2.5.STABLE6-ntlm_fetch_string.patch) = dbf1826522c14dc64c0c37430bb27b2e
+SIZE (squid2.5/squid-2.5.STABLE6-ntlm_fetch_string.patch) = 1606
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index 4ac3a23ca96..505ef0b791e 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -74,7 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -99,7 +99,8 @@ PATCHFILES=	squid-2.5.STABLE6-ufs_no_valid_dir.patch \
 		squid-2.5.STABLE6-client_db_gc.patch \
 		squid-2.5.STABLE6-ntlmtruncated.patch \
 		squid-2.5.STABLE6-errorpage_quote.patch \
-		squid-2.5.STABLE6-heap_segfault.patch
+		squid-2.5.STABLE6-heap_segfault.patch \
+		squid-2.5.STABLE6-ntlm_fetch_string.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index 64c59d203fc..fa496248099 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -26,3 +26,5 @@ MD5 (squid2.5/squid-2.5.STABLE6-errorpage_quote.patch) = b9f329cdf98c7c5a048cdad
 SIZE (squid2.5/squid-2.5.STABLE6-errorpage_quote.patch) = 377
 MD5 (squid2.5/squid-2.5.STABLE6-heap_segfault.patch) = c82d9f3972419833b757c0c116c216f8
 SIZE (squid2.5/squid-2.5.STABLE6-heap_segfault.patch) = 867
+MD5 (squid2.5/squid-2.5.STABLE6-ntlm_fetch_string.patch) = dbf1826522c14dc64c0c37430bb27b2e
+SIZE (squid2.5/squid-2.5.STABLE6-ntlm_fetch_string.patch) = 1606