Attachment #204658 for bug #238179

View | Details | Raw Unified | Return to bug 238179
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	mutt
DISTVERSION=	1.12.0
#PORTREVISION=	0
CATEGORIES+=	mail ipv6
MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \

		FORCEBASE64 GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \
		LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \
		NLS NNTP QUOTE_PATCH REVERSE_REPLY_PATCH SMART_DATE \
		SMTP URLVIEW XML

OPTIONS_SINGLE=	GSSAPI HCACHE SCREEN
OPTIONS_RADIO=	SPELL

REVERSE_REPLY_PATCH_DESC=	Reverse_reply
SLANG_DESC=	SLANG support
SMART_DATE_DESC=	Dynamic date formatting with "%@"
SMIME_OUTLOOK_COMPAT_DESC=	SMIME outlook compatibility
SMTP_DESC=	SMTP relay support
HCACHE_DESC=	Header Cache support
HCACHE_BDB_DESC=	Use Berkeley DB (BDB)

OPTIONS_DEFAULT=	GPGME HTML HCACHE_BDB ICONV IDN \
		IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \
		NLS NCURSES QUOTE_PATCH REVERSE_REPLY_PATCH SMART_DATE \
		SASL SMTP URLVIEW XML GSSAPI_NONE

ASPELL_BUILD_DEPENDS=	aspell:textproc/aspell
ASPELL_RUN_DEPENDS=	aspell:textproc/aspell

SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
SASL_CONFIGURE_ON=	--with-sasl=${LOCALBASE}

SMIME_OUTLOOK_COMPAT_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-smime-outlook
SMART_DATE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-smartdate

FLOCK_CONFIGURE_ENABLE=	flock


GREETING_PATCH_PATCHFILES=	mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc

QUOTE_PATCH_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv
QUOTE_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-${VVV_PATCH_VERSION}.vvv.quote

NNTP_BROKEN=		NNTP broken with 1.12.0
NNTP_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.nntp.xz:-p1:vvv
NNTP_EXTRA_PATCHES=	${PATCHDIR}/extra-nntp-depfiles
NNTP_CONFIGURE_ON=	--enable-nntp


# un/comment as each VERSION is created for PORTVERSION
VVV_PATCH_VERSION=	1.11.1
GREETING_PATCH_VERSION=	1.12.0

.if !defined(VVV_PATCH_VERSION)
VVV_PATCH_VERSION=	${PORTVERSION}

GREETING_PATCH_VERSION=	${PORTVERSION}
.endif

post-patch-QUOTE_PATCH-on:
post-patch-NNTP-on:
# Restore timestamps for autotools sources
	@${TOUCH} -r ${WRKSRC}/configure.ac.orig ${WRKSRC}/configure.ac

Lines 1-11 Link Here

(-)b/mail/mutt/distinfo (-7 / +5 lines)
1	TIMESTAMP = 1552485673	1	TIMESTAMP = 1558928080
2	SHA256 (mutt/mutt-1.11.4.tar.gz) = b651357ea6c8762178080493991c77ecb111d916d171d422500257ab48be2801	2	SHA256 (mutt/mutt-1.12.0.tar.gz) = ca12448784ed7b6c86d498921e18bc7b152d45494a452df56a7a0c8aaf13f98f
3	SIZE (mutt/mutt-1.11.4.tar.gz) = 4582417	3	SIZE (mutt/mutt-1.12.0.tar.gz) = 4668896
4	SHA256 (mutt/mutt-1.11.4.vc.greeting) = 57bd75016350e3ab8516f27154016e23a29176d2f1163258d31531f4aa722afc	4	SHA256 (mutt/mutt-1.12.0.vc.greeting) = 7596d930447e9834567c0cfddf9ac023ecbb99add64bee4131d87e0260eec591
5	SIZE (mutt/mutt-1.11.4.vc.greeting) = 4560	5	SIZE (mutt/mutt-1.12.0.vc.greeting) = 4559
6	SHA256 (mutt/patch-1.11.1.vvv.nntp.xz) = 2a6386a82cbf9afde162bfb1989e545fb222bf40c5f6fac169d9249d4c904c79	6	SHA256 (mutt/patch-1.11.1.vvv.nntp.xz) = 2a6386a82cbf9afde162bfb1989e545fb222bf40c5f6fac169d9249d4c904c79
7	SIZE (mutt/patch-1.11.1.vvv.nntp.xz) = 49384	7	SIZE (mutt/patch-1.11.1.vvv.nntp.xz) = 49384
8	SHA256 (mutt/patch-1.11.1.vvv.initials.xz) = af45defbda3a85f86db3f8ef5235ddb6613a36fdc35540cdc9afa38409114a07	8	SHA256 (mutt/patch-1.11.1.vvv.initials.xz) = af45defbda3a85f86db3f8ef5235ddb6613a36fdc35540cdc9afa38409114a07
9	SIZE (mutt/patch-1.11.1.vvv.initials.xz) = 712	9	SIZE (mutt/patch-1.11.1.vvv.initials.xz) = 712
10	SHA256 (mutt/patch-1.11.1.vvv.quote.xz) = 36896cbdebbe22f1ffea00e79a8735847246063f6498935d4dde3d5492b71c6c
11	SIZE (mutt/patch-1.11.1.vvv.quote.xz) = 1316

Lines 1-6 Link Here

(-)b/mail/mutt/files/extra-patch-doc-ref (-3 / +3 lines)
1	--- doc/mutt.man.orig 2009-02-06 13:52:38.000000000 +0100	1	--- doc/mutt.man.orig 2019-04-22 19:49:50 UTC
2	+++ doc/mutt.man 2009-02-06 13:55:05.000000000 +0100	2	+++ doc/mutt.man
3	@@ -67,7 +67,8 @@	3	@@ -67,7 +67,8 @@ mutt \- The Mutt Mail User Agent
4	.PP	4	.PP
5	Mutt is a small but very powerful text based program for reading and sending electronic	5	Mutt is a small but very powerful text based program for reading and sending electronic
6	mail under unix operating systems, including support for color terminals, MIME,	6	mail under unix operating systems, including support for color terminals, MIME,




--- PATCHES.orig	2019-05-26 19:28:51 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.4.cd.ifdef.1
--- init.c.orig	2019-04-28 20:41:58 UTC
+++ init.c
@@ -651,6 +651,52 @@ static mbchar_table *parse_mbchar_table (const char *s
   return t;
 }
 

 static int parse_unignore (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
 {
   do
--- init.h.orig	2019-05-09 20:47:17 UTC
+++ init.h
@@ -4309,6 +4309,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 *);

 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 *);
