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

(-)b/mail/mutt/Makefile (-8 / +4 lines)
Lines 1-7 Link Here
1
# Created by: Udo Schweigert
1
# Created by: Udo Schweigert
2
2
3
PORTNAME=	mutt
3
PORTNAME=	mutt
4
DISTVERSION=	2.0.7
4
DISTVERSION=	2.1.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 137-148 GSSAPI_MIT_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \ Link Here
137
GSSAPI_NONE_CONFIGURE_ON=	--without-gss
137
GSSAPI_NONE_CONFIGURE_ON=	--without-gss
138
138
139
HCACHE_NONE_CONFIGURE_ON=	--disable-hcache
139
HCACHE_NONE_CONFIGURE_ON=	--disable-hcache
140
HCACHE_NONE_CONFIGURE_OFF=	--enable-hcache \
140
HCACHE_NONE_CONFIGURE_OFF=	--enable-hcache
141
				--without-gdbm \
142
				--without-qdbm
143
141
144
HCACHE_BDB_CONFIGURE_WITH=	bdb=${LOCALBASE}
142
HCACHE_BDB_CONFIGURE_WITH=	bdb=${LOCALBASE}
145
HCACHE_BDB_USES=		bdb:42+
143
HCACHE_BDB_USES=		bdb:42+
144
HCACHE_BDB_VARS=		CFLAGS+=-I${BDB_INCLUDE_DIR} \
145
				LDFLAGS+=-L${BDB_LIB_DIR}
146
146
147
HCACHE_TOKYOCABINET_CONFIGURE_WITH=	tokyocabinet=${LOCALBASE}
147
HCACHE_TOKYOCABINET_CONFIGURE_WITH=	tokyocabinet=${LOCALBASE}
148
HCACHE_TOKYOCABINET_LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
148
HCACHE_TOKYOCABINET_LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
Lines 208-217 pre-configure:: Link Here
208
	@${REINPLACE_CMD} -e 's#$$(docdir)/samples#${EXAMPLESDIR}#g' \
208
	@${REINPLACE_CMD} -e 's#$$(docdir)/samples#${EXAMPLESDIR}#g' \
209
		${WRKSRC}/contrib/Makefile.in
209
		${WRKSRC}/contrib/Makefile.in
210
210
211
pre-configure-HCACHE_BDB-on:
212
	@${REINPLACE_CMD} -E -e 's/BDB_VERSIONS="/&${BDB_LIB_NAME} db${BDB_VER} /' \
213
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
214
215
# Undo some dist. installed files
211
# Undo some dist. installed files
216
post-stage::
212
post-stage::
217
	@${MV} ${STAGEDIR}/${LOCALBASE}/etc/Muttrc.dist \
213
	@${MV} ${STAGEDIR}/${LOCALBASE}/etc/Muttrc.dist \
