- Integrate a vendor patch against a buffer overflow in the WCCP handling,

  see <http://www.squid-cache.org/Versions/v2/2.5/bugs/#squid-2.5.STABLE7-wccp_buffer_overflow>
  and <http://www.squid-cache.org/Advisories/SQUID-2005_3.txt>.

PR:		ports/76827
Submitted by:	maintainer

12 files changed, 30 insertions, 12 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 81505e1c46e6..7fcc7467bc89 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -74,7 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.7
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -108,7 +108,8 @@ PATCHFILES=	squid-2.5.STABLE7-half_closed_POST.patch \
 		squid-2.5.STABLE7-httpd_accel_no_pmtu_disc.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-response_splitting.patch \
+		squid-2.5.STABLE7-wccp_buffer_overflow.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid/distinfo b/www/squid/distinfo
index e1ca82e7bbc7..585aaec8821f 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -44,3 +44,5 @@ MD5 (squid2.5/squid-2.5.STABLE7-short_icons_urls.patch) = 3cbed4fe923641bff5f23e
 SIZE (squid2.5/squid-2.5.STABLE7-short_icons_urls.patch) = 704
 MD5 (squid2.5/squid-2.5.STABLE7-response_splitting.patch) = ff3d8ae3e933817c91e745beba76b5fc
 SIZE (squid2.5/squid-2.5.STABLE7-response_splitting.patch) = 9782
