+2005-11-02 [colin] 1.9.99cvs8
+
+ * configure.ac
+ Require libetpan-0.40 due to upstream fix
+ * src/common/ssl.c
+ Tell libetpan not to call SSL_Library_Init,
+ as we do it ourselves.
+
2005-11-02 [colin] 1.9.99cvs7
* po/POTFILES.in
( cvs diff -u -r 1.3.2.32 -r 1.3.2.33 src/prefs_themes.c; ) > 1.9.99cvs5.patchset
( cvs diff -u -r 1.3.2.15 -r 1.3.2.16 src/ssl_manager.c; cvs diff -u -r 1.2.2.1 -r 1.2.2.2 src/ssl_manager.h; cvs diff -u -r 1.395.2.147 -r 1.395.2.148 src/summaryview.c; cvs diff -u -r 1.4.2.3 -r 1.4.2.4 src/common/ssl_certificate.c; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/common/ssl_certificate.h; cvs diff -u -r 1.9.2.7 -r 1.9.2.8 src/gtk/sslcertwindow.c; cvs diff -u -r 1.6.2.1 -r 1.6.2.2 src/gtk/sslcertwindow.h; ) > 1.9.99cvs6.patchset
( cvs diff -u -r 1.53.2.13 -r 1.53.2.14 po/POTFILES.in; ) > 1.9.99cvs7.patchset
+( cvs diff -u -r 1.654.2.1019 -r 1.654.2.1020 configure.ac; cvs diff -u -r 1.9.2.8 -r 1.9.2.9 src/common/ssl.c; ) > 1.9.99cvs8.patchset
MICRO_VERSION=99
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=7
+EXTRA_VERSION=8
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
LIBETPAN_LIBS="`$libetpanconfig --libs`"
LIBETPAN_VERSION=`$libetpanconfig --version | sed "s/\.//g" | sed "s/-.*$//"`
- if test "$LIBETPAN_VERSION" -lt "039"; then
- AC_MSG_RESULT([*** Sylpheed requires libetpan 0.39 or newer. See http://www.etpan.org/])
+ if test "$LIBETPAN_VERSION" -lt "040"; then
+ AC_MSG_RESULT([*** Sylpheed requires libetpan 0.40 or newer. See http://www.etpan.org/])
AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 support.])
- AC_MSG_ERROR([libetpan 0.39 not found])
+ AC_MSG_ERROR([libetpan 0.40 not found])
fi
AC_SUBST(LIBETPAN_FLAGS)
AC_SUBST(LIBETPAN_LIBS)
AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP support.)
else
- AC_MSG_RESULT([*** Sylpheed requires libetpan 0.39 or newer. See http://www.etpan.org/ ])
+ AC_MSG_RESULT([*** Sylpheed requires libetpan 0.40 or newer. See http://www.etpan.org/ ])
AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 support.])
- AC_MSG_ERROR([libetpan 0.39 not found])
+ AC_MSG_ERROR([libetpan 0.40 not found])
fi
else
AC_MSG_RESULT(no)
#include "ssl.h"
#include "ssl_certificate.h"
+#ifdef HAVE_LIBETPAN
+#include <libetpan/mailstream_ssl.h>
+#endif
+
#ifdef USE_PTHREAD
#include <pthread.h>
#endif
/* Global system initialization*/
SSL_library_init();
SSL_load_error_strings();
+
+ mailstream_ssl_init_not_required();
/* Create our context*/
meth = SSLv23_client_method();