# HG changeset patch
# User Petr Sumbera <petr.sumbera@oracle.com>
# Date 1368693073 25200
# Node ID 948dde330876cc14c1fe091dfa956e44590a0417
# Parent  d936fa6247d536aeb8ac6afd9d153352b137d1c2
PSARC 2012/327 Apache and APR-Util Using OpenLDAP
15537812 SUNBT6798092 APR-Util should use OpenLDAP instead of native Solaris LDAP
15536292 SUNBT6795397 apache libldap crash

diff -r d936fa6247d5 -r 948dde330876 components/apache2/patches/openldap.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apache2/patches/openldap.patch	Thu May 16 01:31:13 2013 -0700
@@ -0,0 +1,33 @@
+--- modules/aaa/config.m4	Mon Jun  9 09:04:46 2008
++++ modules/aaa/config.m4	Thu Nov 10 07:04:40 2011
+@@ -35,7 +35,7 @@
+ dnl LDAP authentication module. This module has both the authn and authz
+ dnl modules in one, so as to share the LDAP server config directives.
+ APACHE_MODULE(authnz_ldap, LDAP based authentication, , , no, [
+-  MOD_AUTHNZ_LDAP_LDADD="`$apu_config --ldap-libs`" || MOD_AUTHNZ_LDAP_LDADD=""
++  MOD_AUTHNZ_LDAP_LDADD="-lldap_r-2.4  -llber"
+   AC_SUBST(MOD_AUTHNZ_LDAP_LDADD)
+ ])
+ 
+--- modules/ldap/config.m4	Mon Jun  9 09:04:46 2008
++++ modules/ldap/config.m4	Thu Nov 10 07:02:52 2011
+@@ -5,7 +5,7 @@
+ 
+ ldap_objects="util_ldap.lo util_ldap_cache.lo util_ldap_cache_mgr.lo"
+ APACHE_MODULE(ldap, LDAP caching and connection pooling services, $ldap_objects, , no, [
+-  MOD_LDAP_LDADD="`$apu_config --ldap-libs`" || MOD_LDAP_LDADD=""
++  MOD_LDAP_LDADD="-lldap_r-2.4  -llber"
+   AC_SUBST(MOD_LDAP_LDADD)
+ ])
+ 
+--- configure.in	Sat Apr 16 12:09:47 2011
++++ configure.in	Thu Nov 10 07:18:54 2011
+@@ -144,7 +144,7 @@
+ 
+ APR_ADDTO(LDFLAGS, `$apu_config --ldflags`)
+ APU_BINDIR=`$apu_config --bindir`
+-APU_INCLUDEDIR=`$apu_config --includedir`
++APU_INCLUDEDIR="`$apu_config --includedir` -I/usr/include/openldap"
+ APU_VERSION=`$apu_config --version`
+ APU_CONFIG="$APU_BINDIR/apu-`echo ${APU_VERSION} | sed 's,\..*,,'`-config"
+ 
diff -r d936fa6247d5 -r 948dde330876 components/apr-util/Makefile
--- a/components/apr-util/Makefile	Tue May 14 14:31:01 2013 -0700
+++ b/components/apr-util/Makefile	Thu May 16 01:31:13 2013 -0700
@@ -45,7 +45,8 @@
 CONFIGURE_OPTIONS +=	--with-mysql=/usr/mysql/5.1
 CONFIGURE_OPTIONS +=	--with-expat=/usr
 CONFIGURE_OPTIONS +=	--with-sqlite3=/usr
-CONFIGURE_OPTIONS +=	--with-ldap=ldap
+CONFIGURE_OPTIONS +=	--with-ldap=ldap_r-2.4
+CONFIGURE_OPTIONS +=	--with-ldap-include=/usr/include/openldap
 CONFIGURE_OPTIONS +=	--without-odbc
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS.32 +=	--enable-layout=OpenSolaris
diff -r d936fa6247d5 -r 948dde330876 components/apr-util/patches/makefile-out.patch
--- a/components/apr-util/patches/makefile-out.patch	Tue May 14 14:31:01 2013 -0700
+++ b/components/apr-util/patches/makefile-out.patch	Thu May 16 01:31:13 2013 -0700
@@ -1,5 +1,14 @@
---- Makefile.in.orig	Mon Apr 18 02:03:58 2011
-+++ Makefile.in	Mon Apr 18 02:09:09 2011
+--- Makefile.in	Thu Nov 20 22:32:58 2008
++++ Makefile.in	Thu Nov 10 05:02:25 2011
+@@ -10,7 +10,7 @@
+ srcdir = @srcdir@
+ VPATH = @srcdir@
+ 
+-INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
++INCLUDES = -I/usr/include/openldap @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
+ APRUTIL_LDFLAGS = @APRUTIL_LDFLAGS@
+ APRUTIL_LIBS = @APRUTIL_LIBS@
+ 
 @@ -71,7 +71,10 @@
  
  # Create apu-config script suitable for the install tree