+MD5 (squid2.5/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 01b1a4a23f170723d7e2bc3846e12c73
+SIZE (squid2.5/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 505
diff --git a/www/squid25/Makefile b/www/squid25/Makefile
index 81505e1c46e6..7fcc7467bc89 100644
--- a/www/squid25/Makefile
+++ b/www/squid25/Makefile
@@ -74,7 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.7
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -108,7 +108,8 @@ PATCHFILES=	squid-2.5.STABLE7-half_closed_POST.patch \
 		squid-2.5.STABLE7-httpd_accel_no_pmtu_disc.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-response_splitting.patch \
+		squid-2.5.STABLE7-wccp_buffer_overflow.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid25/distinfo b/www/squid25/distinfo
index e1ca82e7bbc7..585aaec8821f 100644
--- a/www/squid25/distinfo
+++ b/www/squid25/distinfo
@@ -44,3 +44,5 @@ MD5 (squid2.5/squid-2.5.STABLE7-short_icons_urls.patch) = 3cbed4fe923641bff5f23e
 SIZE (squid2.5/squid-2.5.STABLE7-short_icons_urls.patch) = 704
 MD5 (squid2.5/squid-2.5.STABLE7-response_splitting.patch) = ff3d8ae3e933817c91e745beba76b5fc
 SIZE (squid2.5/squid-2.5.STABLE7-response_splitting.patch) = 9782
+MD5 (squid2.5/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 01b1a4a23f170723d7e2bc3846e12c73
+SIZE (squid2.5/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 505
diff --git a/www/squid26/Makefile b/www/squid26/Makefile
index 81505e1c46e6..7fcc7467bc89 100644
--- a/www/squid26/Makefile
+++ b/www/squid26/Makefile
@@ -74,7 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.7
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -108,7 +108,8 @@ PATCHFILES=	squid-2.5.STABLE7-half_closed_POST.patch \
 		squid-2.5.STABLE7-httpd_accel_no_pmtu_disc.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-response_splitting.patch \
+		squid-2.5.STABLE7-wccp_buffer_overflow.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid26/distinfo b/www/squid26/distinfo
index e1ca82e7bbc7..585aaec8821f 100644
--- a/www/squid26/distinfo
+++ b/www/squid26/distinfo
@@ -44,3 +44,5 @@ MD5 (squid2.5/squid-2.5.STABLE7-short_icons_urls.patch) = 3cbed4fe923641bff5f23e
 SIZE (squid2.5/squid-2.5.STABLE7-short_icons_urls.patch) = 704
 MD5 (squid2.5/squid-2.5.STABLE7-response_splitting.patch) = ff3d8ae3e933817c91e745beba76b5fc
 SIZE (squid2.5/squid-2.5.STABLE7-response_splitting.patch) = 9782
+MD5 (squid2.5/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 01b1a4a23f170723d7e2bc3846e12c73
+SIZE (squid2.5/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 505
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index 81505e1c46e6..7fcc7467bc89 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -74,7 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.7
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -108,7 +108,8 @@ PATCHFILES=	squid-2.5.STABLE7-half_closed_POST.patch \
 		squid-2.5.STABLE7-httpd_accel_no_pmtu_disc.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-response_splitting.patch \
+		squid-2.5.STABLE7-wccp_buffer_overflow.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid27/distinfo b/www/squid27/distinfo
index e1ca82e7bbc7..585aaec8821f 100644
--- a/www/squid27/distinfo
+++ b/www/squid27/distinfo
@@ -44,3 +44,5 @@ MD5 (squid2.5/squid-2.5.STABLE7-short_icons_urls.patch) = 3cbed4fe923641bff5f23e
 SIZE (squid2.5/squid-2.5.STABLE7-short_icons_urls.patch) = 704
 MD5 (squid2.5/squid-2.5.STABLE7-response_splitting.patch) = ff3d8ae3e933817c91e745beba76b5fc
 SIZE (squid2.5/squid-2.5.STABLE7-response_splitting.patch) = 9782
+MD5 (squid2.5/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 01b1a4a23f170723d7e2bc3846e12c73
+SIZE (squid2.5/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 505
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index 81505e1c46e6..7fcc7467bc89 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -74,7 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.7
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -108,7 +108,8 @@ PATCHFILES=	squid-2.5.STABLE7-half_closed_POST.patch \
 		squid-2.5.STABLE7-httpd_accel_no_pmtu_disc.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-response_splitting.patch \
+		squid-2.5.STABLE7-wccp_buffer_overflow.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid30/distinfo b/www/squid30/distinfo
index e1ca82e7bbc7..585aaec8821f 100644
--- a/www/squid30/distinfo
+++ b/www/squid30/distinfo
@@ -44,3 +44,5 @@ MD5 (squid2.5/squid-2.5.STABLE7-short_icons_urls.patch) = 3cbed4fe923641bff5f23e
 SIZE (squid2.5/squid-2.5.STABLE7-short_icons_urls.patch) = 704
 MD5 (squid2.5/squid-2.5.STABLE7-response_splitting.patch) = ff3d8ae3e933817c91e745beba76b5fc
 SIZE (squid2.5/squid-2.5.STABLE7-response_splitting.patch) = 9782
+MD5 (squid2.5/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 01b1a4a23f170723d7e2bc3846e12c73
+SIZE (squid2.5/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 505
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index 81505e1c46e6..7fcc7467bc89 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -74,7 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.7
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -108,7 +108,8 @@ PATCHFILES=	squid-2.5.STABLE7-half_closed_POST.patch \
 		squid-2.5.STABLE7-httpd_accel_no_pmtu_disc.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-response_splitting.patch \
+		squid-2.5.STABLE7-wccp_buffer_overflow.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index e1ca82e7bbc7..585aaec8821f 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -44,3 +44,5 @@ MD5 (squid2.5/squid-2.5.STABLE7-short_icons_urls.patch) = 3cbed4fe923641bff5f23e
 SIZE (squid2.5/squid-2.5.STABLE7-short_icons_urls.patch) = 704
 MD5 (squid2.5/squid-2.5.STABLE7-response_splitting.patch) = ff3d8ae3e933817c91e745beba76b5fc
 SIZE (squid2.5/squid-2.5.STABLE7-response_splitting.patch) = 9782
+MD5 (squid2.5/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 01b1a4a23f170723d7e2bc3846e12c73
+SIZE (squid2.5/squid-2.5.STABLE7-wccp_buffer_overflow.patch) = 505