From nobody Mon Feb 14 05:23:47 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2683F19BC36B; Mon, 14 Feb 2022 05:23:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jxt1J0Z8Kz3hRy; Mon, 14 Feb 2022 05:23:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644816228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=avHQe7DrUYmLzOAoI+7ib9pDdI4usvC2E7/1fpLY7N4=; b=X7BM2gUhHzSok8heEyZKoUmZQEr5feRFOi+jFwmDjywCoVvx/iB0ubfLX1u9msk1c9WkyL hZ45MNoK1OwhKy3awdmoQTH55hpVnNZzxFzwhJRIy0RLe1jkoB0CTjM7bNnlw9KWSlkLUF UWxRfDmjJEzOxm8W9g+6kQzE/W6+kax2OE15Lo0v+GqH55N1Pilq5haTBES1Yu2+P1aim1 uArkxovhQTDVbgJvDxag0exqGKmrcxlDLROQQhT01m6kGTjYwBXPcRxpnXc3mzDg4+qqHs XJKE6KRYCvu2xD2otZMCsKHO9T32YuFvN8H/m4zOz3b0+ZyAjBEYaBt/v5s0IQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E7EE31017; Mon, 14 Feb 2022 05:23:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21E5NlPM084528; Mon, 14 Feb 2022 05:23:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21E5NlZJ084527; Mon, 14 Feb 2022 05:23:47 GMT (envelope-from git) Date: Mon, 14 Feb 2022 05:23:47 GMT Message-Id: <202202140523.21E5NlZJ084527@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guangyuan Yang Subject: git: 79aa6d906518 - main - mail/mutt: Update to 2.2.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ygy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79aa6d906518b8718c84473e630c1b438b1fb429 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644816228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=avHQe7DrUYmLzOAoI+7ib9pDdI4usvC2E7/1fpLY7N4=; b=PjowkAcnj+ao35zi0PfRK9sdBrZGepKyNeFyZ8qxDP9LvUrtSkAK0NEXzCP9aQci86alUn ItlQmDPBwRixSZ8gPNdWT1R65C2QVVOKdkEBqwv+Yqr9SDZSydF1UYXqViRzZzuvTpjqGS Gy4b8aJ8BCkZBmX+bG0MGdxmYcxOe9LwIoKPVHsQiE1il1p6hSutlbb6sUzJ1qjKuoJ+3i 0QmcjJpeIzJ9DEyL8Gm+7SPNAI7XRFoMruFOqGEzxH+IJw5pi6cHZDuTY9yanvzn1Et1oe W4zhawi3ImrWmQcnre+Y+BPJhAvsVF6tn/uto76pLaE5wif8NaHVRQijHDXAgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644816228; a=rsa-sha256; cv=none; b=q5gDuNQV3dgqG5qefz8qY/bQ0RvfT6IKQa+elmmEiulaweTm15oj1A4njuvspTN7DQG6N8 9ztyFmSVhNMLLBZgoJwDaz5cQ01TEeD1evJR7N+eBE3wX+F55Fy2oP8Lm360Td9uqZ14IS ujPhbUyjAgXMug7ANQapEPntVu1zGzghf9K+MVjG467IbEGljyuL6uSBVrEdRgfamvZg9v AFDWAHilj+zNB7gaff/uhsHwylv63VpYiqaJIQ74EnU+BJRmwiJjh2g+aeksCqWLwjOnsa KNR0FJBtBuY9BrJwLKnxzAfkxlxeUPoAjRUJ8+LdhJgE5bjGM0qDmGvZdv6u1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ygy: URL: https://cgit.FreeBSD.org/ports/commit/?id=79aa6d906518b8718c84473e630c1b438b1fb429 commit 79aa6d906518b8718c84473e630c1b438b1fb429 Author: Derek Schrock AuthorDate: 2022-02-14 05:23:36 +0000 Commit: Guangyuan Yang CommitDate: 2022-02-14 05:23:36 +0000 mail/mutt: Update to 2.2.0 Changelog: https://marc.info/?l=mutt-users&m=164471766728598&w=2 PR: 261917 --- mail/mutt/Makefile | 2 +- mail/mutt/distinfo | 6 +++--- mail/mutt/files/extra-patch-ifdef | 14 +++++++------- mail/mutt/files/extra-patch-maildir-mtime | 6 +++--- mail/mutt/files/extra-patch-reverse_reply | 32 ++++++++++++++++--------------- 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, 46 insertions(+), 44 deletions(-) diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index c985519f4550..dd358d7fed5e 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -1,7 +1,7 @@ # Created by: Udo Schweigert PORTNAME= mutt -DISTVERSION= 2.1.5 +DISTVERSION= 2.2.0 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 422b2d7a41e0..6bce2b16bcc2 100644 --- a/mail/mutt/distinfo +++ b/mail/mutt/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1640911132 -SHA256 (mutt/mutt-2.1.5.tar.gz) = 92a309e47e363a97d62425bcb71adceae5ab5c4c413dbcac37fa98ed70c12be0 -SIZE (mutt/mutt-2.1.5.tar.gz) = 5414049 +TIMESTAMP = 1644704304 +SHA256 (mutt/mutt-2.2.0.tar.gz) = e84597f06d03ca82f8ca3b5ec8bc294c150709b43ed2a0177bf479c3e3345314 +SIZE (mutt/mutt-2.2.0.tar.gz) = 5503348 SHA256 (mutt/mutt-2.1.0.vc.greeting) = d43686bbd88539c7b50cc198d15c146f579af344c26b83c4018c50f65f5c6dac SIZE (mutt/mutt-2.1.0.vc.greeting) = 2003 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 c0416b81c705..477c82f88186 100644 --- a/mail/mutt/files/extra-patch-ifdef +++ b/mail/mutt/files/extra-patch-ifdef @@ -1,10 +1,10 @@ ---- PATCHES.orig 2021-06-13 21:49:46 UTC +--- PATCHES.orig 2022-02-12 23:46:24 UTC +++ PATCHES @@ -0,0 +1 @@ +patch-1.5.4.cd.ifdef.1 ---- init.c.orig 2021-05-26 22:40:56 UTC +--- init.c.orig 2022-01-25 19:33:16 UTC +++ init.c -@@ -678,6 +678,52 @@ static mbchar_table *parse_mbchar_table (const char *s +@@ -715,6 +715,52 @@ static mbchar_table *parse_mbchar_table (const char *s return t; } @@ -20,7 +20,7 @@ + if (!(res = (mutt_option_index (tmp->data) != -1))) + for (i = 0; !res && i < MENU_MAX; i++) + { -+ const struct binding_t *b = km_get_table (Menus[i].value); ++ const struct menu_func_op_t *b = km_get_table (Menus[i].value); + + if (!b) + continue; @@ -57,9 +57,9 @@ static int parse_unignore (BUFFER *buf, BUFFER *s, union pointer_long_t udata, BUFFER *err) { do ---- init.h.orig 2021-06-13 21:49:46 UTC +--- init.h.orig 2022-02-12 23:46:24 UTC +++ init.h -@@ -4787,6 +4787,7 @@ static int parse_lists (BUFFER *, BUFFER *, union poin +@@ -4926,6 +4926,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 *); -@@ -4854,6 +4855,7 @@ const struct command_t Commands[] = { +@@ -4993,6 +4994,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 722eb952383a..0047da9e24dc 100644 --- a/mail/mutt/files/extra-patch-maildir-mtime +++ b/mail/mutt/files/extra-patch-maildir-mtime @@ -1,8 +1,8 @@ ---- PATCHES.orig 2021-06-13 21:49:47 UTC +--- PATCHES.orig 2022-02-12 23:46:24 UTC +++ PATCHES @@ -0,0 +1 @@ +patch-1.5.7.ust.maildir-mtime.2 ---- browser.c.orig 2021-05-23 18:20:50 UTC +--- browser.c.orig 2022-01-25 19:33:16 UTC +++ browser.c @@ -32,6 +32,7 @@ #ifdef USE_IMAP @@ -42,7 +42,7 @@ if (tmp && Context && !tmp->nopoll && !mutt_strcmp (tmp->realpath, Context->realpath)) { -@@ -680,6 +697,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b +@@ -684,6 +701,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b s.st_mtime = st2.st_mtime; } diff --git a/mail/mutt/files/extra-patch-reverse_reply b/mail/mutt/files/extra-patch-reverse_reply index ada407240849..35efc80cec42 100644 --- a/mail/mutt/files/extra-patch-reverse_reply +++ b/mail/mutt/files/extra-patch-reverse_reply @@ -1,10 +1,10 @@ ---- PATCHES.orig 2021-06-13 21:49:47 UTC +--- PATCHES.orig 2022-02-12 23:46:24 UTC +++ PATCHES @@ -0,0 +1 @@ +patch-1.5.6.cb.reverse_reply.2 ---- init.h.orig 2021-06-13 21:49:46 UTC +--- init.h.orig 2022-02-12 23:46:24 UTC +++ init.h -@@ -3322,6 +3322,13 @@ struct option_t MuttVars[] = { +@@ -3430,6 +3430,13 @@ struct option_t MuttVars[] = { ** In either case, a missing real name will be filled in afterwards ** using the value of $$realname. */ @@ -15,12 +15,12 @@ + ** headers of reply mails you send, like $reverse_alias does in the index. + ** When unset, the headers taken from the original mail are left unchanged. + */ - { "rfc2047_parameters", DT_BOOL, R_NONE, {.l=OPTRFC2047PARAMS}, {.l=0} }, + { "rfc2047_parameters", DT_BOOL, R_NONE, {.l=OPTRFC2047PARAMS}, {.l=1} }, /* ** .pp ---- mutt.h.orig 2021-06-13 21:49:46 UTC +--- mutt.h.orig 2022-02-12 23:46:24 UTC +++ mutt.h -@@ -525,6 +525,7 @@ enum +@@ -533,6 +533,7 @@ enum OPTREVALIAS, OPTREVNAME, OPTREVREAL, @@ -28,32 +28,32 @@ OPTRFC2047PARAMS, OPTSAVEADDRESS, OPTSAVEEMPTY, ---- protos.h.orig 2021-05-23 18:20:51 UTC +--- protos.h.orig 2022-02-09 20:12:23 UTC +++ protos.h -@@ -85,6 +85,7 @@ char* mutt_extract_message_id (const char *, const cha +@@ -86,6 +86,7 @@ char* mutt_extract_message_id (const char *, const cha ADDRESS *mutt_get_address (ENVELOPE *, char **); ADDRESS *mutt_lookup_alias (const char *s); ADDRESS *mutt_remove_duplicates (ADDRESS *); +ADDRESS *mutt_reverse_address (ADDRESS *); + ADDRESS *mutt_remove_adrlist_group_delimiters (ADDRESS *); ADDRESS *mutt_expand_aliases (ADDRESS *); ADDRESS *mutt_parse_adrlist (ADDRESS *, const char *); - ---- send.c.orig 2021-05-28 19:33:58 UTC +--- send.c.orig 2022-01-15 20:43:36 UTC +++ send.c -@@ -739,6 +739,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env) +@@ -744,6 +744,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env) /* the CC field can get cluttered, especially with lists */ env->to = mutt_remove_duplicates (env->to); env->cc = mutt_remove_duplicates (env->cc); + if (option (OPTREVREPLY)){ -+ env->to = mutt_reverse_address (env->to); -+ env->cc = mutt_reverse_address (env->cc); ++ env->to = mutt_reverse_address (env->to); ++ env->cc = mutt_reverse_address (env->cc); + } env->cc = mutt_remove_xrefs (env->to, env->cc); if (env->cc && !env->to) ---- sendlib.c.orig 2021-05-23 18:20:51 UTC +--- sendlib.c.orig 2022-01-22 23:36:22 UTC +++ sendlib.c -@@ -3044,6 +3044,35 @@ static void set_noconv_flags (BODY *b, short flag) +@@ -3093,6 +3093,37 @@ static void set_noconv_flags (BODY *b, short flag) } } @@ -85,6 +85,8 @@ + } + return addr; +} ++ ++ + int mutt_write_fcc (const char *path, SEND_CONTEXT *sctx, const char *msgid, int post, const char *fcc) { diff --git a/mail/mutt/files/extra-patch-smartdate b/mail/mutt/files/extra-patch-smartdate index 4b707194df7e..40ce4ca583d7 100644 --- a/mail/mutt/files/extra-patch-smartdate +++ b/mail/mutt/files/extra-patch-smartdate @@ -1,4 +1,4 @@ ---- hdrline.c.orig 2021-06-13 21:49:46 UTC +--- hdrline.c.orig 2022-02-12 23:46:24 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 2021-06-13 21:49:47 UTC +--- mutt.h.orig 2022-02-12 23:46:24 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 243fdc38f030..99aa1a45254c 100644 --- a/mail/mutt/files/extra-smime-sender +++ b/mail/mutt/files/extra-smime-sender @@ -1,4 +1,4 @@ ---- commands.c.orig 2021-05-23 18:20:50 UTC +--- commands.c.orig 2021-09-08 11:03:24 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 2021-06-13 21:49:47 UTC +--- init.h.orig 2022-02-12 23:46:24 UTC +++ init.h -@@ -3819,6 +3819,15 @@ struct option_t MuttVars[] = { +@@ -3927,6 +3927,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 2021-06-13 21:49:47 UTC +--- mutt.h.orig 2022-02-12 23:46:24 UTC +++ mutt.h -@@ -609,6 +609,7 @@ enum +@@ -617,6 +617,7 @@ enum OPTSMIMEISDEFAULT, OPTSMIMESELFENCRYPT, OPTASKCERTLABEL, diff --git a/mail/mutt/files/patch-date-conditional b/mail/mutt/files/patch-date-conditional index 3144ba5bf621..35bf404ed230 100644 --- a/mail/mutt/files/patch-date-conditional +++ b/mail/mutt/files/patch-date-conditional @@ -1,8 +1,8 @@ ---- PATCHES.orig 2021-06-13 21:49:47 UTC +--- PATCHES.orig 2022-02-12 23:46:24 UTC +++ PATCHES @@ -0,0 +1 @@ +patch-1.5.0.ats.date_conditional.1 ---- hdrline.c.orig 2021-06-13 21:49:47 UTC +--- hdrline.c.orig 2022-02-12 23:46:24 UTC +++ hdrline.c @@ -428,6 +428,53 @@ hdr_format_str (char *dest, const char *cp; @@ -58,9 +58,9 @@ p = dest; ---- muttlib.c.orig 2021-05-23 18:20:51 UTC +--- muttlib.c.orig 2021-12-30 20:58:19 UTC +++ muttlib.c -@@ -1677,7 +1677,16 @@ void mutt_FormatString (char *dest, /* output buffer +@@ -1681,7 +1681,16 @@ void mutt_FormatString (char *dest, /* output buffer if (*src == '?') { flags |= MUTT_FORMAT_OPTIONAL; @@ -78,7 +78,7 @@ } else { -@@ -1693,12 +1702,12 @@ void mutt_FormatString (char *dest, /* output buffer +@@ -1697,12 +1706,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 7f1515b6aefe..a91d183f5f90 100644 --- a/mail/mutt/files/patch-dgc-deepif +++ b/mail/mutt/files/patch-dgc-deepif @@ -1,6 +1,6 @@ ---- muttlib.c.orig 2021-06-13 21:49:47 UTC +--- muttlib.c.orig 2022-02-12 23:46:24 UTC +++ muttlib.c -@@ -1720,6 +1720,12 @@ void mutt_FormatString (char *dest, /* output buffer +@@ -1724,6 +1724,12 @@ void mutt_FormatString (char *dest, /* output buffer count = 0; while (count < sizeof (ifstring) && *src && *src != '?' && *src != '&') { @@ -13,7 +13,7 @@ *cp++ = *src++; count++; } -@@ -1732,7 +1738,13 @@ void mutt_FormatString (char *dest, /* output buffer +@@ -1736,7 +1742,13 @@ void mutt_FormatString (char *dest, /* output buffer count = 0; while (count < sizeof (elsestring) && *src && *src != '?') {