2 files changed, 89 insertions, 0 deletions
diff --git a/mail/claws-mail/patches/patch-ag b/mail/claws-mail/patches/patch-ag
new file mode 100644
index 00000000000..cfe843d35e2
--- /dev/null
+++ b/mail/claws-mail/patches/patch-ag
@@ -0,0 +1,37 @@
+$NetBSD: patch-ag,v 1.5 2011/06/27 19:46:50 gls Exp $
+https://savannah.gnu.org/support/index.php?107660
+
+--- src/common/ssl.c.orig	2011-02-16 06:39:57.000000000 +0000
++++ src/common/ssl.c
+@@ -29,8 +29,10 @@
+ #include <glib/gi18n.h>
+ #include <errno.h>
+ #include <pthread.h>
++#ifdef HAVE_LIBGCRYPT
+ #include <gcrypt.h>
+ GCRY_THREAD_OPTION_PTHREAD_IMPL;
++#endif
+ 
+ #include "claws.h"
+ #include "utils.h"
+@@ -153,7 +155,9 @@ const gchar *claws_ssl_get_cert_dir(void
+ 
+ void ssl_init(void)
+ {
++#ifdef HAVE_LIBGCRYPT
+ 	gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
++#endif
+ #ifdef HAVE_LIBETPAN
+ 	mailstream_gnutls_init_not_required();
+ #endif	
+@@ -269,6 +273,9 @@ gboolean ssl_init_socket_with_method(Soc
+ 	r = gnutls_init(&session, GNUTLS_CLIENT);
+ 	if (session == NULL || r != 0)
+ 		return FALSE;
++
++	/* compensate for change in gnutls-2.12 */
++	gnutls_transport_set_lowat(session, 1);
+   
+ 	gnutls_set_default_priority(session);
+ 	gnutls_protocol_set_priority (session, proto_prio);
+
diff --git a/mail/claws-mail/patches/patch-ah b/mail/claws-mail/patches/patch-ah
new file mode 100644
index 00000000000..42d96de26fd
--- /dev/null
+++ b/mail/claws-mail/patches/patch-ah
@@ -0,0 +1,52 @@
+$NetBSD: patch-ah,v 1.1 2011/06/27 19:46:50 gls Exp $
+gnutls uses "nettle" instead of libgcrypt per default now. So a client
+ shouldn't try to deal with libgcrypt unless it uses it explicitely.
+
+--- configure.orig	2011-04-09 08:51:04.000000000 +0000
++++ configure
+@@ -16584,13 +16584,13 @@ _ACEOF
+ 
+   LIBS="-lgpg-error $LIBS"
+ 
+-else
+-  ac_cv_enable_gnutls=no
++#else
++#  ac_cv_enable_gnutls=no
+ fi
+ 
+ 
+-else
+-  ac_cv_enable_gnutls=no
++#else
++#  ac_cv_enable_gnutls=no
+ fi
+ 
+ 
+@@ -16642,13 +16642,13 @@ _ACEOF
+ 
+   LIBS="-lgcrypt $LIBS"
+ 
+-else
+-  ac_cv_enable_gnutls=no
++#else
++#  ac_cv_enable_gnutls=no
+ fi
+ 
+ 
+-else
+-  ac_cv_enable_gnutls=no
++#else
++#  ac_cv_enable_gnutls=no
+ fi
+ 
+ 
+@@ -16657,7 +16657,7 @@ fi
+   	if test x"$platform_win32" = "xyes"; then
+ 		GNUTLS_LIBS="-lgnutls -lgcrypt ${GCRYPT_LIBS}"
+ 	else
+-		GNUTLS_LIBS="-lgnutls -lgcrypt -lz ${GCRYPT_LIBS}"
++		GNUTLS_LIBS="-lgnutls"
+ 	fi
+   fi
+ else
+