Hack Kampbjorn wrote:
More problems: with cyrus-sasl version 2.1.9 plugins/otp.c only defined MD5_H for OpenSSL versions < 0.9.7 but in version 2.1.10 the check is removed. OpenBSD 3.2 ships with OpenSSL 0.9.7-beta3 30 Jul 2000 (0x00907003L) and fails with this error:Rob Siemborski wrote:-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 I'd like to announce the release of Cyrus SASL 2.1.10 on ftp.andrew.cmu.edu. This version corrects a number of DIGEST-MD5 interoperability issues, as well as corrects some potential buffer overflows. It is recommended that all sites using a 2.x release upgrade to 2.1.10. Please send any feedback either to [EMAIL PROTECTED] (public list) or to [EMAIL PROTECTED] Download at: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-2.1.10.tar.gz or http://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-2.1.10.tar.gz
This includes two "backup" files which can be quite confusing:
$ tar ztf ../../distfiles/cyrus-sasl-2.1.10.tar.gz cyrus-sasl-2.1.10/config/kerberos*
cyrus-sasl-2.1.10/config/kerberos_v4.m4
cyrus-sasl-2.1.10/config/kerberos_v4.m4.orig
cyrus-sasl-2.1.10/config/kerberos_v4.m4~
/bin/sh ../libtool --mode=compile cc -DHAVE_CONFIG_H -I. -I/usr/ports/security/cyrus-sasl2/w-cyrus-sasl-2.1.10/cyrus-sasl-2.1.10/plugins -I.. -I/usr/ports/security/cyrus-sasl2/w-cyrus-sasl-2.1.10/cyrus-sasl-2.1.10/include -I/usr/ports/security/cyrus-sasl2/w-cyrus-sasl-2.1.10/cyrus-sasl-2.1.10/lib -I/usr/ports/security/cyrus-sasl2/w-cyrus-sasl-2.1.10/cyrus-sasl-2.1.10/sasldb -I/usr/local/include -I/usr/include/kerberosIV -I/usr/include/kerberosV -I/usr/include -Wall -W -Wall -O2 -I/usr/include/kerberosV -c /usr/ports/security/cyrus-sasl2/w-cyrus-sasl-2.1.10/cyrus-sasl-2.1.10/plugins/otp.c
rm -f .libs/otp.lo
cc -DHAVE_CONFIG_H -I. -I/usr/ports/security/cyrus-sasl2/w-cyrus-sasl-2.1.10/cyrus-sasl-2.1.10/plugins -I.. -I/usr/ports/security/cyrus-sasl2/w-cyrus-sasl-2.1.10/cyrus-sasl-2.1.10/include -I/usr/ports/security/cyrus-sasl2/w-cyrus-sasl-2.1.10/cyrus-sasl-2.1.10/lib -I/usr/ports/security/cyrus-sasl2/w-cyrus-sasl-2.1.10/cyrus-sasl-2.1.10/sasldb -I/usr/local/include -I/usr/include/kerberosIV -I/usr/include/kerberosV -I/usr/include -Wall -W -Wall -O2 -I/usr/include/kerberosV -c /usr/ports/security/cyrus-sasl2/w-cyrus-sasl-2.1.10/cyrus-sasl-2.1.10/plugins/otp.c -fPIC -DPIC -o .libs/otp.lo
/usr/ports/security/cyrus-sasl2/w-cyrus-sasl-2.1.10/cyrus-sasl-2.1.10/plugins/otp.c:59: invalid preprocessing directive name
/usr/ports/security/cyrus-sasl2/w-cyrus-sasl-2.1.10/cyrus-sasl-2.1.10/plugins/otp.c:61: invalid preprocessing directive name
*** Error code 1
Stop in /usr/ports/security/cyrus-sasl2/w-cyrus-sasl-2.1.10/build-i386/plugins.
Adding the version check back fixes this problem.
--- plugins/otp.c.orig Tue Dec 10 01:33:54 2002
+++ plugins/otp.c Tue Dec 10 01:39:44 2002
@@ -56,7 +56,9 @@
#include <openssl/evp.h>
#include <sasl.h>
+#if OPENSSL_VERSION_NUMBER < 0x00907000L
#define MD5_H /* suppress internal MD5 */
+#endif
#include <saslplug.h>
#include "plugin_common.h"
- -Rob - -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- Rob Siemborski * Andrew Systems Group * Cyert Hall 207 * 412-268-7456 Research Systems Programmer * /usr/contributed Gatekeeper -----BEGIN PGP SIGNATURE----- Version: PGP 6.5.8 Comment: Made with pgp4pine 1.76 iQA/AwUBPfTJjGes8cJc4y/MEQJkTACgrxUwOCBvIJ5uC8piWb89gMdPfJwAoJ37 uFcGZ9shhlkmhQ3aPSLYcUD9 =0UJK -----END PGP SIGNATURE-----
-- Med venlig hilsen / Kind regards Hack Kampbjørn
