mail/mutt: Update to 1.12.2

PR:		240741
Submitted by:	Derek Schrock <dereks@lifeofadishwasher.com> (maintainer)

4 files changed, 20 insertions, 20 deletions

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 199b80e5a6c7..eb3bb356d90e 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mutt
-DISTVERSION=	1.12.1
+DISTVERSION=	1.12.2
 CATEGORIES+=	mail ipv6
 MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
@@ -182,8 +182,8 @@ DOCS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-doc-ref
 .include <bsd.port.options.mk>
 
 # un/comment as each VERSION is created for PORTVERSION
-#VVV_PATCH_VERSION=	1.12.1
-GREETING_PATCH_VERSION=	1.12.0
+VVV_PATCH_VERSION=	1.12.1
+GREETING_PATCH_VERSION=	1.12.1
 
 .if !defined(VVV_PATCH_VERSION)
 VVV_PATCH_VERSION=	${PORTVERSION}
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index ab10e93129f2..f9b3bf79d29b 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1565808330
-SHA256 (mutt/mutt-1.12.1.tar.gz) = 01c565406ec4ffa85db90b45ece2260b25fac3646cc063bbc20a242c6ed4210c
-SIZE (mutt/mutt-1.12.1.tar.gz) = 4675166
-SHA256 (mutt/mutt-1.12.0.vc.greeting) = 7596d930447e9834567c0cfddf9ac023ecbb99add64bee4131d87e0260eec591
-SIZE (mutt/mutt-1.12.0.vc.greeting) = 4559
+TIMESTAMP = 1569099378
+SHA256 (mutt/mutt-1.12.2.tar.gz) = bc42750ce8237742b9382f2148fc547a8d8601aa4a7cd28c55fe7ca045196882
+SIZE (mutt/mutt-1.12.2.tar.gz) = 4675774
+SHA256 (mutt/mutt-1.12.1.vc.greeting) = 54d1267c1ac496662b47131f9761b5ab53f44c93498938dc93d0156c6578e378
+SIZE (mutt/mutt-1.12.1.vc.greeting) = 4559
 SHA256 (mutt/patch-1.12.1.vvv.nntp.xz) = 9c420584d549ac0bb49c52ddfd2ab5bee0f89e59cb938673444ec27ad7c782ad
 SIZE (mutt/patch-1.12.1.vvv.nntp.xz) = 49672
 SHA256 (mutt/patch-1.12.1.vvv.initials.xz) = 6c66fe6c23362b0f4970a5028a75a33454e1e53ba178e5801113939f1bc22920
diff --git a/mail/mutt/files/extra-patch-ifdef b/mail/mutt/files/extra-patch-ifdef
index 42ec9158a532..f8734bf046df 100644
--- a/mail/mutt/files/extra-patch-ifdef
+++ b/mail/mutt/files/extra-patch-ifdef
@@ -1,8 +1,8 @@
---- PATCHES.orig	2019-06-15 21:17:01 UTC
+--- PATCHES.orig	2017-12-03 03:10:17 UTC
 +++ PATCHES
 @@ -0,0 +1 @@
 +patch-1.5.4.cd.ifdef.1
---- init.c.orig	2019-05-25 16:22:39 UTC
+--- init.c.orig	2019-09-21 19:18:34 UTC
 +++ init.c
 @@ -651,6 +651,52 @@ static mbchar_table *parse_mbchar_table (const char *s
    return t;
@@ -57,9 +57,9 @@
  static int parse_unignore (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
  {
    do
---- init.h.orig	2019-06-15 15:57:01 UTC
+--- init.h.orig	2019-09-21 19:18:34 UTC
 +++ init.h
-@@ -4330,6 +4330,7 @@ static int parse_lists (BUFFER *, BUFFER *, unsigned l
+@@ -4343,6 +4343,7 @@ static int parse_lists (BUFFER *, BUFFER *, unsigned l
  static int parse_unlists (BUFFER *, BUFFER *, unsigned long, BUFFER *);
  static int parse_alias (BUFFER *, BUFFER *, unsigned long, BUFFER *);
  static int parse_unalias (BUFFER *, BUFFER *, unsigned long, BUFFER *);
@@ -67,7 +67,7 @@
  static int parse_echo (BUFFER *, BUFFER *, unsigned long, BUFFER *);
  static int parse_ignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
  static int parse_unignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-@@ -4394,6 +4395,7 @@ const struct command_t Commands[] = {
+@@ -4407,6 +4407,7 @@ const struct command_t Commands[] = {
    { "hdr_order",	parse_list,		UL &HeaderOrderList },
  #ifdef HAVE_ICONV
    { "iconv-hook",	mutt_parse_hook,	MUTT_ICONVHOOK },
diff --git a/mail/mutt/files/extra-patch-reverse_reply b/mail/mutt/files/extra-patch-reverse_reply
index 78fb8038646a..d1cf589f7f00 100644
--- a/mail/mutt/files/extra-patch-reverse_reply
+++ b/mail/mutt/files/extra-patch-reverse_reply
@@ -1,8 +1,8 @@
---- PATCHES.orig	2019-06-15 21:17:02 UTC
+--- PATCHES.orig	2017-12-03 03:10:17 UTC
 +++ PATCHES
 @@ -0,0 +1 @@
 +patch-1.5.6.cb.reverse_reply.2
---- init.h.orig	2019-06-15 21:17:01 UTC
+--- init.h.orig	2019-09-21 19:18:34 UTC
 +++ init.h
 @@ -2966,6 +2966,13 @@ struct option_t MuttVars[] = {
    ** In either case, a missing real name will be filled in afterwards
@@ -18,7 +18,7 @@
    { "rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0 },
    /*
    ** .pp
---- mutt.h.orig	2019-06-15 21:17:01 UTC
+--- mutt.h.orig	2019-09-21 19:18:34 UTC
 +++ mutt.h
 @@ -491,6 +491,7 @@ enum
    OPTREVALIAS,
@@ -28,7 +28,7 @@
    OPTRFC2047PARAMS,
    OPTSAVEADDRESS,
    OPTSAVEEMPTY,
---- protos.h.orig	2019-05-25 16:22:39 UTC
+--- protos.h.orig	2019-09-21 19:18:34 UTC
 +++ protos.h
 @@ -85,6 +85,7 @@ ADDRESS *mutt_get_address (ENVELOPE *, char **);
  ADDRESS *mutt_lookup_alias (const char *s);
@@ -38,7 +38,7 @@
  ADDRESS *mutt_expand_aliases (ADDRESS *);
  ADDRESS *mutt_parse_adrlist (ADDRESS *, const char *);
  
---- send.c.orig	2019-06-14 15:57:33 UTC
+--- send.c.orig	2019-09-21 19:18:34 UTC
 +++ send.c
 @@ -717,6 +717,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env)
    /* the CC field can get cluttered, especially with lists */
@@ -51,9 +51,9 @@
    env->cc = mutt_remove_xrefs (env->to, env->cc);
  
    if (env->cc && !env->to)
---- sendlib.c.orig	2019-06-14 15:57:30 UTC
+--- sendlib.c.orig	2019-09-21 19:18:34 UTC
 +++ sendlib.c
-@@ -2764,6 +2764,35 @@ static void set_noconv_flags (BODY *b, short flag)
+@@ -2765,6 +2765,35 @@ static void set_noconv_flags (BODY *b, short flag)
    }
  }