14 files changed, 28 insertions, 14 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index f93f300b3f65..215003412543 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://ftp.squid-cache.org/pub/squid-2/STABLE/ \
@@ -21,7 +21,8 @@ PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.4/bugs/
 PATCHFILES=	squid-2.4.stable1-wrong_sign_on_timestamp_check.patch \
 		squid-2.4.stable1-high_cpu_with_peers.patch \
 		squid-2.4.stable1-force_valid_blksize.patch \
-		squid-2.4.stable1-kill_parent_on_child_sigkill.patch
+		squid-2.4.stable1-kill_parent_on_child_sigkill.patch \
+		squid-2.4.stable1-htcp_assertion_fix.patch
 
 MAINTAINER=	adrian@freebsd.org
 
diff --git a/www/squid/distinfo b/www/squid/distinfo
index c12c7a92625c..f05df10d05ef 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -3,3 +3,4 @@ MD5 (squid2.4/squid-2.4.stable1-wrong_sign_on_timestamp_check.patch) = bdb1b7fea
 MD5 (squid2.4/squid-2.4.stable1-high_cpu_with_peers.patch) = f358cc67f07ba9e9904d7c150eee4d8a
 MD5 (squid2.4/squid-2.4.stable1-force_valid_blksize.patch) = d6bd16c8059ea16da1cb276331119bf3
 MD5 (squid2.4/squid-2.4.stable1-kill_parent_on_child_sigkill.patch) = a1ad2ff574a0d0973af36a10e0333cab
+MD5 (squid2.4/squid-2.4.stable1-htcp_assertion_fix.patch) = 8332039c0bab696c0ffc244cf6d7f1f8
diff --git a/www/squid24/Makefile b/www/squid24/Makefile
index f93f300b3f65..215003412543 100644
--- a/www/squid24/Makefile
+++ b/www/squid24/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://ftp.squid-cache.org/pub/squid-2/STABLE/ \
@@ -21,7 +21,8 @@ PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.4/bugs/
 PATCHFILES=	squid-2.4.stable1-wrong_sign_on_timestamp_check.patch \
 		squid-2.4.stable1-high_cpu_with_peers.patch \
 		squid-2.4.stable1-force_valid_blksize.patch \
-		squid-2.4.stable1-kill_parent_on_child_sigkill.patch
+		squid-2.4.stable1-kill_parent_on_child_sigkill.patch \
+		squid-2.4.stable1-htcp_assertion_fix.patch
 
 MAINTAINER=	adrian@freebsd.org
 
diff --git a/www/squid24/distinfo b/www/squid24/distinfo
index c12c7a92625c..f05df10d05ef 100644
--- a/www/squid24/distinfo
+++ b/www/squid24/distinfo
@@ -3,3 +3,4 @@ MD5 (squid2.4/squid-2.4.stable1-wrong_sign_on_timestamp_check.patch) = bdb1b7fea
 MD5 (squid2.4/squid-2.4.stable1-high_cpu_with_peers.patch) = f358cc67f07ba9e9904d7c150eee4d8a
 MD5 (squid2.4/squid-2.4.stable1-force_valid_blksize.patch) = d6bd16c8059ea16da1cb276331119bf3
 MD5 (squid2.4/squid-2.4.stable1-kill_parent_on_child_sigkill.patch) = a1ad2ff574a0d0973af36a10e0333cab
+MD5 (squid2.4/squid-2.4.stable1-htcp_assertion_fix.patch) = 8332039c0bab696c0ffc244cf6d7f1f8
diff --git a/www/squid25/Makefile b/www/squid25/Makefile
index f93f300b3f65..215003412543 100644
--- a/www/squid25/Makefile
+++ b/www/squid25/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://ftp.squid-cache.org/pub/squid-2/STABLE/ \
@@ -21,7 +21,8 @@ PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.4/bugs/
 PATCHFILES=	squid-2.4.stable1-wrong_sign_on_timestamp_check.patch \
 		squid-2.4.stable1-high_cpu_with_peers.patch \
 		squid-2.4.stable1-force_valid_blksize.patch \
