624085-gnutls-deprecated-verify-peers.patch: deprecate gnutls_certificate_verify_peer...

diff --git a/debian/changelog b/debian/changelog
index 37a47d82c60fe9c5f916d5d25e1955242fa772db..45e60bb81b395dde6d69326e9db30e09f562f984 100644 (file)
--- 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)
       (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)
   * 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 0cd3e4a417ba48b486330fb138f3be59bcccd909..56a66ca91dff1582e244ae7fef75062a9eed6ead 100644 (file)
--- 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/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
 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 (file)
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)