Attachment #175840 for bug #213431




# $FreeBSD$

PORTNAME=	mutt
PORTVERSION=	1.7.1
PORTREVISION?=	0
CATEGORIES+=	mail ipv6
MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \

		http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
		http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
DIST_SUBDIR=	mutt
EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}

PATCH_SITES+=	http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
		http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
		http://home.uchicago.edu/~dgc/sw/mutt/:dgc \
		https://www.schrab.com/aaron/mutt/:ats \
		http://vc.org.ua/mutt/:vc
PATCH_DIST_STRIP=	-p1
PATCHFILES=	patch-1.5.1.dgc.deepif.1:dgc \
			patch-1.7.0.ats.date_conditional.1:ats

MAINTAINER?=	dereks@lifeofadishwasher.com
COMMENT?=	Small but powerful text based program for read/writing e-mail

LICENSE=	GPLv2+

CONFLICTS?=	ja-mutt-[0-9]* ja-mutt-devel-[0-9]* mutt-1.4* mutt-devel-lite-[0-9]* mutt-lite-[0-9]* zh-mutt-devel-[0-9]*

DIST_SUBDIR=	mutt
DOCSDIR?=	${PREFIX}/share/doc/mutt
EXAMPLESDIR?=	${PREFIX}/share/examples/mutt
DATADIR?=	${PREFIX}/share/mutt

OPTIONS_SUB=	yes

.if defined (MUTT_LITE)
LITE=	yes
USES+=	ncurses
.endif

.if defined (LITE)
OPTIONS_UNSET=	NLS DOCS EXAMPLES
.else
OPTIONS_DEFINE=	COMPRESSED_FOLDERS SASL DEBUG DOCS EXAMPLES FLOCK \


RUN_DEPENDS+=	${LOCALBASE}/etc/mime.types:misc/mime-support

.if !defined (MUTT_LITE)
ASPELL_BUILD_DEPENDS=	aspell:textproc/aspell
ASPELL_RUN_DEPENDS=	aspell:textproc/aspell
ISPELL_BUILD_DEPENDS=	ispell:textproc/aspell-ispell

URLVIEW_RUN_DEPENDS=	urlview:textproc/urlview
.endif

.if defined (MUTT_LITE)
USES+=	ncurses
PLIST_SUB+=	MAILBOX_MANPAGES=""
PLIST_SUB+=	COMPRESSED_FOLDERS="@comment "
PLIST_SUB+=	HTML="@comment "

CONFIGURE_ARGS+=	--disable-nls --disable-iconv --without-idn
.endif

.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


MAILDIR_HEADER_CACHE_CONFIGURE_OFF=	--without-qdbm

GREETING_PATCH_PATCHFILES=	mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc

COMPRESSED_FOLDERS_DISTFILES=	patch-${RR_PATCH_VERSION}.rr.compressed.gz:vvv
COMPRESSED_FOLDERS_CONFIGURE_ON=	--enable-compressed
COMPRESSED_FOLDERS_VARS=	XML_NEEDED=yes


.include <bsd.port.options.mk>

# un/comment as each VERSION is created for PORTVERSION
#VVV_PATCH_VERSION=	1.7.0
#RR_PATCH_VERSION=	1.7.0
#GREETING_PATCH_VERSION=	1.7.0

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

# XXX

CFLAGS+=		${CFLAGS_ADD}
LDFLAGS+=		${LDFLAGS_ADD}

PATCH_DIST_STRIP=	-p1

pre-patch-PARENT_CHILD_MATCH_PATCH-on:
	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-parent-child-match


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

post-patch-GREETING_PATCH-on:
	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-greeting

post-patch-IFDEF_PATCH-on:
	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-ifdef





TIMESTAMP = 1476585934
SHA256 (mutt/mutt-1.7.1.tar.gz) = e9c6f88e83d48690033f0d862a70293ac746286b77241554f5448bc23bd0d6df
SIZE (mutt/mutt-1.7.1.tar.gz) = 4025008
SHA256 (mutt/patch-1.7.1.rr.compressed.gz) = 97bc56bbc6b0312b87e8dfb68dd9b551edb9d6771bb1b52b1c6f63f51d0bd05b
SIZE (mutt/patch-1.7.1.rr.compressed.gz) = 9985
SHA256 (mutt/patch-1.7.1.vvv.nntp.gz) = 798db983e3d63d954bfd88e0b8771f806afddf0ae07cc9a03d27def355675687
SIZE (mutt/patch-1.7.1.vvv.nntp.gz) = 61201
SHA256 (mutt/patch-1.7.1.vvv.nntp_ru.gz) = 497f96c19ff17330404667a63c1abd6a5b309004c4dc5100f73973012ad8a2c1
SIZE (mutt/patch-1.7.1.vvv.nntp_ru.gz) = 5494
SHA256 (mutt/patch-1.5.1.dgc.deepif.1) = d655a2f0003bdb2efb7ee5a8c77c113da661110e9c63289f03eb622773fc7a34
SIZE (mutt/patch-1.5.1.dgc.deepif.1) = 767
SHA256 (mutt/patch-1.7.0.ats.date_conditional.1) = a7f65e0b6e59713582b3b0a1c3d3c0e54e5875f5dfe3bda285e51a5b6d96e14e
SIZE (mutt/patch-1.7.0.ats.date_conditional.1) = 2415
SHA256 (mutt/mutt-1.7.1.vc.greeting) = 05dce466675c8692ab4a2c34d309de06e98e965241249e3cfccbb8d10873b9a3
SIZE (mutt/mutt-1.7.1.vc.greeting) = 4175
SHA256 (mutt/patch-1.7.1.vvv.initials.gz) = 1405104d8929d672dc5ffebbca8ea5601a88c515e862ec2f89e5b92bfdb53ad0
SIZE (mutt/patch-1.7.1.vvv.initials.gz) = 675
SHA256 (mutt/patch-1.7.1.vvv.quote.gz) = de0e47fb8ffe1ab6587aba37438c90443bee6508759bf82d8aa5da27317b3cc7
SIZE (mutt/patch-1.7.1.vvv.quote.gz) = 1258

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-Makefile.am (-3 / +12 lines)
1	--- Makefile.am.orig 2015-09-10 07:37:42.000000000 +0200	1	--- Makefile.am.orig 2016-10-08 19:30:21 UTC
2	+++ Makefile.am 2015-09-10 07:38:51.000000000 +0200	2	+++ Makefile.am
3	@@ -162,10 +162,6 @@	3	@@ -10,7 +10,7 @@ IMAP_SUBDIR = imap
		4	IMAP_INCLUDES = -I$(top_srcdir)/imap
		5	endif
		6
		7	-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
		8	+SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) . doc
		9
		10	bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET)
		11
		12	@@ -165,10 +165,6 @@ install-exec-hook:
4		13
5	install-data-local:	14	install-data-local:
6	$(MKDIR_P) $(DESTDIR)$(sysconfdir)	15	$(MKDIR_P) $(DESTDIR)$(sysconfdir)

Removed Link Here

(-)a/mail/mutt/files/patch-Makefile.am.doc (-11 lines)
1	--- Makefile.am.orig2 Mon Feb 7 10:20:52 2005
2	+++ Makefile.am Mon Feb 7 10:29:41 2005
3	@@ -10,7 +10,7 @@
4	IMAP_INCLUDES = -I$(top_srcdir)/imap
5	endif
6
7	-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
8	+SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) . doc
9
10	bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
11




