Attachment #221828 for bug #252930

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

Lines 2-8 Link Here

(-)b/mail/mutt/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mutt	4	PORTNAME= mutt
5	DISTVERSION= 2.0.4	5	DISTVERSION= 2.0.5
6	CATEGORIES+= mail	6	CATEGORIES+= mail
7	MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \	7	MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \
8	https://bitbucket.org/mutt/mutt/downloads/ \	8	https://bitbucket.org/mutt/mutt/downloads/ \
Lines 192-198 QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv \ Link Here
192	.include <bsd.port.options.mk>	192	.include <bsd.port.options.mk>
193		193
194	VVV_PATCH_VERSION= 1.13.0	194	VVV_PATCH_VERSION= 1.13.0
195	GREETING_PATCH_VERSION= 2.0.1	195	GREETING_PATCH_VERSION= 2.0.5
196		196
197	post-install:	197	post-install:
198	${INSTALL_MAN} ${FILESDIR}/mailcap.5 ${STAGEDIR}${MANPREFIX}/man/man5	198	${INSTALL_MAN} ${FILESDIR}/mailcap.5 ${STAGEDIR}${MANPREFIX}/man/man5

Lines 1-8 Link Here

(-)b/mail/mutt/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1609370754	1	TIMESTAMP = 1611365285
2	SHA256 (mutt/mutt-2.0.4.tar.gz) = 45087e78105e9abc7cc37827865d319081587cb53a94412aa4e3118e937991d4	2	SHA256 (mutt/mutt-2.0.5.tar.gz) = e21d5aec0d3110f89d390929e56a38794a94f5843120d9ff59b21da78fd0004d
3	SIZE (mutt/mutt-2.0.4.tar.gz) = 5293913	3	SIZE (mutt/mutt-2.0.5.tar.gz) = 5294710
4	SHA256 (mutt/mutt-2.0.1.vc.greeting) = 28d157df0ca36f2448dcc3d1cd19e34ec0eefe88251ebf1951e080d7178cccd2	4	SHA256 (mutt/mutt-2.0.5.vc.greeting) = cd91af2f8b30019939243cd736309664b0f00f090f0cd1b2dab6747fb07007e3
5	SIZE (mutt/mutt-2.0.1.vc.greeting) = 4452	5	SIZE (mutt/mutt-2.0.5.vc.greeting) = 4452
6	SHA256 (mutt/patch-1.13.0.vvv.initials.xz) = 8b25ad6596bd57d94f6551e7e73ceb8da620468e96fb507b2f51545d5b3eaa02	6	SHA256 (mutt/patch-1.13.0.vvv.initials.xz) = 8b25ad6596bd57d94f6551e7e73ceb8da620468e96fb507b2f51545d5b3eaa02
7	SIZE (mutt/patch-1.13.0.vvv.initials.xz) = 720	7	SIZE (mutt/patch-1.13.0.vvv.initials.xz) = 720
8	SHA256 (mutt/patch-1.13.0.vvv.quote.xz) = 788d25d1439d86d6c5007d141d1c219496e77940b5ce37819471c941f78f03e4	8	SHA256 (mutt/patch-1.13.0.vvv.quote.xz) = 788d25d1439d86d6c5007d141d1c219496e77940b5ce37819471c941f78f03e4




