Attachment #209818 for bug #242534




# $FreeBSD$

PORTNAME=	mutt
DISTVERSION=	1.13.0
CATEGORIES+=	mail
MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \


OPTIONS_SUB=	yes

OPTIONS_DEFINE=	AUTOCRYPT DEBUG DOCS EXAMPLES FLOCK FORCEBASE64 GPGME \
		GREETING_PATCH HTML ICONV IDN IFDEF_PATCH LOCALES_FIX \
		MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NLS QUOTE_PATCH NNTP \
		REVERSE_REPLY_PATCH SASL SMART_DATE SMTP URLVIEW XML
		SMTP URLVIEW XML

OPTIONS_SINGLE=	GSSAPI HCACHE SCREEN
OPTIONS_RADIO=	SPELL

OPTIONS_SINGLE_HCACHE=	HCACHE_BDB HCACHE_TOKYOCABINET HCACHE_KYOTOCABINET HCACHE_NONE
OPTIONS_SINGLE_SCREEN=	NCURSES SLANG

AUTOCRYPT_DESC=	Convenient End-to-End Encryption
DEBUG_DESC=	Debugging capabilities
FLOCK_DESC=	flock() usage
FORCEBASE64_DESC=	Option to force base64 encoding for compose
GPGME_DESC=	Gpgme interface
GREETING_PATCH_DESC=	Greeting support
HCACHE_BDB_DESC=	Use Berkeley DB (BDB)
HCACHE_DESC=	Header Cache support
HCACHE_KYOTOCABINET_DESC=	Use Kyoto Cabinet
HCACHE_NONE_DESC=	Disable Header Cache
HCACHE_TOKYOCABINET_DESC=	Use Tokyo Cabinet
HTML_DESC=	HTML documentation
IDN_DESC=	International Domain Names (implies ICONV)
IFDEF_PATCH_DESC=	ifdef feature

NLS_DESC=	Native language support (implies ICONV)
QUOTE_PATCH_DESC=	Extended quoting
REVERSE_REPLY_PATCH_DESC=	Reverse_reply
SASL_DESC=	SASL authentication
SLANG_DESC=	SLANG support
SMART_DATE_DESC=	Dynamic date formatting with "%@"
SMTP_DESC=	SMTP relay support
HCACHE_DESC=	Header Cache support
HCACHE_BDB_DESC=	Use Berkeley DB (BDB)
HCACHE_TOKYOCABINET_DESC=	Use Tokyo Cabinet
HCACHE_KYOTOCABINET_DESC=	Use Kyoto Cabinet
HCACHE_NONE_DESC=	Disable Header Cache
URLVIEW_DESC=	Use urlview for the URL selector menu
XML_DESC=	Use XML tools for rebuilding documentation

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

.ifmake makesum # for optional distfiles patchfiles
OPTIONS_OVERRIDE=	${OPTIONS_DEFINE} ${OPTIONS_DEFAULT}
.MAKEOVERRIDES+=	OPTIONS_OVERRIDE
.endif

AUTOCRYPT_CONFIGURE_ENABLE=	autocrypt
AUTOCRYPT_IMPLIES=		GPGME IDN
AUTOCRYPT_USES=			sqlite:3
AUTOCRYPT_CONFIGURE_WITH=	sqlite3=${LOCALBASE}
AUTOCRYPT_DEPENDS=		gnupg>=2.1:security/gnupg \
				gpgme>=1.8:security/gpgme
AUTOCRYPT_BUILD_DEPENDS=	${AUTOCRYPT_DEPENDS}
AUTOCRYPT_RUN_DEPENDS=		${AUTOCRYPT_DEPENDS}

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

ISPELL_RUN_DEPENDS=	ispell:textproc/aspell-ispell
URLVIEW_RUN_DEPENDS=	urlview:textproc/urlview

.ifmake makesum # for optional distfiles patchfiles
PORT_DBDIR=		/dev/null
OPTIONS_DEFAULT+=	${OPTIONS_DEFINE}
.endif

DEBUG_CONFIGURE_ON=	--enable-debug

# Handle ncurses/ncurses-port/slang


SMTP_CONFIGURE_ENABLE=	smtp

GREETING_PATCH_BROKEN=		GREETING_PATCH broken on 1.13.0
GREETING_PATCH_PATCHFILES=	mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc

QUOTE_PATCH_BROKEN=	QUOTE_PATCH broken on 1.13.0
QUOTE_PATCH_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv \
	patch-${VVV_PATCH_VERSION}.vvv.quote.xz:vvv

NNTP_BROKEN=	NNTP_PATCH broken on 1.13.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.12.1
GREETING_PATCH_VERSION=	1.13.0

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

post-patch-NNTP-on:
# Restore timestamps for autotools sources
	@${TOUCH} -r ${WRKSRC}/configure.ac.orig ${WRKSRC}/configure.ac
	@${TOUCH} -r ${WRKSRC}/Makefile.am.orig ${WRKSRC}/Makefile.am
.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
.if 	defined(${PATCH_DEBUG})
		@${ECHO} "===>  Applying ${.TARGET} extra-patch-maildir-mtime-nntp"
.endif
	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime-nntp
.endif
.if ${PORT_OPTIONS:MFORCEBASE64}
.if 	defined(PATCH_DEBUG)
		@${ECHO} "===>  Applying ${.TARGET} extra-patch-forcebase64-nntp"
.endif
	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64-nntp
.endif

post-patch-NNTP-off:
.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
.if 	defined(PATCH_DEBUG)
		@${ECHO} "===>  Applying ${.TARGET} extra-patch-maildir-mtime"
.endif
	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime
.endif
.if ${PORT_OPTIONS:MFORCEBASE64}
.if 	defined(PATCH_DEBUG)
		@${ECHO} "===>  Applying ${.TARGET} extra-patch-forcebase64"
.endif
	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64
.endif


post-install-NNTP-on:
	${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}

WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}

pre-configure::
	@${REINPLACE_CMD} -e 's,?eimdal\*),?eimdal*|\"FreeBSD heimdal\"*),' \
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}

.else
pre-build::
	@${REINPLACE_CMD} \
		-e '/^BUILD_DOC_TARGETS/s/=.*/=/' \
		${WRKSRC}/doc/Makefile
.endif


Lines 1-8 Link Here

