Attachment #199701 for bug #233680

Lines 2-8 Link Here

(-)b/mail/mutt/Makefile (-26 / +14 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mutt	4	PORTNAME= mutt
5	DISTVERSION= 1.10.1	5	DISTVERSION= 1.11.0
6	CATEGORIES+= mail ipv6	6	CATEGORIES+= mail ipv6
7	MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \	7	MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \
8	ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \	8	ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
Lines 18-29 PATCH_SITES+= http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ Link Here
18	http://vc.org.ua/mutt/:vc	18	http://vc.org.ua/mutt/:vc
19	PATCH_DIST_STRIP= -p1	19	PATCH_DIST_STRIP= -p1
20		20
21	MAINTAINER?= dereks@lifeofadishwasher.com	21	MAINTAINER= dereks@lifeofadishwasher.com
22	COMMENT?= Small but powerful text based program for read/writing e-mail	22	COMMENT= Small but powerful text based program for read/writing e-mail
23		23
24	LICENSE= GPLv2+	24	LICENSE= GPLv2+
25		25
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]*	26	RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:misc/mime-support
		27
		28	USES= cpe shebangfix ssl
		29
		30	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		31
28	DOCSDIR?= ${PREFIX}/share/doc/mutt	32	DOCSDIR?= ${PREFIX}/share/doc/mutt
29	EXAMPLESDIR?= ${PREFIX}/share/examples/mutt	33	EXAMPLESDIR?= ${PREFIX}/share/examples/mutt
Lines 34-40 CONFIGURE_ARGS= --disable-fcntl --with-ssl=${OPENSSLBASE} \ Link Here
34	--enable-external-dotlock --enable-pop --enable-imap \	38	--enable-external-dotlock --enable-pop --enable-imap \
35	--enable-compressed --enable-sidebar	39	--enable-compressed --enable-sidebar
36		40
37	USES+= cpe ncurses shebangfix ssl	41	INFO= ${PORTNAME}
		42
38	SHEBANG_FILES= doc/gen-map-doc smime_keys.pl contrib/smime_keys_test.pl	43	SHEBANG_FILES= doc/gen-map-doc smime_keys.pl contrib/smime_keys_test.pl
39		44
40	.if defined(MUTT_CONFIGURE_ARGS)	45	.if defined(MUTT_CONFIGURE_ARGS)
Lines 45-53 GNU_CONFIGURE= yes Link Here
45		50
46	OPTIONS_SUB= yes	51	OPTIONS_SUB= yes
47		52
48	.if defined (MUTT_LITE)
49	OPTIONS_EXCLUDE= NLS DOCS EXAMPLES
50	.else
51	OPTIONS_DEFINE= SASL DEBUG DOCS EXAMPLES FLOCK \	53	OPTIONS_DEFINE= SASL DEBUG DOCS EXAMPLES FLOCK \
52	FORCEBASE64 GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \	54	FORCEBASE64 GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \
53	LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \	55	LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \
Lines 93-120 OPTIONS_DEFAULT= GPGME HTML HCACHE_BDB ICONV IDN \ Link Here
93	IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \	95	IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \
94	NLS NCURSES QUOTE_PATCH REVERSE_REPLY_PATCH SMART_DATE \	96	NLS NCURSES QUOTE_PATCH REVERSE_REPLY_PATCH SMART_DATE \
95	SMIME_OUTLOOK_COMPAT SASL SMTP URLVIEW XML GSSAPI_NONE	97	SMIME_OUTLOOK_COMPAT SASL SMTP URLVIEW XML GSSAPI_NONE
96	.endif
97		98
98	RUN_DEPENDS+= ${LOCALBASE}/etc/mime.types:misc/mime-support
99
100	.if !defined (MUTT_LITE)
101	ASPELL_BUILD_DEPENDS= aspell:textproc/aspell	99	ASPELL_BUILD_DEPENDS= aspell:textproc/aspell
102	ASPELL_RUN_DEPENDS= aspell:textproc/aspell	100	ASPELL_RUN_DEPENDS= aspell:textproc/aspell
103	ISPELL_BUILD_DEPENDS= ispell:textproc/aspell-ispell	101	ISPELL_BUILD_DEPENDS= ispell:textproc/aspell-ispell
104	ISPELL_RUN_DEPENDS= ispell:textproc/aspell-ispell	102	ISPELL_RUN_DEPENDS= ispell:textproc/aspell-ispell
105	URLVIEW_RUN_DEPENDS= urlview:textproc/urlview	103	URLVIEW_RUN_DEPENDS= urlview:textproc/urlview
106	.endif
107
108	.if defined (MUTT_LITE)
109	PKGNAMESUFFIX= -lite
110	USES+= ncurses
111	PLIST_SUB+= MAILBOX_MANPAGES=""
112	PLIST_SUB+= HTML="@comment "
113	PLIST_SUB+= NNTP="@comment "
114	# XXX bug in bpm ?
115	PLIST_SUB+= NLS="@comment "
116	CONFIGURE_ARGS+= --disable-nls --disable-iconv --without-idn
117	.endif
118		104
119	.ifmake makesum # for optional distfiles patchfiles	105	.ifmake makesum # for optional distfiles patchfiles
120	PORT_DBDIR= /dev/null	106	PORT_DBDIR= /dev/null
Lines 172-178 FLOCK_CONFIGURE_ENABLE= flock Link Here
172		158
173	LOCALES_FIX_CONFIGURE_ON= --enable-locales-fix	159	LOCALES_FIX_CONFIGURE_ON= --enable-locales-fix
174		160
175	IDN_LIB_DEPENDS= libidn2.so:dns/libidn2	161	IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 \
		162	libunistring.so:devel/libunistring
