Integrate the following vendor patches as published on

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

- fix a memory leak in client_db (squid bug #833)
- add delay pools information to cachemgr's active_requests
  page
- make basic authentication operate case insensitive by
  default, case sensitive operation can be enabled via
  squid.conf
- log if cache files cannot be created for some reason
- make sure that a HTTP HEAD request does not return stale data
- correctly log partial hits as TCP_MISS instead of TCP_HIT
- fix memory leaks within the NTLM authentication helper
- handle the request_header_max_size directive correctly
- avoid creating a large number of queued DNS lookups for the
  same domain in case of DNS problems
- update LDAP helper

PR:		ports/69307
Submitted by:	maintainer

12 files changed, 330 insertions, 54 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index da0c2d9d421..dfc78b36073 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -21,16 +21,28 @@
 # SQUID_LANGUAGES
 #   A list of languages for which error page files should be installed
 #   (default: all)
+#
+#   E.g. use `make SQUID_LANGUAGES="English French"' if you want to
+#   install the files for these languages only.
+#   Use `make -VSQUID_LANGUAGES' or scroll down to this variable's
+#   definition to see which values are valid.
+#
 # SQUID_DEFAULT_LANG
 #   If you define SQUID_LANGUAGES, select which language should be the default
-#   (default: English)
+#   one (this variable defaults to English). This setting can be overwritten
+#   with squid.conf's error_directory directive.
+#
 # SQUID_CONFIGURE_ARGS
 #   Additional configuration options.
-#   To enable them, use an assignment like
-#   SQUID_CONFIGURE_ARGS="--enable-dlmalloc --enable-truncate"
-#   Below most of the additional configuration options are listed,
-#   please see the configure script in the squid source distribution for a
-#   complete list. Note that you probably do not need to worry about them.
+#
+#   To enable them, use e.g
+#   `make SQUID_CONFIGURE_ARGS="--enable-dlmalloc --enable-truncate" install'
+#
+#   The list below may be incomplete, please see the configure script
+#   in the squid source distribution for the complete list of additional
+#   options.
+#   Note that you probably do not need to worry about these options in most
+#   cases, they are included in case you want to experiment with them.
 #
 #    --enable-dlmalloc
 #     Compile and use the malloc package from Doug Lea
@@ -62,6 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -74,7 +87,18 @@ DISTNAME=	squid-2.5.STABLE6
 DIST_SUBDIR=	squid2.5
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=	squid-2.5.STABLE6.ufs_no_valid_dir.patch
+PATCHFILES=	squid-2.5.STABLE6-ufs_no_valid_dir.patch \
+		squid-2.5.STABLE6-ldap_helpers.patch \
+		squid-2.5.STABLE6-concurrent_dns_lookups.patch \
+		squid-2.5.STABLE6-request_header_max_size.patch \
+		squid-2.5.STABLE6-ntlm_challengereuse_leak.patch \
+		squid-2.5.STABLE6-ntlm_noreuse_leak.patch \
+		squid-2.5.STABLE6-partial_hit_is_miss.patch \
+		squid-2.5.STABLE6-HEAD.patch \
+		squid-2.5.STABLE6-ufs_create_error.patch \
+		squid-2.5.STABLE6-basic_auth_caseinsensitive.patch \
+		squid-2.5.STABLE6-active_requests_delaypool.patch \
+		squid-2.5.STABLE6-client_db_gc.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 334ce815893..6607230a768 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,4 +1,26 @@
 MD5 (squid2.5/squid-2.5.STABLE6.tar.bz2) = 7fd964ac27b43b613d6b981cc702a29e
 SIZE (squid2.5/squid-2.5.STABLE6.tar.bz2) = 1047199
-MD5 (squid2.5/squid-2.5.STABLE6.ufs_no_valid_dir.patch) = 26a4ab522a2469f805f746bcdbe0109c
-SIZE (squid2.5/squid-2.5.STABLE6.ufs_no_valid_dir.patch) = 566
+MD5 (squid2.5/squid-2.5.STABLE6-ufs_no_valid_dir.patch) = 26a4ab522a2469f805f746bcdbe0109c
+SIZE (squid2.5/squid-2.5.STABLE6-ufs_no_valid_dir.patch) = 566
+MD5 (squid2.5/squid-2.5.STABLE6-ldap_helpers.patch) = 2c367b09a30a8c1bb8af290cbc5d15c8
+SIZE (squid2.5/squid-2.5.STABLE6-ldap_helpers.patch) = 25080
+MD5 (squid2.5/squid-2.5.STABLE6-concurrent_dns_lookups.patch) = 2d6c81bd95659aa936281962b86e8a90
+SIZE (squid2.5/squid-2.5.STABLE6-concurrent_dns_lookups.patch) = 6467
+MD5 (squid2.5/squid-2.5.STABLE6-request_header_max_size.patch) = 1900043f6b73aa8a3cbd5004633a6c5c
+SIZE (squid2.5/squid-2.5.STABLE6-request_header_max_size.patch) = 765
+MD5 (squid2.5/squid-2.5.STABLE6-ntlm_challengereuse_leak.patch) = f8f2744de056a9a0cbe7cafe44e67c19
+SIZE (squid2.5/squid-2.5.STABLE6-ntlm_challengereuse_leak.patch) = 12192
+MD5 (squid2.5/squid-2.5.STABLE6-ntlm_noreuse_leak.patch) = 7a18ed9211ec65c9275767401d1f8cf9
+SIZE (squid2.5/squid-2.5.STABLE6-ntlm_noreuse_leak.patch) = 3646
+MD5 (squid2.5/squid-2.5.STABLE6-partial_hit_is_miss.patch) = 9ce8322cf6c48dc02a7a51d039489143
+SIZE (squid2.5/squid-2.5.STABLE6-partial_hit_is_miss.patch) = 747
+MD5 (squid2.5/squid-2.5.STABLE6-HEAD.patch) = 929fe3d48046a7d17c0aa314befd8f7c
+SIZE (squid2.5/squid-2.5.STABLE6-HEAD.patch) = 895
+MD5 (squid2.5/squid-2.5.STABLE6-ufs_create_error.patch) = 63b5693268cbba233a442b345e5769bb
+SIZE (squid2.5/squid-2.5.STABLE6-ufs_create_error.patch) = 847
+MD5 (squid2.5/squid-2.5.STABLE6-basic_auth_caseinsensitive.patch) = eb6f28d6d572c8cf996619aea925a1b6
+SIZE (squid2.5/squid-2.5.STABLE6-basic_auth_caseinsensitive.patch) = 2337
+MD5 (squid2.5/squid-2.5.STABLE6-active_requests_delaypool.patch) = f465bdbbadd83dee417aafeb974a9248
+SIZE (squid2.5/squid-2.5.STABLE6-active_requests_delaypool.patch) = 500
+MD5 (squid2.5/squid-2.5.STABLE6-client_db_gc.patch) = 315e3bb42b4febde95b0974634ef8d66
+SIZE (squid2.5/squid-2.5.STABLE6-client_db_gc.patch) = 3668
diff --git a/www/squid25/Makefile b/www/squid25/Makefile
index da0c2d9d421..dfc78b36073 100644
--- a/www/squid25/Makefile
+++ b/www/squid25/Makefile
@@ -21,16 +21,28 @@
 # SQUID_LANGUAGES
 #   A list of languages for which error page files should be installed
 #   (default: all)
+#
+#   E.g. use `make SQUID_LANGUAGES="English French"' if you want to
+#   install the files for these languages only.
+#   Use `make -VSQUID_LANGUAGES' or scroll down to this variable's
+#   definition to see which values are valid.
+#
 # SQUID_DEFAULT_LANG
 #   If you define SQUID_LANGUAGES, select which language should be the default
-#   (default: English)
+#   one (this variable defaults to English). This setting can be overwritten
+#   with squid.conf's error_directory directive.
+#
 # SQUID_CONFIGURE_ARGS
 #   Additional configuration options.
-#   To enable them, use an assignment like
-#   SQUID_CONFIGURE_ARGS="--enable-dlmalloc --enable-truncate"
-#   Below most of the additional configuration options are listed,
-#   please see the configure script in the squid source distribution for a
-#   complete list. Note that you probably do not need to worry about them.
+#
+#   To enable them, use e.g
+#   `make SQUID_CONFIGURE_ARGS="--enable-dlmalloc --enable-truncate" install'
+#
+#   The list below may be incomplete, please see the configure script
+#   in the squid source distribution for the complete list of additional
+#   options.
+#   Note that you probably do not need to worry about these options in most
+#   cases, they are included in case you want to experiment with them.
 #
 #    --enable-dlmalloc
 #     Compile and use the malloc package from Doug Lea
@@ -62,6 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -74,7 +87,18 @@ DISTNAME=	squid-2.5.STABLE6
 DIST_SUBDIR=	squid2.5
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=	squid-2.5.STABLE6.ufs_no_valid_dir.patch
+PATCHFILES=	squid-2.5.STABLE6-ufs_no_valid_dir.patch \
+		squid-2.5.STABLE6-ldap_helpers.patch \
+		squid-2.5.STABLE6-concurrent_dns_lookups.patch \
+		squid-2.5.STABLE6-request_header_max_size.patch \
+		squid-2.5.STABLE6-ntlm_challengereuse_leak.patch \
+		squid-2.5.STABLE6-ntlm_noreuse_leak.patch \
+		squid-2.5.STABLE6-partial_hit_is_miss.patch \
+		squid-2.5.STABLE6-HEAD.patch \
+		squid-2.5.STABLE6-ufs_create_error.patch \
+		squid-2.5.STABLE6-basic_auth_caseinsensitive.patch \
+		squid-2.5.STABLE6-active_requests_delaypool.patch \
+		squid-2.5.STABLE6-client_db_gc.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid25/distinfo b/www/squid25/distinfo
index 334ce815893..6607230a768 100644
--- a/www/squid25/distinfo
+++ b/www/squid25/distinfo
@@ -1,4 +1,26 @@
 MD5 (squid2.5/squid-2.5.STABLE6.tar.bz2) = 7fd964ac27b43b613d6b981cc702a29e
 SIZE (squid2.5/squid-2.5.STABLE6.tar.bz2) = 1047199
-MD5 (squid2.5/squid-2.5.STABLE6.ufs_no_valid_dir.patch) = 26a4ab522a2469f805f746bcdbe0109c
-SIZE (squid2.5/squid-2.5.STABLE6.ufs_no_valid_dir.patch) = 566
+MD5 (squid2.5/squid-2.5.STABLE6-ufs_no_valid_dir.patch) = 26a4ab522a2469f805f746bcdbe0109c
+SIZE (squid2.5/squid-2.5.STABLE6-ufs_no_valid_dir.patch) = 566
+MD5 (squid2.5/squid-2.5.STABLE6-ldap_helpers.patch) = 2c367b09a30a8c1bb8af290cbc5d15c8
+SIZE (squid2.5/squid-2.5.STABLE6-ldap_helpers.patch) = 25080
+MD5 (squid2.5/squid-2.5.STABLE6-concurrent_dns_lookups.patch) = 2d6c81bd95659aa936281962b86e8a90
+SIZE (squid2.5/squid-2.5.STABLE6-concurrent_dns_lookups.patch) = 6467
+MD5 (squid2.5/squid-2.5.STABLE6-request_header_max_size.patch) = 1900043f6b73aa8a3cbd5004633a6c5c
+SIZE (squid2.5/squid-2.5.STABLE6-request_header_max_size.patch) = 765
+MD5 (squid2.5/squid-2.5.STABLE6-ntlm_challengereuse_leak.patch) = f8f2744de056a9a0cbe7cafe44e67c19
+SIZE (squid2.5/squid-2.5.STABLE6-ntlm_challengereuse_leak.patch) = 12192
+MD5 (squid2.5/squid-2.5.STABLE6-ntlm_noreuse_leak.patch) = 7a18ed9211ec65c9275767401d1f8cf9
+SIZE (squid2.5/squid-2.5.STABLE6-ntlm_noreuse_leak.patch) = 3646
+MD5 (squid2.5/squid-2.5.STABLE6-partial_hit_is_miss.patch) = 9ce8322cf6c48dc02a7a51d039489143
+SIZE (squid2.5/squid-2.5.STABLE6-partial_hit_is_miss.patch) = 747
+MD5 (squid2.5/squid-2.5.STABLE6-HEAD.patch) = 929fe3d48046a7d17c0aa314befd8f7c
+SIZE (squid2.5/squid-2.5.STABLE6-HEAD.patch) = 895
+MD5 (squid2.5/squid-2.5.STABLE6-ufs_create_error.patch) = 63b5693268cbba233a442b345e5769bb
+SIZE (squid2.5/squid-2.5.STABLE6-ufs_create_error.patch) = 847
+MD5 (squid2.5/squid-2.5.STABLE6-basic_auth_caseinsensitive.patch) = eb6f28d6d572c8cf996619aea925a1b6
+SIZE (squid2.5/squid-2.5.STABLE6-basic_auth_caseinsensitive.patch) = 2337
+MD5 (squid2.5/squid-2.5.STABLE6-active_requests_delaypool.patch) = f465bdbbadd83dee417aafeb974a9248
+SIZE (squid2.5/squid-2.5.STABLE6-active_requests_delaypool.patch) = 500
+MD5 (squid2.5/squid-2.5.STABLE6-client_db_gc.patch) = 315e3bb42b4febde95b0974634ef8d66
+SIZE (squid2.5/squid-2.5.STABLE6-client_db_gc.patch) = 3668
diff --git a/www/squid26/Makefile b/www/squid26/Makefile
index da0c2d9d421..dfc78b36073 100644
--- a/www/squid26/Makefile
+++ b/www/squid26/Makefile
@@ -21,16 +21,28 @@
 # SQUID_LANGUAGES
 #   A list of languages for which error page files should be installed
 #   (default: all)
+#
+#   E.g. use `make SQUID_LANGUAGES="English French"' if you want to
+#   install the files for these languages only.
+#   Use `make -VSQUID_LANGUAGES' or scroll down to this variable's
+#   definition to see which values are valid.
+#
 # SQUID_DEFAULT_LANG
 #   If you define SQUID_LANGUAGES, select which language should be the default
-#   (default: English)
+#   one (this variable defaults to English). This setting can be overwritten
+#   with squid.conf's error_directory directive.
+#
 # SQUID_CONFIGURE_ARGS
 #   Additional configuration options.
-#   To enable them, use an assignment like
-#   SQUID_CONFIGURE_ARGS="--enable-dlmalloc --enable-truncate"
-#   Below most of the additional configuration options are listed,
-#   please see the configure script in the squid source distribution for a
-#   complete list. Note that you probably do not need to worry about them.
+#
+#   To enable them, use e.g
+#   `make SQUID_CONFIGURE_ARGS="--enable-dlmalloc --enable-truncate" install'
+#
+#   The list below may be incomplete, please see the configure script
+#   in the squid source distribution for the complete list of additional
+#   options.
+#   Note that you probably do not need to worry about these options in most
+#   cases, they are included in case you want to experiment with them.
 #
 #    --enable-dlmalloc
 #     Compile and use the malloc package from Doug Lea
@@ -62,6 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -74,7 +87,18 @@ DISTNAME=	squid-2.5.STABLE6
 DIST_SUBDIR=	squid2.5
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=	squid-2.5.STABLE6.ufs_no_valid_dir.patch
+PATCHFILES=	squid-2.5.STABLE6-ufs_no_valid_dir.patch \
+		squid-2.5.STABLE6-ldap_helpers.patch \
+		squid-2.5.STABLE6-concurrent_dns_lookups.patch \
+		squid-2.5.STABLE6-request_header_max_size.patch \
+		squid-2.5.STABLE6-ntlm_challengereuse_leak.patch \
+		squid-2.5.STABLE6-ntlm_noreuse_leak.patch \
+		squid-2.5.STABLE6-partial_hit_is_miss.patch \
+		squid-2.5.STABLE6-HEAD.patch \
+		squid-2.5.STABLE6-ufs_create_error.patch \
+		squid-2.5.STABLE6-basic_auth_caseinsensitive.patch \
+		squid-2.5.STABLE6-active_requests_delaypool.patch \
+		squid-2.5.STABLE6-client_db_gc.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid26/distinfo b/www/squid26/distinfo
index 334ce815893..6607230a768 100644
--- a/www/squid26/distinfo
+++ b/www/squid26/distinfo
@@ -1,4 +1,26 @@
 MD5 (squid2.5/squid-2.5.STABLE6.tar.bz2) = 7fd964ac27b43b613d6b981cc702a29e
 SIZE (squid2.5/squid-2.5.STABLE6.tar.bz2) = 1047199
-MD5 (squid2.5/squid-2.5.STABLE6.ufs_no_valid_dir.patch) = 26a4ab522a2469f805f746bcdbe0109c
-SIZE (squid2.5/squid-2.5.STABLE6.ufs_no_valid_dir.patch) = 566
+MD5 (squid2.5/squid-2.5.STABLE6-ufs_no_valid_dir.patch) = 26a4ab522a2469f805f746bcdbe0109c
+SIZE (squid2.5/squid-2.5.STABLE6-ufs_no_valid_dir.patch) = 566
+MD5 (squid2.5/squid-2.5.STABLE6-ldap_helpers.patch) = 2c367b09a30a8c1bb8af290cbc5d15c8
+SIZE (squid2.5/squid-2.5.STABLE6-ldap_helpers.patch) = 25080
+MD5 (squid2.5/squid-2.5.STABLE6-concurrent_dns_lookups.patch) = 2d6c81bd95659aa936281962b86e8a90
+SIZE (squid2.5/squid-2.5.STABLE6-concurrent_dns_lookups.patch) = 6467
+MD5 (squid2.5/squid-2.5.STABLE6-request_header_max_size.patch) = 1900043f6b73aa8a3cbd5004633a6c5c
+SIZE (squid2.5/squid-2.5.STABLE6-request_header_max_size.patch) = 765
+MD5 (squid2.5/squid-2.5.STABLE6-ntlm_challengereuse_leak.patch) = f8f2744de056a9a0cbe7cafe44e67c19
+SIZE (squid2.5/squid-2.5.STABLE6-ntlm_challengereuse_leak.patch) = 12192
+MD5 (squid2.5/squid-2.5.STABLE6-ntlm_noreuse_leak.patch) = 7a18ed9211ec65c9275767401d1f8cf9
+SIZE (squid2.5/squid-2.5.STABLE6-ntlm_noreuse_leak.patch) = 3646
+MD5 (squid2.5/squid-2.5.STABLE6-partial_hit_is_miss.patch) = 9ce8322cf6c48dc02a7a51d039489143
+SIZE (squid2.5/squid-2.5.STABLE6-partial_hit_is_miss.patch) = 747
+MD5 (squid2.5/squid-2.5.STABLE6-HEAD.patch) = 929fe3d48046a7d17c0aa314befd8f7c
+SIZE (squid2.5/squid-2.5.STABLE6-HEAD.patch) = 895
+MD5 (squid2.5/squid-2.5.STABLE6-ufs_create_error.patch) = 63b5693268cbba233a442b345e5769bb
+SIZE (squid2.5/squid-2.5.STABLE6-ufs_create_error.patch) = 847
+MD5 (squid2.5/squid-2.5.STABLE6-basic_auth_caseinsensitive.patch) = eb6f28d6d572c8cf996619aea925a1b6
+SIZE (squid2.5/squid-2.5.STABLE6-basic_auth_caseinsensitive.patch) = 2337
+MD5 (squid2.5/squid-2.5.STABLE6-active_requests_delaypool.patch) = f465bdbbadd83dee417aafeb974a9248
+SIZE (squid2.5/squid-2.5.STABLE6-active_requests_delaypool.patch) = 500
+MD5 (squid2.5/squid-2.5.STABLE6-client_db_gc.patch) = 315e3bb42b4febde95b0974634ef8d66
+SIZE (squid2.5/squid-2.5.STABLE6-client_db_gc.patch) = 3668
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index da0c2d9d421..dfc78b36073 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -21,16 +21,28 @@
 # SQUID_LANGUAGES
 #   A list of languages for which error page files should be installed
 #   (default: all)
+#
+#   E.g. use `make SQUID_LANGUAGES="English French"' if you want to
+#   install the files for these languages only.
+#   Use `make -VSQUID_LANGUAGES' or scroll down to this variable's
+#   definition to see which values are valid.
+#
 # SQUID_DEFAULT_LANG
 #   If you define SQUID_LANGUAGES, select which language should be the default
-#   (default: English)
+#   one (this variable defaults to English). This setting can be overwritten
+#   with squid.conf's error_directory directive.
+#
 # SQUID_CONFIGURE_ARGS
 #   Additional configuration options.
-#   To enable them, use an assignment like
-#   SQUID_CONFIGURE_ARGS="--enable-dlmalloc --enable-truncate"
-#   Below most of the additional configuration options are listed,
-#   please see the configure script in the squid source distribution for a
-#   complete list. Note that you probably do not need to worry about them.
+#
+#   To enable them, use e.g
+#   `make SQUID_CONFIGURE_ARGS="--enable-dlmalloc --enable-truncate" install'
+#
+#   The list below may be incomplete, please see the configure script
+#   in the squid source distribution for the complete list of additional
+#   options.
+#   Note that you probably do not need to worry about these options in most
+#   cases, they are included in case you want to experiment with them.
 #
 #    --enable-dlmalloc
 #     Compile and use the malloc package from Doug Lea
@@ -62,6 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -74,7 +87,18 @@ DISTNAME=	squid-2.5.STABLE6
 DIST_SUBDIR=	squid2.5
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=	squid-2.5.STABLE6.ufs_no_valid_dir.patch
+PATCHFILES=	squid-2.5.STABLE6-ufs_no_valid_dir.patch \
+		squid-2.5.STABLE6-ldap_helpers.patch \
+		squid-2.5.STABLE6-concurrent_dns_lookups.patch \
+		squid-2.5.STABLE6-request_header_max_size.patch \
+		squid-2.5.STABLE6-ntlm_challengereuse_leak.patch \
+		squid-2.5.STABLE6-ntlm_noreuse_leak.patch \
+		squid-2.5.STABLE6-partial_hit_is_miss.patch \
+		squid-2.5.STABLE6-HEAD.patch \
+		squid-2.5.STABLE6-ufs_create_error.patch \
+		squid-2.5.STABLE6-basic_auth_caseinsensitive.patch \
+		squid-2.5.STABLE6-active_requests_delaypool.patch \
+		squid-2.5.STABLE6-client_db_gc.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid27/distinfo b/www/squid27/distinfo
index 334ce815893..6607230a768 100644
--- a/www/squid27/distinfo
+++ b/www/squid27/distinfo
@@ -1,4 +1,26 @@
 MD5 (squid2.5/squid-2.5.STABLE6.tar.bz2) = 7fd964ac27b43b613d6b981cc702a29e
 SIZE (squid2.5/squid-2.5.STABLE6.tar.bz2) = 1047199
-MD5 (squid2.5/squid-2.5.STABLE6.ufs_no_valid_dir.patch) = 26a4ab522a2469f805f746bcdbe0109c
-SIZE (squid2.5/squid-2.5.STABLE6.ufs_no_valid_dir.patch) = 566
+MD5 (squid2.5/squid-2.5.STABLE6-ufs_no_valid_dir.patch) = 26a4ab522a2469f805f746bcdbe0109c
+SIZE (squid2.5/squid-2.5.STABLE6-ufs_no_valid_dir.patch) = 566
+MD5 (squid2.5/squid-2.5.STABLE6-ldap_helpers.patch) = 2c367b09a30a8c1bb8af290cbc5d15c8
+SIZE (squid2.5/squid-2.5.STABLE6-ldap_helpers.patch) = 25080
+MD5 (squid2.5/squid-2.5.STABLE6-concurrent_dns_lookups.patch) = 2d6c81bd95659aa936281962b86e8a90
+SIZE (squid2.5/squid-2.5.STABLE6-concurrent_dns_lookups.patch) = 6467
+MD5 (squid2.5/squid-2.5.STABLE6-request_header_max_size.patch) = 1900043f6b73aa8a3cbd5004633a6c5c
+SIZE (squid2.5/squid-2.5.STABLE6-request_header_max_size.patch) = 765
+MD5 (squid2.5/squid-2.5.STABLE6-ntlm_challengereuse_leak.patch) = f8f2744de056a9a0cbe7cafe44e67c19
+SIZE (squid2.5/squid-2.5.STABLE6-ntlm_challengereuse_leak.patch) = 12192
+MD5 (squid2.5/squid-2.5.STABLE6-ntlm_noreuse_leak.patch) = 7a18ed9211ec65c9275767401d1f8cf9
+SIZE (squid2.5/squid-2.5.STABLE6-ntlm_noreuse_leak.patch) = 3646
+MD5 (squid2.5/squid-2.5.STABLE6-partial_hit_is_miss.patch) = 9ce8322cf6c48dc02a7a51d039489143
+SIZE (squid2.5/squid-2.5.STABLE6-partial_hit_is_miss.patch) = 747
+MD5 (squid2.5/squid-2.5.STABLE6-HEAD.patch) = 929fe3d48046a7d17c0aa314befd8f7c
+SIZE (squid2.5/squid-2.5.STABLE6-HEAD.patch) = 895
+MD5 (squid2.5/squid-2.5.STABLE6-ufs_create_error.patch) = 63b5693268cbba233a442b345e5769bb
+SIZE (squid2.5/squid-2.5.STABLE6-ufs_create_error.patch) = 847
+MD5 (squid2.5/squid-2.5.STABLE6-basic_auth_caseinsensitive.patch) = eb6f28d6d572c8cf996619aea925a1b6
+SIZE (squid2.5/squid-2.5.STABLE6-basic_auth_caseinsensitive.patch) = 2337
+MD5 (squid2.5/squid-2.5.STABLE6-active_requests_delaypool.patch) = f465bdbbadd83dee417aafeb974a9248
+SIZE (squid2.5/squid-2.5.STABLE6-active_requests_delaypool.patch) = 500
+MD5 (squid2.5/squid-2.5.STABLE6-client_db_gc.patch) = 315e3bb42b4febde95b0974634ef8d66
+SIZE (squid2.5/squid-2.5.STABLE6-client_db_gc.patch) = 3668
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index da0c2d9d421..dfc78b36073 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -21,16 +21,28 @@
 # SQUID_LANGUAGES
 #   A list of languages for which error page files should be installed
 #   (default: all)
+#
+#   E.g. use `make SQUID_LANGUAGES="English French"' if you want to
+#   install the files for these languages only.
+#   Use `make -VSQUID_LANGUAGES' or scroll down to this variable's
+#   definition to see which values are valid.
+#
 # SQUID_DEFAULT_LANG
 #   If you define SQUID_LANGUAGES, select which language should be the default
-#   (default: English)
+#   one (this variable defaults to English). This setting can be overwritten
+#   with squid.conf's error_directory directive.
+#
 # SQUID_CONFIGURE_ARGS
 #   Additional configuration options.
-#   To enable them, use an assignment like
-#   SQUID_CONFIGURE_ARGS="--enable-dlmalloc --enable-truncate"
-#   Below most of the additional configuration options are listed,
-#   please see the configure script in the squid source distribution for a
-#   complete list. Note that you probably do not need to worry about them.
+#
+#   To enable them, use e.g
+#   `make SQUID_CONFIGURE_ARGS="--enable-dlmalloc --enable-truncate" install'
+#
+#   The list below may be incomplete, please see the configure script
+#   in the squid source distribution for the complete list of additional
+#   options.
+#   Note that you probably do not need to worry about these options in most
+#   cases, they are included in case you want to experiment with them.
 #
 #    --enable-dlmalloc
 #     Compile and use the malloc package from Doug Lea
@@ -62,6 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -74,7 +87,18 @@ DISTNAME=	squid-2.5.STABLE6
 DIST_SUBDIR=	squid2.5
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=	squid-2.5.STABLE6.ufs_no_valid_dir.patch
+PATCHFILES=	squid-2.5.STABLE6-ufs_no_valid_dir.patch \
+		squid-2.5.STABLE6-ldap_helpers.patch \
+		squid-2.5.STABLE6-concurrent_dns_lookups.patch \
+		squid-2.5.STABLE6-request_header_max_size.patch \
+		squid-2.5.STABLE6-ntlm_challengereuse_leak.patch \
+		squid-2.5.STABLE6-ntlm_noreuse_leak.patch \
+		squid-2.5.STABLE6-partial_hit_is_miss.patch \
+		squid-2.5.STABLE6-HEAD.patch \
+		squid-2.5.STABLE6-ufs_create_error.patch \
+		squid-2.5.STABLE6-basic_auth_caseinsensitive.patch \
+		squid-2.5.STABLE6-active_requests_delaypool.patch \
+		squid-2.5.STABLE6-client_db_gc.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid30/distinfo b/www/squid30/distinfo
index 334ce815893..6607230a768 100644
--- a/www/squid30/distinfo
+++ b/www/squid30/distinfo
@@ -1,4 +1,26 @@
 MD5 (squid2.5/squid-2.5.STABLE6.tar.bz2) = 7fd964ac27b43b613d6b981cc702a29e
 SIZE (squid2.5/squid-2.5.STABLE6.tar.bz2) = 1047199
-MD5 (squid2.5/squid-2.5.STABLE6.ufs_no_valid_dir.patch) = 26a4ab522a2469f805f746bcdbe0109c
-SIZE (squid2.5/squid-2.5.STABLE6.ufs_no_valid_dir.patch) = 566
+MD5 (squid2.5/squid-2.5.STABLE6-ufs_no_valid_dir.patch) = 26a4ab522a2469f805f746bcdbe0109c
+SIZE (squid2.5/squid-2.5.STABLE6-ufs_no_valid_dir.patch) = 566
+MD5 (squid2.5/squid-2.5.STABLE6-ldap_helpers.patch) = 2c367b09a30a8c1bb8af290cbc5d15c8
+SIZE (squid2.5/squid-2.5.STABLE6-ldap_helpers.patch) = 25080
+MD5 (squid2.5/squid-2.5.STABLE6-concurrent_dns_lookups.patch) = 2d6c81bd95659aa936281962b86e8a90
+SIZE (squid2.5/squid-2.5.STABLE6-concurrent_dns_lookups.patch) = 6467
+MD5 (squid2.5/squid-2.5.STABLE6-request_header_max_size.patch) = 1900043f6b73aa8a3cbd5004633a6c5c
+SIZE (squid2.5/squid-2.5.STABLE6-request_header_max_size.patch) = 765
+MD5 (squid2.5/squid-2.5.STABLE6-ntlm_challengereuse_leak.patch) = f8f2744de056a9a0cbe7cafe44e67c19
+SIZE (squid2.5/squid-2.5.STABLE6-ntlm_challengereuse_leak.patch) = 12192
+MD5 (squid2.5/squid-2.5.STABLE6-ntlm_noreuse_leak.patch) = 7a18ed9211ec65c9275767401d1f8cf9
+SIZE (squid2.5/squid-2.5.STABLE6-ntlm_noreuse_leak.patch) = 3646
+MD5 (squid2.5/squid-2.5.STABLE6-partial_hit_is_miss.patch) = 9ce8322cf6c48dc02a7a51d039489143
+SIZE (squid2.5/squid-2.5.STABLE6-partial_hit_is_miss.patch) = 747
+MD5 (squid2.5/squid-2.5.STABLE6-HEAD.patch) = 929fe3d48046a7d17c0aa314befd8f7c
+SIZE (squid2.5/squid-2.5.STABLE6-HEAD.patch) = 895
+MD5 (squid2.5/squid-2.5.STABLE6-ufs_create_error.patch) = 63b5693268cbba233a442b345e5769bb
+SIZE (squid2.5/squid-2.5.STABLE6-ufs_create_error.patch) = 847
+MD5 (squid2.5/squid-2.5.STABLE6-basic_auth_caseinsensitive.patch) = eb6f28d6d572c8cf996619aea925a1b6
+SIZE (squid2.5/squid-2.5.STABLE6-basic_auth_caseinsensitive.patch) = 2337
+MD5 (squid2.5/squid-2.5.STABLE6-active_requests_delaypool.patch) = f465bdbbadd83dee417aafeb974a9248
+SIZE (squid2.5/squid-2.5.STABLE6-active_requests_delaypool.patch) = 500
+MD5 (squid2.5/squid-2.5.STABLE6-client_db_gc.patch) = 315e3bb42b4febde95b0974634ef8d66
+SIZE (squid2.5/squid-2.5.STABLE6-client_db_gc.patch) = 3668
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index da0c2d9d421..dfc78b36073 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -21,16 +21,28 @@
 # SQUID_LANGUAGES
 #   A list of languages for which error page files should be installed
 #   (default: all)
+#
+#   E.g. use `make SQUID_LANGUAGES="English French"' if you want to
+#   install the files for these languages only.
+#   Use `make -VSQUID_LANGUAGES' or scroll down to this variable's
+#   definition to see which values are valid.
+#
 # SQUID_DEFAULT_LANG
 #   If you define SQUID_LANGUAGES, select which language should be the default
-#   (default: English)
+#   one (this variable defaults to English). This setting can be overwritten
+#   with squid.conf's error_directory directive.
+#
 # SQUID_CONFIGURE_ARGS
 #   Additional configuration options.
-#   To enable them, use an assignment like
-#   SQUID_CONFIGURE_ARGS="--enable-dlmalloc --enable-truncate"
-#   Below most of the additional configuration options are listed,
-#   please see the configure script in the squid source distribution for a
-#   complete list. Note that you probably do not need to worry about them.
+#
+#   To enable them, use e.g
+#   `make SQUID_CONFIGURE_ARGS="--enable-dlmalloc --enable-truncate" install'
+#
+#   The list below may be incomplete, please see the configure script
+#   in the squid source distribution for the complete list of additional
+#   options.
+#   Note that you probably do not need to worry about these options in most
+#   cases, they are included in case you want to experiment with them.
 #
 #    --enable-dlmalloc
 #     Compile and use the malloc package from Doug Lea
@@ -62,6 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -74,7 +87,18 @@ DISTNAME=	squid-2.5.STABLE6
 DIST_SUBDIR=	squid2.5
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=	squid-2.5.STABLE6.ufs_no_valid_dir.patch
+PATCHFILES=	squid-2.5.STABLE6-ufs_no_valid_dir.patch \
+		squid-2.5.STABLE6-ldap_helpers.patch \
+		squid-2.5.STABLE6-concurrent_dns_lookups.patch \
+		squid-2.5.STABLE6-request_header_max_size.patch \
+		squid-2.5.STABLE6-ntlm_challengereuse_leak.patch \
+		squid-2.5.STABLE6-ntlm_noreuse_leak.patch \
+		squid-2.5.STABLE6-partial_hit_is_miss.patch \
+		squid-2.5.STABLE6-HEAD.patch \
+		squid-2.5.STABLE6-ufs_create_error.patch \
+		squid-2.5.STABLE6-basic_auth_caseinsensitive.patch \
+		squid-2.5.STABLE6-active_requests_delaypool.patch \
+		squid-2.5.STABLE6-client_db_gc.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index 334ce815893..6607230a768 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -1,4 +1,26 @@
 MD5 (squid2.5/squid-2.5.STABLE6.tar.bz2) = 7fd964ac27b43b613d6b981cc702a29e
 SIZE (squid2.5/squid-2.5.STABLE6.tar.bz2) = 1047199
-MD5 (squid2.5/squid-2.5.STABLE6.ufs_no_valid_dir.patch) = 26a4ab522a2469f805f746bcdbe0109c
-SIZE (squid2.5/squid-2.5.STABLE6.ufs_no_valid_dir.patch) = 566
+MD5 (squid2.5/squid-2.5.STABLE6-ufs_no_valid_dir.patch) = 26a4ab522a2469f805f746bcdbe0109c
+SIZE (squid2.5/squid-2.5.STABLE6-ufs_no_valid_dir.patch) = 566
+MD5 (squid2.5/squid-2.5.STABLE6-ldap_helpers.patch) = 2c367b09a30a8c1bb8af290cbc5d15c8
+SIZE (squid2.5/squid-2.5.STABLE6-ldap_helpers.patch) = 25080
+MD5 (squid2.5/squid-2.5.STABLE6-concurrent_dns_lookups.patch) = 2d6c81bd95659aa936281962b86e8a90
+SIZE (squid2.5/squid-2.5.STABLE6-concurrent_dns_lookups.patch) = 6467
+MD5 (squid2.5/squid-2.5.STABLE6-request_header_max_size.patch) = 1900043f6b73aa8a3cbd5004633a6c5c
+SIZE (squid2.5/squid-2.5.STABLE6-request_header_max_size.patch) = 765
+MD5 (squid2.5/squid-2.5.STABLE6-ntlm_challengereuse_leak.patch) = f8f2744de056a9a0cbe7cafe44e67c19
+SIZE (squid2.5/squid-2.5.STABLE6-ntlm_challengereuse_leak.patch) = 12192
+MD5 (squid2.5/squid-2.5.STABLE6-ntlm_noreuse_leak.patch) = 7a18ed9211ec65c9275767401d1f8cf9
+SIZE (squid2.5/squid-2.5.STABLE6-ntlm_noreuse_leak.patch) = 3646
+MD5 (squid2.5/squid-2.5.STABLE6-partial_hit_is_miss.patch) = 9ce8322cf6c48dc02a7a51d039489143
+SIZE (squid2.5/squid-2.5.STABLE6-partial_hit_is_miss.patch) = 747
+MD5 (squid2.5/squid-2.5.STABLE6-HEAD.patch) = 929fe3d48046a7d17c0aa314befd8f7c
+SIZE (squid2.5/squid-2.5.STABLE6-HEAD.patch) = 895
+MD5 (squid2.5/squid-2.5.STABLE6-ufs_create_error.patch) = 63b5693268cbba233a442b345e5769bb
+SIZE (squid2.5/squid-2.5.STABLE6-ufs_create_error.patch) = 847
+MD5 (squid2.5/squid-2.5.STABLE6-basic_auth_caseinsensitive.patch) = eb6f28d6d572c8cf996619aea925a1b6
+SIZE (squid2.5/squid-2.5.STABLE6-basic_auth_caseinsensitive.patch) = 2337
+MD5 (squid2.5/squid-2.5.STABLE6-active_requests_delaypool.patch) = f465bdbbadd83dee417aafeb974a9248
+SIZE (squid2.5/squid-2.5.STABLE6-active_requests_delaypool.patch) = 500
+MD5 (squid2.5/squid-2.5.STABLE6-client_db_gc.patch) = 315e3bb42b4febde95b0974634ef8d66
+SIZE (squid2.5/squid-2.5.STABLE6-client_db_gc.patch) = 3668