Attachment #183221 for bug #219786

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

Lines 2-9 Link Here

(-)b/mail/mutt/Makefile (-10 / +9 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mutt	4	PORTNAME= mutt
5	PORTVERSION= 1.8.2	5	PORTVERSION= 1.8.3
6	PORTREVISION?= 1	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/ \
9	ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \	9	ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
Lines 17-26 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} Link Here
17		17
18	PATCH_SITES+= http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \	18	PATCH_SITES+= http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
19	http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \	19	http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
20	https://www.schrab.com/aaron/mutt/:ats \	20	https://github.com/aschrab/mutt/compare/dev-base...feature/:ats \
21	http://vc.org.ua/mutt/:vc	21	http://vc.org.ua/mutt/:vc
22	PATCH_DIST_STRIP= -p1	22	PATCH_DIST_STRIP= -p1
23	PATCHFILES= patch-1.7.0.ats.date_conditional.1:ats	23	PATCHFILES= date-conditional.diff:ats
24		24
25	MAINTAINER?= dereks@lifeofadishwasher.com	25	MAINTAINER?= dereks@lifeofadishwasher.com
26	COMMENT?= Small but powerful text based program for read/writing e-mail	26	COMMENT?= Small but powerful text based program for read/writing e-mail
Lines 187-192 IDN_LIB_DEPENDS= libidn.so:dns/libidn Link Here
187	IDN_CONFIGURE_WITH= idn	187	IDN_CONFIGURE_WITH= idn
188	IDN_IMPLIES= ICONV	188	IDN_IMPLIES= ICONV
189		189
		190	IFDEF_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ifdef
		191
