ph10 2007/03/13 09:50:22 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src ACKNOWLEDGMENTS
exim-src/src tls-openssl.c
Log:
Fix compiling problems with OpenSSL 0.9.8e.
Revision Changes Path
1.488 +8 -0 exim/exim-doc/doc-txt/ChangeLog
1.75 +2 -1 exim/exim-src/ACKNOWLEDGMENTS
1.11 +1 -2 exim/exim-src/src/tls-openssl.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -r1.487 -r1.488
--- ChangeLog 1 Mar 2007 14:06:56 -0000 1.487
+++ ChangeLog 13 Mar 2007 09:50:22 -0000 1.488
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.487 2007/03/01 14:06:56 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.488 2007/03/13 09:50:22 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -140,6 +140,14 @@
PH/32 Change the Dovecot authenticator to use read() and write() on the socket
instead of the C I/O that was originally supplied, because problems were
reported on Solaris.
+
+PH/33 Compile failed with OpenSSL 0.9.8e. This was due to a coding error in
+ Exim which did not show up earlier: it was assuming that a call to
+ SSL_CTX_set_info_callback() might give an error value. In fact, there is
+ no error. In previous releases of OpenSSL, SSL_CTX_set_info_callback()
+ was a macro that became an assignment, so it seemed to work. This has
+ changed to a proper function call with a void return, hence the compile
+ error. Exim's code has been fixed.
Exim version 4.66
Index: ACKNOWLEDGMENTS
===================================================================
RCS file: /home/cvs/exim/exim-src/ACKNOWLEDGMENTS,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- ACKNOWLEDGMENTS 1 Mar 2007 14:06:56 -0000 1.74
+++ ACKNOWLEDGMENTS 13 Mar 2007 09:50:22 -0000 1.75
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.74 2007/03/01 14:06:56 ph10 Exp $
+$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.75 2007/03/13 09:50:22 ph10 Exp $
EXIM ACKNOWLEDGEMENTS
@@ -20,7 +20,7 @@
Philip Hazel
Lists created: 20 November 2002
-Last updated: 01 March 2007
+Last updated: 13 March 2007
THE OLD LIST
@@ -162,6 +162,7 @@
HMAC computations
Better error messages for BDB
Sheldon Hearn Suggested patch for smtp_accept_max_nonmail_hosts
+ Fix for compile error with OpenSSL 0.9.8e
Bryan Henderson Patch to use RM_COMMAND everywhere during building
Jakob Hirsch Patch for % operator
Patch for arbitrarily named ACL variables
Index: tls-openssl.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/tls-openssl.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tls-openssl.c 18 Jan 2007 15:35:42 -0000 1.10
+++ tls-openssl.c 13 Mar 2007 09:50:22 -0000 1.11
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/tls-openssl.c,v 1.10 2007/01/18 15:35:42 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/tls-openssl.c,v 1.11 2007/03/13 09:50:22 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -343,8 +343,7 @@
/* Set up the information callback, which outputs if debugging is at a suitable
level. */
-if (!(SSL_CTX_set_info_callback(ctx, (void (*)())info_callback)))
- return tls_error(US"SSL_CTX_set_info_callback", host);
+SSL_CTX_set_info_callback(ctx, (void (*)())info_callback);
/* The following patch was supplied by Robert Roselius */