176	IDN_CONFIGURE_WITH= idn2	163	IDN_CONFIGURE_WITH= idn2
177	IDN_IMPLIES= ICONV	164	IDN_IMPLIES= ICONV
178		165
Lines 190-195 GREETING_PATCH_PATCHFILES= mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc Link Here
190	QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \	177	QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \
191	patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv	178	patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv
192		179
		180	NNTP_BROKEN= NNTP 1.10.0 broken with mutt 1.11.0
193	NNTP_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:-p1:vvv	181	NNTP_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:-p1:vvv
194	NNTP_CONFIGURE_ON= --enable-nntp	182	NNTP_CONFIGURE_ON= --enable-nntp
195	NNTP_VARS= XML_NEEDED=yes	183	NNTP_VARS= XML_NEEDED=yes
Lines 202-208 DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref Link Here
202		190
203	# un/comment as each VERSION is created for PORTVERSION	191	# un/comment as each VERSION is created for PORTVERSION
204	VVV_PATCH_VERSION= 1.10.0	192	VVV_PATCH_VERSION= 1.10.0
205	GREETING_PATCH_VERSION= 1.10.0	193	#GREETING_PATCH_VERSION= 1.11.0
206		194
207	.if !defined(VVV_PATCH_VERSION)	195	.if !defined(VVV_PATCH_VERSION)
208	VVV_PATCH_VERSION= ${PORTVERSION}	196	VVV_PATCH_VERSION= ${PORTVERSION}

Lines 1-8 Link Here

(-)b/mail/mutt/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1531761572	1	TIMESTAMP = 1543291077
2	SHA256 (mutt/mutt-1.10.1.tar.gz) = 734a3883158ec3d180cf6538d8bd7f685ce641d2cdef657aa0038f76e79a54a0	2	SHA256 (mutt/mutt-1.11.0.tar.gz) = 92c9261933809fed34d66469cb83c7f83bb29f721cd48d608c40cafd299c10e3
3	SIZE (mutt/mutt-1.10.1.tar.gz) = 4255890	3	SIZE (mutt/mutt-1.11.0.tar.gz) = 4568953
4	SHA256 (mutt/mutt-1.10.0.vc.greeting) = e33b0659290cfbcff0055a5e3ec0762fed7eb76127e0c29cd00586d62cb92df8	4	SHA256 (mutt/mutt-1.11.0.vc.greeting) = 57bd75016350e3ab8516f27154016e23a29176d2f1163258d31531f4aa722afc
5	SIZE (mutt/mutt-1.10.0.vc.greeting) = 4560	5	SIZE (mutt/mutt-1.11.0.vc.greeting) = 4560
6	SHA256 (mutt/patch-1.10.0.vvv.nntp.gz) = 895c168f00cd073234c6cbb0d6972b5b390c64bf9ee5a13f58e0ea0652cabe4a	6	SHA256 (mutt/patch-1.10.0.vvv.nntp.gz) = 895c168f00cd073234c6cbb0d6972b5b390c64bf9ee5a13f58e0ea0652cabe4a
7	SIZE (mutt/patch-1.10.0.vvv.nntp.gz) = 60723	7	SIZE (mutt/patch-1.10.0.vvv.nntp.gz) = 60723
8	SHA256 (mutt/patch-1.10.0.vvv.initials.gz) = 7254751c439d4b138e89b47f71bd4e37c1c257130a8c88af91189fd8e4f249bb	8	SHA256 (mutt/patch-1.10.0.vvv.initials.gz) = 7254751c439d4b138e89b47f71bd4e37c1c257130a8c88af91189fd8e4f249bb




