[mutt] gnutls_certificate_verify_peers became deprecated, using a recent alternative

[Honza Horak]

commit 422b1495da5cba34449990520377066d46ba3742
Author: Honza Horák <hhorak at redhat.com>
Date:   Mon Mar 4 15:35:13 2013 +0100

    gnutls_certificate_verify_peers became deprecated, using a recent alternative

 mutt-1.5.21-verpeers.patch |   48 ++++++++++++++++++++++++++++++++++++++++++++
 mutt.spec                  |    8 ++++++-
 2 files changed, 55 insertions(+), 1 deletions(-)
---
diff --git a/mutt-1.5.21-verpeers.patch b/mutt-1.5.21-verpeers.patch
new file mode 100644
index 0000000..6e2adb9
--- /dev/null
+++ b/mutt-1.5.21-verpeers.patch
@@ -0,0 +1,48 @@
+Function gnutls_certificate_verify_peers is deprecated so we should
+rather use gnutls_certificate_verify_peers2. This is a fix applied
+by upstream.
+Upstream bug report: http://dev.mutt.org/trac/ticket/3516
+
+diff -up mutt-1.5.21/mutt_ssl_gnutls.c.verpeers mutt-1.5.21/mutt_ssl_gnutls.c
+--- mutt-1.5.21/mutt_ssl_gnutls.c.verpeers	2013-03-04 15:19:56.144838094 +0100
++++ mutt-1.5.21/mutt_ssl_gnutls.c	2013-03-04 15:19:56.378838087 +0100
+@@ -946,22 +946,23 @@ static int tls_check_one_certificate (co
+ /* sanity-checking wrapper for gnutls_certificate_verify_peers */
+ static gnutls_certificate_status tls_verify_peers (gnutls_session tlsstate)
+ {
+-  gnutls_certificate_status certstat;
++  int verify_ret;
++  unsigned int 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;
+   }
+@@ -974,7 +975,7 @@ static gnutls_certificate_status tls_ver
+     return 0;
+   }
+ 
+-  return certstat;
++  return status;
+ }
+ 
+ static int tls_check_certificate (CONNECTION* conn)
diff --git a/mutt.spec b/mutt.spec
index 96db985..e01a180 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -16,7 +16,7 @@
 Summary: A text mode mail user agent
 Name: mutt
 Version: 1.5.21
-Release: 17%{?dist}
+Release: 18%{?dist}
 Epoch: 5
 # The entire source code is GPLv2+ except
 # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain
@@ -38,6 +38,7 @@ Patch12: mutt-1.5.21-notation.patch
 Patch13: mutt-1.5.21-syncdebug.patch
 Patch14: mutt-1.5.21-writehead.patch
 Patch15: mutt-1.5.21-tmpdir.patch
+Patch16: mutt-1.5.21-verpeers.patch
 Url: http://www.mutt.org/
 Requires: mailcap urlview
 BuildRequires: ncurses-devel
@@ -87,6 +88,7 @@ for selecting groups of messages.
 %patch13 -p1 -b .syncdebug
 %patch14 -p1 -b .writehead
 %patch15 -p1 -b .tmpdir
+%patch16 -p1 -b .verpeers
 
 sed -i.gpgerror 's/`$GPGME_CONFIG --libs`/"\0 -lgpg-error"/' configure
 
@@ -171,6 +173,10 @@ ln -sf ./muttrc.5 $RPM_BUILD_ROOT%{_mandir}/man5/muttrc.local.5
 %{_mandir}/man5/muttrc.*
 
 %changelog
+* Mon Mar  4 2013 Honza Horak <hhorak at redhat.com> - 5:1.5.21-18
+- gnutls_certificate_verify_peers became deprecated, using
+  a recent alternative
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5:1.5.21-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild