- Replace security/gnutls with security/gnutls3 and update to 3.2.15

- Bump PORTREVISION on all ports that depend on security/gnutls and
  adjust all ports that depend on security/gnutls3
- Update mail/anubis to version 4.2 which supports gnutls 3.x
- Update mail/libvmime to a development snapshot (recommended by upstream
  developers)

PR:		191274
Exp-run by:	antoine
Approved by:	portmgr (antoine)

4 files changed, 96 insertions, 1 deletions

diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index 84021aa7c8f7..a4b2767592d6 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	heartbeat
 PORTVERSION=	2.1.4
-PORTREVISION=	23
+PORTREVISION=	24
 CATEGORIES=	sysutils
 #MASTER_SITES=	http://hg.linux-ha.org/lha-2.1/archive/STABLE-2.1.4.tar.bz2
 MASTER_SITES=	${MASTER_SITE_LOCAL}
diff --git a/sysutils/heartbeat/files/patch-lib__plugins__quorum__quorumd.c b/sysutils/heartbeat/files/patch-lib__plugins__quorum__quorumd.c
new file mode 100644
index 000000000000..d16768cba841
--- /dev/null
+++ b/sysutils/heartbeat/files/patch-lib__plugins__quorum__quorumd.c
@@ -0,0 +1,32 @@
+--- lib/plugins/quorum/quorumd.c.orig
++++ lib/plugins/quorum/quorumd.c
+@@ -353,15 +353,28 @@
+ 	unsigned int cert_list_size;
+ 	const gnutls_datum *cert_list;
+	int ret;
++	int status;
+ 	gnutls_x509_crt cert;
+ 
+-	ret = gnutls_certificate_verify_peers (session);
++	ret = gnutls_certificate_verify_peers2 (session, &status);
+ 
+ 	if (ret < 0)
+ 	{
+ 		printf("gnutls_certificate_verify_peers2 returns error.\n");
+ 		return -1;
+ 	}
++	if (status & GNUTLS_CERT_INVALID) {
++		printf("The certificate is not trusted.\n");
++		return -1;
++	}
++	if (status & GNUTLS_CERT_SIGNER_NOT_FOUND) {
++		printf("The certificate hasn't got a known issuer.\n");
++		return -1;
++	}
++	if (status & GNUTLS_CERT_REVOKED) {
++		printf("The certificate has been revoked.\n");
++		return -1;
++	}
+ 	if (gnutls_certificate_type_get (session) != GNUTLS_CRT_X509) {
+ 		printf("The certificate is not a x.509 cert\n");
+     		return -1;
diff --git a/sysutils/heartbeat/files/patch-membership__quorumd__quorumd.c b/sysutils/heartbeat/files/patch-membership__quorumd__quorumd.c
new file mode 100644
index 000000000000..63def34bcfc9
--- /dev/null
+++ b/sysutils/heartbeat/files/patch-membership__quorumd__quorumd.c
@@ -0,0 +1,34 @@
+--- membership/quorumd/quorumd.c.orig
++++ membership/quorumd/quorumd.c
+@@ -476,17 +476,30 @@
+ 	unsigned int cert_list_size;
+ 	const gnutls_datum *cert_list;
+	int ret;
++	int status;
+ 	char dn[MAX_DN_LEN];
+ 	size_t dn_len = MAX_DN_LEN;
+ 	gnutls_x509_crt cert;
+ 
+-	ret = gnutls_certificate_verify_peers(session);
++	ret = gnutls_certificate_verify_peers2(session, &status);
+ 
+ 	if (ret < 0)
+ 	{
+ 		quorum_debug(LOG_DEBUG,"gnutls_certificate_verify_peers2 returns error");
+ 		return -1;
+ 	}
++	if (status & GNUTLS_CERT_INVALID) {
++		printf("The certificate is not trusted.\n");
++		return -1;
++	}
++	if (status & GNUTLS_CERT_SIGNER_NOT_FOUND) {
++		printf("The certificate hasn't got a known issuer.\n");
++		return -1;
++	}
++	if (status & GNUTLS_CERT_REVOKED) {
++		printf("The certificate has been revoked.\n");
++		return -1;
++	}
+ 	if (gnutls_certificate_type_get (session) != GNUTLS_CRT_X509) {
+ 		quorum_debug(LOG_DEBUG,"The certificate is not a x.509 cert");
+     		return -1;
diff --git a/sysutils/heartbeat/files/patch-membership__quorumd__quorumdtest.c b/sysutils/heartbeat/files/patch-membership__quorumd__quorumdtest.c
new file mode 100644
index 000000000000..ddbc2cce3565
--- /dev/null
+++ b/sysutils/heartbeat/files/patch-membership__quorumd__quorumdtest.c
@@ -0,0 +1,29 @@
+--- membership/quorumd/quorumdtest.c.orig
++++ membership/quorumd/quorumdtest.c
+@@ -162,16 +162,16 @@
+ 	unsigned int cert_list_size;
+ 	const gnutls_datum *cert_list;
+	int ret;
++	int status;
+ 	gnutls_x509_crt cert;
+ 
+-	ret = gnutls_certificate_verify_peers (session);
++	ret = gnutls_certificate_verify_peers2 (session, &status);
+ 
+ 	if (ret < 0)
+ 	{
+ 		printf("gnutls_certificate_verify_peers2 returns error.\n");
+ 		return -1;
+ 	}
+-/*	
+ 	if (status & GNUTLS_CERT_INVALID) {
+ 		printf("The certificate is not trusted.\n");
+ 		return -1;
+@@ -184,7 +184,6 @@
+ 		printf("The certificate has been revoked.\n");
+ 		return -1;
+ 	}
+-*/	
+ 	if (gnutls_certificate_type_get (session) != GNUTLS_CRT_X509) {
+ 		printf("The certificate is not a x.509 cert\n");
+     		return -1;