From tmseck@netcologne.de  Tue Oct 26 08:39:52 2004
Return-Path: <tmseck@netcologne.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A1DE116A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 26 Oct 2004 08:39:52 +0000 (GMT)
Received: from smtp1.netcologne.de (smtp1.netcologne.de [194.8.194.112])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3AD9043D2F
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 26 Oct 2004 08:39:52 +0000 (GMT)
	(envelope-from tmseck@netcologne.de)
Received: from laurel.tmseck.homedns.org (xdsl-81-173-168-76.netcologne.de [81.173.168.76])
	by smtp1.netcologne.de (Postfix) with SMTP id B496038ED3
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 26 Oct 2004 10:39:49 +0200 (MEST)
Received: (qmail 40505 invoked by uid 1001); 26 Oct 2004 08:40:11 -0000
Message-Id: <20041026084011.40504.qmail@laurel.tmseck.homedns.org>
Date: 26 Oct 2004 08:40:11 -0000
From: Thomas-Martin Seck <tmseck@netcologne.de>
Reply-To: Thomas-Martin Seck <tmseck@netcologne.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [Maintainer] www/squid: integrate two vendor patches
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         73154
>Category:       ports
>Synopsis:       [Maintainer] www/squid: integrate two vendor patches
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sergei
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 26 08:40:28 GMT 2004
>Closed-Date:    Wed Oct 27 08:52:44 GMT 2004
>Last-Modified:  Wed Oct 27 08:52:44 GMT 2004
>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@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:

From: Thomas-Martin Seck <tmseck@netcologne.de>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/73154: [Maintainer] www/squid: integrate two vendor patches
Date: Tue, 26 Oct 2004 15:57:59 +0200

 * Thomas-Martin Seck (tmseck@netcologne.de):
 
 > Use PREFIX instead of LOCALBASE to include OpenLDAP's headers and libraries.
 
 I admit I do not know what The Right Thing[tm] is here -- the OpenLDAP
 port obeys PREFIX so the port (now) breaks when OpenLDAP is pulled in
 as a dependency at build time and PREFIX != LOCALBASE.
 
 I leave it to the committer to decide which variant should be used.
Responsible-Changed-From-To: freebsd-ports-bugs->sergei 
Responsible-Changed-By: sergei 
Responsible-Changed-When: Wed Oct 27 06:52:33 GMT 2004 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=73154 

From: Sergei Kolobov <sergei@FreeBSD.org>
To: Thomas-Martin Seck <tmseck@netcologne.de>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/73154: [Maintainer] www/squid: integrate two vendor patches
Date: Wed, 27 Oct 2004 10:50:24 +0400

 On 2004-10-26 at 14:00 +0000, Thomas-Martin Seck wrote:
 >  * Thomas-Martin Seck (tmseck@netcologne.de):
 >  
 >  > Use PREFIX instead of LOCALBASE to include OpenLDAP's headers and libraries.
 >  
 >  I admit I do not know what The Right Thing[tm] is here -- the OpenLDAP
 >  port obeys PREFIX so the port (now) breaks when OpenLDAP is pulled in
 >  as a dependency at build time and PREFIX != LOCALBASE.
 
 Using LOCALBASE in this case is The Right Thing.
 Please see Porter's Handbook for details.
 
 Sergei

From: Thomas-Martin Seck <tmseck@netcologne.de>
To: Sergei Kolobov <sergei@FreeBSD.org>
Cc: bug-followup@freebsd.org
Subject: Re: ports/73154: [Maintainer] www/squid: integrate two vendor patches
Date: Wed, 27 Oct 2004 09:36:23 +0200

 * Sergei Kolobov (sergei@FreeBSD.org):
 
 > Using LOCALBASE in this case is The Right Thing.
 > Please see Porter's Handbook for details.
 
 Ok. Could you omit this particular change and commit the update? Thanks!
State-Changed-From-To: open->closed 
State-Changed-By: sergei 
State-Changed-When: Wed Oct 27 08:52:35 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=73154 
>Unformatted:
