From nobody Sun May 01 12:12:23 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 2EB4319996D5; Sun, 1 May 2022 12:12:24 +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 4KrlTh0smRz3hq5; Sun, 1 May 2022 12:12:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651407144; 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=6wHDbOuIUEWCrxtMrj52mstppOgeeZluHpDDbNWrA8Y=; b=HjQ2AUT64YtALv1iRKT0CiqeiH2rm4usz5FK7p4kUsprgzf47uhYRC5N/q/Oq6rXnOFA87 EoXw3XzLSSEx5Zq4p7zU6BUugL0hGQWlo3hM3nCR91g5Jah1ZFAAR1V70PCTxlpjQ/CW4S 0QKzD13toDbNQfpmL++v3c2GLA2puJH3gd2xoEN9xcCPPhONxTO7Zls6dg9CnoHQV7KdKQ SLKuH3shYGpcaWshEgzBVBKX8sfLkob/1lJQT+TTtvD+TdyeMhZ9/AQgCfK0cbv5dENSIt tFEjmDspEcNyyFm+Pb06uJS23tJtm/SqRYGRCcqkBH3uylerX/CN5IVluo+F7Q== 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 F341C158CF; Sun, 1 May 2022 12:12:23 +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 241CCN77043507; Sun, 1 May 2022 12:12:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 241CCNqm043506; Sun, 1 May 2022 12:12:23 GMT (envelope-from git) Date: Sun, 1 May 2022 12:12:23 GMT Message-Id: <202205011212.241CCNqm043506@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitri Goutnik Subject: git: 7b7c0dbabef4 - main - mail/mutt: Update to 2.2.4 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: dmgk X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b7c0dbabef45ec596b72d044b6eb6ab300bd69a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651407144; 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=6wHDbOuIUEWCrxtMrj52mstppOgeeZluHpDDbNWrA8Y=; b=SqgCJvrNs3SYpc8rXMQ5lBQFBDkfMVMFY2kbRuZm9yKnrU61pBTpdRZ7feAkLscfNEGWT2 SrZPcemT98BiFL5wybVy4lDzrMQhSQmwnB6OkZSRQ7ngQtM6z5BIlRC0BT/0H6B/kpVqIF bXylZTkZSPq0TRdn5NSArB9bnn8ls0KEeOq2kmgJnOCH/vtGGftoysqXiJXhSzYTcetuV5 //fOswrWEktuMQufykHz6S9EKaKbN7atVsdiJhGdauslzLX6O71bclMmTHsM/MFCXBNTFO oXYT6Bkl08/ATJGs5CwUZvOg5+XTcYKTYH/uF1Ac+vigaqFnaUuQMx2Md/4Nng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651407144; a=rsa-sha256; cv=none; b=JnJZnPpHnH1hHBmdpra6alolP/waRVckvG9wUpzroUG1Bv75ApCaI9+aQZlrZIa65mdMzR mkLnOkQCh7EcUhfup9BzU3pEVsvSA8YsAX/Tl11M+TrMO8qQUkOxuwLONajcEGixy6U5DF xII1H99/L2M3CZOBNhW4FP/7nyAGRiHEcVsyNt/dKARtvPf1NFv5cJNC5VJ5+F6hHdKsIH UqqI3JVyAuKhEvb0VANKLdtjmMnBA66q3/0H+2g23ISN/rxe1PdEloYvIEdV/KxvEPvpBE wm8EnGi+eDUz9RIDIdminbRhaNmlyFtS4V4CI6IXsPIWkrMCM3mXqGTCZ2ACEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dmgk: URL: https://cgit.FreeBSD.org/ports/commit/?id=7b7c0dbabef45ec596b72d044b6eb6ab300bd69a commit 7b7c0dbabef45ec596b72d044b6eb6ab300bd69a Author: Derek Schrock AuthorDate: 2022-05-01 12:08:52 +0000 Commit: Dmitri Goutnik CommitDate: 2022-05-01 12:08:52 +0000 mail/mutt: Update to 2.2.4 Changes: https://marc.info/?l=mutt-users&m=165135060511141&w=2 PR: 263695 --- 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 | 14 +++++++------- mail/mutt/files/extra-patch-smartdate | 4 ++-- mail/mutt/files/extra-smime-sender | 8 ++++---- mail/mutt/files/patch-date-conditional | 10 +++++----- mail/mutt/files/patch-dgc-deepif | 6 +++--- 9 files changed, 32 insertions(+), 32 deletions(-) diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index c17a10e92759..e4ee2932a571 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -1,7 +1,7 @@ # Created by: Udo Schweigert PORTNAME= mutt -DISTVERSION= 2.2.3 +DISTVERSION= 2.2.4 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 e0ec92684b84..03d890dc8244 100644 --- a/mail/mutt/distinfo +++ b/mail/mutt/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1649802229 -SHA256 (mutt/mutt-2.2.3.tar.gz) = 978addcdab454f447ed7d1de84b5767e714c30714285bf82e4a1745071d18d89 -SIZE (mutt/mutt-2.2.3.tar.gz) = 5509344 +TIMESTAMP = 1651351940 +SHA256 (mutt/mutt-2.2.4.tar.gz) = b82776bebff0e10820a33fa1e7eafa5cba4ab3a011b08e83b66ed62d75c6e060 +SIZE (mutt/mutt-2.2.4.tar.gz) = 5515825 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 477c82f88186..6b7f0dc129da 100644 --- a/mail/mutt/files/extra-patch-ifdef +++ b/mail/mutt/files/extra-patch-ifdef @@ -1,8 +1,8 @@ ---- PATCHES.orig 2022-02-12 23:46:24 UTC +--- PATCHES.orig 2022-04-30 21:11:31 UTC +++ PATCHES @@ -0,0 +1 @@ +patch-1.5.4.cd.ifdef.1 ---- init.c.orig 2022-01-25 19:33:16 UTC +--- init.c.orig 2022-04-12 20:38:51 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-02-12 23:46:24 UTC +--- init.h.orig 2022-04-30 21:11:31 UTC +++ init.h -@@ -4926,6 +4926,7 @@ static int parse_lists (BUFFER *, BUFFER *, union poin +@@ -4927,6 +4927,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 *); -@@ -4993,6 +4994,7 @@ const struct command_t Commands[] = { +@@ -4994,6 +4995,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 0047da9e24dc..73306ef3caad 100644 --- a/mail/mutt/files/extra-patch-maildir-mtime +++ b/mail/mutt/files/extra-patch-maildir-mtime @@ -1,8 +1,8 @@ ---- PATCHES.orig 2022-02-12 23:46:24 UTC +--- PATCHES.orig 2022-04-30 21:11:31 UTC +++ PATCHES @@ -0,0 +1 @@ +patch-1.5.7.ust.maildir-mtime.2 ---- browser.c.orig 2022-01-25 19:33:16 UTC +--- browser.c.orig 2022-04-21 21:35:19 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 35efc80cec42..302d69d20179 100644 --- a/mail/mutt/files/extra-patch-reverse_reply +++ b/mail/mutt/files/extra-patch-reverse_reply @@ -1,10 +1,10 @@ ---- PATCHES.orig 2022-02-12 23:46:24 UTC +--- PATCHES.orig 2022-04-30 21:11:31 UTC +++ PATCHES @@ -0,0 +1 @@ +patch-1.5.6.cb.reverse_reply.2 ---- init.h.orig 2022-02-12 23:46:24 UTC +--- init.h.orig 2022-04-30 21:11:31 UTC +++ init.h -@@ -3430,6 +3430,13 @@ struct option_t MuttVars[] = { +@@ -3431,6 +3431,13 @@ struct option_t MuttVars[] = { ** In either case, a missing real name will be filled in afterwards ** using the value of $$realname. */ @@ -18,7 +18,7 @@ { "rfc2047_parameters", DT_BOOL, R_NONE, {.l=OPTRFC2047PARAMS}, {.l=1} }, /* ** .pp ---- mutt.h.orig 2022-02-12 23:46:24 UTC +--- mutt.h.orig 2022-04-30 21:11:31 UTC +++ mutt.h @@ -533,6 +533,7 @@ enum OPTREVALIAS, @@ -28,7 +28,7 @@ OPTRFC2047PARAMS, OPTSAVEADDRESS, OPTSAVEEMPTY, ---- protos.h.orig 2022-02-09 20:12:23 UTC +--- protos.h.orig 2022-03-24 21:38: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-01-15 20:43:36 UTC +--- send.c.orig 2022-03-24 21:38:29 UTC +++ send.c @@ -744,6 +744,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env) /* the CC field can get cluttered, especially with lists */ @@ -51,7 +51,7 @@ env->cc = mutt_remove_xrefs (env->to, env->cc); if (env->cc && !env->to) ---- sendlib.c.orig 2022-01-22 23:36:22 UTC +--- sendlib.c.orig 2022-04-12 20:38:51 UTC +++ sendlib.c @@ -3093,6 +3093,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 40ce4ca583d7..80c351ff17d1 100644 --- a/mail/mutt/files/extra-patch-smartdate +++ b/mail/mutt/files/extra-patch-smartdate @@ -1,4 +1,4 @@ ---- hdrline.c.orig 2022-02-12 23:46:24 UTC +--- hdrline.c.orig 2022-04-30 21:11:31 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-02-12 23:46:24 UTC +--- mutt.h.orig 2022-04-30 21:11:31 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 99aa1a45254c..2b60f4088a74 100644 --- a/mail/mutt/files/extra-smime-sender +++ b/mail/mutt/files/extra-smime-sender @@ -1,4 +1,4 @@ ---- commands.c.orig 2021-09-08 11:03:24 UTC +--- commands.c.orig 2022-03-24 21:38:29 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-02-12 23:46:24 UTC +--- init.h.orig 2022-04-30 21:11:31 UTC +++ init.h -@@ -3927,6 +3927,15 @@ struct option_t MuttVars[] = { +@@ -3928,6 +3928,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,7 +27,7 @@ { "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-02-12 23:46:24 UTC +--- mutt.h.orig 2022-04-30 21:11:31 UTC +++ mutt.h @@ -617,6 +617,7 @@ enum OPTSMIMEISDEFAULT, diff --git a/mail/mutt/files/patch-date-conditional b/mail/mutt/files/patch-date-conditional index 35bf404ed230..ae87993fc648 100644 --- a/mail/mutt/files/patch-date-conditional +++ b/mail/mutt/files/patch-date-conditional @@ -1,8 +1,8 @@ ---- PATCHES.orig 2022-02-12 23:46:24 UTC +--- PATCHES.orig 2022-04-30 21:11:31 UTC +++ PATCHES @@ -0,0 +1 @@ +patch-1.5.0.ats.date_conditional.1 ---- hdrline.c.orig 2022-02-12 23:46:24 UTC +--- hdrline.c.orig 2022-04-30 21:11:31 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-12-30 20:58:19 UTC +--- muttlib.c.orig 2022-04-30 19:35:13 UTC +++ muttlib.c -@@ -1681,7 +1681,16 @@ void mutt_FormatString (char *dest, /* output buffer +@@ -1694,7 +1694,16 @@ void mutt_FormatString (char *dest, /* output buffer if (*src == '?') { flags |= MUTT_FORMAT_OPTIONAL; @@ -78,7 +78,7 @@ } else { -@@ -1697,12 +1706,12 @@ void mutt_FormatString (char *dest, /* output buffer +@@ -1710,12 +1719,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 a91d183f5f90..a2114d2df8df 100644 --- a/mail/mutt/files/patch-dgc-deepif +++ b/mail/mutt/files/patch-dgc-deepif @@ -1,6 +1,6 @@ ---- muttlib.c.orig 2022-02-12 23:46:24 UTC +--- muttlib.c.orig 2022-04-30 21:11:31 UTC +++ muttlib.c -@@ -1724,6 +1724,12 @@ void mutt_FormatString (char *dest, /* output buffer +@@ -1737,6 +1737,12 @@ void mutt_FormatString (char *dest, /* output buffer count = 0; while (count < sizeof (ifstring) && *src && *src != '?' && *src != '&') { @@ -13,7 +13,7 @@ *cp++ = *src++; count++; } -@@ -1736,7 +1742,13 @@ void mutt_FormatString (char *dest, /* output buffer +@@ -1749,7 +1755,13 @@ void mutt_FormatString (char *dest, /* output buffer count = 0; while (count < sizeof (elsestring) && *src && *src != '?') {