fix build with gnutls-3

(inspired by gentoo patch for wmbiff-0.4.27)

4 files changed, 39 insertions, 12 deletions

diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index e5936be4e01..69a65f2cd78 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2012/07/03 10:16:20 tron Exp $
+# $NetBSD: Makefile,v 1.46 2012/07/05 10:30:58 drochner Exp $
 
 DISTNAME=	wmbiff-0.4.26
 PKGREVISION=	15
@@ -9,8 +9,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/wmbiff/
 COMMENT=	xbuffy like "mail-checker" for WindowMaker
 
-BROKEN=		wmbiff doesn't build with GnuTLS 3.0.
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=	gmake
diff --git a/mail/wmbiff/distinfo b/mail/wmbiff/distinfo
index 44dbb77be4c..666e952be46 100644
--- a/mail/wmbiff/distinfo
+++ b/mail/wmbiff/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2012/07/03 10:16:20 tron Exp $
+$NetBSD: distinfo,v 1.15 2012/07/05 10:30:58 drochner Exp $
 
 SHA1 (wmbiff-0.4.26.tar.gz) = cb2fc49bc741209c22d8a50f0f164e34c4a9332d
 RMD160 (wmbiff-0.4.26.tar.gz) = f5ccb17fb6846283cb7cde7996310a65600a8883
 Size (wmbiff-0.4.26.tar.gz) = 200237 bytes
 SHA1 (patch-aa) = 0a4607f2e5d6d3066d9b9994665b659dfbcc003b
 SHA1 (patch-ab) = d84f1c4333d7c192748f5170460563ae7fe0955d
-SHA1 (patch-ac) = d7abfc902dffdfa646957d1bc0157e1ee59dfb86
-SHA1 (patch-wmbiff_gnutls-common.c) = fd9f29a6ead51d4479c6d4fedbcbc905f94b9b54
+SHA1 (patch-ac) = 2dfab161b9f72653f3810d1cac4409841ce8f7b4
+SHA1 (patch-wmbiff_gnutls-common.c) = 645e2c2f463d20cf063f4a2ab0c6268daaa0cc85
diff --git a/mail/wmbiff/patches/patch-ac b/mail/wmbiff/patches/patch-ac
index 9e8744af081..565c0804bf0 100644
--- a/mail/wmbiff/patches/patch-ac
+++ b/mail/wmbiff/patches/patch-ac
@@ -1,7 +1,25 @@
-$NetBSD: patch-ac,v 1.6 2005/09/06 15:49:35 adam Exp $
+$NetBSD: patch-ac,v 1.7 2012/07/05 10:30:58 drochner Exp $
 
 --- wmbiff/tlsComm.c.orig	2004-10-11 00:29:47.000000000 +0000
 +++ wmbiff/tlsComm.c
+@@ -385,7 +385,7 @@ int
+ tls_check_certificate(struct connection_state *scs,
+ 					  const char *remote_hostname)
+ {
+-	int certstat;
++	int verify_ret, certstat;
+ 	const gnutls_datum *cert_list;
+ 	int cert_list_size = 0;
+ 	gnutls_x509_crt cert;
+@@ -394,7 +394,7 @@ tls_check_certificate(struct connection_
+ 		bad_certificate(scs, "Unable to get certificate from peer.\n");
+ 		return;					/* bad_cert will exit if -skip-certificate-check was not given */
+ 	}
+-	certstat = gnutls_certificate_verify_peers(scs->tls_state);
++	verify_ret = gnutls_certificate_verify_peers2(scs->tls_state, &certstat);
+ 	if (certstat == GNUTLS_E_NO_CERTIFICATE_FOUND) {
+ 		bad_certificate(scs, "server presented no certificate.\n");
+ #ifdef GNUTLS_CERT_CORRUPTED
 @@ -412,10 +412,12 @@ tls_check_certificate(struct connection_
  							"server's certificate is invalid or not X.509.\n"
  							"there may be a problem with the certificate stored in your certfile\n");
diff --git a/mail/wmbiff/patches/patch-wmbiff_gnutls-common.c b/mail/wmbiff/patches/patch-wmbiff_gnutls-common.c
index ae6e5541138..9008a009298 100644
--- a/mail/wmbiff/patches/patch-wmbiff_gnutls-common.c
+++ b/mail/wmbiff/patches/patch-wmbiff_gnutls-common.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-wmbiff_gnutls-common.c,v 1.1 2012/07/03 10:16:20 tron Exp $
+$NetBSD: patch-wmbiff_gnutls-common.c,v 1.2 2012/07/05 10:30:58 drochner Exp $
 
 Fix build with GnuTLS 3.0.
 
---- wmbiff/gnutls-common.c.orig	2004-06-23 03:52:42.000000000 +0100
-+++ wmbiff/gnutls-common.c	2012-07-03 10:56:31.000000000 +0100
+--- wmbiff/gnutls-common.c.orig	2004-06-23 02:52:42.000000000 +0000
++++ wmbiff/gnutls-common.c
 @@ -3,7 +3,6 @@
  #include <stdlib.h>
  #include <string.h>
@@ -12,7 +12,18 @@ Fix build with GnuTLS 3.0.
  #include <gnutls/x509.h>
  #include <gnutls/openpgp.h>
  #include <time.h>
-@@ -508,7 +507,6 @@
+@@ -334,8 +333,8 @@ void print_openpgp_info(gnutls_session s
+ void print_cert_vrfy(gnutls_session session)
+ {
+ 
+-	int status;
+-	status = gnutls_certificate_verify_peers(session);
++	int verify_ret, status;
++	verify_ret = gnutls_certificate_verify_peers2(session, &status);
+ 	printf("\n");
+ 
+ 	if (status == GNUTLS_E_NO_CERTIFICATE_FOUND) {
+@@ -508,7 +507,6 @@ void print_list(void)
  
  	printf("Compression methods:");
  	printf(" ZLIB");
@@ -20,7 +31,7 @@ Fix build with GnuTLS 3.0.
  	printf(", NULL\n");
  }
  
-@@ -636,8 +634,6 @@
+@@ -636,8 +634,6 @@ void parse_comp(char **comp, int ncomp, 
  				comp_priority[j++] = GNUTLS_COMP_NULL;
  			if (strncasecmp(comp[i], "ZLI", 3) == 0)
  				comp_priority[j++] = GNUTLS_COMP_ZLIB;