Attachment #207705 for bug #240741

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

Lines 2-8 Link Here

(-)b/mail/mutt/Makefile (-3 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mutt	4	PORTNAME= mutt
5	DISTVERSION= 1.12.1	5	DISTVERSION= 1.12.2
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 182-189 DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref Link Here
182	.include <bsd.port.options.mk>	182	.include <bsd.port.options.mk>
183		183
184	# un/comment as each VERSION is created for PORTVERSION	184	# un/comment as each VERSION is created for PORTVERSION
185	#VVV_PATCH_VERSION= 1.12.1	185	VVV_PATCH_VERSION= 1.12.1
186	GREETING_PATCH_VERSION= 1.12.0	186	GREETING_PATCH_VERSION= 1.12.1
187		187
188	.if !defined(VVV_PATCH_VERSION)	188	.if !defined(VVV_PATCH_VERSION)
189	VVV_PATCH_VERSION= ${PORTVERSION}	189	VVV_PATCH_VERSION= ${PORTVERSION}

Lines 1-8 Link Here

(-)b/mail/mutt/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1565808330	1	TIMESTAMP = 1569099378
2	SHA256 (mutt/mutt-1.12.1.tar.gz) = 01c565406ec4ffa85db90b45ece2260b25fac3646cc063bbc20a242c6ed4210c	2	SHA256 (mutt/mutt-1.12.2.tar.gz) = bc42750ce8237742b9382f2148fc547a8d8601aa4a7cd28c55fe7ca045196882
3	SIZE (mutt/mutt-1.12.1.tar.gz) = 4675166	3	SIZE (mutt/mutt-1.12.2.tar.gz) = 4675774
4	SHA256 (mutt/mutt-1.12.0.vc.greeting) = 7596d930447e9834567c0cfddf9ac023ecbb99add64bee4131d87e0260eec591	4	SHA256 (mutt/mutt-1.12.1.vc.greeting) = 54d1267c1ac496662b47131f9761b5ab53f44c93498938dc93d0156c6578e378
5	SIZE (mutt/mutt-1.12.0.vc.greeting) = 4559	5	SIZE (mutt/mutt-1.12.1.vc.greeting) = 4559
6	SHA256 (mutt/patch-1.12.1.vvv.nntp.xz) = 9c420584d549ac0bb49c52ddfd2ab5bee0f89e59cb938673444ec27ad7c782ad	6	SHA256 (mutt/patch-1.12.1.vvv.nntp.xz) = 9c420584d549ac0bb49c52ddfd2ab5bee0f89e59cb938673444ec27ad7c782ad
7	SIZE (mutt/patch-1.12.1.vvv.nntp.xz) = 49672	7	SIZE (mutt/patch-1.12.1.vvv.nntp.xz) = 49672
8	SHA256 (mutt/patch-1.12.1.vvv.initials.xz) = 6c66fe6c23362b0f4970a5028a75a33454e1e53ba178e5801113939f1bc22920	8	SHA256 (mutt/patch-1.12.1.vvv.initials.xz) = 6c66fe6c23362b0f4970a5028a75a33454e1e53ba178e5801113939f1bc22920




--- PATCHES.orig	2017-12-03 03:10:17 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.4.cd.ifdef.1
--- init.c.orig	2019-09-21 19:18:34 UTC
+++ init.c
@@ -651,6 +651,52 @@ static mbchar_table *parse_mbchar_table (const char *s
   return t;

 static int parse_unignore (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
 {
   do
--- init.h.orig	2019-09-21 19:18:34 UTC
+++ init.h
@@ -4343,6 +4343,7 @@ static int parse_lists (BUFFER *, BUFFER *, unsigned l
 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_echo (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_ignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_unignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
@@ -4407,6 +4407,7 @@ const struct command_t Commands[] = {
   { "hdr_order",	parse_list,		UL &HeaderOrderList },
 #ifdef HAVE_ICONV
   { "iconv-hook",	mutt_parse_hook,	MUTT_ICONVHOOK },




--- PATCHES.orig	2017-12-03 03:10:17 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.6.cb.reverse_reply.2
--- init.h.orig	2019-09-21 19:18:34 UTC
+++ init.h
@@ -2966,6 +2966,13 @@ struct option_t MuttVars[] = {
   ** In either case, a missing real name will be filled in afterwards

   { "rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0 },
   /*
   ** .pp
--- mutt.h.orig	2019-09-21 19:18:34 UTC
+++ mutt.h
@@ -491,6 +491,7 @@ enum
   OPTREVALIAS,

   OPTRFC2047PARAMS,
   OPTSAVEADDRESS,
   OPTSAVEEMPTY,
--- protos.h.orig	2019-09-21 19:18:34 UTC
+++ protos.h
@@ -85,6 +85,7 @@ ADDRESS *mutt_get_address (ENVELOPE *, char **);
 ADDRESS *mutt_lookup_alias (const char *s);

 ADDRESS *mutt_expand_aliases (ADDRESS *);
 ADDRESS *mutt_parse_adrlist (ADDRESS *, const char *);
 
--- send.c.orig	2019-09-21 19:18:34 UTC
+++ send.c
@@ -717,6 +717,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env)
   /* the CC field can get cluttered, especially with lists */

   env->cc = mutt_remove_xrefs (env->to, env->cc);
 
   if (env->cc && !env->to)
--- sendlib.c.orig	2019-09-21 19:18:34 UTC
+++ sendlib.c
@@ -2765,6 +2765,35 @@ static void set_noconv_flags (BODY *b, short flag)
   }
 }
 
- 

Return to bug 240741

Lines 1-8 Link Here

(-)b/mail/mutt/files/extra-patch-ifdef (-5 / +5 lines)
1	--- PATCHES.orig 2019-06-15 21:17:01 UTC	1	--- PATCHES.orig 2017-12-03 03:10:17 UTC
2	+++ PATCHES	2	+++ PATCHES
3	@@ -0,0 +1 @@	3	@@ -0,0 +1 @@
4	+patch-1.5.4.cd.ifdef.1	4	+patch-1.5.4.cd.ifdef.1
5	--- init.c.orig 2019-05-25 16:22:39 UTC	5	--- init.c.orig 2019-09-21 19:18:34 UTC
6	+++ init.c	6	+++ init.c
7	@@ -651,6 +651,52 @@ static mbchar_table parse_mbchar_table (const char s	7	@@ -651,6 +651,52 @@ static mbchar_table parse_mbchar_table (const char s
8	return t;	8	return t;
Lines 57-65 Link Here
57	static int parse_unignore (BUFFER buf, BUFFER s, unsigned long data, BUFFER *err)	57	static int parse_unignore (BUFFER buf, BUFFER s, unsigned long data, BUFFER *err)
58	{	58	{
59	do	59	do
60	--- init.h.orig 2019-06-15 15:57:01 UTC	60	--- init.h.orig 2019-09-21 19:18:34 UTC
61	+++ init.h	61	+++ init.h
62	@@ -4330,6 +4330,7 @@ static int parse_lists (BUFFER , BUFFER , unsigned l	62	@@ -4343,6 +4343,7 @@ static int parse_lists (BUFFER , BUFFER , unsigned l
63	static int parse_unlists (BUFFER , BUFFER , unsigned long, BUFFER *);	63	static int parse_unlists (BUFFER , BUFFER , unsigned long, BUFFER *);
64	static int parse_alias (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 *);	65	static int parse_unalias (BUFFER , BUFFER , unsigned long, BUFFER *);
Lines 67-73 Link Here
67	static int parse_echo (BUFFER , BUFFER , unsigned long, BUFFER *);	67	static int parse_echo (BUFFER , BUFFER , unsigned long, BUFFER *);
68	static int parse_ignore (BUFFER , BUFFER , unsigned long, BUFFER *);	68	static int parse_ignore (BUFFER , BUFFER , unsigned long, BUFFER *);
69	static int parse_unignore (BUFFER , BUFFER , unsigned long, BUFFER *);	69	static int parse_unignore (BUFFER , BUFFER , unsigned long, BUFFER *);
70	@@ -4394,6 +4395,7 @@ const struct command_t Commands[] = {	70	@@ -4407,6 +4407,7 @@ const struct command_t Commands[] = {
71	{ "hdr_order", parse_list, UL &HeaderOrderList },	71	{ "hdr_order", parse_list, UL &HeaderOrderList },
72	#ifdef HAVE_ICONV	72	#ifdef HAVE_ICONV
73	{ "iconv-hook", mutt_parse_hook, MUTT_ICONVHOOK },	73	{ "iconv-hook", mutt_parse_hook, MUTT_ICONVHOOK },

Lines 1-8 Link Here

(-)b/mail/mutt/files/extra-patch-reverse_reply (-8 / +7 lines)
1	--- PATCHES.orig 2019-06-15 21:17:02 UTC	1	--- PATCHES.orig 2017-12-03 03:10:17 UTC
2	+++ PATCHES	2	+++ PATCHES
3	@@ -0,0 +1 @@	3	@@ -0,0 +1 @@
4	+patch-1.5.6.cb.reverse_reply.2	4	+patch-1.5.6.cb.reverse_reply.2
5	--- init.h.orig 2019-06-15 21:17:01 UTC	5	--- init.h.orig 2019-09-21 19:18:34 UTC
6	+++ init.h	6	+++ init.h
7	@@ -2966,6 +2966,13 @@ struct option_t MuttVars[] = {	7	@@ -2966,6 +2966,13 @@ struct option_t MuttVars[] = {
8	** In either case, a missing real name will be filled in afterwards	8	** In either case, a missing real name will be filled in afterwards
Lines 18-24 Link Here
18	{ "rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0 },	18	{ "rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0 },
19	/*	19	/*
20	** .pp	20	** .pp
21	--- mutt.h.orig 2019-06-15 21:17:01 UTC	21	--- mutt.h.orig 2019-09-21 19:18:34 UTC
22	+++ mutt.h	22	+++ mutt.h
23	@@ -491,6 +491,7 @@ enum	23	@@ -491,6 +491,7 @@ enum
24	OPTREVALIAS,	24	OPTREVALIAS,
Lines 28-34 Link Here
28	OPTRFC2047PARAMS,	28	OPTRFC2047PARAMS,
29	OPTSAVEADDRESS,	29	OPTSAVEADDRESS,
30	OPTSAVEEMPTY,	30	OPTSAVEEMPTY,
31	--- protos.h.orig 2019-05-25 16:22:39 UTC	31	--- protos.h.orig 2019-09-21 19:18:34 UTC
32	+++ protos.h	32	+++ protos.h
33	@@ -85,6 +85,7 @@ ADDRESS mutt_get_address (ENVELOPE , char **);	33	@@ -85,6 +85,7 @@ ADDRESS mutt_get_address (ENVELOPE , char **);
34	ADDRESS mutt_lookup_alias (const char s);	34	ADDRESS mutt_lookup_alias (const char s);
Lines 38-44 Link Here
38	ADDRESS mutt_expand_aliases (ADDRESS );	38	ADDRESS mutt_expand_aliases (ADDRESS );
39	ADDRESS mutt_parse_adrlist (ADDRESS , const char *);	39	ADDRESS mutt_parse_adrlist (ADDRESS , const char *);
40		40
41	--- send.c.orig 2019-06-14 15:57:33 UTC	41	--- send.c.orig 2019-09-21 19:18:34 UTC
42	+++ send.c	42	+++ send.c
43	@@ -717,6 +717,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env)	43	@@ -717,6 +717,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env)
44	/* the CC field can get cluttered, especially with lists */	44	/* the CC field can get cluttered, especially with lists */
Lines 51-59 Link Here
51	env->cc = mutt_remove_xrefs (env->to, env->cc);	51	env->cc = mutt_remove_xrefs (env->to, env->cc);
52		52
53	if (env->cc && !env->to)	53	if (env->cc && !env->to)
54	--- sendlib.c.orig 2019-06-14 15:57:30 UTC	54	--- sendlib.c.orig 2019-09-21 19:18:34 UTC
55	+++ sendlib.c	55	+++ sendlib.c
56	@@ -2764,6 +2764,35 @@ static void set_noconv_flags (BODY *b, short flag)	56	@@ -2765,6 +2765,35 @@ static void set_noconv_flags (BODY *b, short flag)
57	}	57	}
58	}	58	}
59		59
60	-