Attachment #231782 for bug #261917

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

Lines 1-7 Link Here

(-)b/mail/mutt/Makefile (-1 / +1 lines)
1	# Created by: Udo Schweigert	1	# Created by: Udo Schweigert
2		2
3	PORTNAME= mutt	3	PORTNAME= mutt
4	DISTVERSION= 2.1.5	4	DISTVERSION= 2.2.0
5	CATEGORIES+= mail	5	CATEGORIES+= mail
6	MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \	6	MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \
7	https://bitbucket.org/mutt/mutt/downloads/ \	7	https://bitbucket.org/mutt/mutt/downloads/ \

Lines 1-6 Link Here

(-)b/mail/mutt/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1640911132	1	TIMESTAMP = 1644704304
2	SHA256 (mutt/mutt-2.1.5.tar.gz) = 92a309e47e363a97d62425bcb71adceae5ab5c4c413dbcac37fa98ed70c12be0	2	SHA256 (mutt/mutt-2.2.0.tar.gz) = e84597f06d03ca82f8ca3b5ec8bc294c150709b43ed2a0177bf479c3e3345314
3	SIZE (mutt/mutt-2.1.5.tar.gz) = 5414049	3	SIZE (mutt/mutt-2.2.0.tar.gz) = 5503348
4	SHA256 (mutt/mutt-2.1.0.vc.greeting) = d43686bbd88539c7b50cc198d15c146f579af344c26b83c4018c50f65f5c6dac	4	SHA256 (mutt/mutt-2.1.0.vc.greeting) = d43686bbd88539c7b50cc198d15c146f579af344c26b83c4018c50f65f5c6dac
5	SIZE (mutt/mutt-2.1.0.vc.greeting) = 2003	5	SIZE (mutt/mutt-2.1.0.vc.greeting) = 2003
6	SHA256 (mutt/patch-1.13.0.vvv.initials.xz) = 8b25ad6596bd57d94f6551e7e73ceb8da620468e96fb507b2f51545d5b3eaa02	6	SHA256 (mutt/patch-1.13.0.vvv.initials.xz) = 8b25ad6596bd57d94f6551e7e73ceb8da620468e96fb507b2f51545d5b3eaa02




--- PATCHES.orig	2022-02-12 23:46:24 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.4.cd.ifdef.1
--- init.c.orig	2022-01-25 19:33:16 UTC
+++ init.c
@@ -715,6 +715,52 @@ static mbchar_table *parse_mbchar_table (const char *s
   return t;
 }
 

