git: b278d09af48e - main - mail/mutt: Update to 2.2.6
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 07 Jun 2022 02:15:07 UTC
The branch main has been updated by ygy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b278d09af48e4e512568c2af697839780e6b8185
commit b278d09af48e4e512568c2af697839780e6b8185
Author: Derek Schrock <dereks@lifeofadishwasher.com>
AuthorDate: 2022-06-07 02:13:18 +0000
Commit: Guangyuan Yang <ygy@FreeBSD.org>
CommitDate: 2022-06-07 02:13:18 +0000
mail/mutt: Update to 2.2.6
Changelog: https://gitlab.com/muttmua/mutt/-/blob/stable/UPDATING#L12
PR: 264489
---
mail/mutt/Makefile | 2 +-
mail/mutt/distinfo | 6 +++---
mail/mutt/files/extra-patch-ifdef | 10 +++++-----
mail/mutt/files/extra-patch-maildir-mtime | 4 ++--
mail/mutt/files/extra-patch-reverse_reply | 16 ++++++++--------
mail/mutt/files/extra-patch-smartdate | 4 ++--
mail/mutt/files/extra-smime-sender | 10 +++++-----
mail/mutt/files/patch-date-conditional | 10 +++++-----
mail/mutt/files/patch-dgc-deepif | 6 +++---
9 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 7fcaae1d938f..9b3e1531d9c9 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,7 +1,7 @@
# Created by: Udo Schweigert
PORTNAME= mutt
-DISTVERSION= 2.2.5
+DISTVERSION= 2.2.6
CATEGORIES+= mail
MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \
https://bitbucket.org/mutt/mutt/downloads/ \
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index 566b0cbd0ac9..f99217c89310 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1653001771
-SHA256 (mutt/mutt-2.2.5.tar.gz) = ff8b781159794adcca126b551d5e419174b7b38a582a159bfe4e13451a757e47
-SIZE (mutt/mutt-2.2.5.tar.gz) = 5516189
+TIMESTAMP = 1654459078
+SHA256 (mutt/mutt-2.2.6.tar.gz) = ffa2d93517cfc606fe01daffc5f12e42062a1c134d3b9af78484ebc5430888d3
+SIZE (mutt/mutt-2.2.6.tar.gz) = 5517121
SHA256 (mutt/mutt-2.2.0.vc.greeting) = 7abb467cfaa0ccbfa1fa7cdf8585eefef94e039459ff95fb59efe23043d941d2
SIZE (mutt/mutt-2.2.0.vc.greeting) = 1979
SHA256 (mutt/patch-1.13.0.vvv.initials.xz) = 8b25ad6596bd57d94f6551e7e73ceb8da620468e96fb507b2f51545d5b3eaa02
diff --git a/mail/mutt/files/extra-patch-ifdef b/mail/mutt/files/extra-patch-ifdef
index 6b7f0dc129da..90d893067df5 100644
--- a/mail/mutt/files/extra-patch-ifdef
+++ b/mail/mutt/files/extra-patch-ifdef
@@ -1,8 +1,8 @@
---- PATCHES.orig 2022-04-30 21:11:31 UTC
+--- PATCHES.orig 2022-06-05 20:10:54 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.4.cd.ifdef.1
---- init.c.orig 2022-04-12 20:38:51 UTC
+--- init.c.orig 2022-05-11 16:57:07 UTC
+++ init.c
@@ -715,6 +715,52 @@ static mbchar_table *parse_mbchar_table (const char *s
return t;
@@ -57,9 +57,9 @@
static int parse_unignore (BUFFER *buf, BUFFER *s, union pointer_long_t udata, BUFFER *err)
{
do
---- init.h.orig 2022-04-30 21:11:31 UTC
+--- init.h.orig 2022-06-05 20:10:54 UTC
+++ init.h
-@@ -4927,6 +4927,7 @@ static int parse_lists (BUFFER *, BUFFER *, union poin
+@@ -4934,6 +4934,7 @@ static int parse_lists (BUFFER *, BUFFER *, union poin
static int parse_unlists (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
static int parse_alias (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
static int parse_unalias (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
@@ -67,7 +67,7 @@
static int parse_echo (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
static int parse_ignore (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
static int parse_unignore (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
-@@ -4994,6 +4995,7 @@ const struct command_t Commands[] = {
+@@ -5001,6 +5002,7 @@ const struct command_t Commands[] = {
{ "hdr_order", parse_list, {.p=&HeaderOrderList} },
#ifdef HAVE_ICONV
{ "iconv-hook", mutt_parse_hook, {.l=MUTT_ICONVHOOK} },
diff --git a/mail/mutt/files/extra-patch-maildir-mtime b/mail/mutt/files/extra-patch-maildir-mtime
index 73306ef3caad..a2d4548bd477 100644
--- a/mail/mutt/files/extra-patch-maildir-mtime
+++ b/mail/mutt/files/extra-patch-maildir-mtime
@@ -1,8 +1,8 @@
---- PATCHES.orig 2022-04-30 21:11:31 UTC
+--- PATCHES.orig 2022-06-05 20:10:54 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.7.ust.maildir-mtime.2
---- browser.c.orig 2022-04-21 21:35:19 UTC
+--- browser.c.orig 2022-06-05 18:00:36 UTC
+++ browser.c
@@ -32,6 +32,7 @@
#ifdef USE_IMAP
diff --git a/mail/mutt/files/extra-patch-reverse_reply b/mail/mutt/files/extra-patch-reverse_reply
index 302d69d20179..0147778998ba 100644
--- a/mail/mutt/files/extra-patch-reverse_reply
+++ b/mail/mutt/files/extra-patch-reverse_reply
@@ -1,8 +1,8 @@
---- PATCHES.orig 2022-04-30 21:11:31 UTC
+--- PATCHES.orig 2022-06-05 20:10:54 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.6.cb.reverse_reply.2
---- init.h.orig 2022-04-30 21:11:31 UTC
+--- init.h.orig 2022-06-05 20:10:54 UTC
+++ init.h
@@ -3431,6 +3431,13 @@ struct option_t MuttVars[] = {
** In either case, a missing real name will be filled in afterwards
@@ -18,9 +18,9 @@
{ "rfc2047_parameters", DT_BOOL, R_NONE, {.l=OPTRFC2047PARAMS}, {.l=1} },
/*
** .pp
---- mutt.h.orig 2022-04-30 21:11:31 UTC
+--- mutt.h.orig 2022-06-05 20:10:54 UTC
+++ mutt.h
-@@ -533,6 +533,7 @@ enum
+@@ -538,6 +538,7 @@ enum
OPTREVALIAS,
OPTREVNAME,
OPTREVREAL,
@@ -28,7 +28,7 @@
OPTRFC2047PARAMS,
OPTSAVEADDRESS,
OPTSAVEEMPTY,
---- protos.h.orig 2022-03-24 21:38:29 UTC
+--- protos.h.orig 2022-05-21 16:36:29 UTC
+++ protos.h
@@ -86,6 +86,7 @@ char* mutt_extract_message_id (const char *, const cha
ADDRESS *mutt_get_address (ENVELOPE *, char **);
@@ -38,7 +38,7 @@
ADDRESS *mutt_remove_adrlist_group_delimiters (ADDRESS *);
ADDRESS *mutt_expand_aliases (ADDRESS *);
ADDRESS *mutt_parse_adrlist (ADDRESS *, const char *);
---- send.c.orig 2022-03-24 21:38:29 UTC
+--- send.c.orig 2022-05-11 16:57:07 UTC
+++ send.c
@@ -744,6 +744,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 2022-04-12 20:38:51 UTC
+--- sendlib.c.orig 2022-05-27 21:24:33 UTC
+++ sendlib.c
-@@ -3093,6 +3093,37 @@ static void set_noconv_flags (BODY *b, short flag)
+@@ -3108,6 +3108,37 @@ static void set_noconv_flags (BODY *b, short flag)
}
}
diff --git a/mail/mutt/files/extra-patch-smartdate b/mail/mutt/files/extra-patch-smartdate
index 80c351ff17d1..a0e81c699146 100644
--- a/mail/mutt/files/extra-patch-smartdate
+++ b/mail/mutt/files/extra-patch-smartdate
@@ -1,4 +1,4 @@
---- hdrline.c.orig 2022-04-30 21:11:31 UTC
+--- hdrline.c.orig 2022-06-05 20:10:54 UTC
+++ hdrline.c
@@ -249,6 +249,89 @@ static char *apply_subject_mods (ENVELOPE *env)
* %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label)
@@ -105,7 +105,7 @@
if (!do_locales)
setlocale (LC_TIME, "");
---- mutt.h.orig 2022-04-30 21:11:31 UTC
+--- mutt.h.orig 2022-06-05 20:10:54 UTC
+++ mutt.h
@@ -168,6 +168,16 @@ typedef enum
MUTT_WRITE_HEADER_MIME
diff --git a/mail/mutt/files/extra-smime-sender b/mail/mutt/files/extra-smime-sender
index 2b60f4088a74..5e689aa61ff7 100644
--- a/mail/mutt/files/extra-smime-sender
+++ b/mail/mutt/files/extra-smime-sender
@@ -1,4 +1,4 @@
---- commands.c.orig 2022-03-24 21:38:29 UTC
+--- commands.c.orig 2022-05-11 16:57:07 UTC
+++ commands.c
@@ -302,7 +302,7 @@ int mutt_display_message (HEADER *cur)
{
@@ -9,9 +9,9 @@
mutt_message ( _("S/MIME signature successfully verified."));
else
mutt_error ( _("S/MIME certificate owner does not match sender."));
---- init.h.orig 2022-04-30 21:11:31 UTC
+--- init.h.orig 2022-06-05 20:10:54 UTC
+++ init.h
-@@ -3928,6 +3928,15 @@ struct option_t MuttVars[] = {
+@@ -3935,6 +3935,15 @@ struct option_t MuttVars[] = {
** to determine the key to use. It will ask you to supply a key, if it can't find one.
** (S/MIME only)
*/
@@ -27,9 +27,9 @@
{ "smime_self_encrypt_as", DT_SYN, R_NONE, {.p="smime_default_key"}, {.p=0} },
{ "smime_default_key", DT_STR, R_NONE, {.p=&SmimeDefaultKey}, {.p=0} },
/*
---- mutt.h.orig 2022-04-30 21:11:31 UTC
+--- mutt.h.orig 2022-06-05 20:10:55 UTC
+++ mutt.h
-@@ -617,6 +617,7 @@ enum
+@@ -622,6 +622,7 @@ enum
OPTSMIMEISDEFAULT,
OPTSMIMESELFENCRYPT,
OPTASKCERTLABEL,
diff --git a/mail/mutt/files/patch-date-conditional b/mail/mutt/files/patch-date-conditional
index ae87993fc648..d2845e668636 100644
--- a/mail/mutt/files/patch-date-conditional
+++ b/mail/mutt/files/patch-date-conditional
@@ -1,8 +1,8 @@
---- PATCHES.orig 2022-04-30 21:11:31 UTC
+--- PATCHES.orig 2022-06-05 20:10:55 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.0.ats.date_conditional.1
---- hdrline.c.orig 2022-04-30 21:11:31 UTC
+--- hdrline.c.orig 2022-06-05 20:10:55 UTC
+++ hdrline.c
@@ -428,6 +428,53 @@ hdr_format_str (char *dest,
const char *cp;
@@ -58,9 +58,9 @@
p = dest;
---- muttlib.c.orig 2022-04-30 19:35:13 UTC
+--- muttlib.c.orig 2022-05-21 16:36:29 UTC
+++ muttlib.c
-@@ -1694,7 +1694,16 @@ void mutt_FormatString (char *dest, /* output buffer
+@@ -1701,7 +1701,16 @@ void mutt_FormatString (char *dest, /* output buffer
if (*src == '?')
{
flags |= MUTT_FORMAT_OPTIONAL;
@@ -78,7 +78,7 @@
}
else
{
-@@ -1710,12 +1719,12 @@ void mutt_FormatString (char *dest, /* output buffer
+@@ -1717,12 +1726,12 @@ void mutt_FormatString (char *dest, /* output buffer
count++;
}
*cp = 0;
diff --git a/mail/mutt/files/patch-dgc-deepif b/mail/mutt/files/patch-dgc-deepif
index a2114d2df8df..b9ca5a455924 100644
--- a/mail/mutt/files/patch-dgc-deepif
+++ b/mail/mutt/files/patch-dgc-deepif
@@ -1,6 +1,6 @@
---- muttlib.c.orig 2022-04-30 21:11:31 UTC
+--- muttlib.c.orig 2022-06-05 20:10:55 UTC
+++ muttlib.c
-@@ -1737,6 +1737,12 @@ void mutt_FormatString (char *dest, /* output buffer
+@@ -1744,6 +1744,12 @@ void mutt_FormatString (char *dest, /* output buffer
count = 0;
while (count < sizeof (ifstring) && *src && *src != '?' && *src != '&')
{
@@ -13,7 +13,7 @@
*cp++ = *src++;
count++;
}
-@@ -1749,7 +1755,13 @@ void mutt_FormatString (char *dest, /* output buffer
+@@ -1756,7 +1762,13 @@ void mutt_FormatString (char *dest, /* output buffer
count = 0;
while (count < sizeof (elsestring) && *src && *src != '?')
{