16 files changed, 96 insertions, 16 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 48d944ab7624..dc809cbf9d1d 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	squid
 PORTVERSION= 	2.3
 CATEGORIES=	www
 MASTER_SITES=  \
-	ftp://squid.nlanr.net/pub/squid-2/STABLE/ \
+	ftp://ftp.squid-cache.org/pub/squid-2/STABLE/ \
 	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \
 	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \
 	ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/
@@ -18,7 +18,12 @@ EXTRACT_SUFX=	-src.tar.gz
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.3/bugs/
 PATCHFILES=	squid-2.3.stable4-ftp_icon_not_found.patch \
-		squid-2.3.stable4-internal_dns_rcode_table_formatting.patch
+		squid-2.3.stable4-internal_dns_rcode_table_formatting.patch \
+		squid-2.3.stable4-ipfw_configure.patch \
+		squid-2.3.stable4-invalid_ip_acl_entry.patch \
+		squid-2.3.stable4-accel_only_access.patch \
+		squid-2.3.stable4-html_quoting.patch \
+		squid-2.3.stable4-carp-assertion.patch
 
 MAINTAINER=	peter@freebsd.org
 
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 161b4a39edd6..8a7788b702d2 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,3 +1,8 @@
 MD5 (squid2.3/squid-2.3.STABLE4-src.tar.gz) = c38c083f44c222a8d026fa129c30b98f
 MD5 (squid2.3/squid-2.3.stable4-ftp_icon_not_found.patch) = f1383b24672f9a8317c2c16302a94eaa
 MD5 (squid2.3/squid-2.3.stable4-internal_dns_rcode_table_formatting.patch) = bec46f5a1fcbd9aa1deb9d518c5c11a5
+MD5 (squid2.3/squid-2.3.stable4-ipfw_configure.patch) = 4453c53a712280a26fdca42c950bc94f
+MD5 (squid2.3/squid-2.3.stable4-invalid_ip_acl_entry.patch) = 436eb77056bed5d45547c739d1123bd3
+MD5 (squid2.3/squid-2.3.stable4-accel_only_access.patch) = db8e4eb9c1712a4adde7e9aaed0b5249
+MD5 (squid2.3/squid-2.3.stable4-html_quoting.patch) = 68228709d011c93c2cccd9ac723fb462
+MD5 (squid2.3/squid-2.3.stable4-carp-assertion.patch) = c3d48a2b4fc26c0d90eb4c30ae34d3d6
diff --git a/www/squid23/Makefile b/www/squid23/Makefile
index 48d944ab7624..dc809cbf9d1d 100644
--- a/www/squid23/Makefile
+++ b/www/squid23/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	squid
 PORTVERSION= 	2.3
 CATEGORIES=	www
 MASTER_SITES=  \
-	ftp://squid.nlanr.net/pub/squid-2/STABLE/ \
+	ftp://ftp.squid-cache.org/pub/squid-2/STABLE/ \
 	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \
 	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \
 	ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/
@@ -18,7 +18,12 @@ EXTRACT_SUFX=	-src.tar.gz
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.3/bugs/
 PATCHFILES=	squid-2.3.stable4-ftp_icon_not_found.patch \
-		squid-2.3.stable4-internal_dns_rcode_table_formatting.patch
+		squid-2.3.stable4-internal_dns_rcode_table_formatting.patch \
+		squid-2.3.stable4-ipfw_configure.patch \
+		squid-2.3.stable4-invalid_ip_acl_entry.patch \
+		squid-2.3.stable4-accel_only_access.patch \
+		squid-2.3.stable4-html_quoting.patch \
+		squid-2.3.stable4-carp-assertion.patch
 
 MAINTAINER=	peter@freebsd.org
 
diff --git a/www/squid23/distinfo b/www/squid23/distinfo
index 161b4a39edd6..8a7788b702d2 100644
--- a/www/squid23/distinfo
+++ b/www/squid23/distinfo
@@ -1,3 +1,8 @@
 MD5 (squid2.3/squid-2.3.STABLE4-src.tar.gz) = c38c083f44c222a8d026fa129c30b98f
 MD5 (squid2.3/squid-2.3.stable4-ftp_icon_not_found.patch) = f1383b24672f9a8317c2c16302a94eaa
 MD5 (squid2.3/squid-2.3.stable4-internal_dns_rcode_table_formatting.patch) = bec46f5a1fcbd9aa1deb9d518c5c11a5