@@ -4373,6 +4374,7 @@ const struct command_t Commands[] = {
   { "hdr_order",	parse_list,		UL &HeaderOrderList },
 #ifdef HAVE_ICONV
   { "iconv-hook",	mutt_parse_hook,	MUTT_ICONVHOOK },




--- PATCHES.orig	2019-05-26 19:28:55 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.7.ust.maildir-mtime.2
--- browser.c.orig	2019-05-26 19:28:52 UTC
+++ browser.c
@@ -32,6 +32,7 @@
 #ifdef USE_IMAP

 
 #include <stdlib.h>
 #include <dirent.h>
@@ -460,6 +461,21 @@ static void init_state (struct browser_state *state, M
     menu->data = state->entry;
 }
 

+  if(!buf || buf->magic != MUTT_MAILDIR)
+    return;
+
+  snprintf (buffer, sizeof (buffer), "%s/tmp", mutt_b2s(buf->pathbuf));
+  if (lstat (buffer, &s) != 0)
+    return;
+

+}
+
 static int examine_directory (MUTTMENU *menu, struct browser_state *state,
 			      const char *d, const char *prefix)
 {
@@ -526,6 +542,7 @@ static int examine_directory (MUTTMENU *menu, struct b
     tmp = Incoming;
     while (tmp && mutt_strcmp (mutt_b2s (buffer), mutt_b2s (tmp->pathbuf)))
       tmp = tmp->next;
+    check_maildir_times (tmp, &s);
     if (tmp && Context &&
         !mutt_strcmp (tmp->realpath, Context->realpath))
     {
@@ -604,6 +621,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b
 	s.st_mtime = st2.st_mtime;
     }
 
+    check_maildir_times (tmp, &s);
     add_folder (menu, state, mutt_b2s (mailbox), &s, tmp);
   }
   while ((tmp = tmp->next));

Lines 24-30 Link Here

(-)b/mail/mutt/files/extra-patch-maildir-mtime-nntp (-1 / +1 lines)
24	+ if(!buf \|\| buf->magic != MUTT_MAILDIR)	24	+ if(!buf \|\| buf->magic != MUTT_MAILDIR)
25	+ return;	25	+ return;
26	+	26	+
27	+ snprintf (buffer, sizeof (buffer), "%s/tmp", buf->path);	27	+ snprintf (buffer, sizeof (buffer), "%s/tmp", mutt_b2s(buf->pathbuf));
28	+ if (lstat (buffer, &s) != 0)	28	+ if (lstat (buffer, &s) != 0)
29	+ return;	29	+ return;
30	+	30	+




--- PATCHES.orig	2019-05-26 19:28:51 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.6.cb.reverse_reply.2
--- init.h.orig	2019-05-26 19:28:51 UTC
+++ init.h
@@ -2945,6 +2945,13 @@ struct option_t MuttVars[] = {
   ** possibly including eventual real names.  When it is \fIunset\fP, mutt will
   ** override any such real names with the setting of the $$realname variable.
   */

   { "rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0 },
   /*
   ** .pp
--- mutt.h.orig	2019-04-28 20:41:58 UTC
+++ mutt.h
@@ -490,6 +490,7 @@ enum
   OPTREVALIAS,
   OPTREVNAME,
   OPTREVREAL,

   OPTRFC2047PARAMS,
   OPTSAVEADDRESS,
   OPTSAVEEMPTY,
--- protos.h.orig	2019-04-28 20:41:58 UTC
+++ protos.h
@@ -85,6 +85,7 @@ ADDRESS *mutt_get_address (ENVELOPE *, char **);
 ADDRESS *mutt_lookup_alias (const char *s);
 ADDRESS *mutt_remove_duplicates (ADDRESS *);
 ADDRESS *mutt_remove_xrefs (ADDRESS *, ADDRESS *);

 ADDRESS *mutt_expand_aliases (ADDRESS *);
 ADDRESS *mutt_parse_adrlist (ADDRESS *, const char *);
 
--- send.c.orig	2019-05-10 02:20:15 UTC
+++ send.c
@@ -716,6 +716,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);

+	env->cc = mutt_reverse_address (env->cc);
+  }
   env->cc = mutt_remove_xrefs (env->to, env->cc);
 
   if (env->cc && !env->to)
--- sendlib.c.orig	2019-05-09 00:19:59 UTC
+++ sendlib.c
@@ -2764,6 +2764,35 @@ static void set_noconv_flags (BODY *b, short flag)
   }
 }
 




--- hdrline.c.orig	2019-05-26 19:28:51 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)
  * %Z = status flags	*/
 

 		size_t destlen,
@@ -422,7 +505,13 @@ hdr_format_str (char *dest,
 
       if (!do_locales)
         setlocale (LC_TIME, "C");
-      strftime (buf2, sizeof (buf2), dest, tm);
+		/* Identify the non-strftime smartdate pattern (%@) */
+		if( strncmp( dest, "%@", 2 ) == 0 ) {
+			smartdate( buf2, sizeof( buf2 ), tm );

+		else {
+			strftime (buf2, sizeof (buf2), dest, tm);
+		}
       if (!do_locales)
         setlocale (LC_TIME, "");
 
--- mutt.h.orig	2019-05-26 19:28:51 UTC
+++ mutt.h
@@ -164,6 +164,16 @@ typedef enum
   MUTT_WRITE_HEADER_MIME
 } mutt_write_header_mode;
 
+/* flags for SmartDate */
+typedef enum {

Removed Link Here

(-)a/mail/mutt/files/extra-patch-smime-outlook (-11 lines)
1	--- crypt.c.orig 2018-05-19 20:33:53 UTC
2	+++ crypt.c
3	@@ -501,7 +501,7 @@
4	{
5	len++;
6	if (!ascii_strcasecmp ((t+len), "p7m"))
7	-#if 0
8	+#if 1
9	return SMIMEENCRYPT;
10	#else
11	/* Not sure if this is the correct thing to do, but




--- browser.c.orig	2019-04-28 20:41:58 UTC
+++ browser.c
@@ -86,6 +86,12 @@ static int browser_compare_subject (const void *a, con
   struct folder_file *pa = (struct folder_file *) a;
   struct folder_file *pb = (struct folder_file *) b;
 

   int r = mutt_strcoll (pa->name, pb->name);
 
   return ((BrowserSort & SORT_REVERSE) ? -r : r);
@@ -96,6 +102,12 @@ static int browser_compare_date (const void *a, const 
   struct folder_file *pa = (struct folder_file *) a;
   struct folder_file *pb = (struct folder_file *) b;
 

   int r = pa->mtime - pb->mtime;
 
   return ((BrowserSort & SORT_REVERSE) ? -r : r);
@@ -105,6 +117,12 @@ static int browser_compare_size (const void *a, const 
 {
   struct folder_file *pa = (struct folder_file *) a;
   struct folder_file *pb = (struct folder_file *) b;
+
+  /* Always keep '..' in first menu position */
+  if (!strncmp(pa->name, "..", 2))
+	  return(-1);
+  if (!strncmp(pb->name, "..", 2))
+	  return(1);
 
   int r = pa->size - pb->size;
 
   return ((BrowserSort & SORT_REVERSE) ? -r : r);

Lines 1-11 Link Here

(-)b/mail/mutt/files/patch-contrib_Makefile.in (-4 / +4 lines)
1	--- contrib/Makefile.in.orig 2018-11-25 17:43:43 UTC	1	--- contrib/Makefile.in.orig 2019-05-25 16:13:42 UTC
2	+++ contrib/Makefile.in	2	+++ contrib/Makefile.in
3	@@ -272,7 +272,7 @@ top_build_prefix = @top_build_prefix@	3	@@ -278,7 +278,7 @@ top_build_prefix = @top_build_prefix@
4	top_builddir = @top_builddir@	4	top_builddir = @top_builddir@
5	top_srcdir = @top_srcdir@	5	top_srcdir = @top_srcdir@
6	subdir = contrib	6	subdir = contrib
7	-SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \	7	-SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
8	+SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp6.rc Tin.rc \	8	+SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp6.rc Tin.rc \
9	sample.mailcap sample.muttrc sample.muttrc-sidebar sample.muttrc-tlr \	9	sample.mailcap sample.muttrc sample.muttrc-sidebar sample.muttrc-tlr \
10	sample.muttrc-compress sample.vimrc-sidebar colors.default colors.linux smime.rc \	10	sample.muttrc-compress sample.muttrc-starter \
11	ca-bundle.crt smime_keys_test.pl mutt_xtitle	11	sample.vimrc-sidebar colors.default colors.linux smime.rc \




--- PATCHES.orig	2019-05-26 19:28:53 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.0.ats.date_conditional.1
--- hdrline.c.orig	2019-05-26 19:28:52 UTC
+++ hdrline.c
@@ -428,6 +428,53 @@ hdr_format_str (char *dest,
       const char *cp;
       struct tm *tm;
       time_t T;
+	int i = 0, invert = 0;
+
+	if (optional && (op == '[' || op == '(')) {

+	  break;
+	}
 
       p = dest;
 
--- muttlib.c.orig	2019-04-28 20:41:58 UTC
+++ muttlib.c
@@ -1487,7 +1487,16 @@ void mutt_FormatString (char *dest,		/* output buffer 
       if (*src == '?')
       {
 	flags |= MUTT_FORMAT_OPTIONAL;

       }
       else
       {
@@ -1503,12 +1512,12 @@ void mutt_FormatString (char *dest,		/* output buffer 
 	  count++;
 	}
 	*cp = 0;

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-dgc-deepif (-3 / +3 lines)
1	--- muttlib.c.orig 2017-06-03 02:20:37 UTC	1	--- muttlib.c.orig 2019-05-26 19:28:53 UTC
2	+++ muttlib.c	2	+++ muttlib.c
3	@@ -1425,6 +1425,12 @@ void mutt_FormatString (char dest, /	3	@@ -1530,6 +1530,12 @@ void mutt_FormatString (char dest, / output buffer
4	count = 0;	4	count = 0;
5	while (count < sizeof (ifstring) && src && src != '?' && *src != '&')	5	while (count < sizeof (ifstring) && src && src != '?' && *src != '&')
6	{	6	{
Lines 13-19 Link Here
13	cp++ = src++;	13	cp++ = src++;
14	count++;	14	count++;
15	}	15	}
16	@@ -1437,7 +1437,13 @@ void mutt_FormatString (char dest, /	16	@@ -1542,7 +1548,13 @@ void mutt_FormatString (char dest, / output buffer
17	count = 0;	17	count = 0;
18	while (count < sizeof (elsestring) && src && src != '?')	18	while (count < sizeof (elsestring) && src && src != '?')
19	{	19	{

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-doc_Makefile.in (-3 / +3 lines)
1	--- doc/Makefile.in.orig 2018-12-01 04:54:52 UTC	1	--- doc/Makefile.in.orig 2019-05-25 16:13:43 UTC
2	+++ doc/Makefile.in	2	+++ doc/Makefile.in
3	@@ -678,14 +678,7 @@ install-data-local: makedoc-all instdoc	3	@@ -684,14 +684,7 @@ install-data-local: makedoc-all instdoc
4	-for f in $(HTML_DOCFILES) ; do \	4	-for f in $(HTML_DOCFILES) ; do \
5	$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \	5	$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
6	done	6	done
Lines 16-22 Link Here
16	-if [ -f mutt.info ] ; then \	16	-if [ -f mutt.info ] ; then \
17	$(MKDIR_P) $(DESTDIR)$(infodir) ; \	17	$(MKDIR_P) $(DESTDIR)$(infodir) ; \
18	$(INSTALL) -m 644 mutt.info $(DESTDIR)$(infodir) ; \	18	$(INSTALL) -m 644 mutt.info $(DESTDIR)$(infodir) ; \
19	@@ -721,9 +714,7 @@ uninstall-local:	19	@@ -727,9 +720,7 @@ uninstall-local:
20		20
21	check:	21	check:
22	manual.txt: manual.html	22	manual.txt: manual.html

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-doc_Muttrc (-2 / +2 lines)
1	--- doc/Muttrc.orig 2018-05-19 20:52:48 UTC	1	--- doc/Muttrc.orig 2019-05-25 16:14:02 UTC
2	+++ doc/Muttrc	2	+++ doc/Muttrc
3	@@ -709,6 +709,7 @@	3	@@ -723,6 +723,7 @@ attachments -I message/external-body
4	# will be saved for later references. Also see $record,	4	# will be saved for later references. Also see $record,
5	# $save_name, $force_name and ``fcc-hook''.	5	# $save_name, $force_name and ``fcc-hook''.
6	#	6	#

Lines 1-4 Link Here

(-)b/mail/mutt/files/patch-doc_manual.xml.head (-1 / +1 lines)
1	--- doc/manual.xml.head.orig 2016-10-08 19:35:50 UTC	1	--- doc/manual.xml.head.orig 2019-05-14 16:23:48 UTC
2	+++ doc/manual.xml.head	2	+++ doc/manual.xml.head
3	@@ -1,6 +1,6 @@	3	@@ -1,6 +1,6 @@
4	<?xml version="1.0" standalone="no"?>	4	<?xml version="1.0" standalone="no"?>




--- muttlib.c.orig	2019-05-26 19:28:53 UTC
+++ muttlib.c
@@ -856,16 +856,15 @@ void _mutt_buffer_mktemp (BUFFER *buf, const char *pre
 void _mutt_mktemp (char *s, size_t slen, const char *prefix, const char *suffix,
                    const char *src, int line)
 {
-  size_t n = snprintf (s, slen, "%s/%s-%s-%d-%d-%ld%ld%s%s",
-                       NONULL (Tempdir), NONULL (prefix), NONULL (Hostname),
-                       (int) getuid (), (int) getpid (), random (), random (),
-                       suffix ? "." : "", NONULL (suffix));
+  size_t n = snprintf (s, slen, "%s/mutt-%s-XXXXXXXX", NONULL (Tempdir), NONULL (Hostname));
   if (n >= slen)
     dprint (1, (debugfile, "%s:%d: ERROR: insufficient buffer space to hold temporary filename! slen=%zu but need %zu\n",
                 src, line, slen, n));
-  dprint (3, (debugfile, "%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s));
-  if (unlink (s) && errno != ENOENT)
-    dprint (1, (debugfile, "%s:%d: ERROR: unlink(\"%s\"): %s (errno %d)\n", src, line, s, strerror (errno), errno));

+  }
 }
 
 /* these characters must be escaped in regular expressions */




--- commands.c.orig	2019-04-28 20:41:58 UTC
+++ commands.c
@@ -266,7 +266,7 @@ int mutt_display_message (HEADER *cur)
     {
       if (cur->security & GOODSIGN)
       {

 	  mutt_message ( _("S/MIME signature successfully verified."));
 	else
 	  mutt_error ( _("S/MIME certificate owner does not match sender."));
--- init.h.orig	2019-05-26 19:28:51 UTC
+++ init.h
@@ -3357,6 +3357,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)
   */

   { "smime_self_encrypt_as",	DT_SYN,  R_NONE, UL "smime_default_key", 0 },
   { "smime_default_key",		DT_STR,	 R_NONE, UL &SmimeDefaultKey, 0 },
   /*
--- mutt.h.orig	2019-05-26 19:28:52 UTC
+++ mutt.h
@@ -566,6 +566,7 @@ enum
   OPTSMIMEISDEFAULT,
   OPTSMIMESELFENCRYPT,
   OPTASKCERTLABEL,




--- mutt.h.orig	2019-05-26 19:28:54 UTC
+++ mutt.h
@@ -242,6 +242,7 @@ enum
   MUTT_EXPIRED,
   MUTT_SUPERSEDED,
   MUTT_TRASH,

 
   /* actions for mutt_pattern_comp/mutt_pattern_exec */
   MUTT_AND,
--- pattern.c.orig	2019-05-10 01:46:06 UTC
+++ pattern.c
@@ -57,6 +57,7 @@ static const struct pattern_flags
 }

   { 'A', MUTT_ALL,			0,		NULL },
   { 'b', MUTT_BODY,		MUTT_FULL_MSG,	eat_regexp },
   { 'B', MUTT_WHOLE_MSG,		MUTT_FULL_MSG,	eat_regexp },
@@ -1338,6 +1339,16 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec
       else
         result = mutt_is_list_cc (pat->alladdr, h->env->to, h->env->cc);
       return (pat->not ^ result);

Lines 75-80 man/man5/muttrc.5.gz Link Here

(-)b/mail/mutt/pkg-plist (-1 / +1 lines)
75	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc	75	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc
76	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-compress	76	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-compress
77	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-sidebar	77	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-sidebar
		78	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-starter
78	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-tlr	79	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-tlr
79	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.vimrc-sidebar	80	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.vimrc-sidebar
80	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smime.rc	81	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smime.rc
81	-

Return to bug 238179

Lines 2-8 Link Here

(-)b/mail/mutt/Makefile (-8 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mutt	4	PORTNAME= mutt
5	DISTVERSION= 1.11.4	5	DISTVERSION= 1.12.0
6	#PORTREVISION= 0	6	#PORTREVISION= 0
7	CATEGORIES+= mail ipv6	7	CATEGORIES+= mail ipv6
8	MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \	8	MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \
Lines 51-57 OPTIONS_DEFINE= SASL DEBUG DOCS EXAMPLES FLOCK \ Link Here
51	FORCEBASE64 GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \	51	FORCEBASE64 GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \
52	LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \	52	LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \
53	NLS NNTP QUOTE_PATCH REVERSE_REPLY_PATCH SMART_DATE \	53	NLS NNTP QUOTE_PATCH REVERSE_REPLY_PATCH SMART_DATE \
54	SMIME_OUTLOOK_COMPAT SMTP URLVIEW XML	54	SMTP URLVIEW XML
55		55
56	OPTIONS_SINGLE= GSSAPI HCACHE SCREEN	56	OPTIONS_SINGLE= GSSAPI HCACHE SCREEN
57	OPTIONS_RADIO= SPELL	57	OPTIONS_RADIO= SPELL
Lines 78-84 QUOTE_PATCH_DESC= Extended quoting Link Here
78	REVERSE_REPLY_PATCH_DESC= Reverse_reply	78	REVERSE_REPLY_PATCH_DESC= Reverse_reply
79	SLANG_DESC= SLANG support	79	SLANG_DESC= SLANG support
80	SMART_DATE_DESC= Dynamic date formatting with "%@"	80	SMART_DATE_DESC= Dynamic date formatting with "%@"
81	SMIME_OUTLOOK_COMPAT_DESC= SMIME outlook compatibility
82	SMTP_DESC= SMTP relay support	81	SMTP_DESC= SMTP relay support
83	HCACHE_DESC= Header Cache support	82	HCACHE_DESC= Header Cache support
84	HCACHE_BDB_DESC= Use Berkeley DB (BDB)	83	HCACHE_BDB_DESC= Use Berkeley DB (BDB)
Lines 91-97 XML_DESC= Use XML tools for rebuilding documentation Link Here
91	OPTIONS_DEFAULT= GPGME HTML HCACHE_BDB ICONV IDN \	90	OPTIONS_DEFAULT= GPGME HTML HCACHE_BDB ICONV IDN \
92	IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \	91	IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \
93	NLS NCURSES QUOTE_PATCH REVERSE_REPLY_PATCH SMART_DATE \	92	NLS NCURSES QUOTE_PATCH REVERSE_REPLY_PATCH SMART_DATE \
94	SMIME_OUTLOOK_COMPAT SASL SMTP URLVIEW XML GSSAPI_NONE	93	SASL SMTP URLVIEW XML GSSAPI_NONE
95		94
96	ASPELL_BUILD_DEPENDS= aspell:textproc/aspell	95	ASPELL_BUILD_DEPENDS= aspell:textproc/aspell
97	ASPELL_RUN_DEPENDS= aspell:textproc/aspell	96	ASPELL_RUN_DEPENDS= aspell:textproc/aspell
Lines 147-153 REVERSE_REPLY_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-reverse_reply Link Here
147	SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2	146	SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
148	SASL_CONFIGURE_ON= --with-sasl=${LOCALBASE}	147	SASL_CONFIGURE_ON= --with-sasl=${LOCALBASE}
149		148
150	SMIME_OUTLOOK_COMPAT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-smime-outlook
151	SMART_DATE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-smartdate	149	SMART_DATE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-smartdate
152		150
153	FLOCK_CONFIGURE_ENABLE= flock	151	FLOCK_CONFIGURE_ENABLE= flock
Lines 170-178 SMTP_CONFIGURE_ENABLE= smtp Link Here
170		168
171	GREETING_PATCH_PATCHFILES= mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc	169	GREETING_PATCH_PATCHFILES= mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc
172		170
173	QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv \	171	QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv
174	patch-${VVV_PATCH_VERSION}.vvv.quote.xz:vvv	172	QUOTE_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-${VVV_PATCH_VERSION}.vvv.quote
175		173
		174	NNTP_BROKEN= NNTP broken with 1.12.0
176	NNTP_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.nntp.xz:-p1:vvv	175	NNTP_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.nntp.xz:-p1:vvv
177	NNTP_EXTRA_PATCHES= ${PATCHDIR}/extra-nntp-depfiles	176	NNTP_EXTRA_PATCHES= ${PATCHDIR}/extra-nntp-depfiles
178	NNTP_CONFIGURE_ON= --enable-nntp	177	NNTP_CONFIGURE_ON= --enable-nntp
Lines 186-192 DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref Link Here
186		185
187	# un/comment as each VERSION is created for PORTVERSION	186	# un/comment as each VERSION is created for PORTVERSION
188	VVV_PATCH_VERSION= 1.11.1	187	VVV_PATCH_VERSION= 1.11.1
189	GREETING_PATCH_VERSION= 1.11.4	188	GREETING_PATCH_VERSION= 1.12.0
190		189
191	.if !defined(VVV_PATCH_VERSION)	190	.if !defined(VVV_PATCH_VERSION)
192	VVV_PATCH_VERSION= ${PORTVERSION}	191	VVV_PATCH_VERSION= ${PORTVERSION}
Lines 195-200 VVV_PATCH_VERSION= ${PORTVERSION} Link Here
195	GREETING_PATCH_VERSION= ${PORTVERSION}	194	GREETING_PATCH_VERSION= ${PORTVERSION}
196	.endif	195	.endif
197		196
		197	post-patch-QUOTE_PATCH-on:
198	post-patch-NNTP-on:	198	post-patch-NNTP-on:
199	# Restore timestamps for autotools sources	199	# Restore timestamps for autotools sources
200	@${TOUCH} -r ${WRKSRC}/configure.ac.orig ${WRKSRC}/configure.ac	200	@${TOUCH} -r ${WRKSRC}/configure.ac.orig ${WRKSRC}/configure.ac

Lines 1-10 Link Here

(-)b/mail/mutt/files/extra-patch-ifdef (-6 / +6 lines)
1	--- PATCHES.orig 2018-11-29 22:49:51 UTC	1	--- PATCHES.orig 2019-05-26 19:28:51 UTC
2	+++ PATCHES	2	+++ PATCHES
3	@@ -0,0 +1 @@	3	@@ -0,0 +1 @@
4	+patch-1.5.4.cd.ifdef.1	4	+patch-1.5.4.cd.ifdef.1
5	--- init.c.orig 2018-11-24 19:06:11 UTC	5	--- init.c.orig 2019-04-28 20:41:58 UTC
6	+++ init.c	6	+++ init.c
7	@@ -650,6 +650,52 @@ static mbchar_table *parse_mbchar_table	7	@@ -651,6 +651,52 @@ static mbchar_table parse_mbchar_table (const char s
8	return t;	8	return t;
9	}	9	}
10		10
Lines 57-65 Link Here
57	static int parse_unignore (BUFFER buf, BUFFER s, unsigned long data, BUFFER *err)	57	static int parse_unignore (BUFFER buf, BUFFER s, unsigned long data, BUFFER *err)
58	{	58	{
59	do	59	do
60	--- init.h.orig 2018-11-29 22:49:51 UTC	60	--- init.h.orig 2019-05-09 20:47:17 UTC
61	+++ init.h	61	+++ init.h
62	@@ -4195,6 +4195,7 @@ static int parse_lists (BUFFER *, BUFFER	62	@@ -4309,6 +4309,7 @@ static int parse_lists (BUFFER , BUFFER , unsigned l
63	static int parse_unlists (BUFFER , BUFFER , unsigned long, BUFFER *);	63	static int parse_unlists (BUFFER , BUFFER , unsigned long, BUFFER *);
64	static int parse_alias (BUFFER , BUFFER , unsigned long, BUFFER *);	64	static int parse_alias (BUFFER , BUFFER , unsigned long, BUFFER *);
65	static int parse_unalias (BUFFER , BUFFER , unsigned long, BUFFER *);	65	static int parse_unalias (BUFFER , BUFFER , unsigned long, BUFFER *);
Lines 67-73 Link Here
67	static int parse_echo (BUFFER , BUFFER , unsigned long, BUFFER *);	67	static int parse_echo (BUFFER , BUFFER , unsigned long, BUFFER *);
68	static int parse_ignore (BUFFER , BUFFER , unsigned long, BUFFER *);	68	static int parse_ignore (BUFFER , BUFFER , unsigned long, BUFFER *);
69	static int parse_unignore (BUFFER , BUFFER , unsigned long, BUFFER *);	69	static int parse_unignore (BUFFER , BUFFER , unsigned long, BUFFER *);
70	@@ -4259,6 +4260,7 @@ const struct command_t Commands[] = {	70	@@ -4373,6 +4374,7 @@ const struct command_t Commands[] = {
71	{ "hdr_order", parse_list, UL &HeaderOrderList },	71	{ "hdr_order", parse_list, UL &HeaderOrderList },
72	#ifdef HAVE_ICONV	72	#ifdef HAVE_ICONV
73	{ "iconv-hook", mutt_parse_hook, MUTT_ICONVHOOK },	73	{ "iconv-hook", mutt_parse_hook, MUTT_ICONVHOOK },

Lines 1-8 Link Here

(-)b/mail/mutt/files/extra-patch-maildir-mtime (-9 / +9 lines)
1	--- PATCHES.orig 2018-05-19 21:17:16 UTC	1	--- PATCHES.orig 2019-05-26 19:28:55 UTC
2	+++ PATCHES	2	+++ PATCHES
3	@@ -0,0 +1 @@	3	@@ -0,0 +1 @@
4	+patch-1.5.7.ust.maildir-mtime.2	4	+patch-1.5.7.ust.maildir-mtime.2
5	--- browser.c.orig 2018-05-19 20:33:53 UTC	5	--- browser.c.orig 2019-05-26 19:28:52 UTC
6	+++ browser.c	6	+++ browser.c
7	@@ -32,6 +32,7 @@	7	@@ -32,6 +32,7 @@
8	#ifdef USE_IMAP	8	#ifdef USE_IMAP
Lines 12-18 Link Here
12		12
13	#include <stdlib.h>	13	#include <stdlib.h>
14	#include <dirent.h>	14	#include <dirent.h>
15	@@ -439,6 +439,21 @@	15	@@ -460,6 +461,21 @@ static void init_state (struct browser_state *state, M
16	menu->data = state->entry;	16	menu->data = state->entry;
17	}	17	}
18		18
Lines 24-30 Link Here
24	+ if(!buf \|\| buf->magic != MUTT_MAILDIR)	24	+ if(!buf \|\| buf->magic != MUTT_MAILDIR)
25	+ return;	25	+ return;
26	+	26	+
27	+ snprintf (buffer, sizeof (buffer), "%s/tmp", buf->path);	27	+ snprintf (buffer, sizeof (buffer), "%s/tmp", mutt_b2s(buf->pathbuf));
28	+ if (lstat (buffer, &s) != 0)	28	+ if (lstat (buffer, &s) != 0)
29	+ return;	29	+ return;
30	+	30	+
Lines 32-52 Link Here
32	+}	32	+}
33	+	33	+
34	static int examine_directory (MUTTMENU menu, struct browser_state state,	34	static int examine_directory (MUTTMENU menu, struct browser_state state,
35	char d, const char prefix)	35	const char d, const char prefix)
36	{	36	{
37	@@ -504,6 +504,7 @@	37	@@ -526,6 +542,7 @@ static int examine_directory (MUTTMENU *menu, struct b
38	tmp = Incoming;	38	tmp = Incoming;
39	while (tmp && mutt_strcmp (buffer, tmp->path))	39	while (tmp && mutt_strcmp (mutt_b2s (buffer), mutt_b2s (tmp->pathbuf)))
40	tmp = tmp->next;	40	tmp = tmp->next;
41	+ check_maildir_times (tmp, &s);	41	+ check_maildir_times (tmp, &s);
42	if (tmp && Context &&	42	if (tmp && Context &&
43	!mutt_strcmp (tmp->realpath, Context->realpath))	43	!mutt_strcmp (tmp->realpath, Context->realpath))
44	{	44	{
45	@@ -578,6 +578,7 @@	45	@@ -604,6 +621,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b
46	s.st_mtime = st2.st_mtime;	46	s.st_mtime = st2.st_mtime;
47	}	47	}
48		48
49	+ check_maildir_times (tmp, &s);	49	+ check_maildir_times (tmp, &s);
50	add_folder (menu, state, buffer, &s, tmp);	50	add_folder (menu, state, mutt_b2s (mailbox), &s, tmp);
51	}	51	}
52	while ((tmp = tmp->next));	52	while ((tmp = tmp->next));

Lines 1-10 Link Here

(-)b/mail/mutt/files/extra-patch-reverse_reply (-12 / +12 lines)
1	--- PATCHES.orig 2018-11-29 22:55:14 UTC	1	--- PATCHES.orig 2019-05-26 19:28:51 UTC
2	+++ PATCHES	2	+++ PATCHES
3	@@ -0,0 +1 @@	3	@@ -0,0 +1 @@
4	+patch-1.5.6.cb.reverse_reply.2	4	+patch-1.5.6.cb.reverse_reply.2
5	--- init.h.orig 2018-11-29 22:55:14 UTC	5	--- init.h.orig 2019-05-26 19:28:51 UTC
6	+++ init.h	6	+++ init.h
7	@@ -2820,6 +2820,13 @@ struct option_t MuttVars[] = {	7	@@ -2945,6 +2945,13 @@ struct option_t MuttVars[] = {
8	** possibly including eventual real names. When it is \fIunset\fP, mutt will	8	** possibly including eventual real names. When it is \fIunset\fP, mutt will
9	** override any such real names with the setting of the $$realname variable.	9	** override any such real names with the setting of the $$realname variable.
10	*/	10	*/
Lines 18-26 Link Here
18	{ "rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0 },	18	{ "rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0 },
19	/*	19	/*
20	** .pp	20	** .pp
21	--- mutt.h.orig 2018-11-29 22:55:14 UTC	21	--- mutt.h.orig 2019-04-28 20:41:58 UTC
22	+++ mutt.h	22	+++ mutt.h
23	@@ -478,6 +478,7 @@ enum	23	@@ -490,6 +490,7 @@ enum
24	OPTREVALIAS,	24	OPTREVALIAS,
25	OPTREVNAME,	25	OPTREVNAME,
26	OPTREVREAL,	26	OPTREVREAL,
Lines 28-36 Link Here
28	OPTRFC2047PARAMS,	28	OPTRFC2047PARAMS,
29	OPTSAVEADDRESS,	29	OPTSAVEADDRESS,
30	OPTSAVEEMPTY,	30	OPTSAVEEMPTY,
31	--- protos.h.orig 2018-11-24 19:06:21 UTC	31	--- protos.h.orig 2019-04-28 20:41:58 UTC
32	+++ protos.h	32	+++ protos.h
33	@@ -85,6 +85,7 @@ ADDRESS mutt_get_address (ENVELOPE , c	33	@@ -85,6 +85,7 @@ ADDRESS mutt_get_address (ENVELOPE , char **);
34	ADDRESS mutt_lookup_alias (const char s);	34	ADDRESS mutt_lookup_alias (const char s);
35	ADDRESS mutt_remove_duplicates (ADDRESS );	35	ADDRESS mutt_remove_duplicates (ADDRESS );
36	ADDRESS mutt_remove_xrefs (ADDRESS , ADDRESS *);	36	ADDRESS mutt_remove_xrefs (ADDRESS , ADDRESS *);
Lines 38-46 Link Here
38	ADDRESS mutt_expand_aliases (ADDRESS );	38	ADDRESS mutt_expand_aliases (ADDRESS );
39	ADDRESS mutt_parse_adrlist (ADDRESS , const char *);	39	ADDRESS mutt_parse_adrlist (ADDRESS , const char *);
40		40
41	--- send.c.orig 2018-10-04 22:30:10 UTC	41	--- send.c.orig 2019-05-10 02:20:15 UTC
42	+++ send.c	42	+++ send.c
43	@@ -600,6 +600,10 @@ void mutt_fix_reply_recipients (ENVELOPE	43	@@ -716,6 +716,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env)
44	/* the CC field can get cluttered, especially with lists */	44	/* the CC field can get cluttered, especially with lists */
45	env->to = mutt_remove_duplicates (env->to);	45	env->to = mutt_remove_duplicates (env->to);
46	env->cc = mutt_remove_duplicates (env->cc);	46	env->cc = mutt_remove_duplicates (env->cc);
Lines 49-59 Link Here
49	+ env->cc = mutt_reverse_address (env->cc);	49	+ env->cc = mutt_reverse_address (env->cc);
50	+ }	50	+ }
51	env->cc = mutt_remove_xrefs (env->to, env->cc);	51	env->cc = mutt_remove_xrefs (env->to, env->cc);
52		52
53	if (env->cc && !env->to)	53	if (env->cc && !env->to)
54	--- sendlib.c.orig 2018-11-24 19:06:11 UTC	54	--- sendlib.c.orig 2019-05-09 00:19:59 UTC
55	+++ sendlib.c	55	+++ sendlib.c
56	@@ -2754,6 +2754,35 @@ static void set_noconv_flags (BODY *b, s	56	@@ -2764,6 +2764,35 @@ static void set_noconv_flags (BODY *b, short flag)
57	}	57	}
58	}	58	}
59		59

Lines 1-6 Link Here

(-)b/mail/mutt/files/extra-patch-smartdate (-11 / +11 lines)
1	--- hdrline.c.orig 2018-11-29 23:19:39 UTC	1	--- hdrline.c.orig 2019-05-26 19:28:51 UTC
2	+++ hdrline.c	2	+++ hdrline.c
3	@@ -249,6 +249,89 @@ static char *apply_subject_mods (ENVELOP	3	@@ -249,6 +249,89 @@ static char apply_subject_mods (ENVELOPE env)
4	* %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label)	4	* %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label)
5	* %Z = status flags */	5	* %Z = status flags */
6		6
Lines 92-100 Link Here
92	size_t destlen,	92	size_t destlen,
93	@@ -422,7 +505,13 @@ hdr_format_str (char *dest,	93	@@ -422,7 +505,13 @@ hdr_format_str (char *dest,
94		94
95	if (!do_locales)	95	if (!do_locales)
96	setlocale (LC_TIME, "C");	96	setlocale (LC_TIME, "C");
97	- strftime (buf2, sizeof (buf2), dest, tm);	97	- strftime (buf2, sizeof (buf2), dest, tm);
98	+ /* Identify the non-strftime smartdate pattern (%@) */	98	+ /* Identify the non-strftime smartdate pattern (%@) */
99	+ if( strncmp( dest, "%@", 2 ) == 0 ) {	99	+ if( strncmp( dest, "%@", 2 ) == 0 ) {
100	+ smartdate( buf2, sizeof( buf2 ), tm );	100	+ smartdate( buf2, sizeof( buf2 ), tm );
Lines 102-115 Link Here
102	+ else {	102	+ else {
103	+ strftime (buf2, sizeof (buf2), dest, tm);	103	+ strftime (buf2, sizeof (buf2), dest, tm);
104	+ }	104	+ }
105	if (!do_locales)	105	if (!do_locales)
106	setlocale (LC_TIME, "");	106	setlocale (LC_TIME, "");
107		107
108	--- mutt.h.orig 2018-11-29 23:17:47 UTC	108	--- mutt.h.orig 2019-05-26 19:28:51 UTC
109	+++ mutt.h	109	+++ mutt.h
110	@@ -156,6 +156,16 @@ typedef enum	110	@@ -164,6 +164,16 @@ typedef enum
111	MUTT_FORMAT_NOFILTER = (1<<7) /* do not allow filtering on this pass */	111	MUTT_WRITE_HEADER_MIME
112	} format_flag;	112	} mutt_write_header_mode;
113		113
114	+/* flags for SmartDate */	114	+/* flags for SmartDate */
115	+typedef enum {	115	+typedef enum {

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-Makefile.in (-4 / +4 lines)
1	--- Makefile.in.orig 2018-11-25 17:43:43 UTC	1	--- Makefile.in.orig 2019-05-25 16:13:42 UTC
2	+++ Makefile.in	2	+++ Makefile.in
3	@@ -531,7 +531,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign	3	@@ -537,7 +537,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign
4	@BUILD_DOC_TRUE@DOC_SUBDIR = doc	4	@BUILD_DOC_TRUE@DOC_SUBDIR = doc
5	@BUILD_IMAP_TRUE@IMAP_SUBDIR = imap	5	@BUILD_IMAP_TRUE@IMAP_SUBDIR = imap
6	@BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap	6	@BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap
Lines 8-15 Link Here
8	+SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) . $(DOC_SUBDIR)	8	+SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) . $(DOC_SUBDIR)
9	bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET)	9	bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET)
10	@BUILD_HCACHE_TRUE@HCVERSION = hcversion.h	10	@BUILD_HCACHE_TRUE@HCVERSION = hcversion.h
11	BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c $(HCVERSION)	11	BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c version.h $(HCVERSION)
12	@@ -1667,18 +1667,9 @@ install-exec-hook:	12	@@ -1678,18 +1678,9 @@ install-exec-hook:
13	rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \	13	rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \
14	ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \	14	ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
15	fi	15	fi

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-browser.c (-7 / +7 lines)
1	--- browser.c.orig 2016-10-08 19:35:50 UTC	1	--- browser.c.orig 2019-04-28 20:41:58 UTC
2	+++ browser.c	2	+++ browser.c
3	@@ -80,6 +80,12 @@ static int browser_compare_subject (cons	3	@@ -86,6 +86,12 @@ static int browser_compare_subject (const void *a, con
4	struct folder_file pa = (struct folder_file ) a;	4	struct folder_file pa = (struct folder_file ) a;
5	struct folder_file pb = (struct folder_file ) b;	5	struct folder_file pb = (struct folder_file ) b;
6		6
Lines 13-19 Link Here
13	int r = mutt_strcoll (pa->name, pb->name);	13	int r = mutt_strcoll (pa->name, pb->name);
14		14
15	return ((BrowserSort & SORT_REVERSE) ? -r : r);	15	return ((BrowserSort & SORT_REVERSE) ? -r : r);
16	@@ -90,6 +96,12 @@ static int browser_compare_date (const v	16	@@ -96,6 +102,12 @@ static int browser_compare_date (const void *a, const
17	struct folder_file pa = (struct folder_file ) a;	17	struct folder_file pa = (struct folder_file ) a;
18	struct folder_file pb = (struct folder_file ) b;	18	struct folder_file pb = (struct folder_file ) b;
19		19
Lines 26-41 Link Here
26	int r = pa->mtime - pb->mtime;	26	int r = pa->mtime - pb->mtime;
27		27
28	return ((BrowserSort & SORT_REVERSE) ? -r : r);	28	return ((BrowserSort & SORT_REVERSE) ? -r : r);
29	@@ -100,6 +112,12 @@ static int browser_compare_size (const v	29	@@ -105,6 +117,12 @@ static int browser_compare_size (const void *a, const
		30	{
30	struct folder_file pa = (struct folder_file ) a;	31	struct folder_file pa = (struct folder_file ) a;
31	struct folder_file pb = (struct folder_file ) b;	32	struct folder_file pb = (struct folder_file ) b;
32		33	+
33	+ /* Always keep '..' in first menu position */	34	+ /* Always keep '..' in first menu position */
34	+ if (!strncmp(pa->name, "..", 2))	35	+ if (!strncmp(pa->name, "..", 2))
35	+ return(-1);	36	+ return(-1);
36	+ if (!strncmp(pb->name, "..", 2))	37	+ if (!strncmp(pb->name, "..", 2))
37	+ return(1);	38	+ return(1);
38	+	39
39	int r = pa->size - pb->size;	40	int r = pa->size - pb->size;
40		41
41	return ((BrowserSort & SORT_REVERSE) ? -r : r);

Lines 1-13 Link Here

(-)b/mail/mutt/files/patch-date-conditional (-9 / +9 lines)
1	--- PATCHES.orig 2017-12-03 03:10:17 UTC	1	--- PATCHES.orig 2019-05-26 19:28:53 UTC
2	+++ PATCHES	2	+++ PATCHES
3	@@ -0,0 +1 @@	3	@@ -0,0 +1 @@
4	+patch-1.5.0.ats.date_conditional.1	4	+patch-1.5.0.ats.date_conditional.1
5	--- hdrline.c.orig 2018-11-24 19:06:11 UTC	5	--- hdrline.c.orig 2019-05-26 19:28:52 UTC
6	+++ hdrline.c	6	+++ hdrline.c
7	@@ -428,6 +428,53 @@ hdr_format_str (char *dest,	7	@@ -428,6 +428,53 @@ hdr_format_str (char *dest,
8	const char *cp;	8	const char *cp;
9	struct tm *tm;	9	struct tm *tm;
10	time_t T;	10	time_t T;
11	+ int i = 0, invert = 0;	11	+ int i = 0, invert = 0;
12	+	12	+
13	+ if (optional && (op == '[' \|\| op == '(')) {	13	+ if (optional && (op == '[' \|\| op == '(')) {
Lines 56-66 Link Here
56	+ break;	56	+ break;
57	+ }	57	+ }
58		58
59	p = dest;	59	p = dest;
60		60
61	--- muttlib.c.orig 2018-11-24 19:06:21 UTC	61	--- muttlib.c.orig 2019-04-28 20:41:58 UTC
62	+++ muttlib.c	62	+++ muttlib.c
63	@@ -1382,7 +1382,16 @@ void mutt_FormatString (char dest, /	63	@@ -1487,7 +1487,16 @@ void mutt_FormatString (char dest, / output buffer
64	if (*src == '?')	64	if (*src == '?')
65	{	65	{
66	flags \|= MUTT_FORMAT_OPTIONAL;	66	flags \|= MUTT_FORMAT_OPTIONAL;
Lines 78-84 Link Here
78	}	78	}
79	else	79	else
80	{	80	{
81	@@ -1398,12 +1407,12 @@ void mutt_FormatString (char dest, /	81	@@ -1503,12 +1512,12 @@ void mutt_FormatString (char dest, / output buffer
82	count++;	82	count++;
83	}	83	}
84	*cp = 0;	84	*cp = 0;

Lines 1-17 Link Here

(-)b/mail/mutt/files/patch-muttlib.c (-7 / +7 lines)
1	--- muttlib.c.orig 2018-11-24 19:06:21 UTC	1	--- muttlib.c.orig 2019-05-26 19:28:53 UTC
2	+++ muttlib.c	2	+++ muttlib.c
3	@@ -845,16 +845,15 @@ void _mutt_buffer_mktemp (BUFFER *buf, c	3	@@ -856,16 +856,15 @@ void _mutt_buffer_mktemp (BUFFER buf, const char pre
4	void _mutt_mktemp (char s, size_t slen, const char prefix, const char *suffix,	4	void _mutt_mktemp (char s, size_t slen, const char prefix, const char *suffix,
5	const char *src, int line)	5	const char *src, int line)
6	{	6	{
7	- size_t n = snprintf (s, slen, "%s/%s-%s-%d-%d-%ld%ld%s%s",	7	- size_t n = snprintf (s, slen, "%s/%s-%s-%d-%d-%ld%ld%s%s",
8	- NONULL (Tempdir), NONULL (prefix), NONULL (Hostname),	8	- NONULL (Tempdir), NONULL (prefix), NONULL (Hostname),
9	- (int) getuid (), (int) getpid (), random (), random (),	9	- (int) getuid (), (int) getpid (), random (), random (),
10	- suffix ? "." : "", NONULL (suffix));	10	- suffix ? "." : "", NONULL (suffix));
11	+ size_t n = snprintf (s, slen, "%s/mutt-%s-XXXXXXXX", NONULL (Tempdir), NONULL (Hostname));	11	+ size_t n = snprintf (s, slen, "%s/mutt-%s-XXXXXXXX", NONULL (Tempdir), NONULL (Hostname));
12	if (n >= slen)	12	if (n >= slen)
13	dprint (1, (debugfile, "%s:%d: ERROR: insufficient buffer space to hold temporary filename! slen=%zu but need %zu\n",	13	dprint (1, (debugfile, "%s:%d: ERROR: insufficient buffer space to hold temporary filename! slen=%zu but need %zu\n",
14	src, line, slen, n));	14	src, line, slen, n));
15	- dprint (3, (debugfile, "%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s));	15	- dprint (3, (debugfile, "%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s));
16	- if (unlink (s) && errno != ENOENT)	16	- if (unlink (s) && errno != ENOENT)
17	- dprint (1, (debugfile, "%s:%d: ERROR: unlink(\"%s\"): %s (errno %d)\n", src, line, s, strerror (errno), errno));	17	- dprint (1, (debugfile, "%s:%d: ERROR: unlink(\"%s\"): %s (errno %d)\n", src, line, s, strerror (errno), errno));
Lines 22-25 Link Here
22	+ }	22	+ }
23	}	23	}
24		24
25	void mutt_free_alias (ALIAS **p)	25	/* these characters must be escaped in regular expressions */

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-smime-sender (-6 / +6 lines)
1	--- commands.c.orig 2018-10-04 22:30:10 UTC	1	--- commands.c.orig 2019-04-28 20:41:58 UTC
2	+++ commands.c	2	+++ commands.c
3	@@ -186,7 +186,7 @@ int mutt_display_message (HEADER *cur)	3	@@ -266,7 +266,7 @@ int mutt_display_message (HEADER *cur)
4	{	4	{
5	if (cur->security & GOODSIGN)	5	if (cur->security & GOODSIGN)
6	{	6	{
Lines 9-17 Link Here
9	mutt_message ( _("S/MIME signature successfully verified."));	9	mutt_message ( _("S/MIME signature successfully verified."));
10	else	10	else
11	mutt_error ( _("S/MIME certificate owner does not match sender."));	11	mutt_error ( _("S/MIME certificate owner does not match sender."));
12	--- init.h.orig 2018-11-24 19:06:11 UTC	12	--- init.h.orig 2019-05-26 19:28:51 UTC
13	+++ init.h	13	+++ init.h
14	@@ -3232,6 +3232,15 @@ struct option_t MuttVars[] = {	14	@@ -3357,6 +3357,15 @@ struct option_t MuttVars[] = {
15	** to determine the key to use. It will ask you to supply a key, if it can't find one.	15	** to determine the key to use. It will ask you to supply a key, if it can't find one.
16	** (S/MIME only)	16	** (S/MIME only)
17	*/	17	*/
Lines 27-35 Link Here
27	{ "smime_self_encrypt_as", DT_SYN, R_NONE, UL "smime_default_key", 0 },	27	{ "smime_self_encrypt_as", DT_SYN, R_NONE, UL "smime_default_key", 0 },
28	{ "smime_default_key", DT_STR, R_NONE, UL &SmimeDefaultKey, 0 },	28	{ "smime_default_key", DT_STR, R_NONE, UL &SmimeDefaultKey, 0 },
29	/*	29	/*
30	--- mutt.h.orig 2018-11-24 19:06:11 UTC	30	--- mutt.h.orig 2019-05-26 19:28:52 UTC
31	+++ mutt.h	31	+++ mutt.h
32	@@ -551,6 +551,7 @@ enum	32	@@ -566,6 +566,7 @@ enum
33	OPTSMIMEISDEFAULT,	33	OPTSMIMEISDEFAULT,
34	OPTSMIMESELFENCRYPT,	34	OPTSMIMESELFENCRYPT,
35	OPTASKCERTLABEL,	35	OPTASKCERTLABEL,

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-threadcomplete (-4 / +4 lines)
1	--- mutt.h.orig 2018-11-24 19:06:11 UTC	1	--- mutt.h.orig 2019-05-26 19:28:54 UTC
2	+++ mutt.h	2	+++ mutt.h
3	@@ -234,6 +234,7 @@ enum	3	@@ -242,6 +242,7 @@ enum
4	MUTT_EXPIRED,	4	MUTT_EXPIRED,
5	MUTT_SUPERSEDED,	5	MUTT_SUPERSEDED,
6	MUTT_TRASH,	6	MUTT_TRASH,
Lines 8-14 Link Here
8		8
9	/* actions for mutt_pattern_comp/mutt_pattern_exec */	9	/* actions for mutt_pattern_comp/mutt_pattern_exec */
10	MUTT_AND,	10	MUTT_AND,
11	--- pattern.c.orig 2018-11-24 19:06:11 UTC	11	--- pattern.c.orig 2019-05-10 01:46:06 UTC
12	+++ pattern.c	12	+++ pattern.c
13	@@ -57,6 +57,7 @@ static const struct pattern_flags	13	@@ -57,6 +57,7 @@ static const struct pattern_flags
14	}	14	}
Lines 18-24 Link Here
18	{ 'A', MUTT_ALL, 0, NULL },	18	{ 'A', MUTT_ALL, 0, NULL },
19	{ 'b', MUTT_BODY, MUTT_FULL_MSG, eat_regexp },	19	{ 'b', MUTT_BODY, MUTT_FULL_MSG, eat_regexp },
20	{ 'B', MUTT_WHOLE_MSG, MUTT_FULL_MSG, eat_regexp },	20	{ 'B', MUTT_WHOLE_MSG, MUTT_FULL_MSG, eat_regexp },
21	@@ -1343,6 +1344,16 @@ mutt_pattern_exec (struct pattern_t *pat	21	@@ -1338,6 +1339,16 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec
22	else	22	else
23	result = mutt_is_list_cc (pat->alladdr, h->env->to, h->env->cc);	23	result = mutt_is_list_cc (pat->alladdr, h->env->to, h->env->cc);
24	return (pat->not ^ result);	24	return (pat->not ^ result);