(-)b/mail/mutt/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1569099378	1	TIMESTAMP = 1575513396
2	SHA256 (mutt/mutt-1.12.2.tar.gz) = bc42750ce8237742b9382f2148fc547a8d8601aa4a7cd28c55fe7ca045196882	2	SHA256 (mutt/mutt-1.13.0.tar.gz) = a00ddc21084f45f53653c35a8a991ca86d68c7162b7c8ec1625d63cfeaf5f5b7
3	SIZE (mutt/mutt-1.12.2.tar.gz) = 4675774	3	SIZE (mutt/mutt-1.13.0.tar.gz) = 4889693
4	SHA256 (mutt/mutt-1.12.1.vc.greeting) = 54d1267c1ac496662b47131f9761b5ab53f44c93498938dc93d0156c6578e378	4	SHA256 (mutt/mutt-1.13.0.vc.greeting) = 64206f0f2a41c4d808542067a4aab799cb603bc183bde2dc924c8b34a0fa6ae7
5	SIZE (mutt/mutt-1.12.1.vc.greeting) = 4559	5	SIZE (mutt/mutt-1.13.0.vc.greeting) = 4717
6	SHA256 (mutt/patch-1.12.1.vvv.nntp.xz) = 9c420584d549ac0bb49c52ddfd2ab5bee0f89e59cb938673444ec27ad7c782ad	6	SHA256 (mutt/patch-1.12.1.vvv.nntp.xz) = 9c420584d549ac0bb49c52ddfd2ab5bee0f89e59cb938673444ec27ad7c782ad
7	SIZE (mutt/patch-1.12.1.vvv.nntp.xz) = 49672	7	SIZE (mutt/patch-1.12.1.vvv.nntp.xz) = 49672
8	SHA256 (mutt/patch-1.12.1.vvv.initials.xz) = 6c66fe6c23362b0f4970a5028a75a33454e1e53ba178e5801113939f1bc22920	8	SHA256 (mutt/patch-1.12.1.vvv.initials.xz) = 6c66fe6c23362b0f4970a5028a75a33454e1e53ba178e5801113939f1bc22920

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-05-25 16:22:39 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,




--- init.h.orig	2019-12-08 02:41:29 UTC
+++ init.h
@@ -1079,6 +1079,11 @@ struct option_t MuttVars[] = {
   ** sent to both the list and your address, resulting in two copies
   ** of the same email for you.
   */
+  { "force_base64",   DT_BOOL, R_NONE, {.l=OPTFORCEBASE64}, {.l=0} },
+  /*
+  ** .pp
+  ** If you need to encode all text parts to base64, set this option.
+  */
   { "force_name",	DT_BOOL, R_NONE, {.l=OPTFORCENAME}, {.l=0} },
   /*
   ** .pp
--- mutt.h.orig	2019-12-08 02:41:29 UTC
+++ mutt.h
@@ -423,6 +423,7 @@ enum
   OPTFCCCLEAR,
   OPTFLAGSAFE,
   OPTFOLLOWUPTO,

   OPTFORCENAME,
   OPTFORWDECODE,
   OPTFORWQUOTE,
--- sendlib.c.orig	2019-12-08 02:41:29 UTC
+++ sendlib.c
@@ -1218,7 +1218,9 @@ static void mutt_set_encoding (BODY *b, CONTENT *info)
   if (b->type == TYPETEXT)
   {
     char *chsname = mutt_get_body_charset (send_charset, sizeof (send_charset), b);




--- PATCHES.orig	2019-12-06 03:41:38 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.4.cd.ifdef.1
--- init.c.orig	2019-10-17 08:01:01 UTC
+++ init.c
@@ -651,6 +651,52 @@ static mbchar_table *parse_mbchar_table (const char *s
   return t;
 }
 
+static int parse_ifdef (BUFFER *tmp, BUFFER *s, union pointer_long_t data, BUFFER *err)
+{
+  int i, j, res = 0;
+  BUFFER token;

+  return 0;
+}
+
 static int parse_unignore (BUFFER *buf, BUFFER *s, union pointer_long_t udata, BUFFER *err)
 {
   do
--- init.h.orig	2019-11-25 23:34:56 UTC
+++ init.h
@@ -4466,6 +4466,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 *);
+static int parse_ifdef (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
 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 *);
@@ -4530,6 +4531,7 @@ const struct command_t Commands[] = {
   { "hdr_order",	parse_list,		{.p=&HeaderOrderList} },
 #ifdef HAVE_ICONV
   { "iconv-hook",	mutt_parse_hook,	{.l=MUTT_ICONVHOOK} },
+  { "ifdef",		parse_ifdef,		{.l=0} },
 #endif
   { "ignore",		parse_ignore,		{.l=0} },
   { "index-format-hook",mutt_parse_idxfmt_hook, {.l=MUTT_IDXFMTHOOK} },




--- PATCHES.orig	2019-12-06 03:42:13 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.7.ust.maildir-mtime.2
--- browser.c.orig	2019-12-06 03:42:13 UTC
+++ browser.c
@@ -32,6 +32,7 @@
 #ifdef USE_IMAP

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

 static int examine_directory (MUTTMENU *menu, struct browser_state *state,
 			      const char *d, const char *prefix)
 {
@@ -514,6 +530,7 @@ static int examine_directory (MUTTMENU *menu, struct b
     tmp = Incoming;
     while (tmp && mutt_strcmp (mutt_b2s (full_path), mutt_b2s (tmp->pathbuf)))
       tmp = tmp->next;
+    check_maildir_times (tmp, &s);
     if (tmp && Context &&
         !mutt_strcmp (tmp->realpath, Context->realpath))
     {
@@ -592,6 +609,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), mutt_b2s (tmp->pathbuf), &s, tmp);
   }
   while ((tmp = tmp->next));




--- PATCHES.orig	2019-12-06 03:41:41 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.6.cb.reverse_reply.2
--- init.h.orig	2019-12-06 03:41:41 UTC
+++ init.h
@@ -3021,6 +3021,13 @@ struct option_t MuttVars[] = {
   ** In either case, a missing real name will be filled in afterwards
   ** using the value of $$realname.
   */
+  { "reverse_reply",	DT_BOOL, R_NONE, {.l=OPTREVREPLY}, {.l=0} },
+  /*
+  ** .pp
+  ** When set, this variable uses the name from your aliases in the To and Cc
+  ** 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} },
   /*
   ** .pp
--- mutt.h.orig	2019-11-20 20:16:28 UTC
+++ mutt.h
@@ -505,6 +505,7 @@ enum
   OPTREVALIAS,
   OPTREVNAME,
   OPTREVREAL,

   OPTRFC2047PARAMS,
   OPTSAVEADDRESS,
   OPTSAVEEMPTY,
--- protos.h.orig	2019-11-01 06:34:06 UTC
+++ protos.h
@@ -88,6 +88,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-11-19 02:15:41 UTC
+++ send.c
@@ -723,6 +723,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_remove_xrefs (env->to, env->cc);
 
   if (env->cc && !env->to)
--- sendlib.c.orig	2019-11-08 03:35:30 UTC
+++ sendlib.c
@@ -2974,6 +2974,35 @@ static void set_noconv_flags (BODY *b, short flag)
   }
 }
 

+  return addr;
+}
+
 int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid, int post, const char *fcc)
 {
   CONTEXT f;




--- hdrline.c.orig	2019-11-11 04:00:36 UTC
+++ hdrline.c
@@ -248,6 +248,89 @@ static char *apply_subject_mods (ENVELOPE *env)
  * %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label)
  * %Z = status flags	*/
 

 static const char *
 hdr_format_str (char *dest,
 		size_t destlen,
@@ -421,7 +504,13 @@ hdr_format_str (char *dest,
 
       if (!do_locales)
         setlocale (LC_TIME, "C");

       if (!do_locales)
         setlocale (LC_TIME, "");
 
--- mutt.h.orig	2019-12-06 03:41:43 UTC
+++ mutt.h
@@ -165,6 +165,16 @@ typedef enum
   MUTT_WRITE_HEADER_MIME
 } mutt_write_header_mode;
 




--- Makefile.in.orig	2019-11-30 18:14:23 UTC
+++ Makefile.in
@@ -540,7 +540,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign
 @BUILD_DOC_TRUE@DOC_SUBDIR = doc
 @BUILD_IMAP_TRUE@IMAP_SUBDIR = imap
 @BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap
 @BUILD_AUTOCRYPT_TRUE@AUTOCRYPT_SUBDIR = autocrypt
 @BUILD_AUTOCRYPT_TRUE@AUTOCRYPT_INCLUDES = -I$(top_srcdir)/autocrypt
-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR) $(AUTOCRYPT_SUBDIR)
+SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) $(AUTOCRYPT_SUBDIR) . doc
 bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET)
 @BUILD_HCACHE_TRUE@HCVERSION = hcversion.h
 BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c version.h $(HCVERSION)