+MD5 (squid2.3/squid-2.3.stable4-ipfw_configure.patch) = 4453c53a712280a26fdca42c950bc94f
+MD5 (squid2.3/squid-2.3.stable4-invalid_ip_acl_entry.patch) = 436eb77056bed5d45547c739d1123bd3
+MD5 (squid2.3/squid-2.3.stable4-accel_only_access.patch) = db8e4eb9c1712a4adde7e9aaed0b5249
+MD5 (squid2.3/squid-2.3.stable4-html_quoting.patch) = 68228709d011c93c2cccd9ac723fb462
+MD5 (squid2.3/squid-2.3.stable4-carp-assertion.patch) = c3d48a2b4fc26c0d90eb4c30ae34d3d6
diff --git a/www/squid24/Makefile b/www/squid24/Makefile
index 48d944ab7624..dc809cbf9d1d 100644
--- a/www/squid24/Makefile
+++ b/www/squid24/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	squid
 PORTVERSION= 	2.3
 CATEGORIES=	www
 MASTER_SITES=  \
-	ftp://squid.nlanr.net/pub/squid-2/STABLE/ \
+	ftp://ftp.squid-cache.org/pub/squid-2/STABLE/ \
 	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \
 	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \
 	ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/
@@ -18,7 +18,12 @@ EXTRACT_SUFX=	-src.tar.gz
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.3/bugs/
 PATCHFILES=	squid-2.3.stable4-ftp_icon_not_found.patch \
-		squid-2.3.stable4-internal_dns_rcode_table_formatting.patch
+		squid-2.3.stable4-internal_dns_rcode_table_formatting.patch \
+		squid-2.3.stable4-ipfw_configure.patch \
+		squid-2.3.stable4-invalid_ip_acl_entry.patch \
+		squid-2.3.stable4-accel_only_access.patch \
+		squid-2.3.stable4-html_quoting.patch \
+		squid-2.3.stable4-carp-assertion.patch
 
 MAINTAINER=	peter@freebsd.org
 
diff --git a/www/squid24/distinfo b/www/squid24/distinfo
index 161b4a39edd6..8a7788b702d2 100644
--- a/www/squid24/distinfo
+++ b/www/squid24/distinfo
@@ -1,3 +1,8 @@
 MD5 (squid2.3/squid-2.3.STABLE4-src.tar.gz) = c38c083f44c222a8d026fa129c30b98f
 MD5 (squid2.3/squid-2.3.stable4-ftp_icon_not_found.patch) = f1383b24672f9a8317c2c16302a94eaa
 MD5 (squid2.3/squid-2.3.stable4-internal_dns_rcode_table_formatting.patch) = bec46f5a1fcbd9aa1deb9d518c5c11a5
+MD5 (squid2.3/squid-2.3.stable4-ipfw_configure.patch) = 4453c53a712280a26fdca42c950bc94f
+MD5 (squid2.3/squid-2.3.stable4-invalid_ip_acl_entry.patch) = 436eb77056bed5d45547c739d1123bd3
+MD5 (squid2.3/squid-2.3.stable4-accel_only_access.patch) = db8e4eb9c1712a4adde7e9aaed0b5249
+MD5 (squid2.3/squid-2.3.stable4-html_quoting.patch) = 68228709d011c93c2cccd9ac723fb462
+MD5 (squid2.3/squid-2.3.stable4-carp-assertion.patch) = c3d48a2b4fc26c0d90eb4c30ae34d3d6
diff --git a/www/squid25/Makefile b/www/squid25/Makefile
index 48d944ab7624..dc809cbf9d1d 100644
--- a/www/squid25/Makefile
+++ b/www/squid25/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	squid
 PORTVERSION= 	2.3
 CATEGORIES=	www
 MASTER_SITES=  \
-	ftp://squid.nlanr.net/pub/squid-2/STABLE/ \
+	ftp://ftp.squid-cache.org/pub/squid-2/STABLE/ \
 	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \
 	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \
 	ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/
