[Maintainer/security] www/squid: protect against HTTP resonse split

attack and other patches

    Integrate vendor patches as published on
    <http://www.squid-cache.org/Versions/v2/2.5/bugs/>:

    - FTP data connection fails on some FTP servers when requesting
      a directory without a trailing slash (squid bug #1194)

    - Icons fail to load on non-anonymous FTP when using the
      short_icons_url configuration directive (squid bug #1203)

    - Strengthen squid against HTTP response splitting cache pollution
      attacks (squid bug #1200), classified as security issue by
      the vendor

    Proposed VuXML information, entry date left to be filled in:

    (Note: I added only a publically accessible link to the Sanctum,
    Inc.  whitepaper, the squid bug tracker contains a deep link
    to the PDF itself; if we are allowed to publish it, it could
    instead be used as reference because Sanctum, Inc. wants you
    to register with them before you get access to their whitepapers.)

PR:		ports/76550
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de>

12 files changed, 66 insertions, 12 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index c0dae01f7424..62936694a16b 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -74,7 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.7
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -102,7 +102,10 @@ PATCHFILES=	squid-2.5.STABLE7-half_closed_POST.patch \
 		squid-2.5.STABLE7-wccp_denial_of_service.patch \
 		squid-2.5.STABLE7-dns_memleak.patch \
 		squid-2.5.STABLE7-fqdn_truncated.patch \
-		squid-2.5.STABLE7-ldap_spaces.patch
+		squid-2.5.STABLE7-ldap_spaces.patch \
+		squid-2.5.STABLE7-ftp_datachannel.patch \
+		squid-2.5.STABLE7-short_icons_urls.patch \
+		squid-2.5.STABLE7-response_splitting.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 1ee5c44c2c23..1f4b5444c390 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -32,3 +32,9 @@ MD5 (squid2.5/squid-2.5.STABLE7-fqdn_truncated.patch) = 1c38e69132cfc469f0aa6db4
 SIZE (squid2.5/squid-2.5.STABLE7-fqdn_truncated.patch) = 4484
 MD5 (squid2.5/squid-2.5.STABLE7-ldap_spaces.patch) = 8c2eb269b16d757b562ee32a2eb7ef99
 SIZE (squid2.5/squid-2.5.STABLE7-ldap_spaces.patch) = 1974
+MD5 (squid2.5/squid-2.5.STABLE7-ftp_datachannel.patch) = cc65c481c7ea1e2cb2bc1c0b61f09a69
+SIZE (squid2.5/squid-2.5.STABLE7-ftp_datachannel.patch) = 4825
+MD5 (squid2.5/squid-2.5.STABLE7-short_icons_urls.patch) = 3cbed4fe923641bff5f23e69c444d63e
+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
diff --git a/www/squid25/Makefile b/www/squid25/Makefile
index c0dae01f7424..62936694a16b 100644
--- a/www/squid25/Makefile
+++ b/www/squid25/Makefile
@@ -74,7 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.7
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -102,7 +102,10 @@ PATCHFILES=	squid-2.5.STABLE7-half_closed_POST.patch \
 		squid-2.5.STABLE7-wccp_denial_of_service.patch \
 		squid-2.5.STABLE7-dns_memleak.patch \
 		squid-2.5.STABLE7-fqdn_truncated.patch \
-		squid-2.5.STABLE7-ldap_spaces.patch
+		squid-2.5.STABLE7-ldap_spaces.patch \
+		squid-2.5.STABLE7-ftp_datachannel.patch \
+		squid-2.5.STABLE7-short_icons_urls.patch \
+		squid-2.5.STABLE7-response_splitting.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid25/distinfo b/www/squid25/distinfo
index 1ee5c44c2c23..1f4b5444c390 100644
--- a/www/squid25/distinfo
+++ b/www/squid25/distinfo
@@ -32,3 +32,9 @@ MD5 (squid2.5/squid-2.5.STABLE7-fqdn_truncated.patch) = 1c38e69132cfc469f0aa6db4
 SIZE (squid2.5/squid-2.5.STABLE7-fqdn_truncated.patch) = 4484
 MD5 (squid2.5/squid-2.5.STABLE7-ldap_spaces.patch) = 8c2eb269b16d757b562ee32a2eb7ef99
 SIZE (squid2.5/squid-2.5.STABLE7-ldap_spaces.patch) = 1974
+MD5 (squid2.5/squid-2.5.STABLE7-ftp_datachannel.patch) = cc65c481c7ea1e2cb2bc1c0b61f09a69
+SIZE (squid2.5/squid-2.5.STABLE7-ftp_datachannel.patch) = 4825
+MD5 (squid2.5/squid-2.5.STABLE7-short_icons_urls.patch) = 3cbed4fe923641bff5f23e69c444d63e
+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
diff --git a/www/squid26/Makefile b/www/squid26/Makefile
index c0dae01f7424..62936694a16b 100644
--- a/www/squid26/Makefile
+++ b/www/squid26/Makefile
@@ -74,7 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.7
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -102,7 +102,10 @@ PATCHFILES=	squid-2.5.STABLE7-half_closed_POST.patch \
 		squid-2.5.STABLE7-wccp_denial_of_service.patch \
 		squid-2.5.STABLE7-dns_memleak.patch \
 		squid-2.5.STABLE7-fqdn_truncated.patch \
-		squid-2.5.STABLE7-ldap_spaces.patch
+		squid-2.5.STABLE7-ldap_spaces.patch \
+		squid-2.5.STABLE7-ftp_datachannel.patch \
+		squid-2.5.STABLE7-short_icons_urls.patch \
+		squid-2.5.STABLE7-response_splitting.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid26/distinfo b/www/squid26/distinfo
index 1ee5c44c2c23..1f4b5444c390 100644
--- a/www/squid26/distinfo
+++ b/www/squid26/distinfo
@@ -32,3 +32,9 @@ MD5 (squid2.5/squid-2.5.STABLE7-fqdn_truncated.patch) = 1c38e69132cfc469f0aa6db4
 SIZE (squid2.5/squid-2.5.STABLE7-fqdn_truncated.patch) = 4484
 MD5 (squid2.5/squid-2.5.STABLE7-ldap_spaces.patch) = 8c2eb269b16d757b562ee32a2eb7ef99
 SIZE (squid2.5/squid-2.5.STABLE7-ldap_spaces.patch) = 1974
+MD5 (squid2.5/squid-2.5.STABLE7-ftp_datachannel.patch) = cc65c481c7ea1e2cb2bc1c0b61f09a69
+SIZE (squid2.5/squid-2.5.STABLE7-ftp_datachannel.patch) = 4825
+MD5 (squid2.5/squid-2.5.STABLE7-short_icons_urls.patch) = 3cbed4fe923641bff5f23e69c444d63e
+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
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index c0dae01f7424..62936694a16b 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -74,7 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.7
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -102,7 +102,10 @@ PATCHFILES=	squid-2.5.STABLE7-half_closed_POST.patch \
 		squid-2.5.STABLE7-wccp_denial_of_service.patch \
 		squid-2.5.STABLE7-dns_memleak.patch \
 		squid-2.5.STABLE7-fqdn_truncated.patch \
-		squid-2.5.STABLE7-ldap_spaces.patch
+		squid-2.5.STABLE7-ldap_spaces.patch \
+		squid-2.5.STABLE7-ftp_datachannel.patch \
+		squid-2.5.STABLE7-short_icons_urls.patch \
+		squid-2.5.STABLE7-response_splitting.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid27/distinfo b/www/squid27/distinfo
index 1ee5c44c2c23..1f4b5444c390 100644
--- a/www/squid27/distinfo
+++ b/www/squid27/distinfo
@@ -32,3 +32,9 @@ MD5 (squid2.5/squid-2.5.STABLE7-fqdn_truncated.patch) = 1c38e69132cfc469f0aa6db4
 SIZE (squid2.5/squid-2.5.STABLE7-fqdn_truncated.patch) = 4484
 MD5 (squid2.5/squid-2.5.STABLE7-ldap_spaces.patch) = 8c2eb269b16d757b562ee32a2eb7ef99
 SIZE (squid2.5/squid-2.5.STABLE7-ldap_spaces.patch) = 1974
+MD5 (squid2.5/squid-2.5.STABLE7-ftp_datachannel.patch) = cc65c481c7ea1e2cb2bc1c0b61f09a69
+SIZE (squid2.5/squid-2.5.STABLE7-ftp_datachannel.patch) = 4825
+MD5 (squid2.5/squid-2.5.STABLE7-short_icons_urls.patch) = 3cbed4fe923641bff5f23e69c444d63e
+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
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index c0dae01f7424..62936694a16b 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -74,7 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.7
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -102,7 +102,10 @@ PATCHFILES=	squid-2.5.STABLE7-half_closed_POST.patch \
 		squid-2.5.STABLE7-wccp_denial_of_service.patch \
 		squid-2.5.STABLE7-dns_memleak.patch \
 		squid-2.5.STABLE7-fqdn_truncated.patch \
-		squid-2.5.STABLE7-ldap_spaces.patch
+		squid-2.5.STABLE7-ldap_spaces.patch \
+		squid-2.5.STABLE7-ftp_datachannel.patch \
+		squid-2.5.STABLE7-short_icons_urls.patch \
+		squid-2.5.STABLE7-response_splitting.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid30/distinfo b/www/squid30/distinfo
index 1ee5c44c2c23..1f4b5444c390 100644
--- a/www/squid30/distinfo
+++ b/www/squid30/distinfo
@@ -32,3 +32,9 @@ MD5 (squid2.5/squid-2.5.STABLE7-fqdn_truncated.patch) = 1c38e69132cfc469f0aa6db4
 SIZE (squid2.5/squid-2.5.STABLE7-fqdn_truncated.patch) = 4484
 MD5 (squid2.5/squid-2.5.STABLE7-ldap_spaces.patch) = 8c2eb269b16d757b562ee32a2eb7ef99
 SIZE (squid2.5/squid-2.5.STABLE7-ldap_spaces.patch) = 1974
+MD5 (squid2.5/squid-2.5.STABLE7-ftp_datachannel.patch) = cc65c481c7ea1e2cb2bc1c0b61f09a69
+SIZE (squid2.5/squid-2.5.STABLE7-ftp_datachannel.patch) = 4825
+MD5 (squid2.5/squid-2.5.STABLE7-short_icons_urls.patch) = 3cbed4fe923641bff5f23e69c444d63e
+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
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index c0dae01f7424..62936694a16b 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -74,7 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.7
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -102,7 +102,10 @@ PATCHFILES=	squid-2.5.STABLE7-half_closed_POST.patch \
 		squid-2.5.STABLE7-wccp_denial_of_service.patch \
 		squid-2.5.STABLE7-dns_memleak.patch \
 		squid-2.5.STABLE7-fqdn_truncated.patch \
-		squid-2.5.STABLE7-ldap_spaces.patch
+		squid-2.5.STABLE7-ldap_spaces.patch \
+		squid-2.5.STABLE7-ftp_datachannel.patch \
+		squid-2.5.STABLE7-short_icons_urls.patch \
+		squid-2.5.STABLE7-response_splitting.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index 1ee5c44c2c23..1f4b5444c390 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -32,3 +32,9 @@ MD5 (squid2.5/squid-2.5.STABLE7-fqdn_truncated.patch) = 1c38e69132cfc469f0aa6db4
 SIZE (squid2.5/squid-2.5.STABLE7-fqdn_truncated.patch) = 4484
 MD5 (squid2.5/squid-2.5.STABLE7-ldap_spaces.patch) = 8c2eb269b16d757b562ee32a2eb7ef99
 SIZE (squid2.5/squid-2.5.STABLE7-ldap_spaces.patch) = 1974
+MD5 (squid2.5/squid-2.5.STABLE7-ftp_datachannel.patch) = cc65c481c7ea1e2cb2bc1c0b61f09a69
+SIZE (squid2.5/squid-2.5.STABLE7-ftp_datachannel.patch) = 4825
+MD5 (squid2.5/squid-2.5.STABLE7-short_icons_urls.patch) = 3cbed4fe923641bff5f23e69c444d63e
+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