190	GPGME_LIB_DEPENDS+= libgpgme.so:security/gpgme	192	GPGME_LIB_DEPENDS+= libgpgme.so:security/gpgme
191	GPGME_LIB_DEPENDS+= libgpg-error.so:security/libgpg-error	193	GPGME_LIB_DEPENDS+= libgpg-error.so:security/libgpg-error
192	GPGME_LIB_DEPENDS+= libassuan.so:security/libassuan	194	GPGME_LIB_DEPENDS+= libassuan.so:security/libassuan
Lines 212-219 DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref Link Here
212	.include <bsd.port.options.mk>	214	.include <bsd.port.options.mk>
213		215
214	# un/comment as each VERSION is created for PORTVERSION	216	# un/comment as each VERSION is created for PORTVERSION
215	#VVV_PATCH_VERSION= 1.8.0	217	VVV_PATCH_VERSION= 1.8.2
216	#GREETING_PATCH_VERSION= 1.8.1	218	#GREETING_PATCH_VERSION= 1.8.3
217		219
218	.if !defined(VVV_PATCH_VERSION)	220	.if !defined(VVV_PATCH_VERSION)
219	VVV_PATCH_VERSION= ${PORTVERSION}	221	VVV_PATCH_VERSION= ${PORTVERSION}
Lines 264-275 post-install: Link Here
264	post-install-NNTP-on:	266	post-install-NNTP-on:
265	${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}	267	${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}
266		268
267	post-patch-IFDEF_PATCH-on:
268	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-ifdef
269
270	WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}	269	WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}
271		270
272	post-patch:	271	pre-configure::
273	@${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \	272	@${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
274	${WRKSRC}/contrib/gpg.rc	273	${WRKSRC}/contrib/gpg.rc
275	@${REINPLACE_CMD} -e 's,pgp6,pgp,g' \	274	@${REINPLACE_CMD} -e 's,pgp6,pgp,g' \




TIMESTAMP = 1496461712
SHA256 (mutt/mutt-1.8.3.tar.gz) = 9b81746d67ffeca5ea44f60893b70dc93c86d4bc10187d4dd360185e4d42ed42
SIZE (mutt/mutt-1.8.3.tar.gz) = 4122012
SHA256 (mutt/patch-1.8.2.vvv.nntp.gz) = 940cf7fd4fbea39f48bd5594180a7be5c3cc6714d62eeb3f2e5fbc0ab4b3545b
SIZE (mutt/patch-1.8.2.vvv.nntp.gz) = 60675
SHA256 (mutt/patch-1.8.2.vvv.nntp_ru.gz) = c85a288ed6864c311cbc70b31bab9f0d0d1051846becb5e8fe737609fd939a9c
SIZE (mutt/patch-1.8.2.vvv.nntp_ru.gz) = 3465
SHA256 (mutt/date-conditional.diff) = 8936c5fe7a2a62a68f2a8d001c7a6dddf138c48186a338482b6639507ba9133e
SIZE (mutt/date-conditional.diff) = 2023
SHA256 (mutt/mutt-1.8.3.vc.greeting) = 73113eb0a3eb761755315ab03c0b6bcb316c09603461a1f8a3f54bd870a576cc
SIZE (mutt/mutt-1.8.3.vc.greeting) = 4499
SHA256 (mutt/patch-1.8.2.vvv.initials.gz) = e929c863dd012624b2ac724cd296f346374cd2522f256020fa458e94890ca750
SIZE (mutt/patch-1.8.2.vvv.initials.gz) = 686
SHA256 (mutt/patch-1.8.2.vvv.quote.gz) = 03b1aa4aa9152b968fc1709e68207073df62b9b1a5da43ff1d680d6dfe17fe35




--- PATCHES.orig	2017-06-03 23:06:11 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.4.cd.ifdef.1
--- init.c.orig	2017-05-30 19:27:52 UTC
+++ init.c
@@ -656,6 +656,52 @@ static mbchar_table *parse_mbchar_table 
   return t;

 static int parse_unignore (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
 {
   do
--- init.h.orig	2017-06-03 23:06:11 UTC
+++ init.h
@@ -3904,6 +3904,7 @@ static int parse_lists (BUFFER *, BUFFER
 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_ignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_unignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_source (BUFFER *, BUFFER *, unsigned long, BUFFER *);
@@ -3966,6 +3967,7 @@ const struct command_t Commands[] = {
   { "hdr_order",	parse_list,		UL &HeaderOrderList },
 #ifdef HAVE_ICONV
   { "iconv-hook",	mutt_parse_hook,	MUTT_ICONVHOOK },




--- PATCHES.orig	2017-06-03 22:37:15 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.7.ust.maildir-mtime.2
--- browser.c.orig	2017-06-03 22:37:03 UTC
+++ browser.c
@@ -32,6 +32,7 @@
 #ifdef USE_IMAP
 #include "imap.h"
 #endif

 
 #include <stdlib.h>
 #include <dirent.h>
@@ -413,6 +414,21 @@ static void init_state (struct browser_s
     menu->data = state->entry;
 }
 

 static int examine_directory (MUTTMENU *menu, struct browser_state *state,
 			      char *d, const char *prefix)
 {
@@ -476,6 +492,7 @@ static int examine_directory (MUTTMENU *
     tmp = Incoming;
     while (tmp && mutt_strcmp (buffer, tmp->path))
       tmp = tmp->next;

     if (tmp && Context &&
         !mutt_strcmp (tmp->realpath, Context->realpath))
     {
@@ -549,6 +566,7 @@ static int examine_mailboxes (MUTTMENU *
     strfcpy (buffer, NONULL(tmp->path), sizeof (buffer));
     mutt_pretty_mailbox (buffer, sizeof (buffer));
 




--- doc/manual.xml.head.orig	2017-05-30 19:27:52 UTC
+++ doc/manual.xml.head
@@ -4265,6 +4265,22 @@ variable <quote>all</quote>, which allow
 their system defaults.
 </para>
 

 </sect2>
 
 <sect2 id="set-myvar">
--- mutt.h.orig	2017-06-03 23:16:03 UTC
+++ mutt.h
@@ -865,6 +865,8 @@ typedef struct pattern_t
   unsigned int alladdr : 1;
   unsigned int stringmatch : 1;
   unsigned int groupmatch : 1;

   unsigned int ign_case : 1;		/* ignore case for local stringmatch searches */
   unsigned int isalias : 1;
   int min;
--- pattern.c.orig	2017-05-30 19:26:40 UTC
+++ pattern.c
@@ -46,6 +46,7 @@ static int eat_regexp (pattern_t *pat, B
 static int eat_date (pattern_t *pat, BUFFER *, BUFFER *);




--- PATCHES.orig	2017-06-03 23:21:18 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.6.cb.reverse_reply.2
--- init.h.orig	2017-06-03 23:21:18 UTC
+++ init.h
@@ -2588,6 +2588,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	2017-06-03 23:21:23 UTC
+++ mutt.h
@@ -440,6 +440,7 @@ enum
   OPTREVALIAS,
   OPTREVNAME,
   OPTREVREAL,

   OPTRFC2047PARAMS,
   OPTSAVEADDRESS,
   OPTSAVEEMPTY,
--- protos.h.orig	2017-05-30 19:27:53 UTC
+++ protos.h
@@ -93,6 +93,7 @@ ADDRESS *mutt_get_address (ENVELOPE *, c
 ADDRESS *mutt_lookup_alias (const char *s);

 ADDRESS *mutt_expand_aliases (ADDRESS *);
 ADDRESS *mutt_parse_adrlist (ADDRESS *, const char *);
 
--- send.c.orig	2017-05-30 19:27:53 UTC
+++ send.c
@@ -585,6 +585,10 @@ void mutt_fix_reply_recipients (ENVELOPE
   /* the CC field can get cluttered, especially with lists */

   env->cc = mutt_remove_xrefs (env->to, env->cc);
   
   if (env->cc && !env->to)
--- sendlib.c.orig	2017-05-30 19:27:53 UTC
+++ sendlib.c
@@ -2714,6 +2714,35 @@ static void set_noconv_flags (BODY *b, s
   }




--- hdrline.c.orig	2017-06-03 23:31:21 UTC
+++ hdrline.c
@@ -249,6 +249,89 @@ static char *apply_subject_mods (ENVELOP
  * %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,
@@ -469,7 +552,13 @@ hdr_format_str (char *dest,
 
         if (!do_locales)
           setlocale (LC_TIME, "C");

         if (!do_locales)
           setlocale (LC_TIME, "");
 
--- mutt.h.orig	2017-05-30 19:27:53 UTC
+++ mutt.h
@@ -134,6 +134,16 @@ typedef enum
   MUTT_FORMAT_NOFILTER    = (1<<7)  /* do not allow filtering on this pass */

Lines 1-6 Link Here

(-)b/mail/mutt/files/extra-patch-smime-outlook (-3 / +3 lines)
1	--- crypt.c.orig Fri Mar 7 09:23:44 2003	1	--- crypt.c.orig 2017-05-30 19:27:52 UTC
2	+++ crypt.c Fri Mar 21 00:06:48 2003	2	+++ crypt.c
3	@@ -440,7 +440,7 @@	3	@@ -491,7 +491,7 @@ int mutt_is_application_smime (BODY *m)
4	{	4	{
5	len++;	5	len++;
6	if (!ascii_strcasecmp ((t+len), "p7m"))	6	if (!ascii_strcasecmp ((t+len), "p7m"))

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-dgc-deepif (-3 / +3 lines)
1	--- muttlib.c.orig 2017-04-19 01:05:29 UTC	1	--- muttlib.c.orig 2017-06-03 02:20:37 UTC
2	+++ muttlib.c	2	+++ muttlib.c
3	@@ -1369,6 +1369,12 @@	3	@@ -1378,6 +1378,12 @@ void mutt_FormatString (char dest, /
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	@@ -1381,7 +1387,13 @@	16	@@ -1390,7 +1396,13 @@ void mutt_FormatString (char dest, /
17	count = 0;	17	count = 0;
18	while (count < sizeof (elsestring) && src && src != '?')	18	while (count < sizeof (elsestring) && src && src != '?')
19	{	19	{




--- contrib/smime.rc.orig	2017-05-30 19:26:40 UTC
+++ contrib/smime.rc
@@ -23,8 +23,12 @@ set crypt_verify_sig = yes
 

 # Uncomment to make mutt ask what key to use when trying to decrypt a message.
 # It will use the default key above (if that was set) else.
 # unset smime_decrypt_use_default_key
--- crypt.c.orig	2017-06-04 00:05:52 UTC
+++ crypt.c
@@ -229,8 +229,18 @@ int mutt_protect (HEADER *msg, char *key
     if ((WithCrypto & APPLICATION_SMIME)

       {
 	/* signed ? free it! */
 	return (-1);
--- init.h.orig	2017-06-04 00:05:52 UTC
+++ init.h
@@ -3017,6 +3017,11 @@ struct option_t MuttVars[] = {
   ** possible \fCprintf(3)\fP-like sequences.
   ** (S/MIME only)
   */

   { "smime_encrypt_with",	DT_STR,	 R_NONE, UL &SmimeCryptAlg, UL "aes256" },
   /*
   ** .pp
--- mutt.h.orig	2017-06-04 00:05:52 UTC
+++ mutt.h
@@ -284,6 +284,7 @@ enum
   OPT_FORWEDIT,
   OPT_FCCATTACH,
   OPT_INCLUDE,




--- commands.c.orig	2017-05-30 19:27:52 UTC
+++ commands.c
@@ -185,7 +185,7 @@ int mutt_display_message (HEADER *cur)
     {

 	  mutt_message ( _("S/MIME signature successfully verified."));
 	else
 	  mutt_error ( _("S/MIME certificate owner does not match sender."));
--- contrib/smime.rc.orig	2017-06-04 00:06:24 UTC
+++ contrib/smime.rc
@@ -8,7 +8,10 @@ set smime_is_default
 

 # Passphrase expiration
 set smime_timeout=300
 
--- init.h.orig	2017-06-04 00:06:24 UTC
+++ init.h
@@ -3000,6 +3000,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_sign_as",			DT_SYN,  R_NONE, UL "smime_default_key", 0 },
   { "smime_default_key",		DT_STR,	 R_NONE, UL &SmimeDefaultKey, 0 },
   /*
--- mutt.h.orig	2017-06-04 00:06:24 UTC
+++ mutt.h
@@ -513,6 +513,7 @@ enum
   OPTCRYPTTIMESTAMP,
   OPTSMIMEISDEFAULT,
   OPTASKCERTLABEL,




--- mutt.h.orig	2017-06-03 22:52:35 UTC
+++ mutt.h
@@ -211,6 +211,7 @@ enum
   MUTT_EXPIRED,
   MUTT_SUPERSEDED,
   MUTT_TRASH,

 
   /* actions for mutt_pattern_comp/mutt_pattern_exec */
   MUTT_AND,
--- pattern.c.orig	2017-06-03 22:52:35 UTC
+++ pattern.c
@@ -57,6 +57,7 @@ static const struct pattern_flags
 }
 Flags[] =
 {

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

Return to bug 219786

Lines 1-14 Link Here

(-)b/mail/mutt/distinfo (-7 / +7 lines)
1	TIMESTAMP = 1494678618	1	TIMESTAMP = 1496461712
2	SHA256 (mutt/mutt-1.8.2.tar.gz) = 1d057bf1b565f2c38ee50c9a661654cbbe4165f98e25bfa361ebbd707d96f235	2	SHA256 (mutt/mutt-1.8.3.tar.gz) = 9b81746d67ffeca5ea44f60893b70dc93c86d4bc10187d4dd360185e4d42ed42
3	SIZE (mutt/mutt-1.8.2.tar.gz) = 4118429	3	SIZE (mutt/mutt-1.8.3.tar.gz) = 4122012
4	SHA256 (mutt/patch-1.8.2.vvv.nntp.gz) = 940cf7fd4fbea39f48bd5594180a7be5c3cc6714d62eeb3f2e5fbc0ab4b3545b	4	SHA256 (mutt/patch-1.8.2.vvv.nntp.gz) = 940cf7fd4fbea39f48bd5594180a7be5c3cc6714d62eeb3f2e5fbc0ab4b3545b
5	SIZE (mutt/patch-1.8.2.vvv.nntp.gz) = 60675	5	SIZE (mutt/patch-1.8.2.vvv.nntp.gz) = 60675
6	SHA256 (mutt/patch-1.8.2.vvv.nntp_ru.gz) = c85a288ed6864c311cbc70b31bab9f0d0d1051846becb5e8fe737609fd939a9c	6	SHA256 (mutt/patch-1.8.2.vvv.nntp_ru.gz) = c85a288ed6864c311cbc70b31bab9f0d0d1051846becb5e8fe737609fd939a9c
7	SIZE (mutt/patch-1.8.2.vvv.nntp_ru.gz) = 3465	7	SIZE (mutt/patch-1.8.2.vvv.nntp_ru.gz) = 3465
8	SHA256 (mutt/patch-1.7.0.ats.date_conditional.1) = a7f65e0b6e59713582b3b0a1c3d3c0e54e5875f5dfe3bda285e51a5b6d96e14e	8	SHA256 (mutt/date-conditional.diff) = 8936c5fe7a2a62a68f2a8d001c7a6dddf138c48186a338482b6639507ba9133e
9	SIZE (mutt/patch-1.7.0.ats.date_conditional.1) = 2415	9	SIZE (mutt/date-conditional.diff) = 2023
10	SHA256 (mutt/mutt-1.8.2.vc.greeting) = 73113eb0a3eb761755315ab03c0b6bcb316c09603461a1f8a3f54bd870a576cc	10	SHA256 (mutt/mutt-1.8.3.vc.greeting) = 73113eb0a3eb761755315ab03c0b6bcb316c09603461a1f8a3f54bd870a576cc
11	SIZE (mutt/mutt-1.8.2.vc.greeting) = 4499	11	SIZE (mutt/mutt-1.8.3.vc.greeting) = 4499
12	SHA256 (mutt/patch-1.8.2.vvv.initials.gz) = e929c863dd012624b2ac724cd296f346374cd2522f256020fa458e94890ca750	12	SHA256 (mutt/patch-1.8.2.vvv.initials.gz) = e929c863dd012624b2ac724cd296f346374cd2522f256020fa458e94890ca750
13	SIZE (mutt/patch-1.8.2.vvv.initials.gz) = 686	13	SIZE (mutt/patch-1.8.2.vvv.initials.gz) = 686
14	SHA256 (mutt/patch-1.8.2.vvv.quote.gz) = 03b1aa4aa9152b968fc1709e68207073df62b9b1a5da43ff1d680d6dfe17fe35	14	SHA256 (mutt/patch-1.8.2.vvv.quote.gz) = 03b1aa4aa9152b968fc1709e68207073df62b9b1a5da43ff1d680d6dfe17fe35

Lines 1-8 Link Here

(-)b/mail/mutt/files/extra-patch-ifdef (-5 / +5 lines)
1	--- PATCHES.orig 2017-04-12 23:01:05 UTC	1	--- PATCHES.orig 2017-06-03 23:06:11 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 2017-04-12 23:01:17 UTC	5	--- init.c.orig 2017-05-30 19:27:52 UTC
6	+++ init.c	6	+++ init.c
7	@@ -656,6 +656,52 @@ static mbchar_table *parse_mbchar_table	7	@@ -656,6 +656,52 @@ static mbchar_table *parse_mbchar_table
8	return t;	8	return t;
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 2017-04-12 23:01:17 UTC	60	--- init.h.orig 2017-06-03 23:06:11 UTC
61	+++ init.h	61	+++ init.h
62	@@ -3889,6 +3889,7 @@ static int parse_lists (BUFFER *, BUFFER	62	@@ -3904,6 +3904,7 @@ static int parse_lists (BUFFER *, BUFFER
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_ignore (BUFFER , BUFFER , unsigned long, BUFFER *);	67	static int parse_ignore (BUFFER , BUFFER , unsigned long, BUFFER *);
68	static int parse_unignore (BUFFER , BUFFER , unsigned long, BUFFER *);	68	static int parse_unignore (BUFFER , BUFFER , unsigned long, BUFFER *);
69	static int parse_source (BUFFER , BUFFER , unsigned long, BUFFER *);	69	static int parse_source (BUFFER , BUFFER , unsigned long, BUFFER *);
70	@@ -3951,6 +3952,7 @@ const struct command_t Commands[] = {	70	@@ -3966,6 +3967,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-10 Link Here

(-)b/mail/mutt/files/extra-patch-maildir-mtime (-8 / +8 lines)
1	--- PATCHES Dec 2002 17:44:54 -0000 3.6	1	--- PATCHES.orig 2017-06-03 22:37:15 UTC
2	+++ PATCHES Feb 2004 13:19:42 -0000	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 Wed Jan 26 13:41:04 2005	5	--- browser.c.orig 2017-06-03 22:37:03 UTC
6	+++ browser.c Wed Feb 9 09:20:14 2005	6	+++ browser.c
7	@@ -27,6 +27,7 @@	7	@@ -32,6 +32,7 @@
8	#ifdef USE_IMAP	8	#ifdef USE_IMAP
9	#include "imap.h"	9	#include "imap.h"
10	#endif	10	#endif
Lines 12-18 Link Here
12		12
13	#include <stdlib.h>	13	#include <stdlib.h>
14	#include <dirent.h>	14	#include <dirent.h>
15	@@ -346,6 +347,21 @@	15	@@ -413,6 +414,21 @@ static void init_state (struct browser_s
16	menu->data = state->entry;	16	menu->data = state->entry;
17	}	17	}
18		18
Lines 34-40 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	char d, const char prefix)	35	char d, const char prefix)
36	{	36	{
37	@@ -409,6 +425,7 @@	37	@@ -476,6 +492,7 @@ static int examine_directory (MUTTMENU *
38	tmp = Incoming;	38	tmp = Incoming;
39	while (tmp && mutt_strcmp (buffer, tmp->path))	39	while (tmp && mutt_strcmp (buffer, tmp->path))
40	tmp = tmp->next;	40	tmp = tmp->next;
Lines 42-48 Link Here
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	@@ -454,6 +471,7 @@	45	@@ -549,6 +566,7 @@ static int examine_mailboxes (MUTTMENU *
46	strfcpy (buffer, NONULL(tmp->path), sizeof (buffer));	46	strfcpy (buffer, NONULL(tmp->path), sizeof (buffer));
47	mutt_pretty_mailbox (buffer, sizeof (buffer));	47	mutt_pretty_mailbox (buffer, sizeof (buffer));
48		48

Lines 1-6 Link Here

(-)b/mail/mutt/files/extra-patch-parent-child-match (-5 / +5 lines)
1	--- doc/manual.xml.head.orig 2017-02-24 18:29:36 UTC	1	--- doc/manual.xml.head.orig 2017-05-30 19:27:52 UTC
2	+++ doc/manual.xml.head	2	+++ doc/manual.xml.head
3	@@ -4259,6 +4259,22 @@ variable <quote>all</quote>, which allow	3	@@ -4265,6 +4265,22 @@ variable <quote>all</quote>, which allow
4	their system defaults.	4	their system defaults.
5	</para>	5	</para>
6		6
Lines 23-31 Link Here
23	</sect2>	23	</sect2>
24		24
25	<sect2 id="set-myvar">	25	<sect2 id="set-myvar">
26	--- mutt.h.orig 2017-02-24 18:29:36 UTC	26	--- mutt.h.orig 2017-06-03 23:16:03 UTC
27	+++ mutt.h	27	+++ mutt.h
28	@@ -863,6 +863,8 @@ typedef struct pattern_t	28	@@ -865,6 +865,8 @@ typedef struct pattern_t
29	unsigned int alladdr : 1;	29	unsigned int alladdr : 1;
30	unsigned int stringmatch : 1;	30	unsigned int stringmatch : 1;
31	unsigned int groupmatch : 1;	31	unsigned int groupmatch : 1;
Lines 34-40 Link Here
34	unsigned int ign_case : 1; /* ignore case for local stringmatch searches */	34	unsigned int ign_case : 1; /* ignore case for local stringmatch searches */
35	unsigned int isalias : 1;	35	unsigned int isalias : 1;
36	int min;	36	int min;
37	--- pattern.c.orig 2017-02-24 18:29:37 UTC	37	--- pattern.c.orig 2017-05-30 19:26:40 UTC
38	+++ pattern.c	38	+++ pattern.c
39	@@ -46,6 +46,7 @@ static int eat_regexp (pattern_t *pat, B	39	@@ -46,6 +46,7 @@ static int eat_regexp (pattern_t *pat, B
40	static int eat_date (pattern_t pat, BUFFER , BUFFER *);	40	static int eat_date (pattern_t pat, BUFFER , BUFFER *);

Lines 1-10 Link Here

(-)b/mail/mutt/files/extra-patch-reverse_reply (-8 / +8 lines)
1	--- PATCHES.orig 2017-04-12 23:01:05 UTC	1	--- PATCHES.orig 2017-06-03 23:21:18 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 2017-04-12 23:01:17 UTC	5	--- init.h.orig 2017-06-03 23:21:18 UTC
6	+++ init.h	6	+++ init.h
7	@@ -2575,6 +2575,13 @@ struct option_t MuttVars[] = {	7	@@ -2588,6 +2588,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 2017-04-12 23:01:17 UTC	21	--- mutt.h.orig 2017-06-03 23:21:23 UTC
22	+++ mutt.h	22	+++ mutt.h
23	@@ -438,6 +438,7 @@ enum	23	@@ -440,6 +440,7 @@ enum
24	OPTREVALIAS,	24	OPTREVALIAS,
25	OPTREVNAME,	25	OPTREVNAME,
26	OPTREVREAL,	26	OPTREVREAL,
Lines 28-34 Link Here
28	OPTRFC2047PARAMS,	28	OPTRFC2047PARAMS,
29	OPTSAVEADDRESS,	29	OPTSAVEADDRESS,
30	OPTSAVEEMPTY,	30	OPTSAVEEMPTY,
31	--- protos.h.orig 2017-04-12 23:01:17 UTC	31	--- protos.h.orig 2017-05-30 19:27:53 UTC
32	+++ protos.h	32	+++ protos.h
33	@@ -93,6 +93,7 @@ ADDRESS mutt_get_address (ENVELOPE , c	33	@@ -93,6 +93,7 @@ ADDRESS mutt_get_address (ENVELOPE , c
34	ADDRESS mutt_lookup_alias (const char s);	34	ADDRESS mutt_lookup_alias (const char s);
Lines 38-44 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 2017-04-12 23:01:07 UTC	41	--- send.c.orig 2017-05-30 19:27:53 UTC
42	+++ send.c	42	+++ send.c
43	@@ -585,6 +585,10 @@ void mutt_fix_reply_recipients (ENVELOPE	43	@@ -585,6 +585,10 @@ void mutt_fix_reply_recipients (ENVELOPE
44	/* the CC field can get cluttered, especially with lists */	44	/* the CC field can get cluttered, especially with lists */
Lines 51-57 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 2017-04-12 23:01:08 UTC	54	--- sendlib.c.orig 2017-05-30 19:27:53 UTC
55	+++ sendlib.c	55	+++ sendlib.c
56	@@ -2714,6 +2714,35 @@ static void set_noconv_flags (BODY *b, s	56	@@ -2714,6 +2714,35 @@ static void set_noconv_flags (BODY *b, s
57	}	57	}

Lines 1-6 Link Here

(-)b/mail/mutt/files/extra-patch-smartdate (-4 / +4 lines)
1	--- hdrline.c.orig 2017-02-24 18:29:36 UTC	1	--- hdrline.c.orig 2017-06-03 23:31:21 UTC
2	+++ hdrline.c	2	+++ hdrline.c
3	@@ -248,6 +248,89 @@ static char *apply_subject_mods (ENVELOP	3	@@ -249,6 +249,89 @@ static char *apply_subject_mods (ENVELOP
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	@@ -421,7 +504,13 @@ hdr_format_str (char *dest,	93	@@ -469,7 +552,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-111 Link Here
105	if (!do_locales)	105	if (!do_locales)
106	setlocale (LC_TIME, "");	106	setlocale (LC_TIME, "");
107		107
108	--- mutt.h.orig 2017-02-24 18:29:36 UTC	108	--- mutt.h.orig 2017-05-30 19:27:53 UTC
109	+++ mutt.h	109	+++ mutt.h
110	@@ -134,6 +134,16 @@ typedef enum	110	@@ -134,6 +134,16 @@ typedef enum
111	MUTT_FORMAT_NOFILTER = (1<<7) /* do not allow filtering on this pass */	111	MUTT_FORMAT_NOFILTER = (1<<7) /* do not allow filtering on this pass */

Lines 1-4 Link Here

(-)b/mail/mutt/files/patch-smime-self (-6 / +6 lines)
1	--- contrib/smime.rc.orig 2016-10-08 19:30:21 UTC	1	--- contrib/smime.rc.orig 2017-05-30 19:26:40 UTC
2	+++ contrib/smime.rc	2	+++ contrib/smime.rc
3	@@ -23,8 +23,12 @@ set crypt_verify_sig = yes	3	@@ -23,8 +23,12 @@ set crypt_verify_sig = yes
4		4
Lines 14-20 Link Here
14	# Uncomment to make mutt ask what key to use when trying to decrypt a message.	14	# Uncomment to make mutt ask what key to use when trying to decrypt a message.
15	# It will use the default key above (if that was set) else.	15	# It will use the default key above (if that was set) else.
16	# unset smime_decrypt_use_default_key	16	# unset smime_decrypt_use_default_key
17	--- crypt.c.orig 2016-10-08 19:35:50 UTC	17	--- crypt.c.orig 2017-06-04 00:05:52 UTC
18	+++ crypt.c	18	+++ crypt.c
19	@@ -229,8 +229,18 @@ int mutt_protect (HEADER msg, char key	19	@@ -229,8 +229,18 @@ int mutt_protect (HEADER msg, char key
20	if ((WithCrypto & APPLICATION_SMIME)	20	if ((WithCrypto & APPLICATION_SMIME)
Lines 37-45 Link Here
37	{	37	{
38	/* signed ? free it! */	38	/* signed ? free it! */
39	return (-1);	39	return (-1);
40	--- init.h.orig 2016-10-08 19:35:50 UTC	40	--- init.h.orig 2017-06-04 00:05:52 UTC
41	+++ init.h	41	+++ init.h
42	@@ -2997,6 +2997,11 @@ struct option_t MuttVars[] = {	42	@@ -3017,6 +3017,11 @@ struct option_t MuttVars[] = {
43	** possible \fCprintf(3)\fP-like sequences.	43	** possible \fCprintf(3)\fP-like sequences.
44	** (S/MIME only)	44	** (S/MIME only)
45	*/	45	*/
Lines 51-59 Link Here
51	{ "smime_encrypt_with", DT_STR, R_NONE, UL &SmimeCryptAlg, UL "aes256" },	51	{ "smime_encrypt_with", DT_STR, R_NONE, UL &SmimeCryptAlg, UL "aes256" },
52	/*	52	/*
53	** .pp	53	** .pp
54	--- mutt.h.orig 2016-10-08 19:30:21 UTC	54	--- mutt.h.orig 2017-06-04 00:05:52 UTC
55	+++ mutt.h	55	+++ mutt.h
56	@@ -274,6 +274,7 @@ enum	56	@@ -284,6 +284,7 @@ enum
57	OPT_FORWEDIT,	57	OPT_FORWEDIT,
58	OPT_FCCATTACH,	58	OPT_FCCATTACH,
59	OPT_INCLUDE,	59	OPT_INCLUDE,

Lines 1-4 Link Here

(-)b/mail/mutt/files/patch-smime-sender (-6 / +6 lines)
1	--- commands.c.orig 2017-04-12 23:01:17 UTC	1	--- commands.c.orig 2017-05-30 19:27:52 UTC
2	+++ commands.c	2	+++ commands.c
3	@@ -185,7 +185,7 @@ int mutt_display_message (HEADER *cur)	3	@@ -185,7 +185,7 @@ int mutt_display_message (HEADER *cur)
4	{	4	{
Lines 9-15 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	--- contrib/smime.rc.orig 2017-04-12 23:01:05 UTC	12	--- contrib/smime.rc.orig 2017-06-04 00:06:24 UTC
13	+++ contrib/smime.rc	13	+++ contrib/smime.rc
14	@@ -8,7 +8,10 @@ set smime_is_default	14	@@ -8,7 +8,10 @@ set smime_is_default
15		15
Lines 23-31 Link Here
23	# Passphrase expiration	23	# Passphrase expiration
24	set smime_timeout=300	24	set smime_timeout=300
25		25
26	--- init.h.orig 2017-04-12 23:01:17 UTC	26	--- init.h.orig 2017-06-04 00:06:24 UTC
27	+++ init.h	27	+++ init.h
28	@@ -2980,6 +2980,15 @@ struct option_t MuttVars[] = {	28	@@ -3000,6 +3000,15 @@ struct option_t MuttVars[] = {
29	** to determine the key to use. It will ask you to supply a key, if it can't find one.	29	** to determine the key to use. It will ask you to supply a key, if it can't find one.
30	** (S/MIME only)	30	** (S/MIME only)
31	*/	31	*/
Lines 41-49 Link Here
41	{ "smime_sign_as", DT_SYN, R_NONE, UL "smime_default_key", 0 },	41	{ "smime_sign_as", DT_SYN, R_NONE, UL "smime_default_key", 0 },
42	{ "smime_default_key", DT_STR, R_NONE, UL &SmimeDefaultKey, 0 },	42	{ "smime_default_key", DT_STR, R_NONE, UL &SmimeDefaultKey, 0 },
43	/*	43	/*
44	--- mutt.h.orig 2017-04-12 23:01:17 UTC	44	--- mutt.h.orig 2017-06-04 00:06:24 UTC
45	+++ mutt.h	45	+++ mutt.h
46	@@ -499,6 +499,7 @@ enum	46	@@ -513,6 +513,7 @@ enum
47	OPTCRYPTTIMESTAMP,	47	OPTCRYPTTIMESTAMP,
48	OPTSMIMEISDEFAULT,	48	OPTSMIMEISDEFAULT,
49	OPTASKCERTLABEL,	49	OPTASKCERTLABEL,

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-threadcomplete (-6 / +5 lines)
1	--- mutt.h.orig 2017-02-27 01:20:29 UTC	1	--- mutt.h.orig 2017-06-03 22:52:35 UTC
2	+++ mutt.h	2	+++ mutt.h
3	@@ -201,6 +201,7 @@ enum	3	@@ -211,6 +211,7 @@ enum
4	MUTT_EXPIRED,	4	MUTT_EXPIRED,
5	MUTT_SUPERSEDED,	5	MUTT_SUPERSEDED,
6	MUTT_TRASH,	6	MUTT_TRASH,
Lines 8-16 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 2017-02-27 01:20:06 UTC	11	--- pattern.c.orig 2017-06-03 22:52:35 UTC
12	+++ pattern.c	12	+++ pattern.c
13	@@ -56,6 +56,7 @@ static const struct pattern_flags	13	@@ -57,6 +57,7 @@ static const struct pattern_flags
14	}	14	}
15	Flags[] =	15	Flags[] =
16	{	16	{
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	@@ -1236,6 +1237,16 @@ mutt_pattern_exec (struct pattern_t *pat	21	@@ -1302,6 +1303,16 @@ pattern_exec (struct pattern_t *pat, pat
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);
25	-