@@ -18,7 +18,12 @@ EXTRACT_SUFX=	-src.tar.gz
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.3/bugs/
 PATCHFILES=	squid-2.3.stable4-ftp_icon_not_found.patch \
-		squid-2.3.stable4-internal_dns_rcode_table_formatting.patch
+		squid-2.3.stable4-internal_dns_rcode_table_formatting.patch \
+		squid-2.3.stable4-ipfw_configure.patch \
+		squid-2.3.stable4-invalid_ip_acl_entry.patch \
+		squid-2.3.stable4-accel_only_access.patch \
+		squid-2.3.stable4-html_quoting.patch \
+		squid-2.3.stable4-carp-assertion.patch
 
 MAINTAINER=	peter@freebsd.org
 
diff --git a/www/squid25/distinfo b/www/squid25/distinfo
index 161b4a39edd6..8a7788b702d2 100644
--- a/www/squid25/distinfo
+++ b/www/squid25/distinfo
@@ -1,3 +1,8 @@
 MD5 (squid2.3/squid-2.3.STABLE4-src.tar.gz) = c38c083f44c222a8d026fa129c30b98f
 MD5 (squid2.3/squid-2.3.stable4-ftp_icon_not_found.patch) = f1383b24672f9a8317c2c16302a94eaa
 MD5 (squid2.3/squid-2.3.stable4-internal_dns_rcode_table_formatting.patch) = bec46f5a1fcbd9aa1deb9d518c5c11a5
+MD5 (squid2.3/squid-2.3.stable4-ipfw_configure.patch) = 4453c53a712280a26fdca42c950bc94f
+MD5 (squid2.3/squid-2.3.stable4-invalid_ip_acl_entry.patch) = 436eb77056bed5d45547c739d1123bd3
+MD5 (squid2.3/squid-2.3.stable4-accel_only_access.patch) = db8e4eb9c1712a4adde7e9aaed0b5249
+MD5 (squid2.3/squid-2.3.stable4-html_quoting.patch) = 68228709d011c93c2cccd9ac723fb462
+MD5 (squid2.3/squid-2.3.stable4-carp-assertion.patch) = c3d48a2b4fc26c0d90eb4c30ae34d3d6
diff --git a/www/squid26/Makefile b/www/squid26/Makefile
index 48d944ab7624..dc809cbf9d1d 100644
--- a/www/squid26/Makefile
+++ b/www/squid26/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	squid
 PORTVERSION= 	2.3
 CATEGORIES=	www
 MASTER_SITES=  \
-	ftp://squid.nlanr.net/pub/squid-2/STABLE/ \
+	ftp://ftp.squid-cache.org/pub/squid-2/STABLE/ \
 	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \
 	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \
 	ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/
@@ -18,7 +18,12 @@ EXTRACT_SUFX=	-src.tar.gz
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.3/bugs/
 PATCHFILES=	squid-2.3.stable4-ftp_icon_not_found.patch \
-		squid-2.3.stable4-internal_dns_rcode_table_formatting.patch
+		squid-2.3.stable4-internal_dns_rcode_table_formatting.patch \
+		squid-2.3.stable4-ipfw_configure.patch \
+		squid-2.3.stable4-invalid_ip_acl_entry.patch \
+		squid-2.3.stable4-accel_only_access.patch \
+		squid-2.3.stable4-html_quoting.patch \
+		squid-2.3.stable4-carp-assertion.patch
 
 MAINTAINER=	peter@freebsd.org
 
diff --git a/www/squid26/distinfo b/www/squid26/distinfo
index 161b4a39edd6..8a7788b702d2 100644
--- a/www/squid26/distinfo
+++ b/www/squid26/distinfo
@@ -1,3 +1,8 @@
 MD5 (squid2.3/squid-2.3.STABLE4-src.tar.gz) = c38c083f44c222a8d026fa129c30b98f
 MD5 (squid2.3/squid-2.3.stable4-ftp_icon_not_found.patch) = f1383b24672f9a8317c2c16302a94eaa
 MD5 (squid2.3/squid-2.3.stable4-internal_dns_rcode_table_formatting.patch) = bec46f5a1fcbd9aa1deb9d518c5c11a5
