------------------------------------------------------------
revno: 12529
revision-id: squid3@treenet.co.nz-20130418053217-rzs2w6kibjmb178k
parent: squid3@treenet.co.nz-20130418053047-7kj11nug4pjq2re7
fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3822
author: Stuart Henderson <sthen@openbsd.org>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Wed 2013-04-17 23:32:17 -0600
message:
  Bug 3822: Locate LDAP and SASL headers in /usr/local/include for BSD support
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20130418053217-rzs2w6kibjmb178k
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: a3121ef5dbcbccc33d01873a34db918c88f01e36
# timestamp: 2013-04-18 05:35:47 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squid3@treenet.co.nz-20130418053047-\
#   7kj11nug4pjq2re7
# 
# Begin patch
=== modified file 'helpers/basic_auth/LDAP/config.test'
--- helpers/basic_auth/LDAP/config.test	2006-04-25 03:37:28 +0000
+++ helpers/basic_auth/LDAP/config.test	2013-04-18 05:32:17 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-if [ -f /usr/include/ldap.h ]; then
+if [ -f /usr/include/ldap.h -o -f /usr/local/include/ldap.h ]; then
 	exit 0
 fi
 if [ -f /usr/include/winldap.h ]; then

=== modified file 'helpers/basic_auth/SASL/config.test'
--- helpers/basic_auth/SASL/config.test	2011-07-25 13:12:53 +0000
+++ helpers/basic_auth/SASL/config.test	2013-04-18 05:32:17 +0000
@@ -1,8 +1,8 @@
 #!/bin/sh
-if [ -f /usr/include/sasl.h ]; then
+if [ -f /usr/include/sasl.h -o -f /usr/local/include/sasl.h ]; then
 	exit 0
 fi
-if [ -f /usr/include/sasl/sasl.h ]; then
+if [ -f /usr/include/sasl/sasl.h -o -f /usr/local/include/sasl/sasl.h ]; then
 	exit 0
 fi
 exit 1

=== modified file 'helpers/digest_auth/LDAP/config.test'
--- helpers/digest_auth/LDAP/config.test	2006-04-25 03:37:28 +0000
+++ helpers/digest_auth/LDAP/config.test	2013-04-18 05:32:17 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-if [ -f /usr/include/ldap.h ]; then
+if [ -f /usr/include/ldap.h -o -f /usr/local/include/ldap.h ]; then
 	exit 0
 fi
 if [ -f /usr/include/winldap.h ]; then

=== modified file 'helpers/digest_auth/eDirectory/config.test'
--- helpers/digest_auth/eDirectory/config.test	2007-06-24 02:50:10 +0000
+++ helpers/digest_auth/eDirectory/config.test	2013-04-18 05:32:17 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-if [ -f /usr/include/ldap.h ]; then
+if [ -f /usr/include/ldap.h -o -f /usr/local/include/ldap.h ]; then
 	exit 0
 fi
 if [ -f /usr/include/winldap.h ]; then

=== modified file 'helpers/external_acl/LDAP_group/config.test'
--- helpers/external_acl/LDAP_group/config.test	2006-04-25 03:37:28 +0000
+++ helpers/external_acl/LDAP_group/config.test	2013-04-18 05:32:17 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-if [ -f /usr/include/ldap.h ]; then
+if [ -f /usr/include/ldap.h -o -f /usr/local/include/ldap.h ]; then
 	exit 0
 fi
 if [ -f /usr/include/winldap.h ]; then

=== modified file 'helpers/external_acl/eDirectory_userip/config.test'
--- helpers/external_acl/eDirectory_userip/config.test	2010-11-02 12:16:02 +0000
+++ helpers/external_acl/eDirectory_userip/config.test	2013-04-18 05:32:17 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ -f /usr/include/ldap.h ]; then
+if [ -f /usr/include/ldap.h -o -f /usr/local/include/ldap.h ]; then
 	exit 0
 fi
 if [ -f /usr/include/winldap.h ]; then