[Gpg4win-devel] Towards the public 1.9.0 BETA release

[Marcus Brinkmann]

At Fri, 25 Apr 2008 23:21:09 +0200,
Colin Leroy <colin at colino.net> wrote:
> On 25 April 2008 at 18h04, Marcus Brinkmann wrote:
> > I have done claws 3.4.0 and libetpan 0.54.  That went pretty well.  I
> > have not tried GnuTLS yet.  I guess that is next.
> 
> You rock, Marcus :) I know of at least 8-10 subscribers to our ML that
> would be glad of these news :)

If only it would work!  I just did some basic tests and claws-mail
hangs trying to make an imap connection.  Did anybody actually try the
libetpan port on windows with claws-mail?

I integrated GNU TLS in gpg4win, but I didn't test it because IMAP
without SSL doesn't work.  Please consider the patches below.  There
is also a problem if pthread is disabled and GNUTLS enabled, then the
code in src/common.c::SSL_connect_nb line 181 does not compile,
because the variable RESULT is not defined and TD isn't defined either
(instead of td->ssl, ssl can be used).  No patch for this, it's a
small thing and we don't use that code path as we use pthread.

At least we have everything compiling and integrated now.

Thanks,
Marcus

diff -rup claws-mail-3.4.0-orig/src/addrindex.h claws-mail-3.4.0/src/addrindex.h
--- claws-mail-3.4.0-orig/src/addrindex.h	2008-04-18 12:47:07.000000000 +0200
+++ claws-mail-3.4.0/src/addrindex.h	2008-04-25 21:43:36.000000000 +0200
@@ -91,6 +91,11 @@ struct _AddressInterface {
 	void (*stopSearch)( void * );
 };
 
+#ifdef G_OS_WIN32
+/* W32 headers define INTERFACE to "struct".  */
+#undef interface
+#endif
+
 typedef struct _AddressDataSource AddressDataSource;
 struct _AddressDataSource {
 	AddrItemObject obj;
diff -rup claws-mail-3.4.0-orig/src/common/ssl_certificate.c claws-mail-3.4.0/src/common/ssl_certificate.c
--- claws-mail-3.4.0-orig/src/common/ssl_certificate.c	2008-04-18 12:47:08.000000000 +0200
+++ claws-mail-3.4.0/src/common/ssl_certificate.c	2008-04-25 21:34:25.000000000 +0200
@@ -33,16 +33,16 @@
 #include <string.h>
 #endif
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
 #include <stdio.h>
-#include <netdb.h>
 #include <glib.h>
 #include <glib/gi18n.h>
-
 #ifdef G_OS_WIN32
-#include "winsock2.h"
-#endif
+#  include <winsock2.h>
+#else
+#  include <sys/socket.h>
+#  include <netinet/in.h>
+#  include <netdb.h>
+#endif /* G_OS_WIN32 */
 #include "ssl_certificate.h"
 #include "utils.h"
 #include "log.h"