--- PATCHES.orig	2018-11-29 22:49:51 UTC
+++ init.h
@@ -4114,6 +4114,7 @@
 static int parse_unlists (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_alias (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_unalias (BUFFER *, BUFFER *, unsigned long, BUFFER *);
+static int parse_ifdef (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_echo (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_ignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_unignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
@@ -4178,6 +4178,7 @@
   { "hdr_order",	parse_list,		UL &HeaderOrderList },
 #ifdef HAVE_ICONV
   { "iconv-hook",	mutt_parse_hook,	MUTT_ICONVHOOK },
+  { "ifdef",		parse_ifdef,		0 },
 #endif
   { "ignore",		parse_ignore,		0 },
   { "lists",		parse_lists,		0 },
--- PATCHES.orig	2018-05-19 23:44:00 UTC
+++ PATCHES
@@ -1,2 +1,3 @@
+patch-1.5.4.cd.ifdef.1
 vvv.quote
 vvv.initials
--- init.c.orig	2018-11-24 19:06:11 UTC
+++ init.c
@@ -650,6 +650,52 @@ static mbchar_table *parse_mbchar_table 
   return t;
 }
 

 static int parse_unignore (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
 {
   do
--- init.h.orig	2018-11-29 22:49:51 UTC
+++ init.h
@@ -4195,6 +4195,7 @@ static int parse_lists (BUFFER *, BUFFER
 static int parse_unlists (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_alias (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_unalias (BUFFER *, BUFFER *, unsigned long, BUFFER *);
+static int parse_ifdef (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_echo (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_ignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_unignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
@@ -4259,6 +4260,7 @@ const struct command_t Commands[] = {
   { "hdr_order",	parse_list,		UL &HeaderOrderList },
 #ifdef HAVE_ICONV
   { "iconv-hook",	mutt_parse_hook,	MUTT_ICONVHOOK },
+  { "ifdef",		parse_ifdef,		0 },
 #endif
   { "ignore",		parse_ignore,		0 },
   { "index-format-hook",mutt_parse_idxfmt_hook, MUTT_IDXFMTHOOK },

Lines 1-10 Link Here

(-)b/mail/mutt/files/extra-patch-reverse_reply (-12 / +15 lines)
1	--- PATCHES.orig 2018-05-19 20:39:17 UTC	1	--- PATCHES.orig 2018-11-29 22:55:14 UTC
2	+++ PATCHES	2	+++ PATCHES
3	@@ -0,0 +1 @@	3	@@ -1,3 +1,4 @@
4	+patch-1.5.6.cb.reverse_reply.2	4	+patch-1.5.6.cb.reverse_reply.2
5	--- init.h.orig 2018-05-19 20:37:42 UTC	5	patch-1.5.4.cd.ifdef.1
		6	vvv.quote
		7	vvv.initials
		8	--- init.h.orig 2018-11-29 22:55:14 UTC
6	+++ init.h	9	+++ init.h
7	@@ -2748,6 +2748,13 @@	10	@@ -2820,6 +2820,13 @@ struct option_t MuttVars[] = {
8	** possibly including eventual real names. When it is \fIunset\fP, mutt will	11	** 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.	12	** override any such real names with the setting of the $$realname variable.
10	*/	13	*/
Lines 18-26 Link Here
18	{ "rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0 },	21	{ "rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0 },
19	/*	22	/*
20	** .pp	23	** .pp
21	--- mutt.h.orig 2018-05-19 20:36:22 UTC	24	--- mutt.h.orig 2018-11-29 22:55:14 UTC
22	+++ mutt.h	25	+++ mutt.h
23	@@ -466,6 +466,7 @@	26	@@ -478,6 +478,7 @@ enum
24	OPTREVALIAS,	27	OPTREVALIAS,
25	OPTREVNAME,	28	OPTREVNAME,
26	OPTREVREAL,	29	OPTREVREAL,
Lines 28-36 Link Here
28	OPTRFC2047PARAMS,	31	OPTRFC2047PARAMS,
29	OPTSAVEADDRESS,	32	OPTSAVEADDRESS,
30	OPTSAVEEMPTY,	33	OPTSAVEEMPTY,
31	--- protos.h.orig 2018-05-19 20:33:53 UTC	34	--- protos.h.orig 2018-11-24 19:06:21 UTC
32	+++ protos.h	35	+++ protos.h
33	@@ -93,6 +93,7 @@	36	@@ -85,6 +85,7 @@ ADDRESS mutt_get_address (ENVELOPE , c
34	ADDRESS mutt_lookup_alias (const char s);	37	ADDRESS mutt_lookup_alias (const char s);
35	ADDRESS mutt_remove_duplicates (ADDRESS );	38	ADDRESS mutt_remove_duplicates (ADDRESS );
36	ADDRESS mutt_remove_xrefs (ADDRESS , ADDRESS *);	39	ADDRESS mutt_remove_xrefs (ADDRESS , ADDRESS *);
Lines 38-46 Link Here
38	ADDRESS mutt_expand_aliases (ADDRESS );	41	ADDRESS mutt_expand_aliases (ADDRESS );
39	ADDRESS mutt_parse_adrlist (ADDRESS , const char *);	42	ADDRESS mutt_parse_adrlist (ADDRESS , const char *);
40		43
41	--- send.c.orig 2018-05-19 20:33:53 UTC	44	--- send.c.orig 2018-10-04 22:30:10 UTC
42	+++ send.c	45	+++ send.c
43	@@ -598,6 +598,10 @@	46	@@ -600,6 +600,10 @@ void mutt_fix_reply_recipients (ENVELOPE
44	/* the CC field can get cluttered, especially with lists */	47	/* the CC field can get cluttered, especially with lists */
45	env->to = mutt_remove_duplicates (env->to);	48	env->to = mutt_remove_duplicates (env->to);
46	env->cc = mutt_remove_duplicates (env->cc);	49	env->cc = mutt_remove_duplicates (env->cc);
Lines 51-59 Link Here
51	env->cc = mutt_remove_xrefs (env->to, env->cc);	54	env->cc = mutt_remove_xrefs (env->to, env->cc);
52		55
53	if (env->cc && !env->to)	56	if (env->cc && !env->to)
54	--- sendlib.c.orig 2018-05-19 20:33:53 UTC	57	--- sendlib.c.orig 2018-11-24 19:06:11 UTC
55	+++ sendlib.c	58	+++ sendlib.c
56	@@ -2753,6 +2753,35 @@	59	@@ -2754,6 +2754,35 @@ static void set_noconv_flags (BODY *b, s
57	}	60	}
58	}	61	}
59		62




--- hdrline.c.orig	2018-11-29 23:19:39 UTC
+++ hdrline.c
@@ -249,6 +249,89 @@ static char *apply_subject_mods (ENVELOP
  * %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label)
  * %Z = status flags	*/
 

 static const char *
 hdr_format_str (char *dest,
 		size_t destlen,
@@ -422,7 +505,13 @@ hdr_format_str (char *dest,
 
         if (!do_locales)
           setlocale (LC_TIME, "C");

         if (!do_locales)
           setlocale (LC_TIME, "");
 
--- mutt.h.orig	2018-11-29 23:17:47 UTC
+++ mutt.h
@@ -156,6 +156,16 @@ typedef enum
   MUTT_FORMAT_NOFILTER    = (1<<7)  /* do not allow filtering on this pass */
 } format_flag;
 

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-Makefile.in (-3 / +3 lines)
1	--- Makefile.in.orig 2018-05-19 20:48:16 UTC	1	--- Makefile.in.orig 2018-11-25 17:43:43 UTC
2	+++ Makefile.in	2	+++ Makefile.in
3	@@ -471,7 +471,7 @@	3	@@ -531,7 +531,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign
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	@@ -1355,18 +1355,9 @@	12	@@ -1667,18 +1667,9 @@ install-exec-hook:
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

Lines 1-5 Link Here

(-)b/mail/mutt/files/patch-contrib_Makefile.in (-2 / +3 lines)
1	Index: contrib/Makefile.in	1	--- contrib/Makefile.in.orig 2018-11-25 17:43:43 UTC
2	@@ -270,7 +270,7 @@	2	+++ contrib/Makefile.in
		3	@@ -272,7 +272,7 @@ top_build_prefix = @top_build_prefix@
3	top_builddir = @top_builddir@	4	top_builddir = @top_builddir@
4	top_srcdir = @top_srcdir@	5	top_srcdir = @top_srcdir@
5	subdir = contrib	6	subdir = contrib




+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.0.ats.date_conditional.1
--- hdrline.c.orig	2018-11-24 19:06:11 UTC
+++ hdrline.c
@@ -428,6 +428,53 @@ hdr_format_str (char *dest,
 	const char *cp;

 
 	p = dest;
 
--- muttlib.c.orig	2018-11-24 19:06:21 UTC
+++ muttlib.c
@@ -1382,7 +1382,16 @@ void mutt_FormatString (char *dest,		/* 
       if (*src == '?')
       {
 	flags |= MUTT_FORMAT_OPTIONAL;

       }
       else
       {
@@ -1398,12 +1407,12 @@ void mutt_FormatString (char *dest,		/* 
 	  count++;
 	}
 	*cp = 0;

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-dgc-deepif (-2 / +2 lines)
1	--- muttlib.c.orig 2017-06-03 02:20:37 UTC	1	--- muttlib.c.orig 2017-06-03 02:20:37 UTC
2	+++ muttlib.c	2	+++ muttlib.c
3	@@ -1378,6 +1378,12 @@ void mutt_FormatString (char dest, /	3	@@ -1425,6 +1425,12 @@ void mutt_FormatString (char dest, /
4	count = 0;	4	count = 0;
5	while (count < sizeof (ifstring) && src && src != '?' && *src != '&')	5	while (count < sizeof (ifstring) && src && src != '?' && *src != '&')
6	{	6	{
Lines 13-19 Link Here
13	cp++ = src++;	13	cp++ = src++;
14	count++;	14	count++;
15	}	15	}
16	@@ -1390,7 +1396,13 @@ void mutt_FormatString (char dest, /	16	@@ -1437,7 +1437,13 @@ void mutt_FormatString (char dest, /
17	count = 0;	17	count = 0;
18	while (count < sizeof (elsestring) && src && src != '?')	18	while (count < sizeof (elsestring) && src && src != '?')
19	{	19	{




--- doc/Makefile.in.orig	2018-12-01 04:54:52 UTC
+++ doc/Makefile.in
@@ -678,14 +678,7 @@ install-data-local: makedoc-all instdoc
 	-for f in $(HTML_DOCFILES) ; do \
 		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
 	done

-		$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir) ; \
-	fi
+	$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.sample
 	-if [ -f mutt.info ] ; then \
 	  $(MKDIR_P) $(DESTDIR)$(infodir) ; \
 	  $(INSTALL) -m 644 mutt.info $(DESTDIR)$(infodir) ; \
@@ -721,9 +714,7 @@ uninstall-local:
 
 check:
 manual.txt: manual.html

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-muttlib.c (-2 / +2 lines)
1	--- muttlib.c.orig 2016-10-08 19:35:50 UTC	1	--- muttlib.c.orig 2018-11-24 19:06:21 UTC
2	+++ muttlib.c	2	+++ muttlib.c
3	@@ -802,16 +802,15 @@ void mutt_merge_envelopes(ENVELOPE* base	3	@@ -845,16 +845,15 @@ void _mutt_buffer_mktemp (BUFFER *buf, c
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	{




--- imap/message.c.orig	2018-11-18 18:07:02 UTC
+++ imap/message.c
@@ -652,6 +652,18 @@ static int read_headers_condstore_qresyn
   {
     imap_hcache_close (idata);
     imap_expunge_mailbox (idata);
+
+    /* undo expunge count updates.
+     * mx_update_context() will do this at the end of the header fetch. */
+    ctx->vcount = 0;
+    ctx->vsize = 0;
+    ctx->tagged = 0;
+    ctx->deleted = 0;
+    ctx->new = 0;
+    ctx->unread = 0;
+    ctx->changed = 0;
+    ctx->flagged = 0;
+
     idata->hcache = imap_hcache_open (idata, NULL);
     idata->reopen &= ~IMAP_EXPUNGE_PENDING;
   }




--- commands.c.orig	2018-10-04 22:30:10 UTC
+++ commands.c
@@ -186,7 +186,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	2018-11-24 19:06:11 UTC
+++ init.h
@@ -3232,6 +3232,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, UL "smime_default_key", 0 },
   { "smime_default_key",		DT_STR,	 R_NONE, UL &SmimeDefaultKey, 0 },
   /*
--- mutt.h.orig	2018-11-24 19:06:11 UTC
+++ mutt.h
@@ -551,6 +551,7 @@ enum
   OPTSMIMEISDEFAULT,
   OPTSMIMESELFENCRYPT,
   OPTASKCERTLABEL,




--- mutt.h.orig	2018-11-24 19:06:11 UTC
+++ mutt.h
@@ -234,6 +234,7 @@ enum
   MUTT_EXPIRED,
   MUTT_SUPERSEDED,
   MUTT_TRASH,

 
   /* actions for mutt_pattern_comp/mutt_pattern_exec */
   MUTT_AND,
--- pattern.c.orig	2018-11-24 19:06:11 UTC
+++ pattern.c
@@ -57,6 +57,7 @@ static const struct pattern_flags
 }
 Flags[] =
 {

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




bin/mutt
bin/muttbug
@(,mail,2755) bin/mutt_dotlock
bin/mutt_pgpring
bin/pgpewrap
bin/pgpring
bin/smime_keys
@sample etc/Muttrc.sample
man/man1/mutt.1.gz
man/man1/mutt_dotlock.1.gz
man/man1/mutt_pgpring.1.gz
man/man1/pgpewrap.1.gz
man/man1/pgpring.1.gz
man/man1/smime_keys.1.gz
man/man5/mailcap.5.gz
%%MAILBOX_MANPAGES%%man/man5/mbox.5.gz

%%NLS%%share/locale/es/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/et/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/eu/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/fi/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/fr/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/ga/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/gl/LC_MESSAGES/mutt.mo
- 

Return to bug 233680

Lines 1-28 Link Here

(-)b/mail/mutt/files/extra-patch-ifdef (-22 / +24 lines)
1	--- init.h.orig 2018-05-19 23:45:18 UTC	1	--- PATCHES.orig 2018-11-29 22:49:51 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
20	+++ PATCHES	2	+++ PATCHES
21	@@ -0,0 +1 @@	3	@@ -1,2 +1,3 @@
22	+patch-1.5.4.cd.ifdef.1	4	+patch-1.5.4.cd.ifdef.1
23	--- init.c.orig 2018-05-19 23:44:00 UTC	5	vvv.quote
		6	vvv.initials
		7	--- init.c.orig 2018-11-24 19:06:11 UTC
24	+++ init.c	8	+++ init.c
25	@@ -650,6 +650,52 @@	9	@@ -650,6 +650,52 @@ static mbchar_table *parse_mbchar_table
26	return t;	10	return t;
27	}	11	}
28		12
Lines 75-77 Link Here
75	static int parse_unignore (BUFFER buf, BUFFER s, unsigned long data, BUFFER *err)	59	static int parse_unignore (BUFFER buf, BUFFER s, unsigned long data, BUFFER *err)
76	{	60	{
77	do	61	do
		62	--- init.h.orig 2018-11-29 22:49:51 UTC
		63	+++ init.h
		64	@@ -4195,6 +4195,7 @@ static int parse_lists (BUFFER *, BUFFER
		65	static int parse_unlists (BUFFER , BUFFER , unsigned long, BUFFER *);
		66	static int parse_alias (BUFFER , BUFFER , unsigned long, BUFFER *);
		67	static int parse_unalias (BUFFER , BUFFER , unsigned long, BUFFER *);
		68	+static int parse_ifdef (BUFFER , BUFFER , unsigned long, BUFFER *);
		69	static int parse_echo (BUFFER , BUFFER , unsigned long, BUFFER *);
		70	static int parse_ignore (BUFFER , BUFFER , unsigned long, BUFFER *);
		71	static int parse_unignore (BUFFER , BUFFER , unsigned long, BUFFER *);
		72	@@ -4259,6 +4260,7 @@ const struct command_t Commands[] = {
		73	{ "hdr_order", parse_list, UL &HeaderOrderList },
		74	#ifdef HAVE_ICONV
		75	{ "iconv-hook", mutt_parse_hook, MUTT_ICONVHOOK },
		76	+ { "ifdef", parse_ifdef, 0 },
		77	#endif
		78	{ "ignore", parse_ignore, 0 },
		79	{ "index-format-hook",mutt_parse_idxfmt_hook, MUTT_IDXFMTHOOK },

Lines 1-6 Link Here

(-)b/mail/mutt/files/extra-patch-smartdate (-5 / +5 lines)
1	--- hdrline.c.orig 2018-05-19 20:36:17 UTC	1	--- hdrline.c.orig 2018-11-29 23:19:39 UTC
2	+++ hdrline.c	2	+++ hdrline.c
3	@@ -249,6 +249,89 @@	3	@@ -249,6 +249,89 @@ static char *apply_subject_mods (ENVELOP
4	* %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label)	4	* %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label)
5	* %Z = status flags */	5	* %Z = status flags */
6		6
Lines 90-96 Link Here
90	static const char *	90	static const char *
91	hdr_format_str (char *dest,	91	hdr_format_str (char *dest,
92	size_t destlen,	92	size_t destlen,
93	@@ -422,7 +505,13 @@	93	@@ -422,7 +505,13 @@ hdr_format_str (char *dest,
94		94
95	if (!do_locales)	95	if (!do_locales)
96	setlocale (LC_TIME, "C");	96	setlocale (LC_TIME, "C");
Lines 105-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-05-19 20:44:10 UTC	108	--- mutt.h.orig 2018-11-29 23:17:47 UTC
109	+++ mutt.h	109	+++ mutt.h
110	@@ -148,6 +148,16 @@	110	@@ -156,6 +156,16 @@ typedef enum
111	MUTT_FORMAT_NOFILTER = (1<<7) /* do not allow filtering on this pass */	111	MUTT_FORMAT_NOFILTER = (1<<7) /* do not allow filtering on this pass */
112	} format_flag;	112	} format_flag;
113		113

Lines 2-8 Link Here

(-)b/mail/mutt/files/patch-date-conditional (-4 / +4 lines)
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 2017-12-03 03:10:17 UTC	5	--- hdrline.c.orig 2018-11-24 19:06:11 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 2017-12-03 03:10:17 UTC	61	--- muttlib.c.orig 2018-11-24 19:06:21 UTC
62	+++ muttlib.c	62	+++ muttlib.c
63	@@ -1335,7 +1335,16 @@ void mutt_FormatString (char dest, /	63	@@ -1382,7 +1382,16 @@ void mutt_FormatString (char dest, /
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	@@ -1351,12 +1360,12 @@ void mutt_FormatString (char dest, /	81	@@ -1398,12 +1407,12 @@ void mutt_FormatString (char dest, /
82	count++;	82	count++;
83	}	83	}
84	*cp = 0;	84	*cp = 0;

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-doc_Makefile.in (-6 / +6 lines)
1	--- doc/Makefile.in.orig 2018-01-27 22:36:31 UTC	1	--- doc/Makefile.in.orig 2018-12-01 04:54:52 UTC
2	+++ doc/Makefile.in	2	+++ doc/Makefile.in
3	@@ -664,14 +664,7 @@ install-data-local: makedoc-all instdoc	3	@@ -678,14 +678,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 13-22 Link Here
13	- $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir) ; \	13	- $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir) ; \
14	- fi	14	- fi
15	+ $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.sample	15	+ $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.sample
16		16	-if [ -f mutt.info ] ; then \
17	uninstall-local:	17	$(MKDIR_P) $(DESTDIR)$(infodir) ; \
18	for f in mutt.1 mutt_dotlock.1 smime_keys.1 pgpewrap.1 pgpring.1; do \	18	$(INSTALL) -m 644 mutt.info $(DESTDIR)$(infodir) ; \
19	@@ -694,9 +687,7 @@ uninstall-local:	19	@@ -721,9 +714,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-qresync-crash (+21 lines)
1	--- imap/message.c.orig 2018-11-18 18:07:02 UTC
2	+++ imap/message.c
3	@@ -652,6 +652,18 @@ static int read_headers_condstore_qresyn
4	{
5	imap_hcache_close (idata);
6	imap_expunge_mailbox (idata);
7	+
8	+ /* undo expunge count updates.
9	+ * mx_update_context() will do this at the end of the header fetch. */
10	+ ctx->vcount = 0;
11	+ ctx->vsize = 0;
12	+ ctx->tagged = 0;
13	+ ctx->deleted = 0;
14	+ ctx->new = 0;
15	+ ctx->unread = 0;
16	+ ctx->changed = 0;
17	+ ctx->flagged = 0;
18	+
19	idata->hcache = imap_hcache_open (idata, NULL);
20	idata->reopen &= ~IMAP_EXPUNGE_PENDING;
21	}

Lines 1-4 Link Here

(-)b/mail/mutt/files/patch-smime-sender (-5 / +5 lines)
1	--- commands.c.orig 2017-09-08 22:18:16 UTC	1	--- commands.c.orig 2018-10-04 22:30:10 UTC
2	+++ commands.c	2	+++ commands.c
3	@@ -186,7 +186,7 @@ int mutt_display_message (HEADER *cur)	3	@@ -186,7 +186,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 2017-09-08 22:18:16 UTC	12	--- init.h.orig 2018-11-24 19:06:11 UTC
13	+++ init.h	13	+++ init.h
14	@@ -3160,6 +3169,15 @@ struct option_t MuttVars[] = {	14	@@ -3232,6 +3232,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, 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 2018-11-24 19:06:11 UTC
31	+++ mutt.h	31	+++ mutt.h
32	@@ -539,6 +540,7 @@ enum	32	@@ -551,6 +551,7 @@ enum
33	OPTSMIMEISDEFAULT,	33	OPTSMIMEISDEFAULT,
34	OPTSMIMESELFENCRYPT,	34	OPTSMIMESELFENCRYPT,
35	OPTASKCERTLABEL,	35	OPTASKCERTLABEL,

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-threadcomplete (-5 / +5 lines)
1	--- mutt.h.orig 2018-05-19 21:17:16 UTC	1	--- mutt.h.orig 2018-11-24 19:06:11 UTC
2	+++ mutt.h	2	+++ mutt.h
3	@@ -225,6 +225,7 @@	3	@@ -234,6 +234,7 @@ enum
4	MUTT_EXPIRED,	4	MUTT_EXPIRED,
5	MUTT_SUPERSEDED,	5	MUTT_SUPERSEDED,
6	MUTT_TRASH,	6	MUTT_TRASH,
Lines 8-16 Link Here
8		8
9	/* actions for mutt_pattern_comp/mutt_pattern_exec */	9	/* actions for mutt_pattern_comp/mutt_pattern_exec */
10	MUTT_AND,	10	MUTT_AND,
11	--- pattern.c.orig 2018-05-19 20:33:53 UTC	11	--- pattern.c.orig 2018-11-24 19:06:11 UTC
12	+++ pattern.c	12	+++ pattern.c
13	@@ -57,6 +57,7 @@	13	@@ -57,6 +57,7 @@ static const struct pattern_flags
14	}	14	}
15	Flags[] =	15	Flags[] =
16	{	16	{
Lines 18-24 Link Here
18	{ 'A', MUTT_ALL, 0, NULL },	18	{ 'A', MUTT_ALL, 0, NULL },
19	{ 'b', MUTT_BODY, MUTT_FULL_MSG, eat_regexp },	19	{ 'b', MUTT_BODY, MUTT_FULL_MSG, eat_regexp },
20	{ 'B', MUTT_WHOLE_MSG, MUTT_FULL_MSG, eat_regexp },	20	{ 'B', MUTT_WHOLE_MSG, MUTT_FULL_MSG, eat_regexp },
21	@@ -1294,6 +1295,16 @@	21	@@ -1343,6 +1344,16 @@ mutt_pattern_exec (struct pattern_t *pat
22	else	22	else
23	result = mutt_is_list_cc (pat->alladdr, h->env->to, h->env->cc);	23	result = mutt_is_list_cc (pat->alladdr, h->env->to, h->env->cc);
24	return (pat->not ^ result);	24	return (pat->not ^ result);

Lines 2-15 bin/flea Link Here

(-)b/mail/mutt/pkg-plist (-3 / +3 lines)
2	bin/mutt	2	bin/mutt
3	bin/muttbug	3	bin/muttbug
4	@(,mail,2755) bin/mutt_dotlock	4	@(,mail,2755) bin/mutt_dotlock
		5	bin/mutt_pgpring
5	bin/pgpewrap	6	bin/pgpewrap
6	bin/pgpring
7	bin/smime_keys	7	bin/smime_keys
8	@sample etc/Muttrc.sample	8	@sample etc/Muttrc.sample
9	man/man1/mutt.1.gz	9	man/man1/mutt.1.gz
10	man/man1/mutt_dotlock.1.gz	10	man/man1/mutt_dotlock.1.gz
		11	man/man1/mutt_pgpring.1.gz
11	man/man1/pgpewrap.1.gz	12	man/man1/pgpewrap.1.gz
12	man/man1/pgpring.1.gz
13	man/man1/smime_keys.1.gz	13	man/man1/smime_keys.1.gz
14	man/man5/mailcap.5.gz	14	man/man5/mailcap.5.gz
15	%%MAILBOX_MANPAGES%%man/man5/mbox.5.gz	15	%%MAILBOX_MANPAGES%%man/man5/mbox.5.gz
Lines 89-94 man/man5/muttrc.5.gz Link Here
89	%%NLS%%share/locale/es/LC_MESSAGES/mutt.mo	89	%%NLS%%share/locale/es/LC_MESSAGES/mutt.mo
90	%%NLS%%share/locale/et/LC_MESSAGES/mutt.mo	90	%%NLS%%share/locale/et/LC_MESSAGES/mutt.mo
91	%%NLS%%share/locale/eu/LC_MESSAGES/mutt.mo	91	%%NLS%%share/locale/eu/LC_MESSAGES/mutt.mo
		92	%%NLS%%share/locale/fi/LC_MESSAGES/mutt.mo
92	%%NLS%%share/locale/fr/LC_MESSAGES/mutt.mo	93	%%NLS%%share/locale/fr/LC_MESSAGES/mutt.mo
93	%%NLS%%share/locale/ga/LC_MESSAGES/mutt.mo	94	%%NLS%%share/locale/ga/LC_MESSAGES/mutt.mo
94	%%NLS%%share/locale/gl/LC_MESSAGES/mutt.mo	95	%%NLS%%share/locale/gl/LC_MESSAGES/mutt.mo
95	-