Date: 21 Aug 2004 12:14:29 -0000 From: Thomas-Martin Seck <tmseck@netcologne.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/70767: [Maintainer] www/squid: additional vendor patches Message-ID: <20040821121429.27734.qmail@laurel.tmseck.homedns.org> Resent-Message-ID: <200408211220.i7LCKOdl010013@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 70767
>Category: ports
>Synopsis: [Maintainer] www/squid: additional vendor patches
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Aug 21 12:20:24 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Thomas-Martin Seck
>Release: FreeBSD 4.10-STABLE i386
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of August 21st, 2004.
>Description:
- Add vendor patches for the following issues:
+ fix grammatical and whitespace errors in squid.conf.default
+ set supplementary group membership correctly when running squid as a
non-root user and do not ignore the squid_group setting when starting
squid as root (squid bug #1021)
+ enable the external_acl helper protocol to handle newlines in the
embedded data (squid bug #1038)
See <http://www.squid-cache.org/Versions/v2/2.5/bugs/>; for further
information.
- Update the patch for cf.data.pre following the changes introduced with
the vendor's grammar patch
- Bump PORTREVISION.
>How-To-Repeat:
>Fix:
Apply this patch:
Index: distinfo
===================================================================
--- distinfo (.../www/squid) (revision 188)
+++ distinfo (.../local/squid) (revision 188)
@@ -22,9 +22,15 @@
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
Index: files/patch-src-cf.data.pre
===================================================================
--- files/patch-src-cf.data.pre (.../www/squid) (revision 188)
+++ files/patch-src-cf.data.pre (.../local/squid) (revision 188)
@@ -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
Index: Makefile
===================================================================
--- Makefile (.../www/squid) (revision 188)
+++ Makefile (.../local/squid) (revision 188)
@@ -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 @@
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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040821121429.27734.qmail>