@@ -1690,18 +1690,9 @@ install-exec-hook:
 		rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;		\
 		ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
 	fi




--- browser.c.orig	2019-11-11 04:00:36 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;
 
+  /* Always keep '..' in first menu position */
+  if (!strncmp(pa->display_name, "..", 2))
+	  return(-1);
+  if (!strncmp(pb->display_name, "..", 2))
+	  return(1);
+
   int r = mutt_strcoll (pa->display_name, pb->display_name);
 
   return ((BrowserSort & SORT_REVERSE) ? -r : r);
@@ -96,6 +102,12 @@ static int browser_compare_date (const void *a, const 

   struct folder_file *pb = (struct folder_file *) b;
 
+  /* Always keep '..' in first menu position */
+  if (!strncmp(pa->display_name, "..", 2))
+	  return(-1);
+  if (!strncmp(pb->display_name, "..", 2))
+	  return(1);
+
   int r = pa->mtime - pb->mtime;

   struct folder_file *pb = (struct folder_file *) b;
+
+  /* Always keep '..' in first menu position */
+  if (!strncmp(pa->display_name, "..", 2))
+	  return(-1);
+  if (!strncmp(pb->display_name, "..", 2))
+	  return(1);
 
   int r = pa->size - pb->size;

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-contrib_Makefile.in (-2 / +2 lines)
1	--- contrib/Makefile.in.orig 2019-05-25 16:13:42 UTC	1	--- contrib/Makefile.in.orig 2019-11-30 18:14:24 UTC
2	+++ contrib/Makefile.in	2	+++ contrib/Makefile.in
3	@@ -278,7 +278,7 @@ top_build_prefix = @top_build_prefix@	3	@@ -280,7 +280,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




--- PATCHES.orig	2019-12-06 03:41:54 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
@@ -427,6 +427,53 @@ hdr_format_str (char *dest,
       const char *cp;
       struct tm *tm;
       time_t T;

 
       p = dest;
 
--- muttlib.c.orig	2019-10-17 08:01:01 UTC
+++ muttlib.c
@@ -1563,7 +1563,16 @@ void mutt_FormatString (char *dest,		/* output buffer 
       if (*src == '?')
       {
 	flags |= MUTT_FORMAT_OPTIONAL;

       }
       else
       {
@@ -1579,12 +1588,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 2019-05-26 19:28:53 UTC	1	--- muttlib.c.orig 2019-12-06 03:41:57 UTC
2	+++ muttlib.c	2	+++ muttlib.c
3	@@ -1530,6 +1530,12 @@ void mutt_FormatString (char dest, / output buffer	3	@@ -1606,6 +1606,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	@@ -1542,7 +1548,13 @@ void mutt_FormatString (char dest, / output buffer	16	@@ -1618,7 +1624,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-8 Link Here

(-)b/mail/mutt/files/patch-doc_Makefile.in (-5 / +5 lines)
1	--- doc/Makefile.in.orig 2019-05-25 16:13:43 UTC	1	--- doc/Makefile.in.orig 2019-11-30 18:14:24 UTC
2	+++ doc/Makefile.in	2	+++ doc/Makefile.in
3	@@ -684,14 +684,7 @@ install-data-local: makedoc-all instdoc	3	@@ -691,14 +691,7 @@ install-data-local: makedoc-all instdoc
4	-for f in $(HTML_DOCFILES) ; do \	4	$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
5	$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \	5	fi \
6	done	6	done
7	- $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist	7	- $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
8	- -if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \	8	- -if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
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	@@ -727,9 +720,7 @@ uninstall-local:	19	@@ -734,9 +727,7 @@ uninstall-local:
20		20
21	check:	21	check:
22	manual.txt: manual.html	22	manual.txt: manual.html

Removed Link Here

(-)a/mail/mutt/files/patch-doc_Muttrc (-10 lines)
1	--- doc/Muttrc.orig 2019-05-25 16:14:02 UTC
2	+++ doc/Muttrc
3	@@ -723,6 +723,7 @@ attachments -I message/external-body
4	# will be saved for later references. Also see $record,
5	# $save_name, $force_name and ``fcc-hook''.
6	#
7	+set followup_to=no
8	#
9	# set crypt_autoencrypt=no
10	#

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-11-24 03:39:46 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"?>

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-muttlib.c (-2 / +2 lines)
1	--- muttlib.c.orig 2019-05-26 19:28:53 UTC	1	--- muttlib.c.orig 2019-12-06 03:42:05 UTC
2	+++ muttlib.c	2	+++ muttlib.c
3	@@ -856,16 +856,15 @@ void _mutt_buffer_mktemp (BUFFER buf, const char pre	3	@@ -877,16 +877,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	{




--- commands.c.orig	2019-10-27 05:28:45 UTC
+++ commands.c
@@ -285,7 +285,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-12-06 03:42:08 UTC
+++ init.h
@@ -3481,6 +3481,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_dont_check_sender",	DT_BOOL, R_NONE, {.l=OPTSMIMENOSENDER}, {.l=0} },
+  /*
+  ** .pp
+  ** This flag controls wether you want the skip the check for the sender's

+  ** longer needs email-addresses as part of the certificates.
+  ** It is not set by default.
+  */
   { "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	2019-12-06 03:42:08 UTC
+++ mutt.h
@@ -585,6 +585,7 @@ enum
   OPTSMIMEISDEFAULT,
   OPTSMIMESELFENCRYPT,
   OPTASKCERTLABEL,




--- mutt.h.orig	2019-12-06 03:42:11 UTC
+++ mutt.h
@@ -243,6 +243,7 @@ enum
   MUTT_EXPIRED,
   MUTT_SUPERSEDED,
   MUTT_TRASH,

 
   /* actions for mutt_pattern_comp/mutt_pattern_exec */
   MUTT_AND,
--- pattern.c.orig	2019-11-16 21:07:54 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 },
@@ -1342,6 +1343,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 68-73 man/man5/muttrc.5.gz Link Here

(-)b/mail/mutt/pkg-plist (-1 / +1 lines)
68	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6-cjk.rc	68	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6-cjk.rc
69	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6.rc	69	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6.rc
70	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.7.rc	70	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.7.rc
		71	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/markdown2html
71	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mutt_xtitle	72	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mutt_xtitle
72	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp2.rc	73	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp2.rc
73	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp6.rc	74	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp6.rc
74	-

Return to bug 242534

Lines 2-8 Link Here

(-)b/mail/mutt/Makefile (-32 / +46 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mutt	4	PORTNAME= mutt
5	DISTVERSION= 1.12.2	5	DISTVERSION= 1.13.0
6	CATEGORIES+= mail	6	CATEGORIES+= mail
7	MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \	7	MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \
8	ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \	8	ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
Lines 46-56 GNU_CONFIGURE= yes Link Here
46		46
47	OPTIONS_SUB= yes	47	OPTIONS_SUB= yes
48		48
49	OPTIONS_DEFINE= SASL DEBUG DOCS EXAMPLES FLOCK \	49	OPTIONS_DEFINE= AUTOCRYPT DEBUG DOCS EXAMPLES FLOCK FORCEBASE64 GPGME \
50	FORCEBASE64 GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \	50	GREETING_PATCH HTML ICONV IDN IFDEF_PATCH LOCALES_FIX \
51	LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \	51	MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NLS QUOTE_PATCH NNTP \
52	NLS NNTP QUOTE_PATCH REVERSE_REPLY_PATCH SMART_DATE \	52	REVERSE_REPLY_PATCH SASL SMART_DATE SMTP URLVIEW XML
53	SMTP URLVIEW XML
54		53
55	OPTIONS_SINGLE= GSSAPI HCACHE SCREEN	54	OPTIONS_SINGLE= GSSAPI HCACHE SCREEN
56	OPTIONS_RADIO= SPELL	55	OPTIONS_RADIO= SPELL
Lines 59-70 OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE Link Here
59	OPTIONS_SINGLE_HCACHE= HCACHE_BDB HCACHE_TOKYOCABINET HCACHE_KYOTOCABINET HCACHE_NONE	58	OPTIONS_SINGLE_HCACHE= HCACHE_BDB HCACHE_TOKYOCABINET HCACHE_KYOTOCABINET HCACHE_NONE
60	OPTIONS_SINGLE_SCREEN= NCURSES SLANG	59	OPTIONS_SINGLE_SCREEN= NCURSES SLANG
61		60
62	SASL_DESC= SASL authentication	61	AUTOCRYPT_DESC= Convenient End-to-End Encryption
63	DEBUG_DESC= Debugging capabilities	62	DEBUG_DESC= Debugging capabilities
64	FLOCK_DESC= flock() usage	63	FLOCK_DESC= flock() usage
65	FORCEBASE64_DESC= Option to force base64 encoding for compose	64	FORCEBASE64_DESC= Option to force base64 encoding for compose
66	GPGME_DESC= Gpgme interface	65	GPGME_DESC= Gpgme interface
67	GREETING_PATCH_DESC= Greeting support	66	GREETING_PATCH_DESC= Greeting support
		67	HCACHE_BDB_DESC= Use Berkeley DB (BDB)
		68	HCACHE_DESC= Header Cache support
		69	HCACHE_KYOTOCABINET_DESC= Use Kyoto Cabinet
		70	HCACHE_NONE_DESC= Disable Header Cache
		71	HCACHE_TOKYOCABINET_DESC= Use Tokyo Cabinet
68	HTML_DESC= HTML documentation	72	HTML_DESC= HTML documentation
69	IDN_DESC= International Domain Names (implies ICONV)	73	IDN_DESC= International Domain Names (implies ICONV)
70	IFDEF_PATCH_DESC= ifdef feature	74	IFDEF_PATCH_DESC= ifdef feature
Lines 75-95 NCURSES_DESC= Ncurses support Link Here
75	NLS_DESC= Native language support (implies ICONV)	79	NLS_DESC= Native language support (implies ICONV)
76	QUOTE_PATCH_DESC= Extended quoting	80	QUOTE_PATCH_DESC= Extended quoting
77	REVERSE_REPLY_PATCH_DESC= Reverse_reply	81	REVERSE_REPLY_PATCH_DESC= Reverse_reply
		82	SASL_DESC= SASL authentication
78	SLANG_DESC= SLANG support	83	SLANG_DESC= SLANG support
79	SMART_DATE_DESC= Dynamic date formatting with "%@"	84	SMART_DATE_DESC= Dynamic date formatting with "%@"
80	SMTP_DESC= SMTP relay support	85	SMTP_DESC= SMTP relay support
81	HCACHE_DESC= Header Cache support
82	HCACHE_BDB_DESC= Use Berkeley DB (BDB)
83	HCACHE_TOKYOCABINET_DESC= Use Tokyo Cabinet
84	HCACHE_KYOTOCABINET_DESC= Use Kyoto Cabinet
85	HCACHE_NONE_DESC= Disable Header Cache
86	URLVIEW_DESC= Use urlview for the URL selector menu	86	URLVIEW_DESC= Use urlview for the URL selector menu
87	XML_DESC= Use XML tools for rebuilding documentation	87	XML_DESC= Use XML tools for rebuilding documentation
88		88
89	OPTIONS_DEFAULT= GPGME HTML HCACHE_BDB ICONV IDN \	89	OPTIONS_DEFAULT= AUTOCRYPT GPGME GSSAPI_NONE HCACHE_BDB HTML ICONV IDN \
90	IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \	90	IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NCURSES \
91	NLS NCURSES QUOTE_PATCH REVERSE_REPLY_PATCH SMART_DATE \	91	NLS REVERSE_REPLY_PATCH SASL SMART_DATE SMTP URLVIEW XML
92	SASL SMTP URLVIEW XML GSSAPI_NONE	92
		93	.ifmake makesum # for optional distfiles patchfiles
		94	OPTIONS_OVERRIDE= ${OPTIONS_DEFINE} ${OPTIONS_DEFAULT}
		95	.MAKEOVERRIDES+= OPTIONS_OVERRIDE
		96	.endif
		97
		98	AUTOCRYPT_CONFIGURE_ENABLE= autocrypt
		99	AUTOCRYPT_IMPLIES= GPGME IDN
		100	AUTOCRYPT_USES= sqlite:3
		101	AUTOCRYPT_CONFIGURE_WITH= sqlite3=${LOCALBASE}
		102	AUTOCRYPT_DEPENDS= gnupg>=2.1:security/gnupg \
		103	gpgme>=1.8:security/gpgme
		104	AUTOCRYPT_BUILD_DEPENDS= ${AUTOCRYPT_DEPENDS}
		105	AUTOCRYPT_RUN_DEPENDS= ${AUTOCRYPT_DEPENDS}
93		106
94	ASPELL_BUILD_DEPENDS= aspell:textproc/aspell	107	ASPELL_BUILD_DEPENDS= aspell:textproc/aspell
95	ASPELL_RUN_DEPENDS= aspell:textproc/aspell	108	ASPELL_RUN_DEPENDS= aspell:textproc/aspell
Lines 97-107 ISPELL_BUILD_DEPENDS= ispell:textproc/aspell-ispell Link Here
97	ISPELL_RUN_DEPENDS= ispell:textproc/aspell-ispell	110	ISPELL_RUN_DEPENDS= ispell:textproc/aspell-ispell
98	URLVIEW_RUN_DEPENDS= urlview:textproc/urlview	111	URLVIEW_RUN_DEPENDS= urlview:textproc/urlview
99		112
100	.ifmake makesum # for optional distfiles patchfiles
101	PORT_DBDIR= /dev/null
102	OPTIONS_DEFAULT+= ${OPTIONS_DEFINE}
103	.endif
104
105	DEBUG_CONFIGURE_ON= --enable-debug	113	DEBUG_CONFIGURE_ON= --enable-debug
106		114
107	# Handle ncurses/ncurses-port/slang	115	# Handle ncurses/ncurses-port/slang
Lines 165-175 GPGME_CONFIGURE_ENABLE= gpgme Link Here
165		173
166	SMTP_CONFIGURE_ENABLE= smtp	174	SMTP_CONFIGURE_ENABLE= smtp
167		175
		176	GREETING_PATCH_BROKEN= GREETING_PATCH broken on 1.13.0
168	GREETING_PATCH_PATCHFILES= mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc	177	GREETING_PATCH_PATCHFILES= mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc
169		178
		179	QUOTE_PATCH_BROKEN= QUOTE_PATCH broken on 1.13.0
170	QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv \	180	QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv \
171	patch-${VVV_PATCH_VERSION}.vvv.quote.xz:vvv	181	patch-${VVV_PATCH_VERSION}.vvv.quote.xz:vvv
172		182
		183	NNTP_BROKEN= NNTP_PATCH broken on 1.13.0
173	NNTP_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.nntp.xz:-p1:vvv	184	NNTP_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.nntp.xz:-p1:vvv
174	NNTP_EXTRA_PATCHES= ${PATCHDIR}/extra-nntp-depfiles	185	NNTP_EXTRA_PATCHES= ${PATCHDIR}/extra-nntp-depfiles
175	NNTP_CONFIGURE_ON= --enable-nntp	186	NNTP_CONFIGURE_ON= --enable-nntp
Lines 183-213 DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref Link Here
183		194
184	# un/comment as each VERSION is created for PORTVERSION	195	# un/comment as each VERSION is created for PORTVERSION
185	VVV_PATCH_VERSION= 1.12.1	196	VVV_PATCH_VERSION= 1.12.1
186	GREETING_PATCH_VERSION= 1.12.1	197	GREETING_PATCH_VERSION= 1.13.0
187
188	.if !defined(VVV_PATCH_VERSION)
189	VVV_PATCH_VERSION= ${PORTVERSION}
190	.endif
191	.if !defined(GREETING_PATCH_VERSION)
192	GREETING_PATCH_VERSION= ${PORTVERSION}
193	.endif
194		198
195	post-patch-NNTP-on:	199	post-patch-NNTP-on:
196	# Restore timestamps for autotools sources	200	# Restore timestamps for autotools sources
197	@${TOUCH} -r ${WRKSRC}/configure.ac.orig ${WRKSRC}/configure.ac	201	@${TOUCH} -r ${WRKSRC}/configure.ac.orig ${WRKSRC}/configure.ac
198	@${TOUCH} -r ${WRKSRC}/Makefile.am.orig ${WRKSRC}/Makefile.am	202	@${TOUCH} -r ${WRKSRC}/Makefile.am.orig ${WRKSRC}/Makefile.am
199	.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}	203	.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
		204	.if defined(${PATCH_DEBUG})
		205	@${ECHO} "===> Applying ${.TARGET} extra-patch-maildir-mtime-nntp"
		206	.endif
200	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime-nntp	207	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime-nntp
201	.endif	208	.endif
202	.if ${PORT_OPTIONS:MFORCEBASE64}	209	.if ${PORT_OPTIONS:MFORCEBASE64}
		210	.if defined(PATCH_DEBUG)
		211	@${ECHO} "===> Applying ${.TARGET} extra-patch-forcebase64-nntp"
		212	.endif
203	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64-nntp	213	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64-nntp
204	.endif	214	.endif
205		215
206	post-patch-NNTP-off:	216	post-patch-NNTP-off:
207	.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}	217	.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
		218	.if defined(PATCH_DEBUG)
		219	@${ECHO} "===> Applying ${.TARGET} extra-patch-maildir-mtime"
		220	.endif
208	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime	221	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime
209	.endif	222	.endif
210	.if ${PORT_OPTIONS:MFORCEBASE64}	223	.if ${PORT_OPTIONS:MFORCEBASE64}
		224	.if defined(PATCH_DEBUG)
		225	@${ECHO} "===> Applying ${.TARGET} extra-patch-forcebase64"
		226	.endif
211	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64	227	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64
212	.endif	228	.endif
213		229
Lines 217-224 post-install: Link Here
217	post-install-NNTP-on:	233	post-install-NNTP-on:
218	${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}	234	${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}
219		235
220	WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}
221
222	pre-configure::	236	pre-configure::
223	@${REINPLACE_CMD} -e 's,?eimdal\),?eimdal\|\"FreeBSD heimdal\"*),' \	237	@${REINPLACE_CMD} -e 's,?eimdal\),?eimdal\|\"FreeBSD heimdal\"*),' \
224	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}	238	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
Lines 250-256 BUILD_DEPENDS+= xsltproc:textproc/libxslt \ Link Here
250	.else	264	.else
251	pre-build::	265	pre-build::
252	@${REINPLACE_CMD} \	266	@${REINPLACE_CMD} \
253	-e 's,manual.html stamp-doc-rc stamp-doc-chunked manual.txt,stamp-doc-rc,' \	267	-e '/^BUILD_DOC_TARGETS/s/=.*/=/' \
254	${WRKSRC}/doc/Makefile	268	${WRKSRC}/doc/Makefile
255	.endif	269	.endif
256		270

