diff options
author | itetcu <itetcu@FreeBSD.org> | 2006-07-11 17:26:23 +0800 |
---|---|---|
committer | itetcu <itetcu@FreeBSD.org> | 2006-07-11 17:26:23 +0800 |
commit | accd60cbcf4524d755dea4a553108c7050a30303 (patch) | |
tree | 65e8bc4ceb419e477afe68753b2d13e037e62937 /www | |
parent | 4737c5879bfdc9653815e17ef8372a1bd9769def (diff) | |
download | freebsd-ports-gnome-accd60cbcf4524d755dea4a553108c7050a30303.tar.gz freebsd-ports-gnome-accd60cbcf4524d755dea4a553108c7050a30303.tar.zst freebsd-ports-gnome-accd60cbcf4524d755dea4a553108c7050a30303.zip |
- integrate a vendor patch from
<http://www.squid-cache.org/Versions/v2/2.5/bugs/>
to correct a problem with logging that could occur in certain cases
(Squid bug #1605)
- add some of the WWW mirrors found on
<http://www.squid-cache.org/Mirrors/http-mirrors.html> as additional
PATCH_SITES
(thanks to Robert Backhaus for the initial submission)
- make the rc.d script print "Stopping squid." in the hand rolled stop command
when shutting down, just like default rc.subr stop routine would do
PR: ports/100056
Submitted by: maintainer
Diffstat (limited to 'www')
-rw-r--r-- | www/squid/Makefile | 17 | ||||
-rw-r--r-- | www/squid/distinfo | 4 | ||||
-rw-r--r-- | www/squid/files/squid.sh.in | 1 | ||||
-rw-r--r-- | www/squid25/Makefile | 17 | ||||
-rw-r--r-- | www/squid25/distinfo | 4 | ||||
-rw-r--r-- | www/squid25/files/squid.sh.in | 1 | ||||
-rw-r--r-- | www/squid30/Makefile | 17 | ||||
-rw-r--r-- | www/squid30/distinfo | 4 | ||||
-rw-r--r-- | www/squid30/files/squid.sh.in | 1 | ||||
-rw-r--r-- | www/squid31/Makefile | 17 | ||||
-rw-r--r-- | www/squid31/distinfo | 4 | ||||
-rw-r--r-- | www/squid31/files/squid.sh.in | 1 |
12 files changed, 68 insertions, 20 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile index ea00c7a154c5..f1d21105325b 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -73,7 +73,7 @@ PORTNAME= squid PORTVERSION= 2.5.14 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -89,8 +89,19 @@ MASTER_SITE_SUBDIR= squid-2/STABLE DISTNAME= squid-2.5.STABLE14 DIST_SUBDIR= squid2.5 -PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/ -PATCHFILES= squid-2.5.STABLE14-httpReplyDestroy.patch +PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \ + http://www2.us.squid-cache.org/%SUBDIR%/ \ + http://www3.us.squid-cache.org/%SUBDIR%/ \ + http://www1.at.squid-cache.org/%SUBDIR%/ \ + http://www1.nl.squid-cache.org/%SUBDIR%/ \ + http://www1.ru.squid-cache.org/%SUBDIR%/ \ + http://www1.uk.squid-cache.org/%SUBDIR%/ \ + http://www1.gr.squid-cache.org/%SUBDIR%/ \ + http://www1.jp.squid-cache.org/%SUBDIR%/ \ + http://www1.tw.squid-cache.org/%SUBDIR%/ +PATCH_SITE_SUBDIR= Versions/v2/2.5/bugs +PATCHFILES= squid-2.5.STABLE14-httpReplyDestroy.patch \ + squid-2.5.STABLE14-hierarchy_tag.patch PATCH_DIST_STRIP= -p1 MAINTAINER= tmseck@netcologne.de diff --git a/www/squid/distinfo b/www/squid/distinfo index dcf1244c991e..7d8154f05637 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -1,6 +1,6 @@ MD5 (squid2.5/squid-2.5.STABLE14.tar.bz2) = f413e0b887a5f9b2a75350243ed5564c -SHA256 (squid2.5/squid-2.5.STABLE14.tar.bz2) = c4eaee0e5ee42f46060217df9a88d628d244c0a543feab8296e44269e57ec7bd SIZE (squid2.5/squid-2.5.STABLE14.tar.bz2) = 1073745 MD5 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1529f8b0170e24b26353578778435bd4 -SHA256 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 9e99132b8efb07e3465d5e33749aa450daecfa3acde73755b6a3589d09d19285 SIZE (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1277 +MD5 (squid2.5/squid-2.5.STABLE14-hierarchy_tag.patch) = 9abe563ca3d01dc58502737edc6f3c60 +SIZE (squid2.5/squid-2.5.STABLE14-hierarchy_tag.patch) = 1319 diff --git a/www/squid/files/squid.sh.in b/www/squid/files/squid.sh.in index f4bbd8cb12b0..afe0fb6bb1e8 100644 --- a/www/squid/files/squid.sh.in +++ b/www/squid/files/squid.sh.in @@ -43,6 +43,7 @@ squid_stop() { # --end rcold # --begin rcng squid_stop() { + echo "Stopping ${name}." ${command} -k shutdown run_rc_command poll } diff --git a/www/squid25/Makefile b/www/squid25/Makefile index ea00c7a154c5..f1d21105325b 100644 --- a/www/squid25/Makefile +++ b/www/squid25/Makefile @@ -73,7 +73,7 @@ PORTNAME= squid PORTVERSION= 2.5.14 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -89,8 +89,19 @@ MASTER_SITE_SUBDIR= squid-2/STABLE DISTNAME= squid-2.5.STABLE14 DIST_SUBDIR= squid2.5 -PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/ -PATCHFILES= squid-2.5.STABLE14-httpReplyDestroy.patch +PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \ + http://www2.us.squid-cache.org/%SUBDIR%/ \ + http://www3.us.squid-cache.org/%SUBDIR%/ \ + http://www1.at.squid-cache.org/%SUBDIR%/ \ + http://www1.nl.squid-cache.org/%SUBDIR%/ \ + http://www1.ru.squid-cache.org/%SUBDIR%/ \ + http://www1.uk.squid-cache.org/%SUBDIR%/ \ + http://www1.gr.squid-cache.org/%SUBDIR%/ \ + http://www1.jp.squid-cache.org/%SUBDIR%/ \ + http://www1.tw.squid-cache.org/%SUBDIR%/ +PATCH_SITE_SUBDIR= Versions/v2/2.5/bugs +PATCHFILES= squid-2.5.STABLE14-httpReplyDestroy.patch \ + squid-2.5.STABLE14-hierarchy_tag.patch PATCH_DIST_STRIP= -p1 MAINTAINER= tmseck@netcologne.de diff --git a/www/squid25/distinfo b/www/squid25/distinfo index dcf1244c991e..7d8154f05637 100644 --- a/www/squid25/distinfo +++ b/www/squid25/distinfo @@ -1,6 +1,6 @@ MD5 (squid2.5/squid-2.5.STABLE14.tar.bz2) = f413e0b887a5f9b2a75350243ed5564c -SHA256 (squid2.5/squid-2.5.STABLE14.tar.bz2) = c4eaee0e5ee42f46060217df9a88d628d244c0a543feab8296e44269e57ec7bd SIZE (squid2.5/squid-2.5.STABLE14.tar.bz2) = 1073745 MD5 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1529f8b0170e24b26353578778435bd4 -SHA256 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 9e99132b8efb07e3465d5e33749aa450daecfa3acde73755b6a3589d09d19285 SIZE (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1277 +MD5 (squid2.5/squid-2.5.STABLE14-hierarchy_tag.patch) = 9abe563ca3d01dc58502737edc6f3c60 +SIZE (squid2.5/squid-2.5.STABLE14-hierarchy_tag.patch) = 1319 diff --git a/www/squid25/files/squid.sh.in b/www/squid25/files/squid.sh.in index f4bbd8cb12b0..afe0fb6bb1e8 100644 --- a/www/squid25/files/squid.sh.in +++ b/www/squid25/files/squid.sh.in @@ -43,6 +43,7 @@ squid_stop() { # --end rcold # --begin rcng squid_stop() { + echo "Stopping ${name}." ${command} -k shutdown run_rc_command poll } diff --git a/www/squid30/Makefile b/www/squid30/Makefile index ea00c7a154c5..f1d21105325b 100644 --- a/www/squid30/Makefile +++ b/www/squid30/Makefile @@ -73,7 +73,7 @@ PORTNAME= squid PORTVERSION= 2.5.14 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -89,8 +89,19 @@ MASTER_SITE_SUBDIR= squid-2/STABLE DISTNAME= squid-2.5.STABLE14 DIST_SUBDIR= squid2.5 -PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/ -PATCHFILES= squid-2.5.STABLE14-httpReplyDestroy.patch +PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \ + http://www2.us.squid-cache.org/%SUBDIR%/ \ + http://www3.us.squid-cache.org/%SUBDIR%/ \ + http://www1.at.squid-cache.org/%SUBDIR%/ \ + http://www1.nl.squid-cache.org/%SUBDIR%/ \ + http://www1.ru.squid-cache.org/%SUBDIR%/ \ + http://www1.uk.squid-cache.org/%SUBDIR%/ \ + http://www1.gr.squid-cache.org/%SUBDIR%/ \ + http://www1.jp.squid-cache.org/%SUBDIR%/ \ + http://www1.tw.squid-cache.org/%SUBDIR%/ +PATCH_SITE_SUBDIR= Versions/v2/2.5/bugs +PATCHFILES= squid-2.5.STABLE14-httpReplyDestroy.patch \ + squid-2.5.STABLE14-hierarchy_tag.patch PATCH_DIST_STRIP= -p1 MAINTAINER= tmseck@netcologne.de diff --git a/www/squid30/distinfo b/www/squid30/distinfo index dcf1244c991e..7d8154f05637 100644 --- a/www/squid30/distinfo +++ b/www/squid30/distinfo @@ -1,6 +1,6 @@ MD5 (squid2.5/squid-2.5.STABLE14.tar.bz2) = f413e0b887a5f9b2a75350243ed5564c -SHA256 (squid2.5/squid-2.5.STABLE14.tar.bz2) = c4eaee0e5ee42f46060217df9a88d628d244c0a543feab8296e44269e57ec7bd SIZE (squid2.5/squid-2.5.STABLE14.tar.bz2) = 1073745 MD5 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1529f8b0170e24b26353578778435bd4 -SHA256 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 9e99132b8efb07e3465d5e33749aa450daecfa3acde73755b6a3589d09d19285 SIZE (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1277 +MD5 (squid2.5/squid-2.5.STABLE14-hierarchy_tag.patch) = 9abe563ca3d01dc58502737edc6f3c60 +SIZE (squid2.5/squid-2.5.STABLE14-hierarchy_tag.patch) = 1319 diff --git a/www/squid30/files/squid.sh.in b/www/squid30/files/squid.sh.in index f4bbd8cb12b0..afe0fb6bb1e8 100644 --- a/www/squid30/files/squid.sh.in +++ b/www/squid30/files/squid.sh.in @@ -43,6 +43,7 @@ squid_stop() { # --end rcold # --begin rcng squid_stop() { + echo "Stopping ${name}." ${command} -k shutdown run_rc_command poll } diff --git a/www/squid31/Makefile b/www/squid31/Makefile index ea00c7a154c5..f1d21105325b 100644 --- a/www/squid31/Makefile +++ b/www/squid31/Makefile @@ -73,7 +73,7 @@ PORTNAME= squid PORTVERSION= 2.5.14 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -89,8 +89,19 @@ MASTER_SITE_SUBDIR= squid-2/STABLE DISTNAME= squid-2.5.STABLE14 DIST_SUBDIR= squid2.5 -PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/ -PATCHFILES= squid-2.5.STABLE14-httpReplyDestroy.patch +PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \ + http://www2.us.squid-cache.org/%SUBDIR%/ \ + http://www3.us.squid-cache.org/%SUBDIR%/ \ + http://www1.at.squid-cache.org/%SUBDIR%/ \ + http://www1.nl.squid-cache.org/%SUBDIR%/ \ + http://www1.ru.squid-cache.org/%SUBDIR%/ \ + http://www1.uk.squid-cache.org/%SUBDIR%/ \ + http://www1.gr.squid-cache.org/%SUBDIR%/ \ + http://www1.jp.squid-cache.org/%SUBDIR%/ \ + http://www1.tw.squid-cache.org/%SUBDIR%/ +PATCH_SITE_SUBDIR= Versions/v2/2.5/bugs +PATCHFILES= squid-2.5.STABLE14-httpReplyDestroy.patch \ + squid-2.5.STABLE14-hierarchy_tag.patch PATCH_DIST_STRIP= -p1 MAINTAINER= tmseck@netcologne.de diff --git a/www/squid31/distinfo b/www/squid31/distinfo index dcf1244c991e..7d8154f05637 100644 --- a/www/squid31/distinfo +++ b/www/squid31/distinfo @@ -1,6 +1,6 @@ MD5 (squid2.5/squid-2.5.STABLE14.tar.bz2) = f413e0b887a5f9b2a75350243ed5564c -SHA256 (squid2.5/squid-2.5.STABLE14.tar.bz2) = c4eaee0e5ee42f46060217df9a88d628d244c0a543feab8296e44269e57ec7bd SIZE (squid2.5/squid-2.5.STABLE14.tar.bz2) = 1073745 MD5 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1529f8b0170e24b26353578778435bd4 -SHA256 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 9e99132b8efb07e3465d5e33749aa450daecfa3acde73755b6a3589d09d19285 SIZE (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1277 +MD5 (squid2.5/squid-2.5.STABLE14-hierarchy_tag.patch) = 9abe563ca3d01dc58502737edc6f3c60 +SIZE (squid2.5/squid-2.5.STABLE14-hierarchy_tag.patch) = 1319 diff --git a/www/squid31/files/squid.sh.in b/www/squid31/files/squid.sh.in index f4bbd8cb12b0..afe0fb6bb1e8 100644 --- a/www/squid31/files/squid.sh.in +++ b/www/squid31/files/squid.sh.in @@ -43,6 +43,7 @@ squid_stop() { # --end rcold # --begin rcng squid_stop() { + echo "Stopping ${name}." ${command} -k shutdown run_rc_command poll } |