+MD5 (squid2.3/squid-2.3.stable4-ipfw_configure.patch) = 4453c53a712280a26fdca42c950bc94f
+MD5 (squid2.3/squid-2.3.stable4-invalid_ip_acl_entry.patch) = 436eb77056bed5d45547c739d1123bd3
+MD5 (squid2.3/squid-2.3.stable4-accel_only_access.patch) = db8e4eb9c1712a4adde7e9aaed0b5249
+MD5 (squid2.3/squid-2.3.stable4-html_quoting.patch) = 68228709d011c93c2cccd9ac723fb462
+MD5 (squid2.3/squid-2.3.stable4-carp-assertion.patch) = c3d48a2b4fc26c0d90eb4c30ae34d3d6
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index 48d944ab7624..dc809cbf9d1d 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	squid
 PORTVERSION= 	2.3
 CATEGORIES=	www
 MASTER_SITES=  \
-	ftp://squid.nlanr.net/pub/squid-2/STABLE/ \
+	ftp://ftp.squid-cache.org/pub/squid-2/STABLE/ \
 	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \
 	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \
 	ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/
@@ -18,7 +18,12 @@ EXTRACT_SUFX=	-src.tar.gz
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.3/bugs/
 PATCHFILES=	squid-2.3.stable4-ftp_icon_not_found.patch \
-		squid-2.3.stable4-internal_dns_rcode_table_formatting.patch
+		squid-2.3.stable4-internal_dns_rcode_table_formatting.patch \
+		squid-2.3.stable4-ipfw_configure.patch \
+		squid-2.3.stable4-invalid_ip_acl_entry.patch \
+		squid-2.3.stable4-accel_only_access.patch \
+		squid-2.3.stable4-html_quoting.patch \
+		squid-2.3.stable4-carp-assertion.patch
 
 MAINTAINER=	peter@freebsd.org
 
diff --git a/www/squid27/distinfo b/www/squid27/distinfo
index 161b4a39edd6..8a7788b702d2 100644
--- a/www/squid27/distinfo
+++ b/www/squid27/distinfo
@@ -1,3 +1,8 @@
 MD5 (squid2.3/squid-2.3.STABLE4-src.tar.gz) = c38c083f44c222a8d026fa129c30b98f
 MD5 (squid2.3/squid-2.3.stable4-ftp_icon_not_found.patch) = f1383b24672f9a8317c2c16302a94eaa
 MD5 (squid2.3/squid-2.3.stable4-internal_dns_rcode_table_formatting.patch) = bec46f5a1fcbd9aa1deb9d518c5c11a5
+MD5 (squid2.3/squid-2.3.stable4-ipfw_configure.patch) = 4453c53a712280a26fdca42c950bc94f
+MD5 (squid2.3/squid-2.3.stable4-invalid_ip_acl_entry.patch) = 436eb77056bed5d45547c739d1123bd3
+MD5 (squid2.3/squid-2.3.stable4-accel_only_access.patch) = db8e4eb9c1712a4adde7e9aaed0b5249
+MD5 (squid2.3/squid-2.3.stable4-html_quoting.patch) = 68228709d011c93c2cccd9ac723fb462
+MD5 (squid2.3/squid-2.3.stable4-carp-assertion.patch) = c3d48a2b4fc26c0d90eb4c30ae34d3d6
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index 48d944ab7624..dc809cbf9d1d 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	squid
 PORTVERSION= 	2.3
 CATEGORIES=	www
 MASTER_SITES=  \
-	ftp://squid.nlanr.net/pub/squid-2/STABLE/ \
+	ftp://ftp.squid-cache.org/pub/squid-2/STABLE/ \
 	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \
 	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \
 	ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/
@@ -18,7 +18,12 @@ EXTRACT_SUFX=	-src.tar.gz
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.3/bugs/
 PATCHFILES=	squid-2.3.stable4-ftp_icon_not_found.patch \
