diff options
Diffstat (limited to 'www/squid')
| -rw-r--r-- | www/squid/Makefile | 5 | ||||
| -rw-r--r-- | www/squid/distinfo | 6 | ||||
| -rw-r--r-- | www/squid/files/patch-src-cf.data.pre | 23 |
3 files changed, 20 insertions, 14 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile index 505ef0b791e4..913bc7644960 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -74,7 +74,7 @@ PORTNAME= squid PORTVERSION= 2.5.6 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -98,8 +98,11 @@ PATCHFILES= squid-2.5.STABLE6-ufs_no_valid_dir.patch \ squid-2.5.STABLE6-active_requests_delaypool.patch \ squid-2.5.STABLE6-client_db_gc.patch \ squid-2.5.STABLE6-ntlmtruncated.patch \ + squid-2.5.STABLE6-grammar.patch \ squid-2.5.STABLE6-errorpage_quote.patch \ squid-2.5.STABLE6-heap_segfault.patch \ + squid-2.5.STABLE6-initgroups.patch \ + squid-2.5.STABLE6-external_acl_newlines.patch \ squid-2.5.STABLE6-ntlm_fetch_string.patch PATCH_DIST_STRIP= -p1 diff --git a/www/squid/distinfo b/www/squid/distinfo index fa4962480992..e3e1ccb6c699 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -22,9 +22,15 @@ MD5 (squid2.5/squid-2.5.STABLE6-client_db_gc.patch) = 315e3bb42b4febde95b0974634 SIZE (squid2.5/squid-2.5.STABLE6-client_db_gc.patch) = 3668 MD5 (squid2.5/squid-2.5.STABLE6-ntlmtruncated.patch) = c77b3c10fc5d5c9d34ccf41f7623a0fe SIZE (squid2.5/squid-2.5.STABLE6-ntlmtruncated.patch) = 4383 +MD5 (squid2.5/squid-2.5.STABLE6-grammar.patch) = 963208de03349b6fa143bc099524699c +SIZE (squid2.5/squid-2.5.STABLE6-grammar.patch) = 50267 MD5 (squid2.5/squid-2.5.STABLE6-errorpage_quote.patch) = b9f329cdf98c7c5a048cdadc32d6874d SIZE (squid2.5/squid-2.5.STABLE6-errorpage_quote.patch) = 377 MD5 (squid2.5/squid-2.5.STABLE6-heap_segfault.patch) = c82d9f3972419833b757c0c116c216f8 SIZE (squid2.5/squid-2.5.STABLE6-heap_segfault.patch) = 867 +MD5 (squid2.5/squid-2.5.STABLE6-initgroups.patch) = 5cd7eb8451754166f543d84c7a9ba6dc +SIZE (squid2.5/squid-2.5.STABLE6-initgroups.patch) = 11060 +MD5 (squid2.5/squid-2.5.STABLE6-external_acl_newlines.patch) = 0e01c58db5545e1b7273d2d244171642 +SIZE (squid2.5/squid-2.5.STABLE6-external_acl_newlines.patch) = 4965 MD5 (squid2.5/squid-2.5.STABLE6-ntlm_fetch_string.patch) = dbf1826522c14dc64c0c37430bb27b2e SIZE (squid2.5/squid-2.5.STABLE6-ntlm_fetch_string.patch) = 1606 diff --git a/www/squid/files/patch-src-cf.data.pre b/www/squid/files/patch-src-cf.data.pre index 2a8e1eff429f..ac5b4bd7ef61 100644 --- a/www/squid/files/patch-src-cf.data.pre +++ b/www/squid/files/patch-src-cf.data.pre @@ -1,20 +1,17 @@ ---- src/cf.data.pre.orig Thu May 1 14:07:51 2003 -+++ src/cf.data.pre Thu May 1 14:13:12 2003 -@@ -2325,7 +2325,7 @@ +--- src/cf.data.pre.orig Fri Aug 20 16:23:18 2004 ++++ src/cf.data.pre Fri Aug 20 16:25:23 2004 +@@ -2396,12 +2396,12 @@ NAME: cache_effective_user TYPE: string -DEFAULT: nobody +DEFAULT: %%SQUID_UID%% LOC: Config.effectiveUser - DOC_NONE - -@@ -2337,7 +2337,7 @@ - + DOC_START If you start Squid as root, it will change its effective/real - UID/GID to the UID/GID specified below. The default is to -- change to UID to nobody. If you define cache_effective_user, -+ change to UID to %%SQUID_UID%%. If you define cache_effective_user, - but not cache_effective_group, Squid sets the GID the - effective user's default group ID (taken from the password - file). + UID/GID to the user specified below. The default is to change +- to UID to nobody. If you define cache_effective_user, but not ++ to UID to %%SQUID_UID%%. If you define cache_effective_user, but not + cache_effective_group, Squid sets the GID to the effective + user's default group ID (taken from the password file) and + supplementary group list from the from groups membership of |