-		squid-2.4.stable1-kill_parent_on_child_sigkill.patch
+		squid-2.4.stable1-kill_parent_on_child_sigkill.patch \
+		squid-2.4.stable1-htcp_assertion_fix.patch
 
 MAINTAINER=	adrian@freebsd.org
 
diff --git a/www/squid25/distinfo b/www/squid25/distinfo
index c12c7a92625c..f05df10d05ef 100644
--- a/www/squid25/distinfo
+++ b/www/squid25/distinfo
@@ -3,3 +3,4 @@ MD5 (squid2.4/squid-2.4.stable1-wrong_sign_on_timestamp_check.patch) = bdb1b7fea
 MD5 (squid2.4/squid-2.4.stable1-high_cpu_with_peers.patch) = f358cc67f07ba9e9904d7c150eee4d8a
 MD5 (squid2.4/squid-2.4.stable1-force_valid_blksize.patch) = d6bd16c8059ea16da1cb276331119bf3
 MD5 (squid2.4/squid-2.4.stable1-kill_parent_on_child_sigkill.patch) = a1ad2ff574a0d0973af36a10e0333cab
+MD5 (squid2.4/squid-2.4.stable1-htcp_assertion_fix.patch) = 8332039c0bab696c0ffc244cf6d7f1f8
diff --git a/www/squid26/Makefile b/www/squid26/Makefile
index f93f300b3f65..215003412543 100644
--- a/www/squid26/Makefile
+++ b/www/squid26/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://ftp.squid-cache.org/pub/squid-2/STABLE/ \
@@ -21,7 +21,8 @@ PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.4/bugs/
 PATCHFILES=	squid-2.4.stable1-wrong_sign_on_timestamp_check.patch \
 		squid-2.4.stable1-high_cpu_with_peers.patch \
 		squid-2.4.stable1-force_valid_blksize.patch \
-		squid-2.4.stable1-kill_parent_on_child_sigkill.patch
+		squid-2.4.stable1-kill_parent_on_child_sigkill.patch \
+		squid-2.4.stable1-htcp_assertion_fix.patch
 
 MAINTAINER=	adrian@freebsd.org
 
diff --git a/www/squid26/distinfo b/www/squid26/distinfo
index c12c7a92625c..f05df10d05ef 100644
--- a/www/squid26/distinfo
+++ b/www/squid26/distinfo
@@ -3,3 +3,4 @@ MD5 (squid2.4/squid-2.4.stable1-wrong_sign_on_timestamp_check.patch) = bdb1b7fea
 MD5 (squid2.4/squid-2.4.stable1-high_cpu_with_peers.patch) = f358cc67f07ba9e9904d7c150eee4d8a
 MD5 (squid2.4/squid-2.4.stable1-force_valid_blksize.patch) = d6bd16c8059ea16da1cb276331119bf3
 MD5 (squid2.4/squid-2.4.stable1-kill_parent_on_child_sigkill.patch) = a1ad2ff574a0d0973af36a10e0333cab
+MD5 (squid2.4/squid-2.4.stable1-htcp_assertion_fix.patch) = 8332039c0bab696c0ffc244cf6d7f1f8
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index f93f300b3f65..215003412543 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://ftp.squid-cache.org/pub/squid-2/STABLE/ \
@@ -21,7 +21,8 @@ PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.4/bugs/
 PATCHFILES=	squid-2.4.stable1-wrong_sign_on_timestamp_check.patch \
 		squid-2.4.stable1-high_cpu_with_peers.patch \
 		squid-2.4.stable1-force_valid_blksize.patch \
-		squid-2.4.stable1-kill_parent_on_child_sigkill.patch
+		squid-2.4.stable1-kill_parent_on_child_sigkill.patch \
+		squid-2.4.stable1-htcp_assertion_fix.patch
 
 MAINTAINER=	adrian@freebsd.org
 
