packages: cyrus-sasl/cyrus-sasl.spec, cyrus-sasl/cyrus-sasl-auxprop.patch (...

[baggins]

Author: baggins                      Date: Thu Oct 20 15:58:37 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- attempt to fix auxprop facepalm failure

---- Files affected:
packages/cyrus-sasl:
   cyrus-sasl.spec (1.212 -> 1.213) , cyrus-sasl-auxprop.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/cyrus-sasl/cyrus-sasl.spec
diff -u packages/cyrus-sasl/cyrus-sasl.spec:1.212 packages/cyrus-sasl/cyrus-sasl.spec:1.213
--- packages/cyrus-sasl/cyrus-sasl.spec:1.212	Wed Oct 19 13:05:28 2011
+++ packages/cyrus-sasl/cyrus-sasl.spec	Thu Oct 20 17:58:31 2011
@@ -26,7 +26,7 @@
 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
@@ -56,6 +56,7 @@
 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
@@ -489,6 +490,7 @@
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 
 cd doc
 echo "cyrus-sasl complies with the following RFCs:" > rfc-compliance
@@ -536,6 +538,7 @@
 	--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}} \
@@ -755,6 +758,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.213  2011/10/20 15:58:31  baggins
+- attempt to fix auxprop facepalm failure
+
 Revision 1.212  2011/10/19 11:05:28  arekm
 - release 4
 

================================================================
Index: packages/cyrus-sasl/cyrus-sasl-auxprop.patch
diff -u /dev/null packages/cyrus-sasl/cyrus-sasl-auxprop.patch:1.1
--- /dev/null	Thu Oct 20 17:58:37 2011
+++ packages/cyrus-sasl/cyrus-sasl-auxprop.patch	Thu Oct 20 17:58:31 2011
@@ -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]");
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cyrus-sasl/cyrus-sasl.spec?r1=1.212&r2=1.213&f=u