From c57d201781ba63549ff5d9c6e759beabaef18988 Mon Sep 17 00:00:00 2001
From: Antonio Radici <antonio@dyne.org>
Date: Tue, 3 May 2011 18:17:21 +0000
Subject: [PATCH] 624085-gnutls-deprecated-verify-peers.patch: deprecate
 gnutls_certificate_verify_peers() (Closes: 624085)

---
 debian/changelog                              |  2 +
 debian/patches/series                         |  4 +-
 ...24085-gnutls-deprecated-verify-peers.patch | 46 +++++++++++++++++++
 3 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 debian/patches/upstream/624085-gnutls-deprecated-verify-peers.patch

diff --git a/debian/changelog b/debian/changelog
index 37a47d8..45e60bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ mutt (1.5.21-5) unstable; urgency=low
       (Closes: 611412)
     + 624058-gnutls-deprecated.patch: deprecate gnutls_protocol_set_priority() 
       (Closes: 624058)
+    + 624085-gnutls-deprecated-verify-peers.patch: deprecate
+      gnutls_certificate_verify_peers() (Closes: 624085)
   * debian/extra/samples/sidebar.muttrc: documented the options that
     the sidebar-{sorted,dotted} patches are introducing; documentation 
     submitted by Julien Valroff (Closes: 603186)
diff --git a/debian/patches/series b/debian/patches/series
index 0cd3e4a..56a66ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -47,8 +47,8 @@ upstream/537061-dont-recode-saved-attachments.patch
 upstream/608706-fix-spelling-errors.patch
 upstream/620854-pop3-segfault.patch
 upstream/611412-bts-regexp.patch
-upstream/624058-gnutls-deprecated.patch
-
+upstream/624058-gnutls-deprecated-set-priority.patch
+upstream/624085-gnutls-deprecated-verify-peers.patch
 upstream/path_max
 
 mutt.org
diff --git a/debian/patches/upstream/624085-gnutls-deprecated-verify-peers.patch b/debian/patches/upstream/624085-gnutls-deprecated-verify-peers.patch
new file mode 100644
index 0000000..9327383
--- /dev/null
+++ b/debian/patches/upstream/624085-gnutls-deprecated-verify-peers.patch
@@ -0,0 +1,46 @@
+Remove the deprecated gnutls_certificate_verify_peers() in favour of the new
+gnutls_certificate_veirfy_peers2()
+
+Reported on http://bugs.debian.org/624085
+
+--- a/mutt_ssl_gnutls.c
++++ b/mutt_ssl_gnutls.c
+@@ -960,22 +960,22 @@
+ /* sanity-checking wrapper for gnutls_certificate_verify_peers */
+ static gnutls_certificate_status tls_verify_peers (gnutls_session tlsstate)
+ {
+-  gnutls_certificate_status certstat;
++  unsigned int verify_ret, status;
+ 
+-  certstat = gnutls_certificate_verify_peers (tlsstate);
+-  if (!certstat)
+-    return certstat;
++  verify_ret = gnutls_certificate_verify_peers2 (tlsstate, &status);
++  if (!verify_ret)
++    return status;
+ 
+-  if (certstat == GNUTLS_E_NO_CERTIFICATE_FOUND)
++  if (status == GNUTLS_E_NO_CERTIFICATE_FOUND)
+   {
+     mutt_error (_("Unable to get certificate from peer"));
+     mutt_sleep (2);
+     return 0;
+   }
+-  if (certstat < 0)
++  if (verify_ret < 0)
+   {
+     mutt_error (_("Certificate verification error (%s)"),
+-                gnutls_strerror (certstat));
++                gnutls_strerror (status));
+     mutt_sleep (2);
+     return 0;
+   }
+@@ -988,7 +988,7 @@
+     return 0;
+   }
+ 
+-  return certstat;
++  return status;
+ }
+ 
+ static int tls_check_certificate (CONNECTION* conn)
-- 
2.43.0