diff --git a/www/squid27/distinfo b/www/squid27/distinfo
index c12c7a92625c..f05df10d05ef 100644
--- a/www/squid27/distinfo
+++ b/www/squid27/distinfo
@@ -3,3 +3,4 @@ MD5 (squid2.4/squid-2.4.stable1-wrong_sign_on_timestamp_check.patch) = bdb1b7fea
 MD5 (squid2.4/squid-2.4.stable1-high_cpu_with_peers.patch) = f358cc67f07ba9e9904d7c150eee4d8a
 MD5 (squid2.4/squid-2.4.stable1-force_valid_blksize.patch) = d6bd16c8059ea16da1cb276331119bf3
 MD5 (squid2.4/squid-2.4.stable1-kill_parent_on_child_sigkill.patch) = a1ad2ff574a0d0973af36a10e0333cab
+MD5 (squid2.4/squid-2.4.stable1-htcp_assertion_fix.patch) = 8332039c0bab696c0ffc244cf6d7f1f8
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index f93f300b3f65..215003412543 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://ftp.squid-cache.org/pub/squid-2/STABLE/ \
@@ -21,7 +21,8 @@ PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.4/bugs/
 PATCHFILES=	squid-2.4.stable1-wrong_sign_on_timestamp_check.patch \
 		squid-2.4.stable1-high_cpu_with_peers.patch \
 		squid-2.4.stable1-force_valid_blksize.patch \
-		squid-2.4.stable1-kill_parent_on_child_sigkill.patch
+		squid-2.4.stable1-kill_parent_on_child_sigkill.patch \
+		squid-2.4.stable1-htcp_assertion_fix.patch
 
 MAINTAINER=	adrian@freebsd.org
 
diff --git a/www/squid30/distinfo b/www/squid30/distinfo
index c12c7a92625c..f05df10d05ef 100644
--- a/www/squid30/distinfo
+++ b/www/squid30/distinfo
@@ -3,3 +3,4 @@ MD5 (squid2.4/squid-2.4.stable1-wrong_sign_on_timestamp_check.patch) = bdb1b7fea
 MD5 (squid2.4/squid-2.4.stable1-high_cpu_with_peers.patch) = f358cc67f07ba9e9904d7c150eee4d8a
 MD5 (squid2.4/squid-2.4.stable1-force_valid_blksize.patch) = d6bd16c8059ea16da1cb276331119bf3
 MD5 (squid2.4/squid-2.4.stable1-kill_parent_on_child_sigkill.patch) = a1ad2ff574a0d0973af36a10e0333cab
+MD5 (squid2.4/squid-2.4.stable1-htcp_assertion_fix.patch) = 8332039c0bab696c0ffc244cf6d7f1f8
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index f93f300b3f65..215003412543 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://ftp.squid-cache.org/pub/squid-2/STABLE/ \
@@ -21,7 +21,8 @@ PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.4/bugs/
 PATCHFILES=	squid-2.4.stable1-wrong_sign_on_timestamp_check.patch \
 		squid-2.4.stable1-high_cpu_with_peers.patch \
 		squid-2.4.stable1-force_valid_blksize.patch \
-		squid-2.4.stable1-kill_parent_on_child_sigkill.patch
+		squid-2.4.stable1-kill_parent_on_child_sigkill.patch \
+		squid-2.4.stable1-htcp_assertion_fix.patch
 
 MAINTAINER=	adrian@freebsd.org
 
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index c12c7a92625c..f05df10d05ef 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -3,3 +3,4 @@ MD5 (squid2.4/squid-2.4.stable1-wrong_sign_on_timestamp_check.patch) = bdb1b7fea
 MD5 (squid2.4/squid-2.4.stable1-high_cpu_with_peers.patch) = f358cc67f07ba9e9904d7c150eee4d8a
 MD5 (squid2.4/squid-2.4.stable1-force_valid_blksize.patch) = d6bd16c8059ea16da1cb276331119bf3
 MD5 (squid2.4/squid-2.4.stable1-kill_parent_on_child_sigkill.patch) = a1ad2ff574a0d0973af36a10e0333cab
+MD5 (squid2.4/squid-2.4.stable1-htcp_assertion_fix.patch) = 8332039c0bab696c0ffc244cf6d7f1f8