- correct report of available cache memory for cache sizes >2GB

  in cache.log (squid bug #570)
- correct the least-load store directory selection algorithm
  for the cache directories using the "ufs" storage scheme (squid bug #676)
- correct the type of the cacheCurrentUnlinkRequests SNMP variable
  (squid bug #946)
- include client IP addresses in debug output (squid bug #948)
- correct the HTML doctype for autogenerated FTP directory listings
  (squid bug #969)
- if no resolv.conf is present the dns_servers variable now defaults
  to 127.0.0.1 (squid bug #991)
- update the documentation of the MSNT basic authentication helper
  (squid bug #717)

PR:		ports/67495
Submitted by:	maintainer

12 files changed, 138 insertions, 12 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index d10b8eeee0d8..bc8d8fbba548 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -29,7 +29,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -56,7 +56,14 @@ PATCHFILES=	squid-2.5.STABLE5-ntlm_assert.patch \
 		squid-2.5.STABLE5-digest_ERR.patch \
 		squid-2.5.STABLE5-turkish_ERR_DNS_FAIL.patch \
 		squid-2.5.STABLE5-vary_negatively.patch \
-		squid-2.5.STABLE5-range_offset_limit.patch
+		squid-2.5.STABLE5-range_offset_limit.patch \
+		squid-2.5.STABLE5-large_cache_mem.patch \
+		squid-2.5.STABLE5-least-load.patch \
+		squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch \
+		squid-2.5.STABLE5-debug_client_ip.patch \
+		squid-2.5.STABLE5-ftp_html_doctype.patch \
+		squid-2.5.STABLE5-dns_localhost.patch \
+		squid-2.5.STABLE5-msnt_auth_doc.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 65d70d2b0edf..db5de42b4fb4 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -30,3 +30,17 @@ MD5 (squid2.5/squid-2.5.STABLE5-vary_negatively.patch) = c442094681847b0db3b10d7
 SIZE (squid2.5/squid-2.5.STABLE5-vary_negatively.patch) = 2308
 MD5 (squid2.5/squid-2.5.STABLE5-range_offset_limit.patch) = 6a0fe31f8a80c0f515c92d766d824fd2
 SIZE (squid2.5/squid-2.5.STABLE5-range_offset_limit.patch) = 565
+MD5 (squid2.5/squid-2.5.STABLE5-large_cache_mem.patch) = 3307814d1bacb3f9d541fdbe6b31a7ff
+SIZE (squid2.5/squid-2.5.STABLE5-large_cache_mem.patch) = 1848
+MD5 (squid2.5/squid-2.5.STABLE5-least-load.patch) = ae82a0a580f854ed99edb6f8dffa3d16
+SIZE (squid2.5/squid-2.5.STABLE5-least-load.patch) = 2638
+MD5 (squid2.5/squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch) = f2ee3fbea33cabdd8388898e06490c8c
+SIZE (squid2.5/squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch) = 1449
+MD5 (squid2.5/squid-2.5.STABLE5-debug_client_ip.patch) = 46ac1ff54916a2c08dc040f484641a0a
+SIZE (squid2.5/squid-2.5.STABLE5-debug_client_ip.patch) = 2104
+MD5 (squid2.5/squid-2.5.STABLE5-ftp_html_doctype.patch) = 81ec48eda92c1b6522d21a9585c94be7
+SIZE (squid2.5/squid-2.5.STABLE5-ftp_html_doctype.patch) = 1266
+MD5 (squid2.5/squid-2.5.STABLE5-dns_localhost.patch) = cee1c1417185696f5ab9c94fba49ffde
+SIZE (squid2.5/squid-2.5.STABLE5-dns_localhost.patch) = 1408
+MD5 (squid2.5/squid-2.5.STABLE5-msnt_auth_doc.patch) = 6031dda00c8e963e7f9ca17b369006bd
+SIZE (squid2.5/squid-2.5.STABLE5-msnt_auth_doc.patch) = 16644
diff --git a/www/squid25/Makefile b/www/squid25/Makefile
index d10b8eeee0d8..bc8d8fbba548 100644
--- a/www/squid25/Makefile
+++ b/www/squid25/Makefile
@@ -29,7 +29,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -56,7 +56,14 @@ PATCHFILES=	squid-2.5.STABLE5-ntlm_assert.patch \
 		squid-2.5.STABLE5-digest_ERR.patch \
 		squid-2.5.STABLE5-turkish_ERR_DNS_FAIL.patch \
 		squid-2.5.STABLE5-vary_negatively.patch \
-		squid-2.5.STABLE5-range_offset_limit.patch
+		squid-2.5.STABLE5-range_offset_limit.patch \
+		squid-2.5.STABLE5-large_cache_mem.patch \
+		squid-2.5.STABLE5-least-load.patch \
+		squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch \
+		squid-2.5.STABLE5-debug_client_ip.patch \
+		squid-2.5.STABLE5-ftp_html_doctype.patch \
+		squid-2.5.STABLE5-dns_localhost.patch \
+		squid-2.5.STABLE5-msnt_auth_doc.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid25/distinfo b/www/squid25/distinfo
index 65d70d2b0edf..db5de42b4fb4 100644
--- a/www/squid25/distinfo
+++ b/www/squid25/distinfo
@@ -30,3 +30,17 @@ MD5 (squid2.5/squid-2.5.STABLE5-vary_negatively.patch) = c442094681847b0db3b10d7
 SIZE (squid2.5/squid-2.5.STABLE5-vary_negatively.patch) = 2308
 MD5 (squid2.5/squid-2.5.STABLE5-range_offset_limit.patch) = 6a0fe31f8a80c0f515c92d766d824fd2
 SIZE (squid2.5/squid-2.5.STABLE5-range_offset_limit.patch) = 565
+MD5 (squid2.5/squid-2.5.STABLE5-large_cache_mem.patch) = 3307814d1bacb3f9d541fdbe6b31a7ff
+SIZE (squid2.5/squid-2.5.STABLE5-large_cache_mem.patch) = 1848
+MD5 (squid2.5/squid-2.5.STABLE5-least-load.patch) = ae82a0a580f854ed99edb6f8dffa3d16
+SIZE (squid2.5/squid-2.5.STABLE5-least-load.patch) = 2638
+MD5 (squid2.5/squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch) = f2ee3fbea33cabdd8388898e06490c8c
+SIZE (squid2.5/squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch) = 1449
+MD5 (squid2.5/squid-2.5.STABLE5-debug_client_ip.patch) = 46ac1ff54916a2c08dc040f484641a0a
+SIZE (squid2.5/squid-2.5.STABLE5-debug_client_ip.patch) = 2104
+MD5 (squid2.5/squid-2.5.STABLE5-ftp_html_doctype.patch) = 81ec48eda92c1b6522d21a9585c94be7
+SIZE (squid2.5/squid-2.5.STABLE5-ftp_html_doctype.patch) = 1266
+MD5 (squid2.5/squid-2.5.STABLE5-dns_localhost.patch) = cee1c1417185696f5ab9c94fba49ffde
+SIZE (squid2.5/squid-2.5.STABLE5-dns_localhost.patch) = 1408
+MD5 (squid2.5/squid-2.5.STABLE5-msnt_auth_doc.patch) = 6031dda00c8e963e7f9ca17b369006bd
+SIZE (squid2.5/squid-2.5.STABLE5-msnt_auth_doc.patch) = 16644
diff --git a/www/squid26/Makefile b/www/squid26/Makefile
index d10b8eeee0d8..bc8d8fbba548 100644
--- a/www/squid26/Makefile
+++ b/www/squid26/Makefile
@@ -29,7 +29,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -56,7 +56,14 @@ PATCHFILES=	squid-2.5.STABLE5-ntlm_assert.patch \
 		squid-2.5.STABLE5-digest_ERR.patch \
 		squid-2.5.STABLE5-turkish_ERR_DNS_FAIL.patch \
 		squid-2.5.STABLE5-vary_negatively.patch \
-		squid-2.5.STABLE5-range_offset_limit.patch
+		squid-2.5.STABLE5-range_offset_limit.patch \
+		squid-2.5.STABLE5-large_cache_mem.patch \
+		squid-2.5.STABLE5-least-load.patch \
+		squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch \
+		squid-2.5.STABLE5-debug_client_ip.patch \
+		squid-2.5.STABLE5-ftp_html_doctype.patch \
+		squid-2.5.STABLE5-dns_localhost.patch \
+		squid-2.5.STABLE5-msnt_auth_doc.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid26/distinfo b/www/squid26/distinfo
index 65d70d2b0edf..db5de42b4fb4 100644
--- a/www/squid26/distinfo
+++ b/www/squid26/distinfo
@@ -30,3 +30,17 @@ MD5 (squid2.5/squid-2.5.STABLE5-vary_negatively.patch) = c442094681847b0db3b10d7
 SIZE (squid2.5/squid-2.5.STABLE5-vary_negatively.patch) = 2308
 MD5 (squid2.5/squid-2.5.STABLE5-range_offset_limit.patch) = 6a0fe31f8a80c0f515c92d766d824fd2
 SIZE (squid2.5/squid-2.5.STABLE5-range_offset_limit.patch) = 565
+MD5 (squid2.5/squid-2.5.STABLE5-large_cache_mem.patch) = 3307814d1bacb3f9d541fdbe6b31a7ff
+SIZE (squid2.5/squid-2.5.STABLE5-large_cache_mem.patch) = 1848
+MD5 (squid2.5/squid-2.5.STABLE5-least-load.patch) = ae82a0a580f854ed99edb6f8dffa3d16
+SIZE (squid2.5/squid-2.5.STABLE5-least-load.patch) = 2638
+MD5 (squid2.5/squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch) = f2ee3fbea33cabdd8388898e06490c8c
+SIZE (squid2.5/squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch) = 1449
+MD5 (squid2.5/squid-2.5.STABLE5-debug_client_ip.patch) = 46ac1ff54916a2c08dc040f484641a0a
+SIZE (squid2.5/squid-2.5.STABLE5-debug_client_ip.patch) = 2104
+MD5 (squid2.5/squid-2.5.STABLE5-ftp_html_doctype.patch) = 81ec48eda92c1b6522d21a9585c94be7
+SIZE (squid2.5/squid-2.5.STABLE5-ftp_html_doctype.patch) = 1266
+MD5 (squid2.5/squid-2.5.STABLE5-dns_localhost.patch) = cee1c1417185696f5ab9c94fba49ffde
+SIZE (squid2.5/squid-2.5.STABLE5-dns_localhost.patch) = 1408
+MD5 (squid2.5/squid-2.5.STABLE5-msnt_auth_doc.patch) = 6031dda00c8e963e7f9ca17b369006bd
+SIZE (squid2.5/squid-2.5.STABLE5-msnt_auth_doc.patch) = 16644
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index d10b8eeee0d8..bc8d8fbba548 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -29,7 +29,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -56,7 +56,14 @@ PATCHFILES=	squid-2.5.STABLE5-ntlm_assert.patch \
 		squid-2.5.STABLE5-digest_ERR.patch \
 		squid-2.5.STABLE5-turkish_ERR_DNS_FAIL.patch \
 		squid-2.5.STABLE5-vary_negatively.patch \
-		squid-2.5.STABLE5-range_offset_limit.patch
+		squid-2.5.STABLE5-range_offset_limit.patch \
+		squid-2.5.STABLE5-large_cache_mem.patch \
+		squid-2.5.STABLE5-least-load.patch \
+		squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch \
+		squid-2.5.STABLE5-debug_client_ip.patch \
+		squid-2.5.STABLE5-ftp_html_doctype.patch \
+		squid-2.5.STABLE5-dns_localhost.patch \
+		squid-2.5.STABLE5-msnt_auth_doc.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid27/distinfo b/www/squid27/distinfo
index 65d70d2b0edf..db5de42b4fb4 100644
--- a/www/squid27/distinfo
+++ b/www/squid27/distinfo
@@ -30,3 +30,17 @@ MD5 (squid2.5/squid-2.5.STABLE5-vary_negatively.patch) = c442094681847b0db3b10d7
 SIZE (squid2.5/squid-2.5.STABLE5-vary_negatively.patch) = 2308
 MD5 (squid2.5/squid-2.5.STABLE5-range_offset_limit.patch) = 6a0fe31f8a80c0f515c92d766d824fd2
 SIZE (squid2.5/squid-2.5.STABLE5-range_offset_limit.patch) = 565
+MD5 (squid2.5/squid-2.5.STABLE5-large_cache_mem.patch) = 3307814d1bacb3f9d541fdbe6b31a7ff
+SIZE (squid2.5/squid-2.5.STABLE5-large_cache_mem.patch) = 1848
+MD5 (squid2.5/squid-2.5.STABLE5-least-load.patch) = ae82a0a580f854ed99edb6f8dffa3d16
+SIZE (squid2.5/squid-2.5.STABLE5-least-load.patch) = 2638
+MD5 (squid2.5/squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch) = f2ee3fbea33cabdd8388898e06490c8c
+SIZE (squid2.5/squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch) = 1449
+MD5 (squid2.5/squid-2.5.STABLE5-debug_client_ip.patch) = 46ac1ff54916a2c08dc040f484641a0a
+SIZE (squid2.5/squid-2.5.STABLE5-debug_client_ip.patch) = 2104
+MD5 (squid2.5/squid-2.5.STABLE5-ftp_html_doctype.patch) = 81ec48eda92c1b6522d21a9585c94be7
+SIZE (squid2.5/squid-2.5.STABLE5-ftp_html_doctype.patch) = 1266
+MD5 (squid2.5/squid-2.5.STABLE5-dns_localhost.patch) = cee1c1417185696f5ab9c94fba49ffde
+SIZE (squid2.5/squid-2.5.STABLE5-dns_localhost.patch) = 1408
+MD5 (squid2.5/squid-2.5.STABLE5-msnt_auth_doc.patch) = 6031dda00c8e963e7f9ca17b369006bd
+SIZE (squid2.5/squid-2.5.STABLE5-msnt_auth_doc.patch) = 16644
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index d10b8eeee0d8..bc8d8fbba548 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -29,7 +29,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -56,7 +56,14 @@ PATCHFILES=	squid-2.5.STABLE5-ntlm_assert.patch \
 		squid-2.5.STABLE5-digest_ERR.patch \
 		squid-2.5.STABLE5-turkish_ERR_DNS_FAIL.patch \
 		squid-2.5.STABLE5-vary_negatively.patch \
-		squid-2.5.STABLE5-range_offset_limit.patch
+		squid-2.5.STABLE5-range_offset_limit.patch \
+		squid-2.5.STABLE5-large_cache_mem.patch \
+		squid-2.5.STABLE5-least-load.patch \
+		squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch \
+		squid-2.5.STABLE5-debug_client_ip.patch \
+		squid-2.5.STABLE5-ftp_html_doctype.patch \
+		squid-2.5.STABLE5-dns_localhost.patch \
+		squid-2.5.STABLE5-msnt_auth_doc.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid30/distinfo b/www/squid30/distinfo
index 65d70d2b0edf..db5de42b4fb4 100644
--- a/www/squid30/distinfo
+++ b/www/squid30/distinfo
@@ -30,3 +30,17 @@ MD5 (squid2.5/squid-2.5.STABLE5-vary_negatively.patch) = c442094681847b0db3b10d7
 SIZE (squid2.5/squid-2.5.STABLE5-vary_negatively.patch) = 2308
 MD5 (squid2.5/squid-2.5.STABLE5-range_offset_limit.patch) = 6a0fe31f8a80c0f515c92d766d824fd2
 SIZE (squid2.5/squid-2.5.STABLE5-range_offset_limit.patch) = 565
+MD5 (squid2.5/squid-2.5.STABLE5-large_cache_mem.patch) = 3307814d1bacb3f9d541fdbe6b31a7ff
+SIZE (squid2.5/squid-2.5.STABLE5-large_cache_mem.patch) = 1848
+MD5 (squid2.5/squid-2.5.STABLE5-least-load.patch) = ae82a0a580f854ed99edb6f8dffa3d16
+SIZE (squid2.5/squid-2.5.STABLE5-least-load.patch) = 2638
+MD5 (squid2.5/squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch) = f2ee3fbea33cabdd8388898e06490c8c
+SIZE (squid2.5/squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch) = 1449
+MD5 (squid2.5/squid-2.5.STABLE5-debug_client_ip.patch) = 46ac1ff54916a2c08dc040f484641a0a
+SIZE (squid2.5/squid-2.5.STABLE5-debug_client_ip.patch) = 2104
+MD5 (squid2.5/squid-2.5.STABLE5-ftp_html_doctype.patch) = 81ec48eda92c1b6522d21a9585c94be7
+SIZE (squid2.5/squid-2.5.STABLE5-ftp_html_doctype.patch) = 1266
+MD5 (squid2.5/squid-2.5.STABLE5-dns_localhost.patch) = cee1c1417185696f5ab9c94fba49ffde
+SIZE (squid2.5/squid-2.5.STABLE5-dns_localhost.patch) = 1408
+MD5 (squid2.5/squid-2.5.STABLE5-msnt_auth_doc.patch) = 6031dda00c8e963e7f9ca17b369006bd
+SIZE (squid2.5/squid-2.5.STABLE5-msnt_auth_doc.patch) = 16644
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index d10b8eeee0d8..bc8d8fbba548 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -29,7 +29,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -56,7 +56,14 @@ PATCHFILES=	squid-2.5.STABLE5-ntlm_assert.patch \
 		squid-2.5.STABLE5-digest_ERR.patch \
 		squid-2.5.STABLE5-turkish_ERR_DNS_FAIL.patch \
 		squid-2.5.STABLE5-vary_negatively.patch \
-		squid-2.5.STABLE5-range_offset_limit.patch
+		squid-2.5.STABLE5-range_offset_limit.patch \
+		squid-2.5.STABLE5-large_cache_mem.patch \
+		squid-2.5.STABLE5-least-load.patch \
+		squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch \
+		squid-2.5.STABLE5-debug_client_ip.patch \
+		squid-2.5.STABLE5-ftp_html_doctype.patch \
+		squid-2.5.STABLE5-dns_localhost.patch \
+		squid-2.5.STABLE5-msnt_auth_doc.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index 65d70d2b0edf..db5de42b4fb4 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -30,3 +30,17 @@ MD5 (squid2.5/squid-2.5.STABLE5-vary_negatively.patch) = c442094681847b0db3b10d7
 SIZE (squid2.5/squid-2.5.STABLE5-vary_negatively.patch) = 2308
 MD5 (squid2.5/squid-2.5.STABLE5-range_offset_limit.patch) = 6a0fe31f8a80c0f515c92d766d824fd2
 SIZE (squid2.5/squid-2.5.STABLE5-range_offset_limit.patch) = 565
+MD5 (squid2.5/squid-2.5.STABLE5-large_cache_mem.patch) = 3307814d1bacb3f9d541fdbe6b31a7ff
+SIZE (squid2.5/squid-2.5.STABLE5-large_cache_mem.patch) = 1848
+MD5 (squid2.5/squid-2.5.STABLE5-least-load.patch) = ae82a0a580f854ed99edb6f8dffa3d16
+SIZE (squid2.5/squid-2.5.STABLE5-least-load.patch) = 2638
+MD5 (squid2.5/squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch) = f2ee3fbea33cabdd8388898e06490c8c
+SIZE (squid2.5/squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch) = 1449
+MD5 (squid2.5/squid-2.5.STABLE5-debug_client_ip.patch) = 46ac1ff54916a2c08dc040f484641a0a
+SIZE (squid2.5/squid-2.5.STABLE5-debug_client_ip.patch) = 2104
+MD5 (squid2.5/squid-2.5.STABLE5-ftp_html_doctype.patch) = 81ec48eda92c1b6522d21a9585c94be7
+SIZE (squid2.5/squid-2.5.STABLE5-ftp_html_doctype.patch) = 1266
+MD5 (squid2.5/squid-2.5.STABLE5-dns_localhost.patch) = cee1c1417185696f5ab9c94fba49ffde
+SIZE (squid2.5/squid-2.5.STABLE5-dns_localhost.patch) = 1408
+MD5 (squid2.5/squid-2.5.STABLE5-msnt_auth_doc.patch) = 6031dda00c8e963e7f9ca17b369006bd
+SIZE (squid2.5/squid-2.5.STABLE5-msnt_auth_doc.patch) = 16644