- Integrate a vendor patch that fixes an assertion caused by

  truncated DNS replies (squid bug #962)
- Bump PORTREVISION

PR:		ports/65458
Submitted by:	maintainer

12 files changed, 30 insertions, 12 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 896629336d38..6eab93fef5b9 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -29,7 +29,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -49,7 +49,8 @@ PATCHFILES=	squid-2.5.STABLE5-ntlm_assert.patch \
 		squid-2.5.STABLE5-deny_info.patch \
 		squid-2.5.STABLE5-CONNECT_timeout.patch \
 		squid-2.5.STABLE5-cache_swap_log.patch \
-		squid-2.5.STABLE5-ntlm_warning.patch
+		squid-2.5.STABLE5-ntlm_warning.patch \
+		squid-2.5.STABLE5-rfc1035NameUnpack.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid/distinfo b/www/squid/distinfo
index ec16de9f290b..cfbdf43b1057 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -16,3 +16,5 @@ MD5 (squid2.5/squid-2.5.STABLE5-cache_swap_log.patch) = 8009bc493487a98b5f3deb01
 SIZE (squid2.5/squid-2.5.STABLE5-cache_swap_log.patch) = 1245
 MD5 (squid2.5/squid-2.5.STABLE5-ntlm_warning.patch) = 57ec2b3e27dcff757412d6d0a6d3c778
 SIZE (squid2.5/squid-2.5.STABLE5-ntlm_warning.patch) = 900
+MD5 (squid2.5/squid-2.5.STABLE5-rfc1035NameUnpack.patch) = e3640442452f77762df5b20380aeb334
+SIZE (squid2.5/squid-2.5.STABLE5-rfc1035NameUnpack.patch) = 685
diff --git a/www/squid25/Makefile b/www/squid25/Makefile
index 896629336d38..6eab93fef5b9 100644
--- a/www/squid25/Makefile
+++ b/www/squid25/Makefile
@@ -29,7 +29,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -49,7 +49,8 @@ PATCHFILES=	squid-2.5.STABLE5-ntlm_assert.patch \
 		squid-2.5.STABLE5-deny_info.patch \
 		squid-2.5.STABLE5-CONNECT_timeout.patch \
 		squid-2.5.STABLE5-cache_swap_log.patch \
-		squid-2.5.STABLE5-ntlm_warning.patch
+		squid-2.5.STABLE5-ntlm_warning.patch \
+		squid-2.5.STABLE5-rfc1035NameUnpack.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid25/distinfo b/www/squid25/distinfo
index ec16de9f290b..cfbdf43b1057 100644
--- a/www/squid25/distinfo
+++ b/www/squid25/distinfo
@@ -16,3 +16,5 @@ MD5 (squid2.5/squid-2.5.STABLE5-cache_swap_log.patch) = 8009bc493487a98b5f3deb01
 SIZE (squid2.5/squid-2.5.STABLE5-cache_swap_log.patch) = 1245
 MD5 (squid2.5/squid-2.5.STABLE5-ntlm_warning.patch) = 57ec2b3e27dcff757412d6d0a6d3c778
 SIZE (squid2.5/squid-2.5.STABLE5-ntlm_warning.patch) = 900
+MD5 (squid2.5/squid-2.5.STABLE5-rfc1035NameUnpack.patch) = e3640442452f77762df5b20380aeb334
+SIZE (squid2.5/squid-2.5.STABLE5-rfc1035NameUnpack.patch) = 685
diff --git a/www/squid26/Makefile b/www/squid26/Makefile
index 896629336d38..6eab93fef5b9 100644
--- a/www/squid26/Makefile
+++ b/www/squid26/Makefile
@@ -29,7 +29,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -49,7 +49,8 @@ PATCHFILES=	squid-2.5.STABLE5-ntlm_assert.patch \
 		squid-2.5.STABLE5-deny_info.patch \
 		squid-2.5.STABLE5-CONNECT_timeout.patch \
 		squid-2.5.STABLE5-cache_swap_log.patch \
-		squid-2.5.STABLE5-ntlm_warning.patch
+		squid-2.5.STABLE5-ntlm_warning.patch \
+		squid-2.5.STABLE5-rfc1035NameUnpack.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid26/distinfo b/www/squid26/distinfo
index ec16de9f290b..cfbdf43b1057 100644
--- a/www/squid26/distinfo
+++ b/www/squid26/distinfo
@@ -16,3 +16,5 @@ MD5 (squid2.5/squid-2.5.STABLE5-cache_swap_log.patch) = 8009bc493487a98b5f3deb01
 SIZE (squid2.5/squid-2.5.STABLE5-cache_swap_log.patch) = 1245
 MD5 (squid2.5/squid-2.5.STABLE5-ntlm_warning.patch) = 57ec2b3e27dcff757412d6d0a6d3c778
 SIZE (squid2.5/squid-2.5.STABLE5-ntlm_warning.patch) = 900
+MD5 (squid2.5/squid-2.5.STABLE5-rfc1035NameUnpack.patch) = e3640442452f77762df5b20380aeb334
+SIZE (squid2.5/squid-2.5.STABLE5-rfc1035NameUnpack.patch) = 685
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index 896629336d38..6eab93fef5b9 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -29,7 +29,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -49,7 +49,8 @@ PATCHFILES=	squid-2.5.STABLE5-ntlm_assert.patch \
 		squid-2.5.STABLE5-deny_info.patch \
 		squid-2.5.STABLE5-CONNECT_timeout.patch \
 		squid-2.5.STABLE5-cache_swap_log.patch \
-		squid-2.5.STABLE5-ntlm_warning.patch
+		squid-2.5.STABLE5-ntlm_warning.patch \
+		squid-2.5.STABLE5-rfc1035NameUnpack.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid27/distinfo b/www/squid27/distinfo
index ec16de9f290b..cfbdf43b1057 100644
--- a/www/squid27/distinfo
+++ b/www/squid27/distinfo
@@ -16,3 +16,5 @@ MD5 (squid2.5/squid-2.5.STABLE5-cache_swap_log.patch) = 8009bc493487a98b5f3deb01
 SIZE (squid2.5/squid-2.5.STABLE5-cache_swap_log.patch) = 1245
 MD5 (squid2.5/squid-2.5.STABLE5-ntlm_warning.patch) = 57ec2b3e27dcff757412d6d0a6d3c778
 SIZE (squid2.5/squid-2.5.STABLE5-ntlm_warning.patch) = 900
+MD5 (squid2.5/squid-2.5.STABLE5-rfc1035NameUnpack.patch) = e3640442452f77762df5b20380aeb334
+SIZE (squid2.5/squid-2.5.STABLE5-rfc1035NameUnpack.patch) = 685
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index 896629336d38..6eab93fef5b9 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -29,7 +29,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -49,7 +49,8 @@ PATCHFILES=	squid-2.5.STABLE5-ntlm_assert.patch \
 		squid-2.5.STABLE5-deny_info.patch \
 		squid-2.5.STABLE5-CONNECT_timeout.patch \
 		squid-2.5.STABLE5-cache_swap_log.patch \
-		squid-2.5.STABLE5-ntlm_warning.patch
+		squid-2.5.STABLE5-ntlm_warning.patch \
+		squid-2.5.STABLE5-rfc1035NameUnpack.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid30/distinfo b/www/squid30/distinfo
index ec16de9f290b..cfbdf43b1057 100644
--- a/www/squid30/distinfo
+++ b/www/squid30/distinfo
@@ -16,3 +16,5 @@ MD5 (squid2.5/squid-2.5.STABLE5-cache_swap_log.patch) = 8009bc493487a98b5f3deb01
 SIZE (squid2.5/squid-2.5.STABLE5-cache_swap_log.patch) = 1245
 MD5 (squid2.5/squid-2.5.STABLE5-ntlm_warning.patch) = 57ec2b3e27dcff757412d6d0a6d3c778
 SIZE (squid2.5/squid-2.5.STABLE5-ntlm_warning.patch) = 900
+MD5 (squid2.5/squid-2.5.STABLE5-rfc1035NameUnpack.patch) = e3640442452f77762df5b20380aeb334
+SIZE (squid2.5/squid-2.5.STABLE5-rfc1035NameUnpack.patch) = 685
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index 896629336d38..6eab93fef5b9 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -29,7 +29,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -49,7 +49,8 @@ PATCHFILES=	squid-2.5.STABLE5-ntlm_assert.patch \
 		squid-2.5.STABLE5-deny_info.patch \
 		squid-2.5.STABLE5-CONNECT_timeout.patch \
 		squid-2.5.STABLE5-cache_swap_log.patch \
-		squid-2.5.STABLE5-ntlm_warning.patch
+		squid-2.5.STABLE5-ntlm_warning.patch \
+		squid-2.5.STABLE5-rfc1035NameUnpack.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index ec16de9f290b..cfbdf43b1057 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -16,3 +16,5 @@ MD5 (squid2.5/squid-2.5.STABLE5-cache_swap_log.patch) = 8009bc493487a98b5f3deb01
 SIZE (squid2.5/squid-2.5.STABLE5-cache_swap_log.patch) = 1245
 MD5 (squid2.5/squid-2.5.STABLE5-ntlm_warning.patch) = 57ec2b3e27dcff757412d6d0a6d3c778
 SIZE (squid2.5/squid-2.5.STABLE5-ntlm_warning.patch) = 900
+MD5 (squid2.5/squid-2.5.STABLE5-rfc1035NameUnpack.patch) = e3640442452f77762df5b20380aeb334
+SIZE (squid2.5/squid-2.5.STABLE5-rfc1035NameUnpack.patch) = 685