ports/69487: [Maintainer] www/squid: use OpenLDAP 2.1

[Thomas-Martin Seck]

>Number:         69487
>Category:       ports
>Synopsis:       [Maintainer] www/squid: use OpenLDAP 2.1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 23 15:20:01 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 July 23rd, 2004.

	
>Description:
There is at least one reported case of LDAP authentication not working
with OpenLDAP 2.2 -- see squid bug #1018 -- so abort the build if 2.2
is the version of OpenLDAP squid is to be built against (thanks to
Oliver Eikemeier for telling me how to do this correctly).

This issue does not seem to be related to the vendor patch against the
LDAP authentication helpers as I originally thought (see ports/69465) but
until this issue is sorted out upstream, keep leaving this patch alone
since I cannot test LDAP authentication myself yet.

No PORTREVISION bump since this is merely a clarification of the status
quo and LDAP auth is not built and installed by default.
	
>How-To-Repeat:
	
>Fix:
Apply this patch:


Index: distinfo
===================================================================
--- distinfo	(.../www/squid)	(revision 131)
+++ distinfo	(.../local/squid)	(revision 131)
@@ -2,8 +2,6 @@
 SIZE (squid2.5/squid-2.5.STABLE6.tar.bz2) = 1047199
 MD5 (squid2.5/squid-2.5.STABLE6-ufs_no_valid_dir.patch) = 26a4ab522a2469f805f746bcdbe0109c
 SIZE (squid2.5/squid-2.5.STABLE6-ufs_no_valid_dir.patch) = 566
-MD5 (squid2.5/squid-2.5.STABLE6-ldap_helpers.patch) = 952d43265fd2a7755986b6c9191ed0fc
-SIZE (squid2.5/squid-2.5.STABLE6-ldap_helpers.patch) = 25097
 MD5 (squid2.5/squid-2.5.STABLE6-concurrent_dns_lookups.patch) = 2d6c81bd95659aa936281962b86e8a90
 SIZE (squid2.5/squid-2.5.STABLE6-concurrent_dns_lookups.patch) = 6467
 MD5 (squid2.5/squid-2.5.STABLE6-request_header_max_size.patch) = 1900043f6b73aa8a3cbd5004633a6c5c
Index: Makefile
===================================================================
--- Makefile	(.../www/squid)	(revision 131)
+++ Makefile	(.../local/squid)	(revision 131)
@@ -161,6 +160,9 @@
 MAN8+=		pam_auth.8 squid_unix_group.8
 .if defined(WITH_SQUID_LDAP_AUTH)
 USE_OPENLDAP=	yes
+.if ${WANT_OPENLDAP_VER}==22
+IGNORE=	Bugs in squid_ldap_auth with OpenLDAP 2.2, see <http://www.squid-cache.org/bugs/show_bug.cgi?id=1018>
+.endif
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAN8+=		squid_ldap_auth.8 squid_ldap_group.8
	


>Release-Note:
>Audit-Trail:
>Unformatted: