Add gpgme 1.8.0 support.

PR:		214868
Submitted by:	dereks lifeofadishwasher com

1 files changed, 36 insertions, 0 deletions

diff --git a/mail/mutt/files/patch-gpgme180 b/mail/mutt/files/patch-gpgme180
new file mode 100644
index 00000000000..c69ef646683
--- /dev/null
+++ b/mail/mutt/files/patch-gpgme180
@@ -0,0 +1,36 @@
+Use gpgme hg commit 84ad86e8b8ab to support gpgme 1.8.0.  This patch
+should be removed once mutt hg commit 84ad86e8b8ab is in an official
+release.
+
+--- crypt-gpgme.c.orig	2016-11-27 02:22:51 UTC
++++ crypt-gpgme.c
+@@ -4946,7 +4946,7 @@ int smime_gpgme_verify_sender (HEADER *h
+   return verify_sender (h, GPGME_PROTOCOL_CMS);
+ }
+ 
+-void gpgme_set_sender (const char *sender)
++void mutt_gpgme_set_sender (const char *sender)
+ {
+   mutt_error ("[setting sender] mailbox: %s\n", sender);
+   FREE (&current_sender);
+--- crypt-gpgme.h.orig	2016-11-27 02:22:51 UTC
++++ crypt-gpgme.h
+@@ -53,6 +53,6 @@ int smime_gpgme_send_menu (HEADER *msg, 
+ 
+ int smime_gpgme_verify_sender (HEADER *h);
+ 
+-void gpgme_set_sender (const char *sender);
++void mutt_gpgme_set_sender (const char *sender);
+ 
+ #endif
+--- crypt-mod-pgp-gpgme.c.orig	2016-11-27 02:22:51 UTC
++++ crypt-mod-pgp-gpgme.c
+@@ -104,7 +104,7 @@ static BODY *crypt_mod_pgp_make_key_atta
+ 
+ static void crypt_mod_pgp_set_sender (const char *sender)
+ {
+-  gpgme_set_sender (sender);
++  mutt_gpgme_set_sender (sender);
+ }
+ 
+ struct crypt_module_specs crypt_mod_pgp_gpgme =