diff options
author | pav <pav@FreeBSD.org> | 2005-03-09 07:27:46 +0800 |
---|---|---|
committer | pav <pav@FreeBSD.org> | 2005-03-09 07:27:46 +0800 |
commit | ccb0d12c39e691882e8d375c7818287e8dbc9703 (patch) | |
tree | 7fe411b315584a45a189792c5544da3f7078817d /www | |
parent | 18f01656bf0f760f71ce6305872acbbc18047cbc (diff) | |
download | freebsd-ports-gnome-ccb0d12c39e691882e8d375c7818287e8dbc9703.tar.gz freebsd-ports-gnome-ccb0d12c39e691882e8d375c7818287e8dbc9703.tar.zst freebsd-ports-gnome-ccb0d12c39e691882e8d375c7818287e8dbc9703.zip |
Integrate the following vendor patches as published on
- correct a race condition related to the Set-Cookie header
- correct the FTP parser with regards to the EPLF format
(squid bug #1252)
- correct FTP listing output when the URL was requested without a trailing
slash (squid bug #1253)
- make ACL configuration errors fatal (squid bug #1255)
PR: ports/78446
Submitted by: Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)
Diffstat (limited to 'www')
-rw-r--r-- | www/squid/Makefile | 6 | ||||
-rw-r--r-- | www/squid/distinfo | 8 | ||||
-rw-r--r-- | www/squid25/Makefile | 6 | ||||
-rw-r--r-- | www/squid25/distinfo | 8 | ||||
-rw-r--r-- | www/squid26/Makefile | 6 | ||||
-rw-r--r-- | www/squid26/distinfo | 8 | ||||
-rw-r--r-- | www/squid27/Makefile | 6 | ||||
-rw-r--r-- | www/squid27/distinfo | 8 | ||||
-rw-r--r-- | www/squid30/Makefile | 6 | ||||
-rw-r--r-- | www/squid30/distinfo | 8 | ||||
-rw-r--r-- | www/squid31/Makefile | 6 | ||||
-rw-r--r-- | www/squid31/distinfo | 8 |
12 files changed, 78 insertions, 6 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile index 6a85318fe1c1..909682ce949b 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -74,6 +74,7 @@ PORTNAME= squid PORTVERSION= 2.5.9 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -86,7 +87,10 @@ DISTNAME= squid-2.5.STABLE9 DIST_SUBDIR= squid2.5 PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/ -PATCHFILES= +PATCHFILES= squid-2.5.STABLE9-setcookie.patch \ + squid-2.5.STABLE9-ftp_EPLF.patch \ + squid-2.5.STABLE9-ftp_base_href.patch \ + squid-2.5.STABLE9-acl_error.patch PATCH_DIST_STRIP= -p1 MAINTAINER= tmseck@netcologne.de diff --git a/www/squid/distinfo b/www/squid/distinfo index 7d7b58d95f38..073e62d6ee9f 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -1,2 +1,10 @@ MD5 (squid2.5/squid-2.5.STABLE9.tar.bz2) = 5a34a303dcab8851c7ab20e24af69b61 SIZE (squid2.5/squid-2.5.STABLE9.tar.bz2) = 1057776 +MD5 (squid2.5/squid-2.5.STABLE9-setcookie.patch) = f4abbc43af5251380b3caaa9b08d0572 +SIZE (squid2.5/squid-2.5.STABLE9-setcookie.patch) = 5328 +MD5 (squid2.5/squid-2.5.STABLE9-ftp_EPLF.patch) = c4ae820794f301b909415e0f4728f1c9 +SIZE (squid2.5/squid-2.5.STABLE9-ftp_EPLF.patch) = 4108 +MD5 (squid2.5/squid-2.5.STABLE9-ftp_base_href.patch) = ddc034a2c2a002bfcf6bf97eb21e8b57 +SIZE (squid2.5/squid-2.5.STABLE9-ftp_base_href.patch) = 709 +MD5 (squid2.5/squid-2.5.STABLE9-acl_error.patch) = f70922d873ce73c7fdad8bf7156afeb4 +SIZE (squid2.5/squid-2.5.STABLE9-acl_error.patch) = 8499 diff --git a/www/squid25/Makefile b/www/squid25/Makefile index 6a85318fe1c1..909682ce949b 100644 --- a/www/squid25/Makefile +++ b/www/squid25/Makefile @@ -74,6 +74,7 @@ PORTNAME= squid PORTVERSION= 2.5.9 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -86,7 +87,10 @@ DISTNAME= squid-2.5.STABLE9 DIST_SUBDIR= squid2.5 PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/ -PATCHFILES= +PATCHFILES= squid-2.5.STABLE9-setcookie.patch \ + squid-2.5.STABLE9-ftp_EPLF.patch \ + squid-2.5.STABLE9-ftp_base_href.patch \ + squid-2.5.STABLE9-acl_error.patch PATCH_DIST_STRIP= -p1 MAINTAINER= tmseck@netcologne.de diff --git a/www/squid25/distinfo b/www/squid25/distinfo index 7d7b58d95f38..073e62d6ee9f 100644 --- a/www/squid25/distinfo +++ b/www/squid25/distinfo @@ -1,2 +1,10 @@ MD5 (squid2.5/squid-2.5.STABLE9.tar.bz2) = 5a34a303dcab8851c7ab20e24af69b61 SIZE (squid2.5/squid-2.5.STABLE9.tar.bz2) = 1057776 +MD5 (squid2.5/squid-2.5.STABLE9-setcookie.patch) = f4abbc43af5251380b3caaa9b08d0572 +SIZE (squid2.5/squid-2.5.STABLE9-setcookie.patch) = 5328 +MD5 (squid2.5/squid-2.5.STABLE9-ftp_EPLF.patch) = c4ae820794f301b909415e0f4728f1c9 +SIZE (squid2.5/squid-2.5.STABLE9-ftp_EPLF.patch) = 4108 +MD5 (squid2.5/squid-2.5.STABLE9-ftp_base_href.patch) = ddc034a2c2a002bfcf6bf97eb21e8b57 +SIZE (squid2.5/squid-2.5.STABLE9-ftp_base_href.patch) = 709 +MD5 (squid2.5/squid-2.5.STABLE9-acl_error.patch) = f70922d873ce73c7fdad8bf7156afeb4 +SIZE (squid2.5/squid-2.5.STABLE9-acl_error.patch) = 8499 diff --git a/www/squid26/Makefile b/www/squid26/Makefile index 6a85318fe1c1..909682ce949b 100644 --- a/www/squid26/Makefile +++ b/www/squid26/Makefile @@ -74,6 +74,7 @@ PORTNAME= squid PORTVERSION= 2.5.9 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -86,7 +87,10 @@ DISTNAME= squid-2.5.STABLE9 DIST_SUBDIR= squid2.5 PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/ -PATCHFILES= +PATCHFILES= squid-2.5.STABLE9-setcookie.patch \ + squid-2.5.STABLE9-ftp_EPLF.patch \ + squid-2.5.STABLE9-ftp_base_href.patch \ + squid-2.5.STABLE9-acl_error.patch PATCH_DIST_STRIP= -p1 MAINTAINER= tmseck@netcologne.de diff --git a/www/squid26/distinfo b/www/squid26/distinfo index 7d7b58d95f38..073e62d6ee9f 100644 --- a/www/squid26/distinfo +++ b/www/squid26/distinfo @@ -1,2 +1,10 @@ MD5 (squid2.5/squid-2.5.STABLE9.tar.bz2) = 5a34a303dcab8851c7ab20e24af69b61 SIZE (squid2.5/squid-2.5.STABLE9.tar.bz2) = 1057776 +MD5 (squid2.5/squid-2.5.STABLE9-setcookie.patch) = f4abbc43af5251380b3caaa9b08d0572 +SIZE (squid2.5/squid-2.5.STABLE9-setcookie.patch) = 5328 +MD5 (squid2.5/squid-2.5.STABLE9-ftp_EPLF.patch) = c4ae820794f301b909415e0f4728f1c9 +SIZE (squid2.5/squid-2.5.STABLE9-ftp_EPLF.patch) = 4108 +MD5 (squid2.5/squid-2.5.STABLE9-ftp_base_href.patch) = ddc034a2c2a002bfcf6bf97eb21e8b57 +SIZE (squid2.5/squid-2.5.STABLE9-ftp_base_href.patch) = 709 +MD5 (squid2.5/squid-2.5.STABLE9-acl_error.patch) = f70922d873ce73c7fdad8bf7156afeb4 +SIZE (squid2.5/squid-2.5.STABLE9-acl_error.patch) = 8499 diff --git a/www/squid27/Makefile b/www/squid27/Makefile index 6a85318fe1c1..909682ce949b 100644 --- a/www/squid27/Makefile +++ b/www/squid27/Makefile @@ -74,6 +74,7 @@ PORTNAME= squid PORTVERSION= 2.5.9 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -86,7 +87,10 @@ DISTNAME= squid-2.5.STABLE9 DIST_SUBDIR= squid2.5 PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/ -PATCHFILES= +PATCHFILES= squid-2.5.STABLE9-setcookie.patch \ + squid-2.5.STABLE9-ftp_EPLF.patch \ + squid-2.5.STABLE9-ftp_base_href.patch \ + squid-2.5.STABLE9-acl_error.patch PATCH_DIST_STRIP= -p1 MAINTAINER= tmseck@netcologne.de diff --git a/www/squid27/distinfo b/www/squid27/distinfo index 7d7b58d95f38..073e62d6ee9f 100644 --- a/www/squid27/distinfo +++ b/www/squid27/distinfo @@ -1,2 +1,10 @@ MD5 (squid2.5/squid-2.5.STABLE9.tar.bz2) = 5a34a303dcab8851c7ab20e24af69b61 SIZE (squid2.5/squid-2.5.STABLE9.tar.bz2) = 1057776 +MD5 (squid2.5/squid-2.5.STABLE9-setcookie.patch) = f4abbc43af5251380b3caaa9b08d0572 +SIZE (squid2.5/squid-2.5.STABLE9-setcookie.patch) = 5328 +MD5 (squid2.5/squid-2.5.STABLE9-ftp_EPLF.patch) = c4ae820794f301b909415e0f4728f1c9 +SIZE (squid2.5/squid-2.5.STABLE9-ftp_EPLF.patch) = 4108 +MD5 (squid2.5/squid-2.5.STABLE9-ftp_base_href.patch) = ddc034a2c2a002bfcf6bf97eb21e8b57 +SIZE (squid2.5/squid-2.5.STABLE9-ftp_base_href.patch) = 709 +MD5 (squid2.5/squid-2.5.STABLE9-acl_error.patch) = f70922d873ce73c7fdad8bf7156afeb4 +SIZE (squid2.5/squid-2.5.STABLE9-acl_error.patch) = 8499 diff --git a/www/squid30/Makefile b/www/squid30/Makefile index 6a85318fe1c1..909682ce949b 100644 --- a/www/squid30/Makefile +++ b/www/squid30/Makefile @@ -74,6 +74,7 @@ PORTNAME= squid PORTVERSION= 2.5.9 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -86,7 +87,10 @@ DISTNAME= squid-2.5.STABLE9 DIST_SUBDIR= squid2.5 PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/ -PATCHFILES= +PATCHFILES= squid-2.5.STABLE9-setcookie.patch \ + squid-2.5.STABLE9-ftp_EPLF.patch \ + squid-2.5.STABLE9-ftp_base_href.patch \ + squid-2.5.STABLE9-acl_error.patch PATCH_DIST_STRIP= -p1 MAINTAINER= tmseck@netcologne.de diff --git a/www/squid30/distinfo b/www/squid30/distinfo index 7d7b58d95f38..073e62d6ee9f 100644 --- a/www/squid30/distinfo +++ b/www/squid30/distinfo @@ -1,2 +1,10 @@ MD5 (squid2.5/squid-2.5.STABLE9.tar.bz2) = 5a34a303dcab8851c7ab20e24af69b61 SIZE (squid2.5/squid-2.5.STABLE9.tar.bz2) = 1057776 +MD5 (squid2.5/squid-2.5.STABLE9-setcookie.patch) = f4abbc43af5251380b3caaa9b08d0572 +SIZE (squid2.5/squid-2.5.STABLE9-setcookie.patch) = 5328 +MD5 (squid2.5/squid-2.5.STABLE9-ftp_EPLF.patch) = c4ae820794f301b909415e0f4728f1c9 +SIZE (squid2.5/squid-2.5.STABLE9-ftp_EPLF.patch) = 4108 +MD5 (squid2.5/squid-2.5.STABLE9-ftp_base_href.patch) = ddc034a2c2a002bfcf6bf97eb21e8b57 +SIZE (squid2.5/squid-2.5.STABLE9-ftp_base_href.patch) = 709 +MD5 (squid2.5/squid-2.5.STABLE9-acl_error.patch) = f70922d873ce73c7fdad8bf7156afeb4 +SIZE (squid2.5/squid-2.5.STABLE9-acl_error.patch) = 8499 diff --git a/www/squid31/Makefile b/www/squid31/Makefile index 6a85318fe1c1..909682ce949b 100644 --- a/www/squid31/Makefile +++ b/www/squid31/Makefile @@ -74,6 +74,7 @@ PORTNAME= squid PORTVERSION= 2.5.9 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -86,7 +87,10 @@ DISTNAME= squid-2.5.STABLE9 DIST_SUBDIR= squid2.5 PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/ -PATCHFILES= +PATCHFILES= squid-2.5.STABLE9-setcookie.patch \ + squid-2.5.STABLE9-ftp_EPLF.patch \ + squid-2.5.STABLE9-ftp_base_href.patch \ + squid-2.5.STABLE9-acl_error.patch PATCH_DIST_STRIP= -p1 MAINTAINER= tmseck@netcologne.de diff --git a/www/squid31/distinfo b/www/squid31/distinfo index 7d7b58d95f38..073e62d6ee9f 100644 --- a/www/squid31/distinfo +++ b/www/squid31/distinfo @@ -1,2 +1,10 @@ MD5 (squid2.5/squid-2.5.STABLE9.tar.bz2) = 5a34a303dcab8851c7ab20e24af69b61 SIZE (squid2.5/squid-2.5.STABLE9.tar.bz2) = 1057776 +MD5 (squid2.5/squid-2.5.STABLE9-setcookie.patch) = f4abbc43af5251380b3caaa9b08d0572 +SIZE (squid2.5/squid-2.5.STABLE9-setcookie.patch) = 5328 +MD5 (squid2.5/squid-2.5.STABLE9-ftp_EPLF.patch) = c4ae820794f301b909415e0f4728f1c9 +SIZE (squid2.5/squid-2.5.STABLE9-ftp_EPLF.patch) = 4108 +MD5 (squid2.5/squid-2.5.STABLE9-ftp_base_href.patch) = ddc034a2c2a002bfcf6bf97eb21e8b57 +SIZE (squid2.5/squid-2.5.STABLE9-ftp_base_href.patch) = 709 +MD5 (squid2.5/squid-2.5.STABLE9-acl_error.patch) = f70922d873ce73c7fdad8bf7156afeb4 +SIZE (squid2.5/squid-2.5.STABLE9-acl_error.patch) = 8499 |