--- PATCHES.orig	2021-01-23 01:39:53 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.4.cd.ifdef.1
--- init.c.orig	2021-01-21 20:23:24 UTC
+++ init.c
@@ -678,6 +678,52 @@ static mbchar_table *parse_mbchar_table (const char *s
   return t;
 }
 

 static int parse_unignore (BUFFER *buf, BUFFER *s, union pointer_long_t udata, BUFFER *err)
 {
   do
--- init.h.orig	2021-01-23 01:39:53 UTC
+++ init.h
@@ -4705,6 +4705,7 @@ static int parse_lists (BUFFER *, BUFFER *, union poin
 static int parse_unlists (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);




--- PATCHES.orig	2021-01-23 01:39:53 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.6.cb.reverse_reply.2
--- init.h.orig	2021-01-23 01:39:53 UTC
+++ init.h
@@ -3191,6 +3191,13 @@ struct option_t MuttVars[] = {
   ** In either case, a missing real name will be filled in afterwards

   { "rfc2047_parameters", DT_BOOL, R_NONE, {.l=OPTRFC2047PARAMS}, {.l=0} },
   /*
   ** .pp
--- mutt.h.orig	2021-01-23 01:39:53 UTC
+++ mutt.h
@@ -522,6 +522,7 @@ enum
   OPTREVALIAS,

   OPTRFC2047PARAMS,
   OPTSAVEADDRESS,
   OPTSAVEEMPTY,
--- protos.h.orig	2021-01-21 20:23:24 UTC
+++ protos.h
@@ -85,6 +85,7 @@ char* mutt_extract_message_id (const char *, const cha
 ADDRESS *mutt_get_address (ENVELOPE *, char **);

 ADDRESS *mutt_expand_aliases (ADDRESS *);
 ADDRESS *mutt_parse_adrlist (ADDRESS *, const char *);
 
--- send.c.orig	2021-01-21 20:23:24 UTC
+++ send.c
@@ -739,6 +739,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	2021-01-21 20:23:24 UTC
+++ sendlib.c
@@ -3012,6 +3012,35 @@ static void set_noconv_flags (BODY *b, short flag)
   }
 }
 
- 

Return to bug 252930

Lines 1-10 Link Here

(-)b/mail/mutt/files/extra-patch-ifdef (-4 / +4 lines)
1	--- PATCHES.orig 2020-11-08 20:52:48 UTC	1	--- PATCHES.orig 2021-01-23 01:39:53 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 2020-11-03 17:50:37 UTC	5	--- init.c.orig 2021-01-21 20:23:24 UTC
6	+++ init.c	6	+++ init.c
7	@@ -672,6 +672,52 @@ static mbchar_table parse_mbchar_table (const char s	7	@@ -678,6 +678,52 @@ static mbchar_table parse_mbchar_table (const char s
8	return t;	8	return t;
9	}	9	}
10		10
Lines 57-63 Link Here
57	static int parse_unignore (BUFFER buf, BUFFER s, union pointer_long_t udata, BUFFER *err)	57	static int parse_unignore (BUFFER buf, BUFFER s, union pointer_long_t udata, BUFFER *err)
58	{	58	{
59	do	59	do
60	--- init.h.orig 2020-11-08 20:52:48 UTC	60	--- init.h.orig 2021-01-23 01:39:53 UTC
61	+++ init.h	61	+++ init.h
62	@@ -4705,6 +4705,7 @@ static int parse_lists (BUFFER , BUFFER , union poin	62	@@ -4705,6 +4705,7 @@ static int parse_lists (BUFFER , BUFFER , union poin
63	static int parse_unlists (BUFFER , BUFFER , union pointer_long_t, BUFFER *);	63	static int parse_unlists (BUFFER , BUFFER , union pointer_long_t, BUFFER *);

Lines 1-8 Link Here

(-)b/mail/mutt/files/extra-patch-reverse_reply (-8 / +7 lines)
1	--- PATCHES.orig 2020-11-08 20:52:49 UTC	1	--- PATCHES.orig 2021-01-23 01:39:53 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 2020-11-08 20:52:48 UTC	5	--- init.h.orig 2021-01-23 01:39:53 UTC
6	+++ init.h	6	+++ init.h
7	@@ -3191,6 +3191,13 @@ struct option_t MuttVars[] = {	7	@@ -3191,6 +3191,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, {.l=OPTRFC2047PARAMS}, {.l=0} },	18	{ "rfc2047_parameters", DT_BOOL, R_NONE, {.l=OPTRFC2047PARAMS}, {.l=0} },
19	/*	19	/*
20	** .pp	20	** .pp
21	--- mutt.h.orig 2020-11-08 20:52:48 UTC	21	--- mutt.h.orig 2021-01-23 01:39:53 UTC
22	+++ mutt.h	22	+++ mutt.h
23	@@ -522,6 +522,7 @@ enum	23	@@ -522,6 +522,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 2020-11-06 22:06:35 UTC	31	--- protos.h.orig 2021-01-21 20:23:24 UTC
32	+++ protos.h	32	+++ protos.h
33	@@ -85,6 +85,7 @@ char* mutt_extract_message_id (const char *, const cha	33	@@ -85,6 +85,7 @@ char* mutt_extract_message_id (const char *, const cha
34	ADDRESS mutt_get_address (ENVELOPE , char **);	34	ADDRESS mutt_get_address (ENVELOPE , char **);
Lines 38-44 Link Here
38	ADDRESS mutt_expand_aliases (ADDRESS );	38	ADDRESS mutt_expand_aliases (ADDRESS );
39	ADDRESS mutt_parse_adrlist (ADDRESS , const char *);	39	ADDRESS mutt_parse_adrlist (ADDRESS , const char *);
40		40
41	--- send.c.orig 2020-11-03 17:50:37 UTC	41	--- send.c.orig 2021-01-21 20:23:24 UTC
42	+++ send.c	42	+++ send.c
43	@@ -739,6 +739,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env)	43	@@ -739,6 +739,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env)
44	/* the CC field can get cluttered, especially with lists */	44	/* the CC field can get cluttered, especially with lists */
Lines 51-59 Link Here
51	env->cc = mutt_remove_xrefs (env->to, env->cc);	51	env->cc = mutt_remove_xrefs (env->to, env->cc);
52		52
53	if (env->cc && !env->to)	53	if (env->cc && !env->to)
54	--- sendlib.c.orig 2020-11-03 17:50:37 UTC	54	--- sendlib.c.orig 2021-01-21 20:23:24 UTC
55	+++ sendlib.c	55	+++ sendlib.c
56	@@ -3007,6 +3007,35 @@ static void set_noconv_flags (BODY *b, short flag)	56	@@ -3012,6 +3012,35 @@ static void set_noconv_flags (BODY *b, short flag)
57	}	57	}
58	}	58	}
59		59
60	-