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

(-)b/mail/mutt/Makefile (-7 / +7 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	mutt
4
PORTNAME=	mutt
5
DISTVERSION=	1.9.5
5
DISTVERSION=	1.10.0
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 11-17 MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ Link Here
11
		ftp://ftp.demon.co.uk/pub/mirrors/mutt/ \
11
		ftp://ftp.demon.co.uk/pub/mirrors/mutt/ \
12
		http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
12
		http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
13
		http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv
13
		http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv
14
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
15
DIST_SUBDIR=	mutt
14
DIST_SUBDIR=	mutt
16
EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
15
EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
17
16
Lines 174-181 FLOCK_CONFIGURE_ENABLE= flock Link Here
174
173
175
LOCALES_FIX_CONFIGURE_ON=	--enable-locales-fix
174
LOCALES_FIX_CONFIGURE_ON=	--enable-locales-fix
176
175
177
IDN_LIB_DEPENDS=	libidn.so:dns/libidn
176
IDN_LIB_DEPENDS=	libidn2.so:dns/libidn2
178
IDN_CONFIGURE_WITH=	idn
177
IDN_CONFIGURE_WITH=	idn2
179
IDN_IMPLIES=	ICONV
178
IDN_IMPLIES=	ICONV
180
179
181
IFDEF_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ifdef
180
IFDEF_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ifdef
Lines 192-197 GREETING_PATCH_PATCHFILES= mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc Link Here
192
QUOTE_PATCH_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \
191
QUOTE_PATCH_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \
193
			patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv
192
			patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv
194
193
194
NNTP_BROKEN=	NNTP Patch needs updated for 1.10.x
195
NNTP_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:-p1:vvv
195
NNTP_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:-p1:vvv
196
NNTP_CONFIGURE_ON=	--enable-nntp
196
NNTP_CONFIGURE_ON=	--enable-nntp
197
NNTP_VARS=	XML_NEEDED=yes
197
NNTP_VARS=	XML_NEEDED=yes
Lines 203-210 DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref Link Here
203
.include <bsd.port.options.mk>
203
.include <bsd.port.options.mk>
204
204
205
# un/comment as each VERSION is created for PORTVERSION
205
# un/comment as each VERSION is created for PORTVERSION
206
#VVV_PATCH_VERSION=	1.9.5
206
VVV_PATCH_VERSION=	1.9.5
207
#GREETING_PATCH_VERSION=	1.9.5
207
GREETING_PATCH_VERSION=	1.9.5
208
208
209
.if !defined(VVV_PATCH_VERSION)
209
.if !defined(VVV_PATCH_VERSION)
210
VVV_PATCH_VERSION=	${PORTVERSION}
210
VVV_PATCH_VERSION=	${PORTVERSION}
(-)b/mail/mutt/distinfo (-3 / +3 lines)
Lines 1-6 Link Here
1
TIMESTAMP = 1524260157
1
TIMESTAMP = 1526775216
2
SHA256 (mutt/mutt-1.9.5.tar.gz) = bf617e64ae4e08a998bef8e42a965a211587e051f1437a3a4884b351a9385753
2
SHA256 (mutt/mutt-1.10.0.tar.gz) = 0215b5f90ef9cc33441a6ca842379b64412ed7f8da83ed68bfaa319179f5535b
3
SIZE (mutt/mutt-1.9.5.tar.gz) = 4207937
3
SIZE (mutt/mutt-1.10.0.tar.gz) = 4249980
4
SHA256 (mutt/mutt-1.9.5.vc.greeting) = b4ac804c24a07c7eb8330ebfdc94cdbf6fd7a4671badfb32fb611df09c008317
4
SHA256 (mutt/mutt-1.9.5.vc.greeting) = b4ac804c24a07c7eb8330ebfdc94cdbf6fd7a4671badfb32fb611df09c008317
5
SIZE (mutt/mutt-1.9.5.vc.greeting) = 4534
5
SIZE (mutt/mutt-1.9.5.vc.greeting) = 4534
6
SHA256 (mutt/patch-1.9.5.vvv.nntp.gz) = fdb7021ff9a5085175b56d5d896a14c314b64fcc074860292fe3299b5efca584
6
SHA256 (mutt/patch-1.9.5.vvv.nntp.gz) = fdb7021ff9a5085175b56d5d896a14c314b64fcc074860292fe3299b5efca584
(-)b/mail/mutt/files/extra-patch-aspell (-2 / +2 lines)
Lines 1-6 Link Here
1
--- doc/Muttrc.head.orig	2017-04-12 23:01:06 UTC
1
--- doc/Muttrc.head.orig	2018-05-19 20:33:53 UTC
2
+++ doc/Muttrc.head
2
+++ doc/Muttrc.head
3
@@ -34,6 +34,8 @@ bind browser y exit
3
@@ -35,6 +35,8 @@
4
 # close-hook  '\.gz$'  "gzip -c   '%t' >  '%f'"
4
 # close-hook  '\.gz$'  "gzip -c   '%t' >  '%f'"
5
 # append-hook '\.gz$'  "gzip -c   '%t' >> '%f'"
5
 # append-hook '\.gz$'  "gzip -c   '%t' >> '%f'"
6
 
6
 
(-)b/mail/mutt/files/extra-patch-ifdef (-21 / +21 lines)
Lines 1-10 Link Here
1
--- PATCHES.orig	2017-09-04 23:34:26 UTC
1
--- init.h.orig	2018-05-19 23:45:18 UTC
2
+++ init.h
3
@@ -4114,6 +4114,7 @@
4
 static int parse_unlists (BUFFER *, BUFFER *, unsigned long, BUFFER *);
5
 static int parse_alias (BUFFER *, BUFFER *, unsigned long, BUFFER *);
6
 static int parse_unalias (BUFFER *, BUFFER *, unsigned long, BUFFER *);
7
+static int parse_ifdef (BUFFER *, BUFFER *, unsigned long, BUFFER *);
8
 static int parse_echo (BUFFER *, BUFFER *, unsigned long, BUFFER *);
9
 static int parse_ignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
10
 static int parse_unignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
11
@@ -4178,6 +4178,7 @@
12
   { "hdr_order",	parse_list,		UL &HeaderOrderList },
13
 #ifdef HAVE_ICONV
14
   { "iconv-hook",	mutt_parse_hook,	MUTT_ICONVHOOK },
15
+  { "ifdef",		parse_ifdef,		0 },
16
 #endif
17
   { "ignore",		parse_ignore,		0 },
18
   { "lists",		parse_lists,		0 },
19
--- PATCHES.orig	2018-05-19 23:44:00 UTC
2
+++ PATCHES
20
+++ PATCHES
3
@@ -0,0 +1 @@
21
@@ -0,0 +1 @@
4
+patch-1.5.4.cd.ifdef.1
22
+patch-1.5.4.cd.ifdef.1
5
--- init.c.orig	2017-09-04 23:34:22 UTC
23
--- init.c.orig	2018-05-19 23:44:00 UTC
6
+++ init.c
24
+++ init.c
7
@@ -656,6 +656,52 @@ static mbchar_table *parse_mbchar_table 
25
@@ -650,6 +650,52 @@
8
   return t;
26
   return t;
9
 }