+  if (!(res = (mutt_option_index (tmp->data) != -1)))
+    for (i = 0; !res && i < MENU_MAX; i++)
+    {
+      const struct menu_func_op_t *b = km_get_table (Menus[i].value);
+
+      if (!b)
+	continue;

 static int parse_unignore (BUFFER *buf, BUFFER *s, union pointer_long_t udata, BUFFER *err)
 {
   do
--- init.h.orig	2022-02-12 23:46:24 UTC
+++ init.h
@@ -4926,6 +4926,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_echo (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
 static int parse_ignore (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
 static int parse_unignore (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
@@ -4993,6 +4994,7 @@ const struct command_t Commands[] = {
   { "hdr_order",	parse_list,		{.p=&HeaderOrderList} },
 #ifdef HAVE_ICONV
   { "iconv-hook",	mutt_parse_hook,	{.l=MUTT_ICONVHOOK} },

Lines 1-8 Link Here

(-)b/mail/mutt/files/extra-patch-maildir-mtime (-3 / +3 lines)
1	--- PATCHES.orig 2021-06-13 21:49:47 UTC	1	--- PATCHES.orig 2022-02-12 23:46:24 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 2021-05-23 18:20:50 UTC	5	--- browser.c.orig 2022-01-25 19:33:16 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 42-48 Link Here
42	if (tmp && Context && !tmp->nopoll &&	42	if (tmp && Context && !tmp->nopoll &&
43	!mutt_strcmp (tmp->realpath, Context->realpath))	43	!mutt_strcmp (tmp->realpath, Context->realpath))
44	{	44	{
45	@@ -680,6 +697,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b	45	@@ -684,6 +701,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




--- PATCHES.orig	2022-02-12 23:46:24 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.6.cb.reverse_reply.2
--- init.h.orig	2022-02-12 23:46:24 UTC
+++ init.h
@@ -3430,6 +3430,13 @@ struct option_t MuttVars[] = {
   ** In either case, a missing real name will be filled in afterwards
   ** using the value of $$realname.
   */

+  ** 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=1} },
   /*
   ** .pp
--- mutt.h.orig	2022-02-12 23:46:24 UTC
+++ mutt.h
@@ -533,6 +533,7 @@ enum
   OPTREVALIAS,
   OPTREVNAME,
   OPTREVREAL,

   OPTRFC2047PARAMS,
   OPTSAVEADDRESS,
   OPTSAVEEMPTY,
--- protos.h.orig	2022-02-09 20:12:23 UTC
+++ protos.h
@@ -86,6 +86,7 @@ char* mutt_extract_message_id (const char *, const cha
 ADDRESS *mutt_get_address (ENVELOPE *, char **);
 ADDRESS *mutt_lookup_alias (const char *s);
 ADDRESS *mutt_remove_duplicates (ADDRESS *);
+ADDRESS *mutt_reverse_address (ADDRESS *);
 ADDRESS *mutt_remove_adrlist_group_delimiters (ADDRESS *);
 ADDRESS *mutt_expand_aliases (ADDRESS *);
 ADDRESS *mutt_parse_adrlist (ADDRESS *, const char *);
--- send.c.orig	2022-01-15 20:43:36 UTC
--- send.c.orig	2021-05-28 19:33:58 UTC
+++ send.c
@@ -744,6 +744,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);
+  if (option (OPTREVREPLY)){
+    env->to = mutt_reverse_address (env->to);
+    env->cc = mutt_reverse_address (env->cc);
+  }
   env->cc = mutt_remove_xrefs (env->to, env->cc);
 
   if (env->cc && !env->to)
--- sendlib.c.orig	2022-01-22 23:36:22 UTC
+++ sendlib.c
@@ -3093,6 +3093,37 @@ static void set_noconv_flags (BODY *b, short flag)
   }
 }
 

+  }
+  return addr;
+}
+
+
+
 int mutt_write_fcc (const char *path, SEND_CONTEXT *sctx, const char *msgid, int post, const char *fcc)
 {

Lines 1-4 Link Here

(-)b/mail/mutt/files/extra-patch-smartdate (-2 / +2 lines)
1	--- hdrline.c.orig 2021-06-13 21:49:46 UTC	1	--- hdrline.c.orig 2022-02-12 23:46:24 UTC
2	+++ hdrline.c	2	+++ hdrline.c
3	@@ -249,6 +249,89 @@ static char apply_subject_mods (ENVELOPE env)	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)
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 2021-06-13 21:49:47 UTC	108	--- mutt.h.orig 2022-02-12 23:46:24 UTC
109	+++ mutt.h	109	+++ mutt.h
110	@@ -168,6 +168,16 @@ typedef enum	110	@@ -168,6 +168,16 @@ typedef enum
111	MUTT_WRITE_HEADER_MIME	111	MUTT_WRITE_HEADER_MIME




--- commands.c.orig	2021-09-08 11:03:24 UTC
+++ commands.c
@@ -302,7 +302,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."));
--- init.h.orig	2022-02-12 23:46:24 UTC
+++ init.h
@@ -3927,6 +3927,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, {.p="smime_default_key"}, {.p=0} },
   { "smime_default_key",		DT_STR,	 R_NONE, {.p=&SmimeDefaultKey}, {.p=0} },
   /*
--- mutt.h.orig	2022-02-12 23:46:24 UTC
+++ mutt.h
@@ -617,6 +617,7 @@ enum
   OPTSMIMEISDEFAULT,
   OPTSMIMESELFENCRYPT,
   OPTASKCERTLABEL,




--- PATCHES.orig	2022-02-12 23:46:24 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.0.ats.date_conditional.1
--- hdrline.c.orig	2022-02-12 23:46:24 UTC
+++ hdrline.c
@@ -428,6 +428,53 @@ hdr_format_str (char *dest,
       const char *cp;

 
       p = dest;
 
--- muttlib.c.orig	2021-12-30 20:58:19 UTC
+++ muttlib.c
@@ -1681,7 +1681,16 @@ void mutt_FormatString (char *dest,		/* output buffer 
       if (*src == '?')
       {
 	flags |= MUTT_FORMAT_OPTIONAL;

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

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-dgc-deepif (-4 / +3 lines)
1	--- muttlib.c.orig 2021-06-13 21:49:47 UTC	1	--- muttlib.c.orig 2022-02-12 23:46:24 UTC
2	+++ muttlib.c	2	+++ muttlib.c
3	@@ -1720,6 +1720,12 @@ void mutt_FormatString (char dest, / output buffer	3	@@ -1724,6 +1724,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	@@ -1732,7 +1738,13 @@ void mutt_FormatString (char dest, / output buffer	16	@@ -1736,7 +1742,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	{
20	-

Return to bug 261917

Lines 1-10 Link Here

(-)b/mail/mutt/files/extra-patch-ifdef (-7 / +7 lines)
1	--- PATCHES.orig 2021-06-13 21:49:46 UTC	1	--- PATCHES.orig 2022-02-12 23:46:24 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 2021-05-26 22:40:56 UTC	5	--- init.c.orig 2022-01-25 19:33:16 UTC
6	+++ init.c	6	+++ init.c
7	@@ -678,6 +678,52 @@ static mbchar_table parse_mbchar_table (const char s	7	@@ -715,6 +715,52 @@ static mbchar_table parse_mbchar_table (const char s
8	return t;	8	return t;
9	}	9	}
10		10
Lines 20-26 Link Here
20	+ if (!(res = (mutt_option_index (tmp->data) != -1)))	20	+ if (!(res = (mutt_option_index (tmp->data) != -1)))
21	+ for (i = 0; !res && i < MENU_MAX; i++)	21	+ for (i = 0; !res && i < MENU_MAX; i++)
22	+ {	22	+ {
23	+ const struct binding_t *b = km_get_table (Menus[i].value);	23	+ const struct menu_func_op_t *b = km_get_table (Menus[i].value);
24	+	24	+
25	+ if (!b)	25	+ if (!b)
26	+ continue;	26	+ continue;
Lines 57-65 Link Here
57	static int parse_unignore (BUFFER buf, BUFFER s, union pointer_long_t udata, 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 2021-06-13 21:49:46 UTC	60	--- init.h.orig 2022-02-12 23:46:24 UTC
61	+++ init.h	61	+++ init.h
62	@@ -4787,6 +4787,7 @@ static int parse_lists (BUFFER , BUFFER , union poin	62	@@ -4926,6 +4926,7 @@ static int parse_lists (BUFFER , BUFFER , union poin
63	static int parse_unlists (BUFFER , BUFFER , union pointer_long_t, BUFFER *);	63	static int parse_unlists (BUFFER , BUFFER , union pointer_long_t, BUFFER *);
64	static int parse_alias (BUFFER , BUFFER , union pointer_long_t, BUFFER *);	64	static int parse_alias (BUFFER , BUFFER , union pointer_long_t, BUFFER *);
65	static int parse_unalias (BUFFER , BUFFER , union pointer_long_t, BUFFER *);	65	static int parse_unalias (BUFFER , BUFFER , union pointer_long_t, BUFFER *);
Lines 67-73 Link Here
67	static int parse_echo (BUFFER , BUFFER , union pointer_long_t, BUFFER *);	67	static int parse_echo (BUFFER , BUFFER , union pointer_long_t, BUFFER *);
68	static int parse_ignore (BUFFER , BUFFER , union pointer_long_t, BUFFER *);	68	static int parse_ignore (BUFFER , BUFFER , union pointer_long_t, BUFFER *);
69	static int parse_unignore (BUFFER , BUFFER , union pointer_long_t, BUFFER *);	69	static int parse_unignore (BUFFER , BUFFER , union pointer_long_t, BUFFER *);
70	@@ -4854,6 +4855,7 @@ const struct command_t Commands[] = {	70	@@ -4993,6 +4994,7 @@ const struct command_t Commands[] = {
71	{ "hdr_order", parse_list, {.p=&HeaderOrderList} },	71	{ "hdr_order", parse_list, {.p=&HeaderOrderList} },
72	#ifdef HAVE_ICONV	72	#ifdef HAVE_ICONV
73	{ "iconv-hook", mutt_parse_hook, {.l=MUTT_ICONVHOOK} },	73	{ "iconv-hook", mutt_parse_hook, {.l=MUTT_ICONVHOOK} },

Lines 1-10 Link Here

(-)b/mail/mutt/files/extra-patch-reverse_reply (-15 / +17 lines)
1	--- PATCHES.orig 2021-06-13 21:49:47 UTC	1	--- PATCHES.orig 2022-02-12 23:46:24 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 2021-06-13 21:49:46 UTC	5	--- init.h.orig 2022-02-12 23:46:24 UTC
6	+++ init.h	6	+++ init.h
7	@@ -3322,6 +3322,13 @@ struct option_t MuttVars[] = {	7	@@ -3430,6 +3430,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	*/
Lines 15-26 Link Here
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, {.l=OPTRFC2047PARAMS}, {.l=0} },	18	{ "rfc2047_parameters", DT_BOOL, R_NONE, {.l=OPTRFC2047PARAMS}, {.l=1} },
19	/*	19	/*
20	** .pp	20	** .pp
21	--- mutt.h.orig 2021-06-13 21:49:46 UTC	21	--- mutt.h.orig 2022-02-12 23:46:24 UTC
22	+++ mutt.h	22	+++ mutt.h
23	@@ -525,6 +525,7 @@ enum	23	@@ -533,6 +533,7 @@ enum
24	OPTREVALIAS,	24	OPTREVALIAS,
25	OPTREVNAME,	25	OPTREVNAME,
26	OPTREVREAL,	26	OPTREVREAL,
Lines 28-59 Link Here
28	OPTRFC2047PARAMS,	28	OPTRFC2047PARAMS,
29	OPTSAVEADDRESS,	29	OPTSAVEADDRESS,
30	OPTSAVEEMPTY,	30	OPTSAVEEMPTY,
31	--- protos.h.orig 2021-05-23 18:20:51 UTC	31	--- protos.h.orig 2022-02-09 20:12:23 UTC
32	+++ protos.h	32	+++ protos.h
33	@@ -85,6 +85,7 @@ char* mutt_extract_message_id (const char *, const cha	33	@@ -86,6 +86,7 @@ char* mutt_extract_message_id (const char *, const cha
34	ADDRESS mutt_get_address (ENVELOPE , char **);	34	ADDRESS mutt_get_address (ENVELOPE , char **);
35	ADDRESS mutt_lookup_alias (const char s);	35	ADDRESS mutt_lookup_alias (const char s);
36	ADDRESS mutt_remove_duplicates (ADDRESS );	36	ADDRESS mutt_remove_duplicates (ADDRESS );
37	+ADDRESS mutt_reverse_address (ADDRESS );	37	+ADDRESS mutt_reverse_address (ADDRESS );
		38	ADDRESS mutt_remove_adrlist_group_delimiters (ADDRESS );
38	ADDRESS mutt_expand_aliases (ADDRESS );	39	ADDRESS mutt_expand_aliases (ADDRESS );
39	ADDRESS mutt_parse_adrlist (ADDRESS , const char *);	40	ADDRESS mutt_parse_adrlist (ADDRESS , const char *);
40		41	--- send.c.orig 2022-01-15 20:43:36 UTC
41	--- send.c.orig 2021-05-28 19:33:58 UTC
42	+++ send.c	42	+++ send.c
43	@@ -739,6 +739,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env)	43	@@ -744,6 +744,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);
47	+ if (option (OPTREVREPLY)){	47	+ if (option (OPTREVREPLY)){
48	+ env->to = mutt_reverse_address (env->to);	48	+ env->to = mutt_reverse_address (env->to);
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 2021-05-23 18:20:51 UTC	54	--- sendlib.c.orig 2022-01-22 23:36:22 UTC
55	+++ sendlib.c	55	+++ sendlib.c
56	@@ -3044,6 +3044,35 @@ static void set_noconv_flags (BODY *b, short flag)	56	@@ -3093,6 +3093,37 @@ static void set_noconv_flags (BODY *b, short flag)
57	}	57	}
58	}	58	}
59		59
Lines 85-90 Link Here
85	+ }	85	+ }
86	+ return addr;	86	+ return addr;
87	+}	87	+}
		88	+
		89	+
88	+	90	+
89	int mutt_write_fcc (const char path, SEND_CONTEXT sctx, const char msgid, int post, const char fcc)	91	int mutt_write_fcc (const char path, SEND_CONTEXT sctx, const char msgid, int post, const char fcc)
90	{	92	{

Lines 1-4 Link Here

(-)b/mail/mutt/files/extra-smime-sender (-5 / +5 lines)
1	--- commands.c.orig 2021-05-23 18:20:50 UTC	1	--- commands.c.orig 2021-09-08 11:03:24 UTC
2	+++ commands.c	2	+++ commands.c
3	@@ -302,7 +302,7 @@ int mutt_display_message (HEADER *cur)	3	@@ -302,7 +302,7 @@ int mutt_display_message (HEADER *cur)
4	{	4	{
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 2021-06-13 21:49:47 UTC	12	--- init.h.orig 2022-02-12 23:46:24 UTC
13	+++ init.h	13	+++ init.h
14	@@ -3819,6 +3819,15 @@ struct option_t MuttVars[] = {	14	@@ -3927,6 +3927,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, {.p="smime_default_key"}, {.p=0} },	27	{ "smime_self_encrypt_as", DT_SYN, R_NONE, {.p="smime_default_key"}, {.p=0} },
28	{ "smime_default_key", DT_STR, R_NONE, {.p=&SmimeDefaultKey}, {.p=0} },	28	{ "smime_default_key", DT_STR, R_NONE, {.p=&SmimeDefaultKey}, {.p=0} },
29	/*	29	/*
30	--- mutt.h.orig 2021-06-13 21:49:47 UTC	30	--- mutt.h.orig 2022-02-12 23:46:24 UTC
31	+++ mutt.h	31	+++ mutt.h
32	@@ -609,6 +609,7 @@ enum	32	@@ -617,6 +617,7 @@ enum
33	OPTSMIMEISDEFAULT,	33	OPTSMIMEISDEFAULT,
34	OPTSMIMESELFENCRYPT,	34	OPTSMIMESELFENCRYPT,
35	OPTASKCERTLABEL,	35	OPTASKCERTLABEL,

Lines 1-8 Link Here

(-)b/mail/mutt/files/patch-date-conditional (-5 / +5 lines)
1	--- PATCHES.orig 2021-06-13 21:49:47 UTC	1	--- PATCHES.orig 2022-02-12 23:46:24 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 2021-06-13 21:49:47 UTC	5	--- hdrline.c.orig 2022-02-12 23:46:24 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;
Lines 58-66 Link Here
58		58
59	p = dest;	59	p = dest;
60		60
61	--- muttlib.c.orig 2021-05-23 18:20:51 UTC	61	--- muttlib.c.orig 2021-12-30 20:58:19 UTC
62	+++ muttlib.c	62	+++ muttlib.c
63	@@ -1677,7 +1677,16 @@ void mutt_FormatString (char dest, / output buffer	63	@@ -1681,7 +1681,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	@@ -1693,12 +1702,12 @@ void mutt_FormatString (char dest, / output buffer	81	@@ -1697,12 +1706,12 @@ void mutt_FormatString (char dest, / output buffer
82	count++;	82	count++;
83	}	83	}
84	*cp = 0;	84	*cp = 0;