Author: dnicholson
Date: 2006-04-25 12:56:41 -0600 (Tue, 25 Apr 2006)
New Revision: 1506
Added:
trunk/cyrus-sasl/cyrus-sasl-2.1.21-openldap23-1.patch
trunk/cyrus-sasl/cyrus-sasl-2.1.21-openssl98-1.patch
Log:
Patches for cyrus-sasl using newer SSL and LDAP libraries
Added: trunk/cyrus-sasl/cyrus-sasl-2.1.21-openldap23-1.patch
===================================================================
--- trunk/cyrus-sasl/cyrus-sasl-2.1.21-openldap23-1.patch
(rev 0)
+++ trunk/cyrus-sasl/cyrus-sasl-2.1.21-openldap23-1.patch 2006-04-25
18:56:41 UTC (rev 1506)
@@ -0,0 +1,28 @@
+Submitted By: Dan Nicholson <dnicholson_at_linuxfromscratch_dot_org>
+Date: 2006-04-25
+Initial Package Version: 2.1.21
+Upstream Status: Applied
+Origin: Upstream CVS
+ $ cvs log cmulocal/openldap.m4
+ ...
+ RCS file: /cvs/src/cmulocal/openldap.m4,v
+ Working file: cmulocal/openldap.m4
+ ...
+ ----------------------------
+ revision 1.2
+ date: 2006/03/13 19:16:11; author: mel; state: Exp; lines: +3 -1
+ Allow for OpenLDAP 2.3+
+Description: Allow OpenLDAP => 2.3
+
+diff -pur cyrus-sasl-2.1.21.orig/configure cyrus-sasl-2.1.21/configure
+--- cyrus-sasl-2.1.21.orig/configure 2006-03-30 14:24:55.000000000 +0000
++++ cyrus-sasl-2.1.21/configure 2006-03-30 21:00:35.388580365 +0000
+@@ -12253,6 +12253,8 @@ cat >>conftest.$ac_ext <<_ACEOF
+ char *__openldap_compat = "2.1.27 or better okay";
+ #elif LDAP_VENDOR_VERSION_MAJOR == 2 && LDAP_VENDOR_VERSION_MINOR == 2 &&
LDAP_VENDOR_VERSION_PATCH > 5
+ char *__openldap_compat = "2.2.6 or better okay";
++#elif LDAP_VENDOR_VERSION_MAJOR == 2 && LDAP_VENDOR_VERSION_MINOR > 2
++char *__openldap_compat = "2.3 or better okay"
+ #endif
+
+ _ACEOF
Added: trunk/cyrus-sasl/cyrus-sasl-2.1.21-openssl98-1.patch
===================================================================
--- trunk/cyrus-sasl/cyrus-sasl-2.1.21-openssl98-1.patch
(rev 0)
+++ trunk/cyrus-sasl/cyrus-sasl-2.1.21-openssl98-1.patch 2006-04-25
18:56:41 UTC (rev 1506)
@@ -0,0 +1,44 @@
+Submitted By: Dan Nicholson <dnicholson_at_linuxfromscratch_dot_org>
+Date: 2006-04-25
+Initial Package Version: 2.1.21
+Upstream Status: Applied
+Origin: Upstream CVS
+
http://asg.web.cmu.edu/archive/message.php?mailbox=org.acs.asg.project.sasl.commits&msg=1519
+
http://asg.web.cmu.edu/archive/message.php?mailbox=org.acs.asg.project.sasl.commits&msg=1578
+Description: Adds needed headers for plugins when compiled with OpenSSL-0.9.8
+
+diff -pNur cyrus-sasl-2.1.21.orig/plugins/ntlm.c
cyrus-sasl-2.1.21/plugins/ntlm.c
+--- cyrus-sasl-2.1.21.orig/plugins/ntlm.c 2004-12-24 16:06:14.000000000
+0000
++++ cyrus-sasl-2.1.21/plugins/ntlm.c 2006-04-25 18:46:24.433487794 +0000
+@@ -74,6 +74,7 @@
+ #endif /* WIN32 */
+
+ #include <openssl/md4.h>
++#include <openssl/md5.h>
+ #include <openssl/hmac.h>
+ #include <openssl/des.h>
+ #include <openssl/opensslv.h>
+diff -pNur cyrus-sasl-2.1.21.orig/plugins/passdss.c
cyrus-sasl-2.1.21/plugins/passdss.c
+--- cyrus-sasl-2.1.21.orig/plugins/passdss.c 2004-11-27 16:17:43.000000000
+0000
++++ cyrus-sasl-2.1.21/plugins/passdss.c 2006-04-25 18:46:36.131787252
+0000
+@@ -67,6 +67,9 @@
+ /* for digest and cipher support */
+ #include <openssl/evp.h>
+ #include <openssl/hmac.h>
++#include <openssl/md5.h>
++#include <openssl/sha.h>
++#include <openssl/dsa.h>
+
+ #include <sasl.h>
+ #define MD5_H /* suppress internal MD5 */
+diff -pNur cyrus-sasl-2.1.21.orig/plugins/srp.c cyrus-sasl-2.1.21/plugins/srp.c
+--- cyrus-sasl-2.1.21.orig/plugins/srp.c 2004-06-23 18:43:37.000000000
+0000
++++ cyrus-sasl-2.1.21/plugins/srp.c 2006-04-25 18:46:36.135785645 +0000
+@@ -87,6 +87,7 @@ typedef unsigned short uint32;
+ /* for digest and cipher support */
+ #include <openssl/evp.h>
+ #include <openssl/hmac.h>
++#include <openssl/md5.h>
+
+ #include <sasl.h>
+ #define MD5_H /* suppress internal MD5 */
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
