ports/86718: cyrus-sasl2 2.1.21 will not build with openssl 0.9.8.

[Jim Trigg]

>Number:         86718
>Category:       ports
>Synopsis:       cyrus-sasl2 2.1.21 will not build with openssl 0.9.8.
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 29 18:30:13 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Jim Trigg
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
>Environment:
System: FreeBSD argent.heraldsnet.org 4.10-STABLE FreeBSD 4.10-STABLE #0: Fri Jul 2 23:36:48 EDT 2004 root at argent.heraldsnet.org:/usr/obj/usr/src/sys/K7WINE i386
>Description:
When rebuilding security/cyrus-sasl2 after upgrading security/openssl to version 0.9.8 the following error occurs:
In file included from ../include/saslplug.h:14,
                 from ntlm.c:96:
../include/hmac-md5.h:11: syntax error before `MD5_CTX'
In file included from ntlm.c:96:
../include/saslplug.h:73: syntax error before `*'
../include/saslplug.h:74: syntax error before `*'
../include/saslplug.h:75: syntax error before `MD5_CTX'
ntlm.c: In function `ntlm_server_mech_step2':
ntlm.c:1574: `MD5_DIGEST_LENGTH' undeclared (first use in this function)
ntlm.c:1574: (Each undeclared identifier is reported only once
ntlm.c:1574: for each function it appears in.)
ntlm.c: In function `ntlm_client_mech_step2':
ntlm.c:2002: `MD5_DIGEST_LENGTH' undeclared (first use in this function)
>How-To-Repeat:
portupgrade openssl && portupgrade -f cyrus-sasl
>Fix:
Add new patch file to cyrus-sasl2 (code written by Ken Murchison and taken from cyrus-sasl mailing list):
Index: plugins/ntlm.c
diff -u plugins/ntlm.c.orig plugins/ntlm.c
--- plugins/ntlm.c      8 Dec 2004 12:13:55 -0000       1.29
+++ plugins/ntlm.c      30 Aug 2005 15:04:45 -0000
@@ -92,8 +92,14 @@
 #endif /* OpenSSL 0.9.7+ w/o old DES support */

 #include <sasl.h>
-#define MD5_H  /* suppress internal MD5 */
+#if (OPENSSL_VERSION_NUMBER <= 0x0090700f)
+# define MD5_H  /* suppress internal MD5 */
+#endif
 #include <saslplug.h>
+
+#ifndef MD5_DIGEST_LENGTH
+#define MD5_DIGEST_LENGTH 16
+#endif

 #include "plugin_common.h"

>Release-Note:
>Audit-Trail:
>Unformatted: