Add two patches from drochner@ to make claws-mail build again against newer

gnutls.
PKGREVISION++

5 files changed, 95 insertions, 7 deletions

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index f49024146ef..2b41ee6f7a1 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2011/04/22 13:42:34 obache Exp $
+# $NetBSD: Makefile,v 1.36 2011/06/27 19:46:50 gls Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 INSTALLATION_DIRS+=	${EGDIR}
@@ -7,7 +7,7 @@ INSTALLATION_DIRS+=	share/claws-mail
 .include "Makefile.common"
 
 PKGNAME=	claws-mail-${CLAWS_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	X based e-mail and netnews client
diff --git a/mail/claws-mail/Makefile.common b/mail/claws-mail/Makefile.common
index 8e53e0b6bc6..a3bfca3e9ac 100644
--- a/mail/claws-mail/Makefile.common
+++ b/mail/claws-mail/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2011/05/04 17:41:15 drochner Exp $
+# $NetBSD: Makefile.common,v 1.11 2011/06/27 19:46:50 gls Exp $
 
 # used by mail/claws-mail/plugins.mk
 
@@ -46,9 +46,6 @@ CONFIGURE_ARGS+=	--enable-libetpan
 CONFIGURE_ARGS+=	--disable-bogofilter-plugin
 CONFIGURE_ARGS+=	--disable-spamassassin-plugin
 
-# see https://savannah.gnu.org/support/index.php?107660
-BUILDLINK_ABI_DEPENDS.gnutls+= gnutls<2.12.0
-
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mail/libetpan/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index a2bf3fa6115..9d5aaa3832a 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2011/03/19 14:52:07 gls Exp $
+$NetBSD: distinfo,v 1.18 2011/06/27 19:46:50 gls Exp $
 
 SHA1 (claws-mail-3.7.8.tar.bz2) = 401edc6642250599eb6764c50e9c73c2486d8678
 RMD160 (claws-mail-3.7.8.tar.bz2) = c48e13de078d18dafb85b2d1ac640d728613195b
@@ -6,4 +6,6 @@ Size (claws-mail-3.7.8.tar.bz2) = 6947244 bytes
 SHA1 (patch-ab) = d908b8b47b525aa9d6ed677e5c1d5e5eddf74cc0
 SHA1 (patch-ae) = 0312eeaaf2d31ab72d771598062019127c69cbef
 SHA1 (patch-af) = 2655fac7e0e7bfb2d50291537eab9481dbc83691
+SHA1 (patch-ag) = 4072cc73c42d4dd0b9d0e7cc75f7c6dd228340d7
+SHA1 (patch-ah) = dbc2c4095ebee928e086c3d39c1fd11788613d49
 SHA1 (patch-bb) = 2d432d7c1c3869b76965adea77f05127796a27f5
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
+