(-)b/mail/mutt/distinfo (-3 / +3 lines)
Lines 1-6 Link Here
1
TIMESTAMP = 1620172336
1
TIMESTAMP = 1623620472
2
SHA256 (mutt/mutt-2.0.7.tar.gz) = 957688c6a521561992d4f2f27cf9feb239c7c6c0042c6061c0e474a7dd26cc91
2
SHA256 (mutt/mutt-2.1.0.tar.gz) = 80835bbcce920bccf4fc99676eda9e83f03a929b4022eada931d721ede330d37
3
SIZE (mutt/mutt-2.0.7.tar.gz) = 5299366
3
SIZE (mutt/mutt-2.1.0.tar.gz) = 5405519
4
SHA256 (mutt/mutt-2.0.6.vc.greeting) = dbf9602a153acb5410d22d1fe7a478df74f40ba1b203c8a4bdb7eab2f876bdb5
4
SHA256 (mutt/mutt-2.0.6.vc.greeting) = dbf9602a153acb5410d22d1fe7a478df74f40ba1b203c8a4bdb7eab2f876bdb5
5
SIZE (mutt/mutt-2.0.6.vc.greeting) = 1971
5
SIZE (mutt/mutt-2.0.6.vc.greeting) = 1971
6
SHA256 (mutt/patch-1.13.0.vvv.initials.xz) = 8b25ad6596bd57d94f6551e7e73ceb8da620468e96fb507b2f51545d5b3eaa02
6
SHA256 (mutt/patch-1.13.0.vvv.initials.xz) = 8b25ad6596bd57d94f6551e7e73ceb8da620468e96fb507b2f51545d5b3eaa02
(-)b/mail/mutt/files/extra-patch-ifdef (-5 / +5 lines)
Lines 1-8 Link Here
1
--- PATCHES.orig	2021-01-23 01:39:53 UTC
1
--- PATCHES.orig	2021-06-13 21:49:46 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-01-21 20:23:24 UTC
5
--- init.c.orig	2021-05-26 22:40:56 UTC
6
+++ init.c
6
+++ init.c
7
@@ -678,6 +678,52 @@ static mbchar_table *parse_mbchar_table (const char *s
7
@@ -678,6 +678,52 @@ static mbchar_table *parse_mbchar_table (const char *s
8
   return t;
8
   return t;
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-01-23 01:39:53 UTC
60
--- init.h.orig	2021-06-13 21:49:46 UTC
61
+++ init.h
61
+++ init.h
62
@@ -4705,6 +4705,7 @@ static int parse_lists (BUFFER *, BUFFER *, union poin
62
@@ -4787,6 +4787,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
@@ -4772,6 +4773,7 @@ const struct command_t Commands[] = {
70
@@ -4854,6 +4855,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} },
(-)b/mail/mutt/files/extra-patch-maildir-mtime (-5 / +5 lines)
Lines 1-8 Link Here
1
--- PATCHES.orig	2020-11-08 20:52:49 UTC
1
--- PATCHES.orig	2021-06-13 21:49:47 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	2020-11-03 17:50:37 UTC
5
--- browser.c.orig	2021-05-23 18:20:50 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
@@ -430,6 +431,21 @@ static void init_state (struct browser_state *state, M
15
@@ -531,6 +532,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-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
 			      const char *d, const char *prefix)
35
 			      const char *d, const char *prefix)
36
 {
36
 {
37
@@ -496,6 +512,7 @@ static int examine_directory (MUTTMENU *menu, struct b
37
@@ -597,6 +613,7 @@ static int examine_directory (MUTTMENU *menu, struct b
38
     tmp = Incoming;
38
     tmp = Incoming;
39
     while (tmp && mutt_strcmp (mutt_b2s (full_path), 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;
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
@@ -579,6 +596,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b
45
@@ -680,6 +697,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
 
(-)b/mail/mutt/files/extra-patch-reverse_reply (-9 / +9 lines)
Lines 1-10 Link Here
1
--- PATCHES.orig	2021-01-23 01:39:53 UTC
1
--- PATCHES.orig	2021-06-13 21:49:47 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-01-23 01:39:53 UTC
5
--- init.h.orig	2021-06-13 21:49:46 UTC
6
+++ init.h
6
+++ init.h
7
@@ -3191,6 +3191,13 @@ struct option_t MuttVars[] = {
7
@@ -3322,6 +3322,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 18-26 Link Here
18
   { "rfc2047_parameters", DT_BOOL, R_NONE, {.l=OPTRFC2047PARAMS}, {.l=0} },
18
   { "rfc2047_parameters", DT_BOOL, R_NONE, {.l=OPTRFC2047PARAMS}, {.l=0} },
19
   /*
19
   /*
20
   ** .pp
20
   ** .pp
21
--- mutt.h.orig	2021-01-23 01:39:53 UTC
21
--- mutt.h.orig	2021-06-13 21:49:46 UTC
22
+++ mutt.h
22
+++ mutt.h
23
@@ -522,6 +522,7 @@ enum
23
@@ -525,6 +525,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	2021-01-21 20:23:24 UTC
31
--- protos.h.orig	2021-05-23 18:20:51 UTC
32
+++ protos.h
32
+++ protos.h
33
@@ -85,6 +85,7 @@ char* mutt_extract_message_id (const char *, const cha
33
@@ -85,6 +85,7 @@ char* mutt_extract_message_id (const char *, const cha
34
 ADDRESS *mutt_get_address (ENVELOPE *, char **);
34
 ADDRESS *mutt_get_address (ENVELOPE *, char **);
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	2021-01-21 20:23:24 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
@@ -739,6 +739,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 */
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	2021-01-21 20:23:24 UTC
54
--- sendlib.c.orig	2021-05-23 18:20:51 UTC
55
+++ sendlib.c
55
+++ sendlib.c
56
@@ -3012,6 +3012,35 @@ static void set_noconv_flags (BODY *b, short flag)
56
@@ -3044,6 +3044,35 @@ static void set_noconv_flags (BODY *b, short flag)
57
   }
57
   }
58
 }
58
 }
59
 
59
 
(-)b/mail/mutt/files/extra-patch-smartdate (-3 / +3 lines)
Lines 1-4 Link Here
1
--- hdrline.c.orig	2020-11-08 20:52:48 UTC
1
--- hdrline.c.orig	2021-06-13 21:49:46 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-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	2020-11-08 20:52:49 UTC
108
--- mutt.h.orig	2021-06-13 21:49:47 UTC
109
+++ mutt.h
109
+++ mutt.h
110
@@ -169,6 +169,16 @@ typedef enum
110
@@ -168,6 +168,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
 
(-)b/mail/mutt/files/extra-smime-sender (-5 / +5 lines)
Lines 1-4 Link Here
1
--- commands.c.orig	2020-11-06 20:53:46 UTC
1
--- commands.c.orig	2021-05-23 18:20:50 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	2020-11-08 20:52:49 UTC
12
--- init.h.orig	2021-06-13 21:49:47 UTC
13
+++ init.h
13
+++ init.h
14
@@ -3688,6 +3688,15 @@ struct option_t MuttVars[] = {
14
@@ -3819,6 +3819,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	2020-11-08 20:52:49 UTC
30
--- mutt.h.orig	2021-06-13 21:49:47 UTC
31
+++ mutt.h
31
+++ mutt.h
32
@@ -606,6 +606,7 @@ enum
32
@@ -609,6 +609,7 @@ enum
33
   OPTSMIMEISDEFAULT,
33
   OPTSMIMEISDEFAULT,
34
   OPTSMIMESELFENCRYPT,
34
   OPTSMIMESELFENCRYPT,
35
   OPTASKCERTLABEL,
35
   OPTASKCERTLABEL,
(-)a/mail/mutt/files/patch-browser.c (-67 lines)
Removed Link Here
1
--- browser.c.orig	2020-11-08 20:52:49 UTC
2
+++ browser.c
3
@@ -87,6 +87,12 @@ static int browser_compare_subject (const void *a, con
4
   struct folder_file *pa = (struct folder_file *) a;
5
   struct folder_file *pb = (struct folder_file *) b;
6
 
7
+  /* Always keep '..' in first menu position */
8
+  if (!strncmp(pa->display_name, "..", 2))
9
+	  return(-1);
10
+  if (!strncmp(pb->display_name, "..", 2))
11
+	  return(1);
12
+
13
   int r = mutt_strcoll (pa->display_name, pb->display_name);
14
 
15
   return ((BrowserSort & SORT_REVERSE) ? -r : r);
16
@@ -97,6 +103,12 @@ static int browser_compare_date (const void *a, const 
17
   struct folder_file *pa = (struct folder_file *) a;
18
   struct folder_file *pb = (struct folder_file *) b;
19
 
20
+  /* Always keep '..' in first menu position */
21
+  if (!strncmp(pa->display_name, "..", 2))
22
+	  return(-1);
23
+  if (!strncmp(pb->display_name, "..", 2))
24
+	  return(1);
25
+
26
   int r = pa->mtime - pb->mtime;
27
 
28
   return ((BrowserSort & SORT_REVERSE) ? -r : r);
29
@@ -107,6 +119,12 @@ static int browser_compare_size (const void *a, const 
30
   struct folder_file *pa = (struct folder_file *) a;
31
   struct folder_file *pb = (struct folder_file *) b;
32
 
33
+  /* Always keep '..' in first menu position */
34
+  if (!strncmp(pa->display_name, "..", 2))
35
+	  return(-1);
36
+  if (!strncmp(pb->display_name, "..", 2))
37
+	  return(1);
38
+
39
   int r = pa->size - pb->size;
40
 
41
   return ((BrowserSort & SORT_REVERSE) ? -r : r);
42
@@ -117,6 +135,12 @@ static int browser_compare_count (const void *a, const
43
   struct folder_file *pa = (struct folder_file *) a;
44
   struct folder_file *pb = (struct folder_file *) b;
45
 
46
+  /* Always keep '..' in first menu position */
47
+  if (!strncmp(pa->display_name, "..", 2))
48
+	  return(-1);
49
+  if (!strncmp(pb->display_name, "..", 2))
50
+	  return(1);
51
+
52
   int r = pa->msg_count - pb->msg_count;
53
 
54
   return ((BrowserSort & SORT_REVERSE) ? -r : r);
55
@@ -126,6 +150,12 @@ static int browser_compare_unread (const void *a, cons
56
 {
57
   struct folder_file *pa = (struct folder_file *) a;
58
   struct folder_file *pb = (struct folder_file *) b;
59
+
60
+  /* Always keep '..' in first menu position */
61
+  if (!strncmp(pa->display_name, "..", 2))
62
+	  return(-1);
63
+  if (!strncmp(pb->display_name, "..", 2))
64
+	  return(1);
65
 
66
   int r = pa->msg_unread - pb->msg_unread;
67
 
(-)b/mail/mutt/files/patch-date-conditional (-5 / +5 lines)
Lines 1-8 Link Here
1
--- PATCHES.orig	2020-11-08 20:52:50 UTC
1
--- PATCHES.orig	2021-06-13 21:49:47 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	2020-11-08 20:52:49 UTC
5
--- hdrline.c.orig	2021-06-13 21:49:47 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	2020-11-06 22:10:26 UTC
61
--- muttlib.c.orig	2021-05-23 18:20:51 UTC
62
+++ muttlib.c
62
+++ muttlib.c
63
@@ -1764,7 +1764,16 @@ void mutt_FormatString (char *dest,		/* output buffer 
63
@@ -1677,7 +1677,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
@@ -1780,12 +1789,12 @@ void mutt_FormatString (char *dest,		/* output buffer 
81
@@ -1693,12 +1702,12 @@ void mutt_FormatString (char *dest,		/* output buffer 
82
 	  count++;
82
 	  count++;
83
 	}
83
 	}
84
 	*cp = 0;
84
 	*cp = 0;
(-)b/mail/mutt/files/patch-dgc-deepif (-4 / +3 lines)
Lines 1-6 Link Here
1
--- muttlib.c.orig	2020-11-08 20:52:50 UTC
1
--- muttlib.c.orig	2021-06-13 21:49:47 UTC
2
+++ muttlib.c
2
+++ muttlib.c
3
@@ -1807,6 +1807,12 @@ void mutt_FormatString (char *dest,		/* output buffer 
3
@@ -1720,6 +1720,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
@@ -1819,7 +1825,13 @@ void mutt_FormatString (char *dest,		/* output buffer 
16
@@ -1732,7 +1738,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 256609