From f505b066bd2e8fa33e20b7ef8b8c13d4a2582098 Mon Sep 17 00:00:00 2001 From: Derek Schrock Date: Mon, 5 Dec 2016 17:13:45 -0500 Subject: [PATCH] Update to mutt 1.7.2 - Update to 1.7.2 - Makefile and distinfo updates - VVV and RR patches are still 1.7.1 - Remove patch-gpgme180 this is part of 1.7.2 From the 1.7.2 release email: This is a bug fix release, primarily fixing build issues with OpenSSL 1.1 and GPGME 1.8. Please note that as part of the OpenSSL fixes, versions less than 0.9.6 are no longer supported. --- mail/mutt/Makefile | 8 ++++---- mail/mutt/distinfo | 6 +++--- mail/mutt/files/patch-gpgme180 | 36 ------------------------------------ 3 files changed, 7 insertions(+), 43 deletions(-) delete mode 100644 mail/mutt/files/patch-gpgme180 diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 5c9171e90..3a038ff6f 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= mutt -PORTVERSION= 1.7.1 -PORTREVISION?= 2 +PORTVERSION= 1.7.2 +PORTREVISION?= 0 CATEGORIES+= mail ipv6 MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \ @@ -218,8 +218,8 @@ DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref .include # un/comment as each VERSION is created for PORTVERSION -#VVV_PATCH_VERSION= 1.7.0 -#RR_PATCH_VERSION= 1.7.0 +VVV_PATCH_VERSION= 1.7.1 +RR_PATCH_VERSION= 1.7.1 #GREETING_PATCH_VERSION= 1.7.0 .if !defined(VVV_PATCH_VERSION) diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo index 40c171dac..75e22bfbe 100644 --- a/mail/mutt/distinfo +++ b/mail/mutt/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1476585934 -SHA256 (mutt/mutt-1.7.1.tar.gz) = e9c6f88e83d48690033f0d862a70293ac746286b77241554f5448bc23bd0d6df -SIZE (mutt/mutt-1.7.1.tar.gz) = 4025008 +TIMESTAMP = 1480971443 +SHA256 (mutt/mutt-1.7.2.tar.gz) = 1553501687cd22d5b8aaee4dc5a7d9dcf6cc61d7956f6aabaadd252d10cd5ff9 +SIZE (mutt/mutt-1.7.2.tar.gz) = 4025880 SHA256 (mutt/patch-1.7.1.rr.compressed.gz) = 97bc56bbc6b0312b87e8dfb68dd9b551edb9d6771bb1b52b1c6f63f51d0bd05b SIZE (mutt/patch-1.7.1.rr.compressed.gz) = 9985 SHA256 (mutt/patch-1.7.1.vvv.nntp.gz) = 798db983e3d63d954bfd88e0b8771f806afddf0ae07cc9a03d27def355675687 diff --git a/mail/mutt/files/patch-gpgme180 b/mail/mutt/files/patch-gpgme180 deleted file mode 100644 index c69ef6466..000000000 --- a/mail/mutt/files/patch-gpgme180 +++ /dev/null @@ -1,36 +0,0 @@ -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 (¤t_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 = -- 2.11.0