aboutsummaryrefslogtreecommitdiff
path: root/mail/mutt/files/patch-date-conditional
diff options
context:
space:
mode:
authorNiclas Zeising <zeising@FreeBSD.org>2020-06-29 14:58:48 +0000
committerNiclas Zeising <zeising@FreeBSD.org>2020-06-29 14:58:48 +0000
commit2cbbd49ac627ee683bfeb3aa4834934b9871bfbd (patch)
tree3fa27a3162f7f6dbb4d60084e05096378577a7e9 /mail/mutt/files/patch-date-conditional
parent155f180f89a3593a17c385b6071c9e592c984125 (diff)
downloadports-2cbbd49ac627ee683bfeb3aa4834934b9871bfbd.tar.gz
ports-2cbbd49ac627ee683bfeb3aa4834934b9871bfbd.zip
MFH: r530651 r534246 r535833 r536629 r538859 r540343
This updates mail/mutt to 1.14.5 This merges all changes to mail/mutt that have been done to FreeBSD ports head branch during the 2020Q2 period. This is needed in order to update mail/mutt to 1.14.5 in order to fix security issues. mail/mutt: upgrade 1.13.4 -> 1.13.5 - Bring back vvv quote/initials patches - Remove NNTP option (XML as well) - Update default option patches context PR: 245175 Submitted by: Derek Schrock <dereks@lifeofadishwasher.com> (maintainer) Relnotes: https://marc.info/?l=mutt-users&m=158542977114051&w=2 mail/mutt: update 1.13.5 -> 1.14.0 - Default DEBUG option (very small performance impact and ~4% binary size increase) PR: 246270 Submitted by: Derek Schrock <dereks@lifeofadishwasher.com> (maintainer) Relnotes: http://www.mutt.org/relnotes/1.14/ mail/mutt: update 1.14.0 -> 1.14.1 - Rename DEBUG option to DEBUG_LOGS - Add lang/perl5 deps that triggers a Muttrc rebuild - Make smime patch optional due to perl build deps. - Remove unnecessary doc patches and REINPLACE_CMD - Move build changing patches to make targets - ASPELL updates the (pre)built Muttrc to not require a rebuild PR: 246559 Submitted by: Derek Schrock <dereks@lifeofadishwasher.com> (maintainer) Relnotes: https://marc.info/?l=mutt-users&m=158965668315387&w=2 mail/mutt: Update to 1.14.2 ChangeLog: http://www.mutt.org/ PR: 246731 Submitted by: dereks@lifeofadishwasher.com (maintainer) mail/mutt: Update to 1.14.3 - Update to 1.14.3 - Muttrc removed from dist. making perl a BUILD_DEPENDS - manual.txt removed from dist. making lynx a DOCS_BUILD_DEPENDS - Remove MASTER_SITES not updated or can't connect PR: 247266 Submitted by: Derek Schrock <dereks@lifeofadishwasher.com> (maintainer) Relnotes: https://marc.info/?l=mutt-users&m=159217236324614&w=2 mail/mutt: Update to 1.14.5 Update mail/mutt to 1.14.5, this is a security fix release, with fixes for CVE-2020-14093 and CVE-2020-14954 PR: 247400 Submitted by: Derek Schrock Security: 5b397852-b1d0-11ea-a11c-4437e6ad11c4 29b13a34-b1d2-11ea-a11c-4437e6ad11c4 Approved by: ports-secteam (joenum)
Notes
Notes: svn path=/branches/2020Q2/; revision=540778
Diffstat (limited to 'mail/mutt/files/patch-date-conditional')
-rw-r--r--mail/mutt/files/patch-date-conditional12
1 files changed, 6 insertions, 6 deletions
diff --git a/mail/mutt/files/patch-date-conditional b/mail/mutt/files/patch-date-conditional
index d2add078f656..8bbad9b84ef1 100644
--- a/mail/mutt/files/patch-date-conditional
+++ b/mail/mutt/files/patch-date-conditional
@@ -1,10 +1,10 @@
---- PATCHES.orig 2019-12-06 03:41:54 UTC
+--- PATCHES.orig 2020-05-05 02:09:34 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.0.ats.date_conditional.1
---- hdrline.c.orig 2019-12-06 03:41:54 UTC
+--- hdrline.c.orig 2020-05-05 02:09:33 UTC
+++ hdrline.c
-@@ -427,6 +427,53 @@ hdr_format_str (char *dest,
+@@ -428,6 +428,53 @@ hdr_format_str (char *dest,
const char *cp;
struct tm *tm;
time_t T;
@@ -58,9 +58,9 @@
p = dest;
---- muttlib.c.orig 2019-10-17 08:01:01 UTC
+--- muttlib.c.orig 2020-05-02 21:08:56 UTC
+++ muttlib.c
-@@ -1563,7 +1563,16 @@ void mutt_FormatString (char *dest, /* output buffer
+@@ -1667,7 +1667,16 @@ void mutt_FormatString (char *dest, /* output buffer
if (*src == '?')
{
flags |= MUTT_FORMAT_OPTIONAL;
@@ -78,7 +78,7 @@
}
else
{
-@@ -1579,12 +1588,12 @@ void mutt_FormatString (char *dest, /* output buffer
+@@ -1683,12 +1692,12 @@ void mutt_FormatString (char *dest, /* output buffer
count++;
}
*cp = 0;