webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-11 01:38:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Zwischencommit fuer LFS.

Browse Source 
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@320 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2006-10-13 15:35:24 +00:00
parent bea6ab0a05
commit 411afd1f4b
13 changed files with 133 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/patches/cyrus-sasl-2.1.21-openldap23-1.patch Normal file
View File

@@ -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

44
src/patches/cyrus-sasl-2.1.21-openssl98-1.patch Normal file
View File

@@ -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 */