OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Mar-2003 11:45:28
Branch: HEAD Handle: 2003031210452600
Modified files:
openpkg-src/sasl sasl.patch sasl.spec
Log:
hammer the with_ldap build to actually compile a non-dummy ldap
interface that compiles with current OpenLDAP
Summary:
Revision Changes Path
1.4 +46 -0 openpkg-src/sasl/sasl.patch
1.59 +9 -0 openpkg-src/sasl/sasl.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 sasl.patch
--- openpkg-src/sasl/sasl.patch 7 Mar 2003 12:47:05 -0000 1.3
+++ openpkg-src/sasl/sasl.patch 12 Mar 2003 10:45:26 -0000 1.4
@@ -16,3 +16,49 @@
if (sock) break;
cur_host = db_host;
+--- saslauthd/lak.c.dist Wed Mar 12 11:39:22 2003
++++ saslauthd/lak.c Wed Mar 12 11:39:22 2003
+@@ -532,8 +532,6 @@
+ return;
+
+ if (lak->ld != NULL) {
+- if (lak->conf->cache_ttl)
+- ldap_destroy_cache(lak->ld);
+ ldap_unbind_s(lak->ld);
+ }
+
+@@ -642,16 +640,6 @@
+ syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_RESTART.");
+ }
+
+- /*
+- * Set up client-side caching
+- */
+- if (lak->conf->cache_ttl) {
+- rc = ldap_enable_cache(lak->ld, lak->conf->cache_ttl,
lak->conf->cache_mem);
+- if (rc != LDAP_SUCCESS) {
+- syslog(LOG_WARNING|LOG_AUTH, "Unable to enable cache --
continuing (%s)", ldap_err2string(rc));
+- }
+- }
+-
+ return LAK_OK;
+ }
+
+@@ -667,8 +655,6 @@
+
+ if (lak->bind_status == LAK_NOT_BOUND) {
+ if (lak->ld != NULL) {
+- if (lak->conf->cache_ttl)
+- ldap_destroy_cache(lak->ld);
+ ldap_unbind_s(lak->ld);
+ lak->ld = NULL;
+ }
+@@ -683,8 +669,6 @@
+ lak->bind_status = LAK_NOT_BOUND;
+
+ if (lak->ld != NULL) {
+- if (lak->conf->cache_ttl)
+- ldap_destroy_cache(lak->ld);
+ ldap_unbind_s(lak->ld);
+
+ lak->ld = NULL;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.spec
============================================================================
$ cvs diff -u -r1.58 -r1.59 sasl.spec
--- openpkg-src/sasl/sasl.spec 12 Mar 2003 08:54:26 -0000 1.58
+++ openpkg-src/sasl/sasl.spec 12 Mar 2003 10:45:26 -0000 1.59
@@ -92,6 +92,12 @@
-e "s;javah;javah-xxx;g" \
-e "s;javadoc;javadoc-xxx;g" \
configure
+%if "%{with_ldap}" == "yes"
+ echo 'ac_cv_lib_ldap_ldap_initialize=yes' >config.cache
+ %{l_shtool} subst \
+ -e "s;\(\$LDAP_LIBS\) *\(-lcrypto\);\1 -lssl \2;" \
+ saslauthd/configure
+%endif
cflags="%{l_cflags -O} %{l_cppflags}"
ldflags="%{l_ldflags}"
@@ -101,6 +107,7 @@
libs="$libs `%{l_prefix}/bin/fsl-config --all --libs`"
%endif
%if "%{with_ldap}" == "yes"
+ cflags="$cflags -DAUTH_LDAP"
ldflags="$ldflags `%{l_prefix}/bin/fsl-config --all --ldflags`"
libs="$libs `%{l_prefix}/bin/fsl-config --all --libs`"
%endif
@@ -132,8 +139,10 @@
%endif
%if "%{with_ldap}" == "yes"
--with-ldap=%{l_prefix} \
+ --with-openssl=%{l_prefix} \
%else
--without-ldap \
+ --without-openssl \
%endif
%if "%{with_mysql}" == "yes"
--with-mysql=%{l_prefix} \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