27
 }
10
 
28
 
Lines 57-77 Link Here
57
 static int parse_unignore (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
75
 static int parse_unignore (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
58
 {
76
 {
59
   do
77
   do
60
--- init.h.orig	2017-09-04 23:34:22 UTC
61
+++ init.h
62
@@ -4037,6 +4037,7 @@ static int parse_lists (BUFFER *, BUFFER
63
 static int parse_unlists (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 *);
66
+static int parse_ifdef (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 *);
69
 static int parse_source (BUFFER *, BUFFER *, unsigned long, BUFFER *);
70
@@ -4099,6 +4100,7 @@ const struct command_t Commands[] = {
71
   { "hdr_order",	parse_list,		UL &HeaderOrderList },
72
 #ifdef HAVE_ICONV
73
   { "iconv-hook",	mutt_parse_hook,	MUTT_ICONVHOOK },
74
+  { "ifdef",		parse_ifdef,		0 },
75
 #endif
76
   { "ignore",		parse_ignore,		0 },
77
   { "lists",		parse_lists,		0 },
(-)b/mail/mutt/files/extra-patch-maildir-mtime (-7 / +7 lines)
Lines 1-9 Link Here
1
--- PATCHES.orig	2017-09-04 15:19:31.167205000 -0400
1
--- PATCHES.orig	2018-05-19 21:17:16 UTC
2
+++ PATCHES	2017-09-04 15:19:31.168636000 -0400
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	2017-09-04 15:19:27.714342000 -0400
5
--- browser.c.orig	2018-05-19 20:33:53 UTC
6
+++ browser.c	2017-09-04 15:19:31.178678000 -0400
6
+++ browser.c
7
@@ -32,6 +32,7 @@
7
@@ -32,6 +32,7 @@
8
 #ifdef USE_IMAP
8
 #ifdef USE_IMAP
9
 #include "imap.h"
9
 #include "imap.h"
Lines 12-18 Link Here
12
 
12
 
13
 #include <stdlib.h>
13
 #include <stdlib.h>
14
 #include <dirent.h>
14
 #include <dirent.h>
15
@@ -413,6 +414,21 @@
15
@@ -439,6 +439,21 @@
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
@@ -476,6 +492,7 @@
37
@@ -504,6 +504,7 @@
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
@@ -549,6 +566,7 @@
45
@@ -578,6 +578,7 @@
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 (-12 / +13 lines)
Lines 1-10 Link Here
1
--- PATCHES.orig	2017-09-04 23:35:30 UTC
1
--- PATCHES.orig	2018-05-19 20:39:17 UTC
2
+++ PATCHES
2
+++ PATCHES
3
@@ -0,0 +1 @@
3
@@ -1 +1,2 @@
4
+patch-1.5.6.cb.reverse_reply.2
4
+patch-1.5.6.cb.reverse_reply.2
5
--- init.h.orig	2017-09-04 23:35:27 UTC
5
 patch-1.5.4.cd.ifdef.1
6
--- init.h.orig	2018-05-19 20:37:42 UTC
6
+++ init.h
7
+++ init.h
7
@@ -2687,6 +2687,13 @@ struct option_t MuttVars[] = {
8
@@ -2748,6 +2748,13 @@
8
   ** possibly including eventual real names.  When it is \fIunset\fP, mutt will
9
   ** 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.
10
   ** override any such real names with the setting of the $$realname variable.
10
   */
11
   */
Lines 18-26 Link Here
18
   { "rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0 },
19
   { "rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0 },
19
   /*
20
   /*
20
   ** .pp
21
   ** .pp
21
--- mutt.h.orig	2017-09-04 23:35:27 UTC
22
--- mutt.h.orig	2018-05-19 20:36:22 UTC
22
+++ mutt.h
23
+++ mutt.h
23
@@ -448,6 +448,7 @@ enum
24
@@ -466,6 +466,7 @@
24
   OPTREVALIAS,
25
   OPTREVALIAS,
25
   OPTREVNAME,
26
   OPTREVNAME,
26
   OPTREVREAL,
27
   OPTREVREAL,
Lines 28-36 Link Here
28
   OPTRFC2047PARAMS,
29
   OPTRFC2047PARAMS,
29
   OPTSAVEADDRESS,
30
   OPTSAVEADDRESS,
30
   OPTSAVEEMPTY,
31
   OPTSAVEEMPTY,
31
--- protos.h.orig	2017-09-04 23:35:27 UTC
32
--- protos.h.orig	2018-05-19 20:33:53 UTC
32
+++ protos.h
33
+++ protos.h
33
@@ -93,6 +93,7 @@ ADDRESS *mutt_get_address (ENVELOPE *, c
34
@@ -93,6 +93,7 @@
34
 ADDRESS *mutt_lookup_alias (const char *s);
35
 ADDRESS *mutt_lookup_alias (const char *s);
35
 ADDRESS *mutt_remove_duplicates (ADDRESS *);
36
 ADDRESS *mutt_remove_duplicates (ADDRESS *);
36
 ADDRESS *mutt_remove_xrefs (ADDRESS *, ADDRESS *);
37
 ADDRESS *mutt_remove_xrefs (ADDRESS *, ADDRESS *);
Lines 38-46 Link Here
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
 
41
--- send.c.orig	2017-09-04 23:35:27 UTC
42
--- send.c.orig	2018-05-19 20:33:53 UTC
42
+++ send.c
43
+++ send.c
43
@@ -598,6 +598,10 @@ void mutt_fix_reply_recipients (ENVELOPE
44
@@ -598,6 +598,10 @@
44
   /* the CC field can get cluttered, especially with lists */
45
   /* the CC field can get cluttered, especially with lists */
45
   env->to = mutt_remove_duplicates (env->to);
46
   env->to = mutt_remove_duplicates (env->to);
46
   env->cc = mutt_remove_duplicates (env->cc);
47
   env->cc = mutt_remove_duplicates (env->cc);
Lines 51-59 Link Here
51
   env->cc = mutt_remove_xrefs (env->to, env->cc);
52
   env->cc = mutt_remove_xrefs (env->to, env->cc);
52
   
53
   
53
   if (env->cc && !env->to)
54
   if (env->cc && !env->to)
54
--- sendlib.c.orig	2017-09-04 23:35:27 UTC
55
--- sendlib.c.orig	2018-05-19 20:33:53 UTC
55
+++ sendlib.c
56
+++ sendlib.c
56
@@ -2753,6 +2753,35 @@ static void set_noconv_flags (BODY *b, s
57
@@ -2753,6 +2753,35 @@
57
   }
58
   }
58
 }
59
 }
59
 
60
 
(-)b/mail/mutt/files/extra-patch-smartdate (-5 / +5 lines)
Lines 1-6 Link Here
1
--- hdrline.c.orig	2018-01-27 22:22:49 UTC
1
--- hdrline.c.orig	2018-05-19 20:36:17 UTC
2
+++ hdrline.c
2
+++ hdrline.c
3
@@ -249,6 +249,89 @@ static char *apply_subject_mods (ENVELOP
3
@@ -249,6 +249,89 @@
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
@@ -422,7 +505,13 @@
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	2018-01-27 22:22:49 UTC
108
--- mutt.h.orig	2018-05-19 20:44:10 UTC
109
+++ mutt.h
109
+++ mutt.h
110
@@ -134,6 +134,16 @@ typedef enum
110
@@ -148,6 +148,16 @@
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 */
112
 } format_flag;
112
 } format_flag;
113
 
113
 
(-)b/mail/mutt/files/extra-patch-smime-outlook (-2 / +2 lines)
Lines 1-6 Link Here
1
--- crypt.c.orig	2017-05-30 19:27:52 UTC
1
--- crypt.c.orig	2018-05-19 20:33:53 UTC
2
+++ crypt.c
2
+++ crypt.c
3
@@ -491,7 +491,7 @@ int mutt_is_application_smime (BODY *m)
3
@@ -501,7 +501,7 @@
4
     {
4
     {
5
       len++;
5
       len++;
6
       if (!ascii_strcasecmp ((t+len), "p7m"))
6
       if (!ascii_strcasecmp ((t+len), "p7m"))
(-)b/mail/mutt/files/patch-Makefile.in (-3 / +3 lines)
Lines 1-6 Link Here
1
--- Makefile.in.orig	2018-03-04 01:36:55 UTC
1
--- Makefile.in.orig	2018-05-19 20:48:16 UTC
2
+++ Makefile.in
2
+++ Makefile.in
3
@@ -471,7 +471,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign
3
@@ -471,7 +471,7 @@
4
 @BUILD_DOC_TRUE@DOC_SUBDIR = doc
4
 @BUILD_DOC_TRUE@DOC_SUBDIR = doc
5
 @BUILD_IMAP_TRUE@IMAP_SUBDIR = imap
5
 @BUILD_IMAP_TRUE@IMAP_SUBDIR = imap
6
 @BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap
6
 @BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap
Lines 9-15 Link Here
9
 bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET)
9
 bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET)
10
 @BUILD_HCACHE_TRUE@HCVERSION = hcversion.h
10
 @BUILD_HCACHE_TRUE@HCVERSION = hcversion.h
11
 BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c $(HCVERSION)
11
 BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c $(HCVERSION)
12
@@ -1357,18 +1357,9 @@ install-exec-hook:
12
@@ -1355,18 +1355,9 @@
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
(-)b/mail/mutt/files/patch-doc_Muttrc (-2 / +2 lines)
Lines 1-6 Link Here
1
--- doc/Muttrc.orig	2016-10-08 19:48:13 UTC
1
--- doc/Muttrc.orig	2018-05-19 20:52:48 UTC
2
+++ doc/Muttrc
2
+++ doc/Muttrc
3
@@ -649,6 +649,7 @@ attachments   -I message/external-body
3
@@ -709,6 +709,7 @@
4
 # will be saved for later references.  Also see $record,
4
 # will be saved for later references.  Also see $record,
5
 # $save_name, $force_name and ``fcc-hook''.
5
 # $save_name, $force_name and ``fcc-hook''.
6
 # 
6
 # 
(-)b/mail/mutt/files/patch-smime-sender (-4 / +4 lines)
Lines 1-6 Link Here
1
--- commands.c.orig	2017-09-08 22:18:16 UTC
1
--- commands.c.orig	2017-09-08 22:18:16 UTC
2
+++ commands.c
2
+++ commands.c
3
@@ -185,7 +185,7 @@ int mutt_display_message (HEADER *cur)
3
@@ -186,7 +186,7 @@ int mutt_display_message (HEADER *cur)
4
     {
4
     {
5
       if (cur->security & GOODSIGN)
5
       if (cur->security & GOODSIGN)
6
       {
6
       {
Lines 11-17 Link Here
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	2017-09-08 22:18:16 UTC
12
--- init.h.orig	2017-09-08 22:18:16 UTC
13
+++ init.h
13
+++ init.h
14
@@ -3099,6 +3099,15 @@ struct option_t MuttVars[] = {
14
@@ -3160,6 +3169,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 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_sign_as",			DT_SYN,  R_NONE, UL "smime_default_key", 0 },
27
   { "smime_self_encrypt_as",	DT_SYN,  R_NONE, UL "smime_default_key", 0 },
28
   { "smime_default_key",		DT_STR,	 R_NONE, UL &SmimeDefaultKey, 0 },
28
   { "smime_default_key",		DT_STR,	 R_NONE, UL &SmimeDefaultKey, 0 },
29
   /*
29
   /*
30
--- mutt.h.orig	2017-09-08 22:18:16 UTC
30
--- mutt.h.orig	2017-09-08 22:18:16 UTC
31
+++ mutt.h
31
+++ mutt.h
32
@@ -521,6 +521,7 @@ enum
32
@@ -539,6 +540,7 @@ enum
33
   OPTSMIMEISDEFAULT,
33
   OPTSMIMEISDEFAULT,
34
   OPTSMIMESELFENCRYPT,
34
   OPTSMIMESELFENCRYPT,
35
   OPTASKCERTLABEL,
35
   OPTASKCERTLABEL,
(-)b/mail/mutt/files/patch-threadcomplete (-6 / +5 lines)
Lines 1-6 Link Here
1
--- mutt.h.orig	2017-09-04 23:39:03 UTC
1
--- mutt.h.orig	2018-05-19 21:17:16 UTC
2
+++ mutt.h
2
+++ mutt.h
3
@@ -211,6 +211,7 @@ enum
3
@@ -225,6 +225,7 @@
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-09-04 23:39:03 UTC
11
--- pattern.c.orig	2018-05-19 20:33:53 UTC
12
+++ pattern.c
12
+++ pattern.c
13
@@ -56,6 +56,7 @@ static const struct pattern_flags
13
@@ -57,6 +57,7 @@
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
@@ -1270,6 +1271,16 @@ mutt_pattern_exec (struct pattern_t *pat
21
@@ -1294,6 +1295,16 @@
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
- 

Return to bug 228387