ports/73154: [Maintainer] www/squid: integrate two vendor patches
Thomas-Martin Seck
tmseck at netcologne.de
Tue Oct 26 08:40:29 UTC 2004
>Number: 73154
>Category: ports
>Synopsis: [Maintainer] www/squid: integrate two 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: Tue Oct 26 08:40:28 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 Oct 26, 2004.
>Description:
Integrate the following vendor patches:
- document the LDAP helpers' -v option
- correct the implementation of the req_header and resp_header acls
(the original implementation submitted in squid bug #961 was faulty)
See <http://www.squid-cache.org/Versions/v2/2.5/bugs/> for further details.
Use PREFIX instead of LOCALBASE to include OpenLDAP's headers and libraries.
Bump PORTREVISION.
>How-To-Repeat:
>Fix:
Apply this patch:
Index: distinfo
===================================================================
--- distinfo (.../www/squid) (revision 265)
+++ distinfo (.../local/squid) (revision 265)
@@ -2,3 +2,7 @@
SIZE (squid2.5/squid-2.5.STABLE7.tar.bz2) = 1051830
MD5 (squid2.5/squid-2.5.STABLE7-half_closed_POST.patch) = 7468154bb645932718d74c3dafcc9ec3
SIZE (squid2.5/squid-2.5.STABLE7-half_closed_POST.patch) = 805
+MD5 (squid2.5/squid-2.5.STABLE7-LDAP_version_documentation.patch) = 7e2dbbcfd22643246c3637a60b234214
+SIZE (squid2.5/squid-2.5.STABLE7-LDAP_version_documentation.patch) = 1170
+MD5 (squid2.5/squid-2.5.STABLE7_req_resp_header.patch) = 4237a7bcea6cb440e2b80414daf82c25
+SIZE (squid2.5/squid-2.5.STABLE7_req_resp_header.patch) = 1696
Index: Makefile
===================================================================
--- Makefile (.../www/squid) (revision 265)
+++ Makefile (.../local/squid) (revision 265)
@@ -74,7 +74,7 @@
PORTNAME= squid
PORTVERSION= 2.5.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -87,7 +87,9 @@
DIST_SUBDIR= squid2.5
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES= squid-2.5.STABLE7-half_closed_POST.patch
+PATCHFILES= squid-2.5.STABLE7-half_closed_POST.patch \
+ squid-2.5.STABLE7-LDAP_version_documentation.patch \
+ squid-2.5.STABLE7_req_resp_header.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck at netcologne.de
@@ -178,8 +180,8 @@
MAN8+= pam_auth.8 squid_unix_group.8
.if defined(WITH_SQUID_LDAP_AUTH)
USE_OPENLDAP= yes
-CFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${PREFIX}/include
+LDFLAGS+= -L${PREFIX}/lib
MAN8+= squid_ldap_auth.8 squid_ldap_group.8
basic_auth+= LDAP
external_acl+= ldap_group
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list