--- browser.c.orig	2016-10-08 19:35:50 UTC
+++ browser.c
@@ -80,6 +80,12 @@ static int browser_compare_subject (cons
   struct folder_file *pa = (struct folder_file *) a;
   struct folder_file *pb = (struct folder_file *) b;
 

   int r = mutt_strcoll (pa->name, pb->name);
 
   return ((BrowserSort & SORT_REVERSE) ? -r : r);
@@ -90,6 +96,12 @@ static int browser_compare_date (const v
   struct folder_file *pa = (struct folder_file *) a;
   struct folder_file *pb = (struct folder_file *) b;
 

   int r = pa->mtime - pb->mtime;
 
   return ((BrowserSort & SORT_REVERSE) ? -r : r);
@@ -100,6 +112,12 @@ static int browser_compare_size (const v
   struct folder_file *pa = (struct folder_file *) a;
   struct folder_file *pb = (struct folder_file *) b;
 

Removed Link Here

(-)a/mail/mutt/files/patch-contrib-Makefile.am (-11 lines)
1	--- contrib/Makefile.am.orig Tue Jul 18 20:04:14 2006
2	+++ contrib/Makefile.am Wed Aug 30 16:15:04 2006
3	@@ -2,7 +2,7 @@
4
5	subdir = contrib
6
7	-SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
8	+SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp6.rc Tin.rc \
9	sample.muttrc sample.mailcap sample.muttrc-tlr \
10	colors.default colors.linux smime.rc \
11	ca-bundle.crt smime_keys_test.pl

Added Link Here

(-)b/mail/mutt/files/patch-contrib_Makefile.am (+11 lines)
1	--- contrib/Makefile.am.orig 2016-10-08 19:30:21 UTC
2	+++ contrib/Makefile.am
3	@@ -2,7 +2,7 @@
4
5	subdir = contrib
6
7	-SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
8	+SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp6.rc Tin.rc \
9	sample.mailcap sample.muttrc sample.muttrc-sidebar sample.muttrc-tlr \
10	sample.vimrc-sidebar colors.default colors.linux smime.rc \
11	ca-bundle.crt smime_keys_test.pl mutt_xtitle

Removed Link Here

(-)a/mail/mutt/files/patch-date-conditional (-147 lines)
1	--- PATCHES~ never
2	+++ PATCHES Thu Jun 13 16:25:05 CDT 2002
3	@@ -0,0 +1 @@
4	+dgc.deepif.1
5	diff -Pur mutt-1.5.1-base/muttlib.c mutt-1.5.1/muttlib.c
6	--- muttlib.c Tue Mar 26 16:47:06 2002
7	+++ muttlib.c Thu Jun 13 15:28:20 2002
8	@@ -978,6 +978,12 @@
9	count = 0;
10	while (count < sizeof (ifstring) && src && src != '?' && *src != '&')
11	{
12	+ if (*src == '\\')
13	+ {
14	+ src++;
15	+ if (!*src)
16	+ break;
17	+ }
18	cp++ = src++;
19	count++;
20	}
21	@@ -990,7 +996,13 @@
22	count = 0;
23	while (count < sizeof (elsestring) && src && src != '?')
24	{
25	- cp++ = src++;
26	+ if (*src == '\\')
27	+ {
28	+ src++;
29	+ if (!*src)
30	+ break;
31	+ }
32	+ cp++ = src++;
33	count++;
34	}
35	*cp = 0;
36	Index: PATCHES
37	===================================================================
38	--- PATCHES (revision 22)
39	+++ PATCHES (revision 22)
40	@@ -0,0 +1 @@
41	+patch-1.5.0.ats.date_conditional.1
42	Index: muttlib.c
43	===================================================================
44	--- muttlib.c (revision 22)
45	+++ muttlib.c (revision 22)
46	@@ -944,7 +944,16 @@
47	if (*src == '?')
48	{
49	flags \|= MUTT_FORMAT_OPTIONAL;
50	- src++;
51	+ ch = (++src); / save the character to switch on */
52	+ cp = prefix;
53	+ ++src;
54	+ count = 0;
55	+ while (count < sizeof (prefix) && *src != '?')
56	+ {
57	+ cp++ = src++;
58	+ count++;
59	+ }
60	+ *cp = 0;
61	}
62	else
63	{
64	@@ -960,12 +969,12 @@
65	count++;
66	}
67	*cp = 0;
68	- }
69
70	- if (!*src)
71	- break; /* bad format */
72	+ if (!*src)
73	+ break; /* bad format */
74
75	- ch = src++; / save the character to switch on */
76	+ ch = src++; / save the character to switch on */
77	+ }
78
79	if (flags & M_FORMAT_OPTIONAL)
80	{
81	--- hdrline.c.orig Tue Jun 29 15:01:28 2004
82	+++ hdrline.c Tue Jun 29 15:02:59 2004
83	@@ -316,6 +316,64 @@
84	const char *cp;
85	struct tm *tm;
86	time_t T;
87	+ int i = 0, invert = 0;
88	+
89	+ if (optional && (op == '[' \|\| op == '(')) {
90	+ char *is;
91	+ int d;
92	+ T = time(NULL);
93	+ tm = localtime(&T);
94	+ d = (T + tm->tm_gmtoff) % 86400;
95	+ T -= (op == '(') ? hdr->received : hdr->date_sent;
96	+
97	+ is = (char *)prefix;
98	+ if( *is == '>' ) {
99	+ invert = 1;
100	+ ++is;
101	+ }
102	+
103	+ while( is && is != '?' ) {
104	+ int t = strtol (is, &is, 10);
105	+ switch (*(is++)) {
106	+ case '?':
107	+ break;
108	+ case 'y':
109	+ t = 365 24 * 60 * 60;
110	+ break;
111	+ case 'M':
112	+ t = 30 24 * 60 * 60;
113	+ break;
114	+ case 'w':
115	+ t = 7 24 * 60 * 60;
116	+ break;
117	+ case 'd':
118	+ t = 24 60 * 60;
119	+ break;
120	+ case 't':
121	+ if (t > 1) {
122	+ t = (t-1) * 24 * 60 * 60;
123	+ } else {
124	+ t = 0;
125	+ }
126	+ t += d;
127	+ break;
128	+ case 'h':
129	+ t = 60 60;
130	+ break;
131	+ case 'm':
132	+ t *= 60;
133	+ break;
134	+ }
135	+ i += t;
136	+ }
137	+
138	+ if (i < 0)
139	+ i *= -1;
140	+
141	+ if( (T > i \|\| T < -1*i) ^ invert )
142	+ optional = 0;
143	+ break;
144	+ }
145
146	p = dest;
147

Removed Link Here

(-)a/mail/mutt/files/patch-doc-Muttrc (-10 lines)
1	--- doc/Muttrc.orig Sat May 13 08:30:44 2000
2	+++ doc/Muttrc Sat May 13 08:32:05 2000
3	@@ -629,6 +629,7 @@
4	# Type: boolean
5	# Default: yes
6	#
7	+set followup_to=no
8	#
9	# Controls whether or not the Mail-Followup-To header field is
10	# generated when sending mail. When set, Mutt will generate this

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-doc_Makefile.am (-4 / +4 lines)
1	--- doc/Makefile.am.orig 2014-05-31 14:09:54.000000000 +0200	1	--- doc/Makefile.am.orig 2016-10-08 19:30:21 UTC
2	+++ doc/Makefile.am 2014-05-31 14:12:07.000000000 +0200	2	+++ doc/Makefile.am
3	@@ -77,14 +77,7 @@	3	@@ -79,14 +79,7 @@ install-data-local: makedoc-all instdoc
4	-for f in $(HTML_DOCFILES) ; do \	4	-for f in $(HTML_DOCFILES) ; do \
5	$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \	5	$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
6	done	6	done
Lines 16-22 Link Here
16		16
17	uninstall-local:	17	uninstall-local:
18	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 smime_keys.1 pgpewrap.1 pgpring.1; do \	18	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 smime_keys.1 pgpewrap.1 pgpring.1; do \
19	@@ -107,9 +100,7 @@	19	@@ -109,9 +102,7 @@ uninstall-local:
20		20
21	check:	21	check:
22	manual.txt: manual.html	22	manual.txt: manual.html

Added Link Here

(-)b/mail/mutt/files/patch-doc_Muttrc (+10 lines)
1	--- doc/Muttrc.orig 2016-10-08 19:48:13 UTC
2	+++ doc/Muttrc
3	@@ -626,6 +626,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-5 Link Here

(-)b/mail/mutt/files/patch-doc_manual.xml.head (-2 / +2 lines)
1	--- doc/manual.xml.head.orig 2009-06-22 08:35:06.000000000 +0200	1	--- doc/manual.xml.head.orig 2016-10-08 19:35:50 UTC
2	+++ doc/manual.xml.head 2009-06-22 08:37:31.000000000 +0200	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"?>
5	<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"	5	<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"




--- INSTALL.orig	2016-10-08 19:30:21 UTC
+++ INSTALL
@@ -228,13 +228,13 @@ If you decide to use your system's iconv
 need to tell mutt about implementation-defined names for some
 character sets.  Sample configuration files for various systems can
 be found in the directory contrib/iconv/ in this source
-distribution, and will be installed in the samples/iconv directory
+distribution, and will be installed in the share/examples/mutt/iconv directory
 as part of mutt's documentation.
 
 In order to use these sample configuration files, just put a line
 like
 
-     source /usr/local/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc
+     source /usr/local/share/examples/mutt/iconv/iconv.osf1-4.0d.rc
 
 into your system's global Muttrc, which normally resides in /etc or
 /usr/local/etc.
--- contrib/Makefile.am.orig	2016-10-08 19:30:21 UTC
+++ contrib/Makefile.am
@@ -1,6 +1,7 @@
 # $Id$
 
 subdir = contrib
+samplesdir = @samplesdir@
 
 SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
 	sample.mailcap sample.muttrc sample.muttrc-sidebar sample.muttrc-tlr \
@@ -14,12 +15,12 @@ EXTRA_DIST = language.txt language50.txt
 	iconv/make.sh
 
 install-data-local:

 	done
 
 uninstall-local:
--- doc/manual.txt.orig	2016-10-08 19:55:06 UTC
+++ doc/manual.txt
@@ -8073,8 +8073,8 @@ set imap_authenticators="gssapi:cram-md5
 
    For examples on how to configure these formats for the various versions
    of PGP which are floating around, see the pgp and gpg sample
-   configuration files in the samples/ subdirectory which has been
-   installed on your system alongside the documentation. (PGP only)
+   configuration files in the share/examples/mutt/ subdirectory which has
+   been installed on your system alongside the documentation. (PGP only)
 
 3.166. pgp_decrypt_command
 
@@ -9332,8 +9332,8 @@ set sidebar_delim_chars='.'
    or "-CAfile [1766]$$ssmmiimmee__ccaa__llooccaattiioonn".
 
    For examples on how to configure these formats, see the smime.rc in the
-   samples/ subdirectory which has been installed on your system alongside
-   the documentation. (S/MIME only)
+   share/examples/mutt/ subdirectory which has been installed on your system
+   alongside the documentation. (S/MIME only)
 
 3.271. smime_decrypt_use_default_key
 
--- init.h.orig	2016-10-08 19:35:50 UTC
+++ init.h
@@ -1814,9 +1814,8 @@ struct option_t MuttVars[] = {
   ** .pp
   ** For examples on how to configure these formats for the various versions
   ** of PGP which are floating around, see the pgp and gpg sample configuration files in

+  ** the \fCshare/examples/mutt/\fP subdirectory which has been installed on
+  **  your system. (PGP only)
   */
   { "pgp_decrypt_command", 	DT_STR, R_NONE, UL &PgpDecryptCommand, 0},
   /*
@@ -2942,9 +2941,8 @@ struct option_t MuttVars[] = {
   ** .de
   ** .pp
   ** For examples on how to configure these formats, see the \fCsmime.rc\fP in

+  ** the \fCshare/examples/mutt/\fP subdirectory which has been installed on
+  ** your system. (S/MIME only)
   */
   { "smime_decrypt_use_default_key",	DT_BOOL, R_NONE, OPTSDEFAULTDECRYPTKEY, 1 },
   /*
--- INSTALL.orig	Mon Nov 25 15:16:46 2002
+++ INSTALL	Wed Mar 26 15:59:57 2003
@@ -225,13 +225,13 @@
 need to tell mutt about implementation-defined names for some
 character sets.  Sample configuration files for various systems can
 be found in the directory contrib/iconv/ in this source
-distribution, and will be installed in the samples/iconv directory
+distribution, and will be installed in the share/examples/mutt/iconv directory
 as part of mutt's documentation.
 
 In order to use these sample configuration files, just put a line
 like
 
-     source /usr/local/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc
+     source /usr/local/share/examples/mutt/iconv/iconv.osf1-4.0d.rc
 
 into your system's global Muttrc, which normally resides in /etc or
 /usr/local/etc.
--- doc/manual.txt.orig	2015-08-30 19:25:51.000000000 +0200
+++ doc/manual.txt	2015-09-10 08:56:32.000000000 +0200
@@ -7736,8 +7736,8 @@
 
    For examples on how to configure these formats for the various versions
    of PGP which are floating around, see the pgp and gpg sample
-   configuration files in the samples/ subdirectory which has been
-   installed on your system alongside the documentation. (PGP only)
+   configuration files in the share/examples/mutt/ subdirectory which has
+   been installed on your system alongside the documentation. (PGP only)
 
 3.162. pgp_decrypt_command
 
@@ -8783,8 +8783,8 @@
       "-CAfile $$ssmmiimmee__ccaa__llooccaattiioonn".
 
    For examples on how to configure these formats, see the smime.rc in the
-   samples/ subdirectory which has been installed on your system alongside
-   the documentation. (S/MIME only)
+   share/examples/mutt/ subdirectory which has been installed on your system
+   alongside the documentation. (S/MIME only)
 
 3.252. smime_decrypt_use_default_key
 




This patch fixes a segfault that happens when the IMAP server sends some
additional flags for the same message ID, see upstream bug
http://bugs.mutt.org/3288

--- imap/message.c
+++ imap/message.c
@@ -288,7 +288,7 @@
         continue;
       }
       /* May receive FLAGS updates in a separate untagged response (#2935) */
-      if (idx < ctx->msgcount)
+      if (ctx->hdrs[idx] != NULL)
       {
 	dprint (2, (debugfile, "imap_read_headers: message %d is not new\n",
 		    h.sid));

Lines 1-7 Link Here

(-)b/mail/mutt/files/patch-m4_gssapi.m4 (-4 / +4 lines)
1	--- m4/gssapi.m4.orig 2015-08-30 19:06:38.000000000 +0200	1	--- m4/gssapi.m4.orig 2016-10-08 19:30:21 UTC
2	+++ m4/gssapi.m4 2016-01-25 15:04:37.448609000 +0100	2	+++ m4/gssapi.m4
3	@@ -27,6 +27,7 @@	3	@@ -27,6 +27,7 @@ AC_DEFUN([MUTT_AM_PATH_GSSAPI],
4	GSSAPI_LIBS="$MUTTLIBS `$KRB5CFGPATH --libs gssapi`"	4	GSSAPI_LIBS="`$KRB5CFGPATH --libs gssapi`"
5	case "`$KRB5CFGPATH --version`" in	5	case "`$KRB5CFGPATH --version`" in
6	"Kerberos 5 "*) GSSAPI_IMPL="MIT";;	6	"Kerberos 5 "*) GSSAPI_IMPL="MIT";;
7	+ "FreeBSD heimdal"*) GSSAPI_IMPL="Heimdal";;	7	+ "FreeBSD heimdal"*) GSSAPI_IMPL="Heimdal";;

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-muttlib.c (-3 / +3 lines)
1	--- muttlib.c.orig 2015-09-10 08:59:45.000000000 +0200	1	--- muttlib.c.orig 2016-10-08 19:35:50 UTC
2	+++ muttlib.c 2015-09-10 09:04:24.000000000 +0200	2	+++ muttlib.c
3	@@ -774,16 +774,15 @@	3	@@ -779,16 +779,15 @@ void mutt_merge_envelopes(ENVELOPE* base
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	{




--- contrib/smime.rc.orig	2016-10-08 19:30:21 UTC
+++ contrib/smime.rc
@@ -23,8 +23,12 @@ set crypt_verify_sig = yes
 
 # The (default) keyfile for signing/decrypting.  Uncomment the following
 # line and replace the keyid with your own.
-set smime_default_key="12345678.0"
+# set smime_default_key="12345678.0"
 
+# Uncomment the following line in addition to the one above, if you want that
+# all encrypted messages are also encrypted with your default key.
+# set smime_encrypt_self = 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	2016-10-08 19:35:50 UTC
+++ crypt.c
@@ -231,8 +231,18 @@ int mutt_protect (HEADER *msg, char *key
     if ((WithCrypto & APPLICATION_SMIME)
         && (msg->security & APPLICATION_SMIME))
     {

       {
 	/* signed ? free it! */
 	return (-1);
--- init.h.orig	2016-10-08 19:35:50 UTC
+++ init.h
@@ -2971,6 +2971,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	2016-10-08 19:30:21 UTC
+++ mutt.h
@@ -263,6 +263,7 @@ enum
@@ -275,6 +275,7 @@
   OPT_DELETE,
   OPT_FORWEDIT,
   OPT_FCCATTACH,
   OPT_INCLUDE,
+  OPT_SMIMEENCRYPTSELF,
   OPT_MFUPTO,
   OPT_MIMEFWD,
   OPT_MIMEFWDREST,
--- contrib/smime.rc.orig	2015-08-30 19:06:38.000000000 +0200
+++ contrib/smime.rc	2015-09-10 09:14:20.000000000 +0200
@@ -23,8 +23,12 @@
 
 # The (default) keyfile for signing/decrypting.  Uncomment the following
 # line and replace the keyid with your own.
-set smime_default_key="12345678.0"
+# set smime_default_key="12345678.0"
 
+# Uncomment the following line in addition to the one above, if you want that
+# all encrypted messages are also encrypted with your default key.
+# set smime_encrypt_self = 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




--- commands.c.orig	2016-10-08 19:30:21 UTC
+++ commands.c
@@ -185,7 +185,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."));
--- contrib/smime.rc.orig	2016-10-08 19:30:21 UTC
+++ contrib/smime.rc
@@ -8,7 +8,10 @@ set smime_is_default
 
 # Uncomment this if you don't want to set labels for certificates you add.
 # unset smime_ask_cert_label
-
+ 
+# Uncomment this if you don't want to check for sender's email address
+# set smime_dont_check_sender = yes
+  
 # Passphrase expiration
 set smime_timeout=300
 
--- init.h.orig	2016-10-08 19:35:50 UTC
+++ init.h
@@ -2946,6 +2946,15 @@ struct option_t MuttVars[] = {
   ** alongside the documentation.
   ** (S/MIME only)
   */
+  { "smime_dont_check_sender",	DT_BOOL, R_NONE, OPTSMIMENOSENDER, 0 },
+  /*

   { "smime_decrypt_use_default_key",	DT_BOOL, R_NONE, OPTSDEFAULTDECRYPTKEY, 1 },
   /*
   ** .pp
--- mutt.h.orig	2016-10-08 19:30:21 UTC
+++ mutt.h
@@ -486,6 +486,7 @@ enum
   OPTCRYPTTIMESTAMP,
   OPTSMIMEISDEFAULT,
   OPTASKCERTLABEL,
+  OPTSMIMENOSENDER,
   OPTSDEFAULTDECRYPTKEY,
   OPTPGPIGNORESUB,
   OPTPGPCHECKEXIT,
--- contrib/smime.rc.orig	2015-09-10 09:16:17.000000000 +0200
+++ contrib/smime.rc	2015-09-10 09:18:18.000000000 +0200
@@ -8,7 +8,10 @@
 
 # Uncomment this if you don't want to set labels for certificates you add.
 # unset smime_ask_cert_label
-
+ 
+# Uncomment this if you don't want to check for sender's email address
+# set smime_dont_check_sender = yes
+  
 # Passphrase expiration
 set smime_timeout=300
 




--- Makefile.am.orig	2015-09-10 09:19:15.000000000 +0200
+++ Makefile.am	2015-09-10 09:21:00.000000000 +0200
@@ -150,15 +150,6 @@
 	$(srcdir)/patchlist.sh < $(srcdir)/PATCHES > patchlist.c
 
 install-exec-hook:
-	if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/mutt_dotlock ; then	\
-		rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;		\
-		ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
-	fi
-	if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x$(DOTLOCK_GROUP) != x ; then \
-		chgrp $(DOTLOCK_GROUP) $(DESTDIR)$(bindir)/mutt_dotlock && \
-		chmod $(DOTLOCK_PERMISSION) $(DESTDIR)$(bindir)/mutt_dotlock || \
-		{ echo "Can't fix mutt_dotlock's permissions!  This is required to lock mailboxes in the mail spool directory." >&2 ; exit 1 ; } \
-	fi
 
 install-data-local:
 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)




--- mutt.h.orig	2016-10-08 19:30:21 UTC
+++ mutt.h
@@ -190,6 +190,7 @@ enum
   MUTT_LIMIT,
   MUTT_EXPIRED,
   MUTT_SUPERSEDED,
   MUTT_TRASH,
+  MUTT_THREADCOMPLETE,
 
   /* actions for mutt_pattern_comp/mutt_pattern_exec */
   MUTT_AND,
--- pattern.c.orig	2016-10-08 19:30:21 UTC
+++ pattern.c
@@ -56,6 +56,7 @@ static const struct pattern_flags
 }
 Flags[] =
 {
+  { 'a', MUTT_THREADCOMPLETE,	0,		NULL },
   { 'A', MUTT_ALL,			0,		NULL },
   { 'b', MUTT_BODY,		MUTT_FULL_MSG,	eat_regexp },
   { 'B', MUTT_WHOLE_MSG,		MUTT_FULL_MSG,	eat_regexp },
@@ -1185,6 +1186,16 @@ mutt_pattern_exec (struct pattern_t *pat
                                              2, h->env->to, h->env->cc));
     case MUTT_LIST:	/* known list, subscribed or not */
       return (pat->not ^ mutt_is_list_cc (pat->alladdr, h->env->to, h->env->cc));

Lines 76-82 man/man5/muttrc.5.gz Link Here

(-)b/mail/mutt/pkg-plist (-1 / +2 lines)
76	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp6.rc	76	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp6.rc
77	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.mailcap	77	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.mailcap
78	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc	78	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc
		79	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-sidebar
79	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-tlr	80	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-tlr
		81	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.vimrc-sidebar
80	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smime.rc	82	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smime.rc
81	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smime_keys_test.pl	83	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smime_keys_test.pl
82	%%NLS%%share/locale/bg/LC_MESSAGES/mutt.mo	84	%%NLS%%share/locale/bg/LC_MESSAGES/mutt.mo
83	-

Return to bug 213431

Lines 2-8 Link Here

(-)b/mail/mutt/Makefile (-20 / +26 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mutt	4	PORTNAME= mutt
5	PORTVERSION= 1.7.0	5	PORTVERSION= 1.7.1
6	PORTREVISION?= 0	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/ \
Lines 12-31 MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ Link Here
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}	14	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
		15	DIST_SUBDIR= mutt
15	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}	16	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
16		17
17	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 \
18	http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \	19	http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
19	http://home.woolridge.ca/mutt/patches/:dw	20	http://home.uchicago.edu/~dgc/sw/mutt/:dgc \
		21	https://www.schrab.com/aaron/mutt/:ats \
		22	http://vc.org.ua/mutt/:vc
		23	PATCH_DIST_STRIP= -p1
		24	PATCHFILES= patch-1.5.1.dgc.deepif.1:dgc \
		25	patch-1.7.0.ats.date_conditional.1:ats
20		26
21	MAINTAINER?= dereks@lifeofadishwasher.com	27	MAINTAINER?= dereks@lifeofadishwasher.com
22	COMMENT?= The Mongrel of Mail User Agents	28	COMMENT?= Small but powerful text based program for read/writing e-mail
23		29
24	LICENSE= GPLv2+	30	LICENSE= GPLv2+
25		31
26	CONFLICTS?= ja-mutt-[0-9]* ja-mutt-devel-[0-9]* mutt-1.4* mutt-devel-lite-[0-9]* mutt-lite-[0-9]* zh-mutt-devel-[0-9]*	32	CONFLICTS?= ja-mutt-[0-9]* ja-mutt-devel-[0-9]* mutt-1.4* mutt-devel-lite-[0-9]* mutt-lite-[0-9]* zh-mutt-devel-[0-9]*
27		33
28	DIST_SUBDIR= mutt
29	DOCSDIR?= ${PREFIX}/share/doc/mutt	34	DOCSDIR?= ${PREFIX}/share/doc/mutt
30	EXAMPLESDIR?= ${PREFIX}/share/examples/mutt	35	EXAMPLESDIR?= ${PREFIX}/share/examples/mutt
31	DATADIR?= ${PREFIX}/share/mutt	36	DATADIR?= ${PREFIX}/share/mutt
Lines 49-59 AUTOMAKE_ARGS= --add-missing --foreign Link Here
49	OPTIONS_SUB= yes	54	OPTIONS_SUB= yes
50		55
51	.if defined (MUTT_LITE)	56	.if defined (MUTT_LITE)
52	LITE= yes
53	USES+= ncurses
54	.endif
55
56	.if defined (LITE)
57	OPTIONS_UNSET= NLS DOCS EXAMPLES	57	OPTIONS_UNSET= NLS DOCS EXAMPLES
58	.else	58	.else
59	OPTIONS_DEFINE= COMPRESSED_FOLDERS SASL DEBUG DOCS EXAMPLES FLOCK \	59	OPTIONS_DEFINE= COMPRESSED_FOLDERS SASL DEBUG DOCS EXAMPLES FLOCK \
Lines 111-117 OPTIONS_DEFAULT= COMPRESSED_FOLDERS HTML ICONV IDN IFDEF_PATCH \ Link Here
111		111
112	RUN_DEPENDS+= ${LOCALBASE}/etc/mime.types:misc/mime-support	112	RUN_DEPENDS+= ${LOCALBASE}/etc/mime.types:misc/mime-support
113		113
114	.if !defined (LITE)	114	.if !defined (MUTT_LITE)
115	ASPELL_BUILD_DEPENDS= aspell:textproc/aspell	115	ASPELL_BUILD_DEPENDS= aspell:textproc/aspell
116	ASPELL_RUN_DEPENDS= aspell:textproc/aspell	116	ASPELL_RUN_DEPENDS= aspell:textproc/aspell
117	ISPELL_BUILD_DEPENDS= ispell:textproc/aspell-ispell	117	ISPELL_BUILD_DEPENDS= ispell:textproc/aspell-ispell
Lines 119-126 ISPELL_RUN_DEPENDS= ispell:textproc/aspell-ispell Link Here
119	URLVIEW_RUN_DEPENDS= urlview:textproc/urlview	119	URLVIEW_RUN_DEPENDS= urlview:textproc/urlview
120	.endif	120	.endif
121		121
122	.if defined (LITE)	122	.if defined (MUTT_LITE)
123	PKGNAMESUFFIX= -lite	123	USES+= ncurses
124	PLIST_SUB+= MAILBOX_MANPAGES=""	124	PLIST_SUB+= MAILBOX_MANPAGES=""
125	PLIST_SUB+= COMPRESSED_FOLDERS="@comment "	125	PLIST_SUB+= COMPRESSED_FOLDERS="@comment "
126	PLIST_SUB+= HTML="@comment "	126	PLIST_SUB+= HTML="@comment "
Lines 131-136 PLIST_SUB+= NLS="@comment " Link Here
131	CONFIGURE_ARGS+= --disable-nls --disable-iconv --without-idn	131	CONFIGURE_ARGS+= --disable-nls --disable-iconv --without-idn
132	.endif	132	.endif
133		133
		134	.ifmake makesum # for optional distfiles patchfiles
		135	PORT_DBDIR= /dev/null
		136	OPTIONS_DEFAULT= ${OPTIONS_DEFINE}
		137	.endif
		138
134	DEBUG_CONFIGURE_ON= --enable-debug	139	DEBUG_CONFIGURE_ON= --enable-debug
135		140
136	# Handle ncurses/ncurses-port/slang	141	# Handle ncurses/ncurses-port/slang
Lines 187-192 SMTP_CONFIGURE_ENABLE= smtp Link Here
187		192
188	MAILDIR_HEADER_CACHE_CONFIGURE_OFF= --without-qdbm	193	MAILDIR_HEADER_CACHE_CONFIGURE_OFF= --without-qdbm
189		194
		195	GREETING_PATCH_PATCHFILES= mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc
		196
190	COMPRESSED_FOLDERS_DISTFILES= patch-${RR_PATCH_VERSION}.rr.compressed.gz:vvv	197	COMPRESSED_FOLDERS_DISTFILES= patch-${RR_PATCH_VERSION}.rr.compressed.gz:vvv
191	COMPRESSED_FOLDERS_CONFIGURE_ON= --enable-compressed	198	COMPRESSED_FOLDERS_CONFIGURE_ON= --enable-compressed
192	COMPRESSED_FOLDERS_VARS= XML_NEEDED=yes	199	COMPRESSED_FOLDERS_VARS= XML_NEEDED=yes
Lines 209-223 DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref Link Here
209		216
210	.include <bsd.port.options.mk>	217	.include <bsd.port.options.mk>
211		218
212	DW_PATCH_VERSION= 1.5.6	219	# un/comment as each VERSION is created for PORTVERSION
		220	#VVV_PATCH_VERSION= 1.7.0
		221	#RR_PATCH_VERSION= 1.7.0
		222	#GREETING_PATCH_VERSION= 1.7.0
		223
213	.if !defined(VVV_PATCH_VERSION)	224	.if !defined(VVV_PATCH_VERSION)
214	VVV_PATCH_VERSION= ${PORTVERSION}	225	VVV_PATCH_VERSION= ${PORTVERSION}
215	.endif	226	.endif
216	.if !defined(RR_PATCH_VERSION)	227	.if !defined(RR_PATCH_VERSION)
217	RR_PATCH_VERSION= ${PORTVERSION}	228	RR_PATCH_VERSION= ${PORTVERSION}
218	.endif	229	.endif
219	.if !defined(DW_PATCH_VERSION)	230	.if !defined(GREETING_PATCH_VERSION)
220	DW_PATCH_VERSION= ${PORTVERSION}	231	GREETING_PATCH_VERSION= ${PORTVERSION}
221	.endif	232	.endif
222		233
223	# XXX	234	# XXX
Lines 234-241 LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath=${LOCALBASE}/lib:/usr/lib -ltinfow Link Here
234	CFLAGS+= ${CFLAGS_ADD}	245	CFLAGS+= ${CFLAGS_ADD}
235	LDFLAGS+= ${LDFLAGS_ADD}	246	LDFLAGS+= ${LDFLAGS_ADD}
236		247
237	PATCH_DIST_STRIP= -p1
238
239	pre-patch-PARENT_CHILD_MATCH_PATCH-on:	248	pre-patch-PARENT_CHILD_MATCH_PATCH-on:
240	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-parent-child-match	249	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-parent-child-match
241		250
Lines 273-281 post-install: Link Here
273	post-install-NNTP-on:	282	post-install-NNTP-on:
274	${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}	283	${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}
275		284
276	post-patch-GREETING_PATCH-on:
277	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-greeting
278
279	post-patch-IFDEF_PATCH-on:	285	post-patch-IFDEF_PATCH-on:
280	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-ifdef	286	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-ifdef
281		287

Lines 1-13 Link Here

(-)b/mail/mutt/distinfo (-13 / +19 lines)
1	TIMESTAMP = 1475708081	1	TIMESTAMP = 1476585934
2	SHA256 (mutt/mutt-1.7.0.tar.gz) = 1d3e987433d8c92ef88a604f4dcefdb35a86ce73f3eff0157e2e491e5b55b345	2	SHA256 (mutt/mutt-1.7.1.tar.gz) = e9c6f88e83d48690033f0d862a70293ac746286b77241554f5448bc23bd0d6df
3	SIZE (mutt/mutt-1.7.0.tar.gz) = 4019567	3	SIZE (mutt/mutt-1.7.1.tar.gz) = 4025008
4	SHA256 (mutt/patch-1.7.0.rr.compressed.gz) = 663987cf588e1b55cae37efa55d078ed805f5c1eaca892d2077408855d47f561	4	SHA256 (mutt/patch-1.7.1.rr.compressed.gz) = 97bc56bbc6b0312b87e8dfb68dd9b551edb9d6771bb1b52b1c6f63f51d0bd05b
5	SIZE (mutt/patch-1.7.0.rr.compressed.gz) = 9994	5	SIZE (mutt/patch-1.7.1.rr.compressed.gz) = 9985
6	SHA256 (mutt/patch-1.7.0.vvv.nntp.gz) = c22c42f0635246532a8d806e479d963dac419b913c6fbd0a1af41c2444175aa9	6	SHA256 (mutt/patch-1.7.1.vvv.nntp.gz) = 798db983e3d63d954bfd88e0b8771f806afddf0ae07cc9a03d27def355675687
7	SIZE (mutt/patch-1.7.0.vvv.nntp.gz) = 61078	7	SIZE (mutt/patch-1.7.1.vvv.nntp.gz) = 61201
8	SHA256 (mutt/patch-1.7.0.vvv.nntp_ru.gz) = f238786497f56925a7d230143622b9ff5c5f9baaf5643e2b0322b9cfb7013ce8	8	SHA256 (mutt/patch-1.7.1.vvv.nntp_ru.gz) = 497f96c19ff17330404667a63c1abd6a5b309004c4dc5100f73973012ad8a2c1
9	SIZE (mutt/patch-1.7.0.vvv.nntp_ru.gz) = 5495	9	SIZE (mutt/patch-1.7.1.vvv.nntp_ru.gz) = 5494
10	SHA256 (mutt/patch-1.7.0.vvv.initials.gz) = f27a94a16233de695a004e2e720ac2b531e26956577c08ab576f79e288268420	10	SHA256 (mutt/patch-1.5.1.dgc.deepif.1) = d655a2f0003bdb2efb7ee5a8c77c113da661110e9c63289f03eb622773fc7a34
11	SIZE (mutt/patch-1.7.0.vvv.initials.gz) = 669	11	SIZE (mutt/patch-1.5.1.dgc.deepif.1) = 767
12	SHA256 (mutt/patch-1.7.0.vvv.quote.gz) = 9f22fd73fe918520750174be6285ba9a7d95054e616db717b638ad5e3073d5dc	12	SHA256 (mutt/patch-1.7.0.ats.date_conditional.1) = a7f65e0b6e59713582b3b0a1c3d3c0e54e5875f5dfe3bda285e51a5b6d96e14e
13	SIZE (mutt/patch-1.7.0.vvv.quote.gz) = 1252	13	SIZE (mutt/patch-1.7.0.ats.date_conditional.1) = 2415
		14	SHA256 (mutt/mutt-1.7.1.vc.greeting) = 05dce466675c8692ab4a2c34d309de06e98e965241249e3cfccbb8d10873b9a3
		15	SIZE (mutt/mutt-1.7.1.vc.greeting) = 4175
		16	SHA256 (mutt/patch-1.7.1.vvv.initials.gz) = 1405104d8929d672dc5ffebbca8ea5601a88c515e862ec2f89e5b92bfdb53ad0
		17	SIZE (mutt/patch-1.7.1.vvv.initials.gz) = 675
		18	SHA256 (mutt/patch-1.7.1.vvv.quote.gz) = de0e47fb8ffe1ab6587aba37438c90443bee6508759bf82d8aa5da27317b3cc7
		19	SIZE (mutt/patch-1.7.1.vvv.quote.gz) = 1258

Lines 1-5 Link Here

(-)b/mail/mutt/files/patch-browser.c (-4 / +5 lines)
1	Index: browser.c	1	--- browser.c.orig 2016-10-08 19:35:50 UTC
2	@@ -80,6 +80,12 @@	2	+++ browser.c
		3	@@ -80,6 +80,12 @@ static int browser_compare_subject (cons
3	struct folder_file pa = (struct folder_file ) a;	4	struct folder_file pa = (struct folder_file ) a;
4	struct folder_file pb = (struct folder_file ) b;	5	struct folder_file pb = (struct folder_file ) b;
5		6
Lines 12-18 Index: browser.c Link Here
12	int r = mutt_strcoll (pa->name, pb->name);	13	int r = mutt_strcoll (pa->name, pb->name);
13		14
14	return ((BrowserSort & SORT_REVERSE) ? -r : r);	15	return ((BrowserSort & SORT_REVERSE) ? -r : r);
15	@@ -90,6 +96,12 @@	16	@@ -90,6 +96,12 @@ static int browser_compare_date (const v
16	struct folder_file pa = (struct folder_file ) a;	17	struct folder_file pa = (struct folder_file ) a;
17	struct folder_file pb = (struct folder_file ) b;	18	struct folder_file pb = (struct folder_file ) b;
18		19
Lines 25-31 Index: browser.c Link Here
25	int r = pa->mtime - pb->mtime;	26	int r = pa->mtime - pb->mtime;
26		27
27	return ((BrowserSort & SORT_REVERSE) ? -r : r);	28	return ((BrowserSort & SORT_REVERSE) ? -r : r);
28	@@ -100,6 +112,12 @@	29	@@ -100,6 +112,12 @@ static int browser_compare_size (const v
29	struct folder_file pa = (struct folder_file ) a;	30	struct folder_file pa = (struct folder_file ) a;
30	struct folder_file pb = (struct folder_file ) b;	31	struct folder_file pb = (struct folder_file ) b;
31		32

Lines 1-14 Link Here

(-)b/mail/mutt/files/patch-examples (-53 / +53 lines)
1	--- contrib/Makefile.am.orig 2015-09-10 08:43:38.000000000 +0200	1	--- INSTALL.orig 2016-10-08 19:30:21 UTC
2	+++ contrib/Makefile.am 2015-09-10 08:48:05.000000000 +0200	2	+++ INSTALL
		3	@@ -228,13 +228,13 @@ If you decide to use your system's iconv
		4	need to tell mutt about implementation-defined names for some
		5	character sets. Sample configuration files for various systems can
		6	be found in the directory contrib/iconv/ in this source
		7	-distribution, and will be installed in the samples/iconv directory
		8	+distribution, and will be installed in the share/examples/mutt/iconv directory
		9	as part of mutt's documentation.
		10
		11	In order to use these sample configuration files, just put a line
		12	like
		13
		14	- source /usr/local/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc
		15	+ source /usr/local/share/examples/mutt/iconv/iconv.osf1-4.0d.rc
		16
		17	into your system's global Muttrc, which normally resides in /etc or
		18	/usr/local/etc.
		19	--- contrib/Makefile.am.orig 2016-10-08 19:30:21 UTC
		20	+++ contrib/Makefile.am
3	@@ -1,6 +1,7 @@	21	@@ -1,6 +1,7 @@
4	# $Id$	22	# $Id$
5		23
6	subdir = contrib	24	subdir = contrib
7	+samplesdir = @samplesdir@	25	+samplesdir = @samplesdir@
8		26
9	SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp6.rc Tin.rc \	27	SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
10	sample.muttrc sample.mailcap sample.muttrc-tlr \	28	sample.mailcap sample.muttrc sample.muttrc-sidebar sample.muttrc-tlr \
11	@@ -14,12 +15,12 @@	29	@@ -14,12 +15,12 @@ EXTRA_DIST = language.txt language50.txt
12	iconv/make.sh	30	iconv/make.sh
13		31
14	install-data-local:	32	install-data-local:
Lines 24-32 Link Here
24	done	42	done
25		43
26	uninstall-local:	44	uninstall-local:
27	--- init.h.orig 2009-02-06 13:27:52.000000000 +0100	45	--- doc/manual.txt.orig 2016-10-08 19:55:06 UTC
28	+++ init.h 2009-02-06 13:34:09.000000000 +0100	46	+++ doc/manual.txt
29	@@ -1808,9 +1808,8 @@	47	@@ -8073,8 +8073,8 @@ set imap_authenticators="gssapi:cram-md5
		48
		49	For examples on how to configure these formats for the various versions
		50	of PGP which are floating around, see the pgp and gpg sample
		51	- configuration files in the samples/ subdirectory which has been
		52	- installed on your system alongside the documentation. (PGP only)
		53	+ configuration files in the share/examples/mutt/ subdirectory which has
		54	+ been installed on your system alongside the documentation. (PGP only)
		55
		56	3.166. pgp_decrypt_command
		57
		58	@@ -9332,8 +9332,8 @@ set sidebar_delim_chars='.'
		59	or "-CAfile [1766]$$ssmmiimmee__ccaa__llooccaattiioonn".
		60
		61	For examples on how to configure these formats, see the smime.rc in the
		62	- samples/ subdirectory which has been installed on your system alongside
		63	- the documentation. (S/MIME only)
		64	+ share/examples/mutt/ subdirectory which has been installed on your system
		65	+ alongside the documentation. (S/MIME only)
		66
		67	3.271. smime_decrypt_use_default_key
		68
		69	--- init.h.orig 2016-10-08 19:35:50 UTC
		70	+++ init.h
		71	@@ -1814,9 +1814,8 @@ struct option_t MuttVars[] = {
30	** .pp	72	** .pp
31	** For examples on how to configure these formats for the various versions	73	** For examples on how to configure these formats for the various versions
32	** of PGP which are floating around, see the pgp and gpg sample configuration files in	74	** of PGP which are floating around, see the pgp and gpg sample configuration files in
Lines 36-44 Link Here
36	+ ** the \fCshare/examples/mutt/\fP subdirectory which has been installed on	78	+ ** the \fCshare/examples/mutt/\fP subdirectory which has been installed on
37	+ ** your system. (PGP only)	79	+ ** your system. (PGP only)
38	*/	80	*/
39	{ "pgp_getkeys_command", DT_STR, R_NONE, UL &PgpGetkeysCommand, 0},	81	{ "pgp_decrypt_command", DT_STR, R_NONE, UL &PgpDecryptCommand, 0},
40	/*	82	/*
41	@@ -2017,9 +2016,8 @@	83	@@ -2942,9 +2941,8 @@ struct option_t MuttVars[] = {
42	** .de	84	** .de
43	** .pp	85	** .pp
44	** For examples on how to configure these formats, see the \fCsmime.rc\fP in	86	** For examples on how to configure these formats, see the \fCsmime.rc\fP in
Lines 48-94 Link Here
48	+ ** the \fCshare/examples/mutt/\fP subdirectory which has been installed on	90	+ ** the \fCshare/examples/mutt/\fP subdirectory which has been installed on
49	+ ** your system. (S/MIME only)	91	+ ** your system. (S/MIME only)
50	*/	92	*/
51	{ "smime_verify_command", DT_STR, R_NONE, UL &SmimeVerifyCommand, 0},	93	{ "smime_decrypt_use_default_key", DT_BOOL, R_NONE, OPTSDEFAULTDECRYPTKEY, 1 },
52	/*	94	/*
53	--- INSTALL.orig Mon Nov 25 15:16:46 2002
54	+++ INSTALL Wed Mar 26 15:59:57 2003
55	@@ -225,13 +225,13 @@
56	need to tell mutt about implementation-defined names for some
57	character sets. Sample configuration files for various systems can
58	be found in the directory contrib/iconv/ in this source
59	-distribution, and will be installed in the samples/iconv directory
60	+distribution, and will be installed in the share/examples/mutt/iconv directory
61	as part of mutt's documentation.
62
63	In order to use these sample configuration files, just put a line
64	like
65
66	- source /usr/local/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc
67	+ source /usr/local/share/examples/mutt/iconv/iconv.osf1-4.0d.rc
68
69	into your system's global Muttrc, which normally resides in /etc or
70	/usr/local/etc.
71	--- doc/manual.txt.orig 2015-08-30 19:25:51.000000000 +0200
72	+++ doc/manual.txt 2015-09-10 08:56:32.000000000 +0200
73	@@ -7736,8 +7736,8 @@
74
75	For examples on how to configure these formats for the various versions
76	of PGP which are floating around, see the pgp and gpg sample
77	- configuration files in the samples/ subdirectory which has been
78	- installed on your system alongside the documentation. (PGP only)
79	+ configuration files in the share/examples/mutt/ subdirectory which has
80	+ been installed on your system alongside the documentation. (PGP only)
81
82	3.162. pgp_decrypt_command
83
84	@@ -8783,8 +8783,8 @@
85	"-CAfile $$ssmmiimmee__ccaa__llooccaattiioonn".
86
87	For examples on how to configure these formats, see the smime.rc in the
88	- samples/ subdirectory which has been installed on your system alongside
89	- the documentation. (S/MIME only)
90	+ share/examples/mutt/ subdirectory which has been installed on your system
91	+ alongside the documentation. (S/MIME only)
92
93	3.252. smime_decrypt_use_default_key
94

Removed Link Here

(-)a/mail/mutt/files/patch-imap-message.c (-15 lines)
1	This patch fixes a segfault that happens when the IMAP server sends some
2	additional flags for the same message ID, see upstream bug
3	http://bugs.mutt.org/3288
4
5	--- imap/message.c
6	+++ imap/message.c
7	@@ -288,7 +288,7 @@
8	continue;
9	}
10	/* May receive FLAGS updates in a separate untagged response (#2935) */
11	- if (idx < ctx->msgcount)
12	+ if (ctx->hdrs[idx] != NULL)
13	{
14	dprint (2, (debugfile, "imap_read_headers: message %d is not new\n",
15	h.sid));

Lines 1-7 Link Here

(-)b/mail/mutt/files/patch-smime-self (-28 / +26 lines)
1	Base: http://descolada.dartmouth.edu/mutt/patch-1.5.4+-ow.smime-encrypt-self.2	1	--- contrib/smime.rc.orig 2016-10-08 19:30:21 UTC
2	--- crypt.c 7 Mar 2003 08:23:27 -0000 3.17	2	+++ contrib/smime.rc
3	+++ crypt.c 7 May 2003 14:57:00 -0000	3	@@ -23,8 +23,12 @@ set crypt_verify_sig = yes
4	@@ -246,8 +246,18 @@	4
		5	# The (default) keyfile for signing/decrypting. Uncomment the following
		6	# line and replace the keyid with your own.
		7	-set smime_default_key="12345678.0"
		8	+# set smime_default_key="12345678.0"
		9
		10	+# Uncomment the following line in addition to the one above, if you want that
		11	+# all encrypted messages are also encrypted with your default key.
		12	+# set smime_encrypt_self = yes
		13	+
		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.
		16	# unset smime_decrypt_use_default_key
		17	--- crypt.c.orig 2016-10-08 19:35:50 UTC
		18	+++ crypt.c
		19	@@ -231,8 +231,18 @@ int mutt_protect (HEADER msg, char key
5	if ((WithCrypto & APPLICATION_SMIME)	20	if ((WithCrypto & APPLICATION_SMIME)
6	&& (msg->security & APPLICATION_SMIME))	21	&& (msg->security & APPLICATION_SMIME))
7	{	22	{
Lines 22-30 Base: http://descolada.dartmouth.edu/mutt/patch-1.5.4+-ow.smime-encrypt-self.2 Link Here
22	{	37	{
23	/* signed ? free it! */	38	/* signed ? free it! */
24	return (-1);	39	return (-1);
25	--- init.h.orig 2015-09-10 09:06:48.000000000 +0200	40	--- init.h.orig 2016-10-08 19:35:50 UTC
26	+++ init.h 2015-09-10 09:08:24.000000000 +0200	41	+++ init.h
27	@@ -2748,6 +2748,11 @@	42	@@ -2971,6 +2971,11 @@ struct option_t MuttVars[] = {
28	** possible \fCprintf(3)\fP-like sequences.	43	** possible \fCprintf(3)\fP-like sequences.
29	** (S/MIME only)	44	** (S/MIME only)
30	*/	45	*/
Lines 36-65 Base: http://descolada.dartmouth.edu/mutt/patch-1.5.4+-ow.smime-encrypt-self.2 Link Here
36	{ "smime_encrypt_with", DT_STR, R_NONE, UL &SmimeCryptAlg, UL "aes256" },	51	{ "smime_encrypt_with", DT_STR, R_NONE, UL &SmimeCryptAlg, UL "aes256" },
37	/*	52	/*
38	** .pp	53	** .pp
39	diff -u -d -b -B -r3.18 mutt.h	54	--- mutt.h.orig 2016-10-08 19:30:21 UTC
40	--- mutt.h.orig Thu Nov 6 08:15:51 2003	55	+++ mutt.h
41	+++ mutt.h Thu Nov 6 08:16:43 2003	56	@@ -263,6 +263,7 @@ enum
42	@@ -275,6 +275,7 @@
43	OPT_DELETE,
44	OPT_FORWEDIT,	57	OPT_FORWEDIT,
		58	OPT_FCCATTACH,
45	OPT_INCLUDE,	59	OPT_INCLUDE,
46	+ OPT_SMIMEENCRYPTSELF,	60	+ OPT_SMIMEENCRYPTSELF,
47	OPT_MFUPTO,	61	OPT_MFUPTO,
48	OPT_MIMEFWD,	62	OPT_MIMEFWD,
49	OPT_MIMEFWDREST,	63	OPT_MIMEFWDREST,
50	--- contrib/smime.rc.orig 2015-08-30 19:06:38.000000000 +0200
51	+++ contrib/smime.rc 2015-09-10 09:14:20.000000000 +0200
52	@@ -23,8 +23,12 @@
53
54	# The (default) keyfile for signing/decrypting. Uncomment the following
55	# line and replace the keyid with your own.
56	-set smime_default_key="12345678.0"
57	+# set smime_default_key="12345678.0"
58
59	+# Uncomment the following line in addition to the one above, if you want that
60	+# all encrypted messages are also encrypted with your default key.
61	+# set smime_encrypt_self = yes
62	+
63	# Uncomment to make mutt ask what key to use when trying to decrypt a message.
64	# It will use the default key above (if that was set) else.
65	# unset smime_decrypt_use_default_key

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-smime-sender (-28 / +28 lines)
1	--- commands.c.orig Thu Mar 20 20:37:21 2003	1	--- commands.c.orig 2016-10-08 19:30:21 UTC
2	+++ commands.c Thu Mar 20 20:40:29 2003	2	+++ commands.c
3	@@ -178,7 +178,7 @@	3	@@ -185,7 +185,7 @@ int mutt_display_message (HEADER *cur)
4	{	4	{
5	if (cur->security & GOODSIGN)	5	if (cur->security & GOODSIGN)
6	{	6	{
Lines 9-19 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.orig2 Fri May 31 10:14:05 2002	12	--- contrib/smime.rc.orig 2016-10-08 19:30:21 UTC
13	+++ init.h Fri May 31 10:54:55 2002	13	+++ contrib/smime.rc
14	@@ -1435,6 +1435,15 @@	14	@@ -8,7 +8,10 @@ set smime_is_default
15	** This flag controls wether you want to be asked to enter a label for a certificate	15
16	** about to be added to the database or not. It is set by default.	16	# Uncomment this if you don't want to set labels for certificates you add.
		17	# unset smime_ask_cert_label
		18	-
		19	+
		20	+# Uncomment this if you don't want to check for sender's email address
		21	+# set smime_dont_check_sender = yes
		22	+
		23	# Passphrase expiration
		24	set smime_timeout=300
		25
		26	--- init.h.orig 2016-10-08 19:35:50 UTC
		27	+++ init.h
		28	@@ -2946,6 +2946,15 @@ struct option_t MuttVars[] = {
		29	** alongside the documentation.
		30	** (S/MIME only)
17	*/	31	*/
18	+ { "smime_dont_check_sender", DT_BOOL, R_NONE, OPTSMIMENOSENDER, 0 },	32	+ { "smime_dont_check_sender", DT_BOOL, R_NONE, OPTSMIMENOSENDER, 0 },
19	+ /*	33	+ /*
Lines 27-53 Link Here
27	{ "smime_decrypt_use_default_key", DT_BOOL, R_NONE, OPTSDEFAULTDECRYPTKEY, 1 },	41	{ "smime_decrypt_use_default_key", DT_BOOL, R_NONE, OPTSDEFAULTDECRYPTKEY, 1 },
28	/*	42	/*
29	** .pp	43	** .pp
30	--- mutt.h.orig2 Fri May 31 10:14:06 2002	44	--- mutt.h.orig 2016-10-08 19:30:21 UTC
31	+++ mutt.h Fri May 31 10:24:03 2002	45	+++ mutt.h
32	@@ -453,6 +453,7 @@	46	@@ -486,6 +486,7 @@ enum
33	#ifdef HAVE_SMIME	47	OPTCRYPTTIMESTAMP,
34	OPTSMIMEISDEFAULT,	48	OPTSMIMEISDEFAULT,
35	OPTASKCERTLABEL,	49	OPTASKCERTLABEL,
36	+ OPTSMIMENOSENDER,	50	+ OPTSMIMENOSENDER,
37	OPTSDEFAULTDECRYPTKEY,	51	OPTSDEFAULTDECRYPTKEY,
38	#endif	52	OPTPGPIGNORESUB,
39	#ifdef HAVE_PGP	53	OPTPGPCHECKEXIT,
40	--- contrib/smime.rc.orig 2015-09-10 09:16:17.000000000 +0200
41	+++ contrib/smime.rc 2015-09-10 09:18:18.000000000 +0200
42	@@ -8,7 +8,10 @@
43
44	# Uncomment this if you don't want to set labels for certificates you add.
45	# unset smime_ask_cert_label
46	-
47	+
48	+# Uncomment this if you don't want to check for sender's email address
49	+# set smime_dont_check_sender = yes
50	+
51	# Passphrase expiration
52	set smime_timeout=300
53

Removed Link Here

(-)a/mail/mutt/files/patch-staging-Makefile.am (-18 lines)
1	--- Makefile.am.orig 2015-09-10 09:19:15.000000000 +0200
2	+++ Makefile.am 2015-09-10 09:21:00.000000000 +0200
3	@@ -150,15 +150,6 @@
4	$(srcdir)/patchlist.sh < $(srcdir)/PATCHES > patchlist.c
5
6	install-exec-hook:
7	- if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/mutt_dotlock ; then \
8	- rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \
9	- ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
10	- fi
11	- if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x$(DOTLOCK_GROUP) != x ; then \
12	- chgrp $(DOTLOCK_GROUP) $(DESTDIR)$(bindir)/mutt_dotlock && \
13	- chmod $(DOTLOCK_PERMISSION) $(DESTDIR)$(bindir)/mutt_dotlock \|\| \
14	- { echo "Can't fix mutt_dotlock's permissions! This is required to lock mailboxes in the mail spool directory." >&2 ; exit 1 ; } \
15	- fi
16
17	install-data-local:
18	$(MKDIR_P) $(DESTDIR)$(sysconfdir)

Lines 1-25 Link Here

(-)b/mail/mutt/files/patch-threadcomplete (-11 / +10 lines)
1	--- mutt.h.orig2 Mon Sep 6 09:24:17 2004	1	--- mutt.h.orig 2016-10-08 19:30:21 UTC
2	+++ mutt.h Mon Sep 6 09:27:04 2004	2	+++ mutt.h
3	@@ -212,6 +212,7 @@	3	@@ -190,6 +190,7 @@ enum
4	MUTT_LIMIT,
5	MUTT_EXPIRED,	4	MUTT_EXPIRED,
6	MUTT_SUPERSEDED,	5	MUTT_SUPERSEDED,
7	MUTT_TRASH,	6	MUTT_TRASH,
8	+ MUTT_THREADCOMPLETE,	7	+ MUTT_THREADCOMPLETE,
9		8
10	/* actions for mutt_pattern_comp/mutt_pattern_exec */	9	/* actions for mutt_pattern_comp/mutt_pattern_exec */
11	M_AND,	10	MUTT_AND,
12	--- pattern.c.orig2 Sun Sep 18 15:17:46 2005	11	--- pattern.c.orig 2016-10-08 19:30:21 UTC
13	+++ pattern.c Sun Sep 18 15:19:48 2005	12	+++ pattern.c
14	@@ -54,6 +54,7 @@	13	@@ -56,6 +56,7 @@ static const struct pattern_flags
15	}	14	}
16	Flags[] =	15	Flags[] =
17	{	16	{
18	+ { 'a', MUTT_THREADCOMPLETE, 0, NULL },	17	+ { 'a', MUTT_THREADCOMPLETE, 0, NULL },
19	{ 'A', MUTT_ALL, 0, NULL },	18	{ 'A', MUTT_ALL, 0, NULL },
20	{ 'b', MUTT_BODY, M_FULL_MSG, eat_regexp },	19	{ 'b', MUTT_BODY, MUTT_FULL_MSG, eat_regexp },
21	{ 'B', MUTT_WHOLE_MSG, M_FULL_MSG, eat_regexp },	20	{ 'B', MUTT_WHOLE_MSG, MUTT_FULL_MSG, eat_regexp },
22	@@ -1139,6 +1140,16 @@	21	@@ -1185,6 +1186,16 @@ mutt_pattern_exec (struct pattern_t *pat
23	2, h->env->to, h->env->cc));	22	2, h->env->to, h->env->cc));
24	case MUTT_LIST: /* known list, subscribed or not */	23	case MUTT_LIST: /* known list, subscribed or not */
25	return (pat->not ^ mutt_is_list_cc (pat->alladdr, h->env->to, h->env->cc));	24	return (pat->not ^ mutt_is_list_cc (pat->alladdr, h->env->to, h->env->cc));