-		squid-2.3.stable4-internal_dns_rcode_table_formatting.patch
+		squid-2.3.stable4-internal_dns_rcode_table_formatting.patch \
+		squid-2.3.stable4-ipfw_configure.patch \
+		squid-2.3.stable4-invalid_ip_acl_entry.patch \
+		squid-2.3.stable4-accel_only_access.patch \
+		squid-2.3.stable4-html_quoting.patch \
+		squid-2.3.stable4-carp-assertion.patch
 
 MAINTAINER=	peter@freebsd.org
 
diff --git a/www/squid30/distinfo b/www/squid30/distinfo
index 161b4a39edd6..8a7788b702d2 100644
--- a/www/squid30/distinfo
+++ b/www/squid30/distinfo
@@ -1,3 +1,8 @@
 MD5 (squid2.3/squid-2.3.STABLE4-src.tar.gz) = c38c083f44c222a8d026fa129c30b98f
 MD5 (squid2.3/squid-2.3.stable4-ftp_icon_not_found.patch) = f1383b24672f9a8317c2c16302a94eaa
 MD5 (squid2.3/squid-2.3.stable4-internal_dns_rcode_table_formatting.patch) = bec46f5a1fcbd9aa1deb9d518c5c11a5
+MD5 (squid2.3/squid-2.3.stable4-ipfw_configure.patch) = 4453c53a712280a26fdca42c950bc94f
+MD5 (squid2.3/squid-2.3.stable4-invalid_ip_acl_entry.patch) = 436eb77056bed5d45547c739d1123bd3
+MD5 (squid2.3/squid-2.3.stable4-accel_only_access.patch) = db8e4eb9c1712a4adde7e9aaed0b5249
+MD5 (squid2.3/squid-2.3.stable4-html_quoting.patch) = 68228709d011c93c2cccd9ac723fb462
+MD5 (squid2.3/squid-2.3.stable4-carp-assertion.patch) = c3d48a2b4fc26c0d90eb4c30ae34d3d6
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index 48d944ab7624..dc809cbf9d1d 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	squid
 PORTVERSION= 	2.3
 CATEGORIES=	www
 MASTER_SITES=  \
-	ftp://squid.nlanr.net/pub/squid-2/STABLE/ \
+	ftp://ftp.squid-cache.org/pub/squid-2/STABLE/ \
 	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \
 	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \
 	ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/
@@ -18,7 +18,12 @@ EXTRACT_SUFX=	-src.tar.gz
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.3/bugs/
 PATCHFILES=	squid-2.3.stable4-ftp_icon_not_found.patch \
-		squid-2.3.stable4-internal_dns_rcode_table_formatting.patch
+		squid-2.3.stable4-internal_dns_rcode_table_formatting.patch \
+		squid-2.3.stable4-ipfw_configure.patch \
+		squid-2.3.stable4-invalid_ip_acl_entry.patch \
+		squid-2.3.stable4-accel_only_access.patch \
+		squid-2.3.stable4-html_quoting.patch \
+		squid-2.3.stable4-carp-assertion.patch
 
 MAINTAINER=	peter@freebsd.org
 
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index 161b4a39edd6..8a7788b702d2 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -1,3 +1,8 @@
 MD5 (squid2.3/squid-2.3.STABLE4-src.tar.gz) = c38c083f44c222a8d026fa129c30b98f
 MD5 (squid2.3/squid-2.3.stable4-ftp_icon_not_found.patch) = f1383b24672f9a8317c2c16302a94eaa
 MD5 (squid2.3/squid-2.3.stable4-internal_dns_rcode_table_formatting.patch) = bec46f5a1fcbd9aa1deb9d518c5c11a5
+MD5 (squid2.3/squid-2.3.stable4-ipfw_configure.patch) = 4453c53a712280a26fdca42c950bc94f
+MD5 (squid2.3/squid-2.3.stable4-invalid_ip_acl_entry.patch) = 436eb77056bed5d45547c739d1123bd3
+MD5 (squid2.3/squid-2.3.stable4-accel_only_access.patch) = db8e4eb9c1712a4adde7e9aaed0b5249
+MD5 (squid2.3/squid-2.3.stable4-html_quoting.patch) = 68228709d011c93c2cccd9ac723fb462
+MD5 (squid2.3/squid-2.3.stable4-carp-assertion.patch) = c3d48a2b4fc26c0d90eb4c30ae34d3d6