From a83cce40cc16df28eb5305c3b46bac6ec1094cd5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Thu, 20 Oct 2011 15:58:31 +0000
Subject: [PATCH 1/1] - attempt to fix auxprop facepalm failure

Changed files:
    cyrus-sasl-auxprop.patch -> 1.1
    cyrus-sasl.spec -> 1.213
---
 cyrus-sasl-auxprop.patch | 13 +++++++++++++
 cyrus-sasl.spec          |  5 ++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 cyrus-sasl-auxprop.patch

diff --git a/cyrus-sasl-auxprop.patch b/cyrus-sasl-auxprop.patch
new file mode 100644
index 0000000..779807c
--- /dev/null
+++ b/cyrus-sasl-auxprop.patch
@@ -0,0 +1,13 @@
+--- cyrus-sasl-2.1.25/lib/auxprop.c~	2011-10-20 17:33:46.423015318 +0200
++++ cyrus-sasl-2.1.25/lib/auxprop.c	2011-10-20 17:48:49.336348654 +0200
+@@ -971,6 +971,10 @@
+     }
+ 
+     if(!found) {
++	/* compatibility with <= 2.1.23, ignore the lack of auxrop plugin */
++	if (!plist)
++	    result = SASL_OK;
++	else
+ 	_sasl_log(sparams->utils->conn, SASL_LOG_DEBUG,
+ 		  "could not find auxprop plugin, was searching for '%s'",
+ 		  plist ? plist : "[all]");
diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index 400e0b7..5379f9e 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -25,7 +25,7 @@ Summary(ru.UTF-8):	Библиотека Cyrus SASL
 Summary(uk.UTF-8):	Бібліотека Cyrus SASL
 Name:		cyrus-sasl
 Version:	2.1.25
-Release:	4
+Release:	4.5
 License:	distributable
 Group:		Libraries
 Source0:	ftp://ftp.cyrusimap.org/cyrus-sasl/%{name}-%{version}.tar.gz
@@ -55,6 +55,7 @@ Patch16:	%{name}-gssapi_ext.patch
 Patch17:	0032-revert_1.103_revision_to_unbreak_GSSAPI.patch
 Patch18:	0033-fix_segfault_in_GSSAPI.patch
 Patch19:	0034-fix_dovecot_authentication.patch
+Patch20:	%{name}-auxprop.patch
 URL:		http://asg.web.cmu.edu/sasl/
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake >= 1:1.7
@@ -488,6 +489,7 @@ Wtyczka Nagiosa do sprawdzania działania saslauthd.
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 
 cd doc
 echo "cyrus-sasl complies with the following RFCs:" > rfc-compliance
@@ -535,6 +537,7 @@ cd ..
 	--with-dbpath=/var/lib/sasl2/sasl.db \
 	%{?with_authlib:--with-authdaemond=/var/spool/authdaemon/socket} \
 	%{?with_ldap: --with-ldap=%{_prefix}} \
+	%{?with_ldap: --enable-ldapdb} \
 	%{?with_mysql: --with-mysql=%{_prefix}} \
 	%{?with_pgsql: --with-pgsql=%{_prefix}} \
 	%{?with_sqlite: --with-sqlite=%{_prefix}} \
-- 
2.44.0