Lines 1-20 Link Here

(-)b/mail/mutt/files/extra-patch-forcebase64 (-8 / +8 lines)
1	--- init.h.orig 2017-04-12 23:01:17 UTC	1	--- init.h.orig 2019-12-08 02:41:29 UTC
2	+++ init.h	2	+++ init.h
3	@@ -871,6 +871,11 @@ struct option_t MuttVars[] = {	3	@@ -1079,6 +1079,11 @@ struct option_t MuttVars[] = {
4	** sent to both the list and your address, resulting in two copies	4	** sent to both the list and your address, resulting in two copies
5	** of the same email for you.	5	** of the same email for you.
6	*/	6	*/
7	+ { "force_base64", DT_BOOL, R_NONE, OPTFORCEBASE64, 0 },	7	+ { "force_base64", DT_BOOL, R_NONE, {.l=OPTFORCEBASE64}, {.l=0} },
8	+ /*	8	+ /*
9	+ ** .pp	9	+ ** .pp
10	+ ** If you need to encode all text parts to base64, set this option.	10	+ ** If you need to encode all text parts to base64, set this option.
11	+ */	11	+ */
12	{ "force_name", DT_BOOL, R_NONE, OPTFORCENAME, 0 },	12	{ "force_name", DT_BOOL, R_NONE, {.l=OPTFORCENAME}, {.l=0} },
13	/*	13	/*
14	** .pp	14	** .pp
15	--- mutt.h.orig 2017-04-12 23:01:17 UTC	15	--- mutt.h.orig 2019-12-08 02:41:29 UTC
16	+++ mutt.h	16	+++ mutt.h
17	@@ -355,6 +355,7 @@ enum	17	@@ -423,6 +423,7 @@ enum
18	OPTFCCCLEAR,	18	OPTFCCCLEAR,
19	OPTFLAGSAFE,	19	OPTFLAGSAFE,
20	OPTFOLLOWUPTO,	20	OPTFOLLOWUPTO,
Lines 22-30 Link Here
22	OPTFORCENAME,	22	OPTFORCENAME,
23	OPTFORWDECODE,	23	OPTFORWDECODE,
24	OPTFORWQUOTE,	24	OPTFORWQUOTE,
25	--- sendlib.c.orig 2017-04-12 23:01:08 UTC	25	--- sendlib.c.orig 2019-12-08 02:41:29 UTC
26	+++ sendlib.c	26	+++ sendlib.c
27	@@ -1171,7 +1171,9 @@ static void mutt_set_encoding (BODY *b,	27	@@ -1218,7 +1218,9 @@ static void mutt_set_encoding (BODY b, CONTENT info)
28	if (b->type == TYPETEXT)	28	if (b->type == TYPETEXT)
29	{	29	{
30	char *chsname = mutt_get_body_charset (send_charset, sizeof (send_charset), b);	30	char *chsname = mutt_get_body_charset (send_charset, sizeof (send_charset), b);

Lines 1-14 Link Here

(-)b/mail/mutt/files/extra-patch-ifdef (-19 / +19 lines)
1	--- PATCHES.orig 2017-12-03 03:10:17 UTC	1	--- PATCHES.orig 2019-12-06 03:41:38 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 2019-09-21 19:18:34 UTC	5	--- init.c.orig 2019-10-17 08:01:01 UTC
6	+++ init.c	6	+++ init.c
7	@@ -651,6 +651,52 @@ static mbchar_table parse_mbchar_table (const char s	7	@@ -651,6 +651,52 @@ static mbchar_table parse_mbchar_table (const char s
8	return t;	8	return t;
9	}	9	}
10		10
11	+static int parse_ifdef (BUFFER tmp, BUFFER s, unsigned long data, BUFFER *err)	11	+static int parse_ifdef (BUFFER tmp, BUFFER s, union pointer_long_t data, BUFFER *err)
12	+{	12	+{
13	+ int i, j, res = 0;	13	+ int i, j, res = 0;
14	+ BUFFER token;	14	+ BUFFER token;
Lines 54-77 Link Here
54	+ return 0;	54	+ return 0;
55	+}	55	+}
56	+	56	+
57	static int parse_unignore (BUFFER buf, BUFFER s, unsigned long data, BUFFER *err)	57	static int parse_unignore (BUFFER buf, BUFFER s, union pointer_long_t udata, BUFFER *err)
58	{	58	{
59	do	59	do
60	--- init.h.orig 2019-09-21 19:18:34 UTC	60	--- init.h.orig 2019-11-25 23:34:56 UTC
61	+++ init.h	61	+++ init.h
62	@@ -4343,6 +4343,7 @@ static int parse_lists (BUFFER , BUFFER , unsigned l	62	@@ -4466,6 +4466,7 @@ static int parse_lists (BUFFER , BUFFER , union poin
63	static int parse_unlists (BUFFER , BUFFER , unsigned long, BUFFER *);	63	static int parse_unlists (BUFFER , BUFFER , union pointer_long_t, BUFFER *);
64	static int parse_alias (BUFFER , BUFFER , unsigned long, BUFFER *);	64	static int parse_alias (BUFFER , BUFFER , union pointer_long_t, BUFFER *);
65	static int parse_unalias (BUFFER , BUFFER , unsigned long, BUFFER *);	65	static int parse_unalias (BUFFER , BUFFER , union pointer_long_t, BUFFER *);
66	+static int parse_ifdef (BUFFER , BUFFER , unsigned long, BUFFER *);	66	+static int parse_ifdef (BUFFER , BUFFER , union pointer_long_t, BUFFER *);
67	static int parse_echo (BUFFER , BUFFER , unsigned long, BUFFER *);	67	static int parse_echo (BUFFER , BUFFER , union pointer_long_t, BUFFER *);
68	static int parse_ignore (BUFFER , BUFFER , unsigned long, BUFFER *);	68	static int parse_ignore (BUFFER , BUFFER , union pointer_long_t, BUFFER *);
69	static int parse_unignore (BUFFER , BUFFER , unsigned long, BUFFER *);	69	static int parse_unignore (BUFFER , BUFFER , union pointer_long_t, BUFFER *);
70	@@ -4407,6 +4407,7 @@ const struct command_t Commands[] = {	70	@@ -4530,6 +4531,7 @@ const struct command_t Commands[] = {
71	{ "hdr_order", parse_list, UL &HeaderOrderList },	71	{ "hdr_order", parse_list, {.p=&HeaderOrderList} },
72	#ifdef HAVE_ICONV	72	#ifdef HAVE_ICONV
73	{ "iconv-hook", mutt_parse_hook, MUTT_ICONVHOOK },	73	{ "iconv-hook", mutt_parse_hook, {.l=MUTT_ICONVHOOK} },
74	+ { "ifdef", parse_ifdef, 0 },	74	+ { "ifdef", parse_ifdef, {.l=0} },
75	#endif	75	#endif
76	{ "ignore", parse_ignore, 0 },	76	{ "ignore", parse_ignore, {.l=0} },
77	{ "index-format-hook",mutt_parse_idxfmt_hook, MUTT_IDXFMTHOOK },	77	{ "index-format-hook",mutt_parse_idxfmt_hook, {.l=MUTT_IDXFMTHOOK} },

Lines 1-8 Link Here

(-)b/mail/mutt/files/extra-patch-maildir-mtime (-7 / +7 lines)
1	--- PATCHES.orig 2019-05-26 19:28:55 UTC	1	--- PATCHES.orig 2019-12-06 03:42:13 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 2019-05-26 19:28:52 UTC	5	--- browser.c.orig 2019-12-06 03:42:13 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	@@ -460,6 +461,21 @@ static void init_state (struct browser_state *state, M	15	@@ -448,6 +449,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 34-52 Link Here
34	static int examine_directory (MUTTMENU menu, struct browser_state state,	34	static int examine_directory (MUTTMENU menu, struct browser_state state,
35	const char d, const char prefix)	35	const char d, const char prefix)
36	{	36	{
37	@@ -526,6 +542,7 @@ static int examine_directory (MUTTMENU *menu, struct b	37	@@ -514,6 +530,7 @@ static int examine_directory (MUTTMENU *menu, struct b
38	tmp = Incoming;	38	tmp = Incoming;
39	while (tmp && mutt_strcmp (mutt_b2s (buffer), mutt_b2s (tmp->pathbuf)))	39	while (tmp && mutt_strcmp (mutt_b2s (full_path), 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	@@ -604,6 +621,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b	45	@@ -592,6 +609,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, mutt_b2s (mailbox), &s, tmp);	50	add_folder (menu, state, mutt_b2s (mailbox), mutt_b2s (tmp->pathbuf), &s, tmp);
51	}	51	}
52	while ((tmp = tmp->next));	52	while ((tmp = tmp->next));

Lines 1-26 Link Here

(-)b/mail/mutt/files/extra-patch-reverse_reply (-14 / +14 lines)
1	--- PATCHES.orig 2017-12-03 03:10:17 UTC	1	--- PATCHES.orig 2019-12-06 03:41:41 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 2019-09-21 19:18:34 UTC	5	--- init.h.orig 2019-12-06 03:41:41 UTC
6	+++ init.h	6	+++ init.h
7	@@ -2966,6 +2966,13 @@ struct option_t MuttVars[] = {	7	@@ -3021,6 +3021,13 @@ struct option_t MuttVars[] = {
8	** In either case, a missing real name will be filled in afterwards	8	** In either case, a missing real name will be filled in afterwards
9	** using the value of $$realname.	9	** using the value of $$realname.
10	*/	10	*/
11	+ { "reverse_reply", DT_BOOL, R_NONE, OPTREVREPLY, 0 },	11	+ { "reverse_reply", DT_BOOL, R_NONE, {.l=OPTREVREPLY}, {.l=0} },
12	+ /*	12	+ /*
13	+ ** .pp	13	+ ** .pp
14	+ ** When set, this variable uses the name from your aliases in the To and Cc	14	+ ** When set, this variable uses the name from your aliases in the To and Cc
15	+ ** headers of reply mails you send, like $reverse_alias does in the index.	15	+ ** headers of reply mails you send, like $reverse_alias does in the index.
16	+ ** When unset, the headers taken from the original mail are left unchanged.	16	+ ** When unset, the headers taken from the original mail are left unchanged.
17	+ */	17	+ */
18	{ "rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0 },	18	{ "rfc2047_parameters", DT_BOOL, R_NONE, {.l=OPTRFC2047PARAMS}, {.l=0} },
19	/*	19	/*
20	** .pp	20	** .pp
21	--- mutt.h.orig 2019-09-21 19:18:34 UTC	21	--- mutt.h.orig 2019-11-20 20:16:28 UTC
22	+++ mutt.h	22	+++ mutt.h
23	@@ -491,6 +491,7 @@ enum	23	@@ -505,6 +505,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 2019-09-21 19:18:34 UTC	31	--- protos.h.orig 2019-11-01 06:34:06 UTC
32	+++ protos.h	32	+++ protos.h
33	@@ -85,6 +85,7 @@ ADDRESS mutt_get_address (ENVELOPE , char **);	33	@@ -88,6 +88,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 2019-09-21 19:18:34 UTC	41	--- send.c.orig 2019-11-19 02:15:41 UTC
42	+++ send.c	42	+++ send.c
43	@@ -717,6 +717,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env)	43	@@ -723,6 +723,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 51-59 Link Here
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 2019-09-21 19:18:34 UTC	54	--- sendlib.c.orig 2019-11-08 03:35:30 UTC
55	+++ sendlib.c	55	+++ sendlib.c
56	@@ -2765,6 +2765,35 @@ static void set_noconv_flags (BODY *b, short flag)	56	@@ -2974,6 +2974,35 @@ static void set_noconv_flags (BODY *b, short flag)
57	}	57	}
58	}	58	}
59		59
Lines 86-91 Link Here
86	+ return addr;	86	+ return addr;
87	+}	87	+}
88	+	88	+
89	int mutt_write_fcc (const char path, HEADER hdr, const char msgid, int post, char fcc)	89	int mutt_write_fcc (const char path, HEADER hdr, const char msgid, int post, const char fcc)
90	{	90	{
91	CONTEXT f;	91	CONTEXT f;

Lines 1-6 Link Here

(-)b/mail/mutt/files/extra-patch-smartdate (-5 / +5 lines)
1	--- hdrline.c.orig 2019-05-26 19:28:51 UTC	1	--- hdrline.c.orig 2019-11-11 04:00:36 UTC
2	+++ hdrline.c	2	+++ hdrline.c
3	@@ -249,6 +249,89 @@ static char apply_subject_mods (ENVELOPE env)	3	@@ -248,6 +248,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 90-96 Link Here
90	static const char *	90	static const char *
91	hdr_format_str (char *dest,	91	hdr_format_str (char *dest,
92	size_t destlen,	92	size_t destlen,
93	@@ -422,7 +505,13 @@ hdr_format_str (char *dest,	93	@@ -421,7 +504,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");
Lines 105-113 Link Here
105	if (!do_locales)	105	if (!do_locales)
106	setlocale (LC_TIME, "");	106	setlocale (LC_TIME, "");
107		107
108	--- mutt.h.orig 2019-05-26 19:28:51 UTC	108	--- mutt.h.orig 2019-12-06 03:41:43 UTC
109	+++ mutt.h	109	+++ mutt.h
110	@@ -164,6 +164,16 @@ typedef enum	110	@@ -165,6 +165,16 @@ typedef enum
111	MUTT_WRITE_HEADER_MIME	111	MUTT_WRITE_HEADER_MIME
112	} mutt_write_header_mode;	112	} mutt_write_header_mode;
113		113

Lines 1-15 Link Here

(-)b/mail/mutt/files/patch-Makefile.in (-7 / +7 lines)
1	--- Makefile.in.orig 2019-06-15 16:07:04 UTC	1	--- Makefile.in.orig 2019-11-30 18:14:23 UTC
2	+++ Makefile.in	2	+++ Makefile.in
3	@@ -537,7 +537,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign	3	@@ -540,7 +540,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign
4	@BUILD_DOC_TRUE@DOC_SUBDIR = doc
5	@BUILD_IMAP_TRUE@IMAP_SUBDIR = imap
6	@BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap	4	@BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap
7	-SUBDIRS = m4 po intl $(DOC_SUBDIR) contrib $(IMAP_SUBDIR)	5	@BUILD_AUTOCRYPT_TRUE@AUTOCRYPT_SUBDIR = autocrypt
8	+SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) . $(DOC_SUBDIR)	6	@BUILD_AUTOCRYPT_TRUE@AUTOCRYPT_INCLUDES = -I$(top_srcdir)/autocrypt
		7	-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR) $(AUTOCRYPT_SUBDIR)
		8	+SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) $(AUTOCRYPT_SUBDIR) . doc
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 version.h $(HCVERSION)	11	BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c version.h $(HCVERSION)
12	@@ -1676,18 +1676,9 @@ install-exec-hook:	12	@@ -1690,18 +1690,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-16 Link Here

(-)b/mail/mutt/files/patch-browser.c (-8 / +8 lines)
1	--- browser.c.orig 2019-04-28 20:41:58 UTC	1	--- browser.c.orig 2019-11-11 04:00:36 UTC
2	+++ browser.c	2	+++ browser.c
3	@@ -86,6 +86,12 @@ static int browser_compare_subject (const void *a, con	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
7	+ /* Always keep '..' in first menu position */	7	+ /* Always keep '..' in first menu position */
8	+ if (!strncmp(pa->name, "..", 2))	8	+ if (!strncmp(pa->display_name, "..", 2))
9	+ return(-1);	9	+ return(-1);
10	+ if (!strncmp(pb->name, "..", 2))	10	+ if (!strncmp(pb->display_name, "..", 2))
11	+ return(1);	11	+ return(1);
12	+	12	+
13	int r = mutt_strcoll (pa->name, pb->name);	13	int r = mutt_strcoll (pa->display_name, pb->display_name);
14		14
15	return ((BrowserSort & SORT_REVERSE) ? -r : r);	15	return ((BrowserSort & SORT_REVERSE) ? -r : r);
16	@@ -96,6 +102,12 @@ static int browser_compare_date (const void *a, const	16	@@ -96,6 +102,12 @@ static int browser_compare_date (const void *a, const
Lines 18-26 Link Here
18	struct folder_file pb = (struct folder_file ) b;	18	struct folder_file pb = (struct folder_file ) b;
19		19
20	+ /* Always keep '..' in first menu position */	20	+ /* Always keep '..' in first menu position */
21	+ if (!strncmp(pa->name, "..", 2))	21	+ if (!strncmp(pa->display_name, "..", 2))
22	+ return(-1);	22	+ return(-1);
23	+ if (!strncmp(pb->name, "..", 2))	23	+ if (!strncmp(pb->display_name, "..", 2))
24	+ return(1);	24	+ return(1);
25	+	25	+
26	int r = pa->mtime - pb->mtime;	26	int r = pa->mtime - pb->mtime;
Lines 32-40 Link Here
32	struct folder_file pb = (struct folder_file ) b;	32	struct folder_file pb = (struct folder_file ) b;
33	+	33	+
34	+ /* Always keep '..' in first menu position */	34	+ /* Always keep '..' in first menu position */
35	+ if (!strncmp(pa->name, "..", 2))	35	+ if (!strncmp(pa->display_name, "..", 2))
36	+ return(-1);	36	+ return(-1);
37	+ if (!strncmp(pb->name, "..", 2))	37	+ if (!strncmp(pb->display_name, "..", 2))
38	+ return(1);	38	+ return(1);
39		39
40	int r = pa->size - pb->size;	40	int r = pa->size - pb->size;

Lines 1-10 Link Here

(-)b/mail/mutt/files/patch-date-conditional (-6 / +6 lines)
1	--- PATCHES.orig 2019-05-26 19:28:53 UTC	1	--- PATCHES.orig 2019-12-06 03:41:54 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 2019-05-26 19:28:52 UTC	5	--- hdrline.c.orig 2019-12-06 03:41:54 UTC
6	+++ hdrline.c	6	+++ hdrline.c
7	@@ -428,6 +428,53 @@ hdr_format_str (char *dest,	7	@@ -427,6 +427,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;
Lines 58-66 Link Here
58		58
59	p = dest;	59	p = dest;
60		60
61	--- muttlib.c.orig 2019-04-28 20:41:58 UTC	61	--- muttlib.c.orig 2019-10-17 08:01:01 UTC
62	+++ muttlib.c	62	+++ muttlib.c
63	@@ -1487,7 +1487,16 @@ void mutt_FormatString (char dest, / output buffer	63	@@ -1563,7 +1563,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	@@ -1503,12 +1512,12 @@ void mutt_FormatString (char dest, / output buffer	81	@@ -1579,12 +1588,12 @@ void mutt_FormatString (char dest, / output buffer
82	count++;	82	count++;
83	}	83	}
84	*cp = 0;	84	*cp = 0;

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-smime-sender (-9 / +9 lines)
1	--- commands.c.orig 2019-05-25 16:22:39 UTC	1	--- commands.c.orig 2019-10-27 05:28:45 UTC
2	+++ commands.c	2	+++ commands.c
3	@@ -266,7 +266,7 @@ int mutt_display_message (HEADER *cur)	3	@@ -285,7 +285,7 @@ int mutt_display_message (HEADER *cur)
4	{	4	{
5	if (cur->security & GOODSIGN)	5	if (cur->security & GOODSIGN)
6	{	6	{
Lines 9-21 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 2019-06-15 21:17:02 UTC	12	--- init.h.orig 2019-12-06 03:42:08 UTC
13	+++ init.h	13	+++ init.h
14	@@ -3378,6 +3378,15 @@ struct option_t MuttVars[] = {	14	@@ -3481,6 +3481,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	*/
18	+ { "smime_dont_check_sender", DT_BOOL, R_NONE, OPTSMIMENOSENDER, 0 },	18	+ { "smime_dont_check_sender", DT_BOOL, R_NONE, {.l=OPTSMIMENOSENDER}, {.l=0} },
19	+ /*	19	+ /*
20	+ ** .pp	20	+ ** .pp
21	+ ** This flag controls wether you want the skip the check for the sender's	21	+ ** This flag controls wether you want the skip the check for the sender's
Lines 24-35 Link Here
24	+ ** longer needs email-addresses as part of the certificates.	24	+ ** longer needs email-addresses as part of the certificates.
25	+ ** It is not set by default.	25	+ ** It is not set by default.
26	+ */	26	+ */
27	{ "smime_self_encrypt_as", DT_SYN, R_NONE, UL "smime_default_key", 0 },	27	{ "smime_self_encrypt_as", DT_SYN, R_NONE, {.p="smime_default_key"}, {.p=0} },
28	{ "smime_default_key", DT_STR, R_NONE, UL &SmimeDefaultKey, 0 },	28	{ "smime_default_key", DT_STR, R_NONE, {.p=&SmimeDefaultKey}, {.p=0} },
29	/*	29	/*
30	--- mutt.h.orig 2019-06-15 21:17:02 UTC	30	--- mutt.h.orig 2019-12-06 03:42:08 UTC
31	+++ mutt.h	31	+++ mutt.h
32	@@ -567,6 +567,7 @@ enum	32	@@ -585,6 +585,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 2019-05-26 19:28:54 UTC	1	--- mutt.h.orig 2019-12-06 03:42:11 UTC
2	+++ mutt.h	2	+++ mutt.h
3	@@ -242,6 +242,7 @@ enum	3	@@ -243,6 +243,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 2019-05-10 01:46:06 UTC	11	--- pattern.c.orig 2019-11-16 21:07:54 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	@@ -1338,6 +1339,16 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec	21	@@ -1342,6 +1343,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);