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

(-)b/mail/mutt/Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	mutt
4
PORTNAME=	mutt
5
DISTVERSION=	1.12.0
5
DISTVERSION=	1.12.1
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/ \
(-)b/mail/mutt/distinfo (-3 / +3 lines)
Lines 1-6 Link Here
1
TIMESTAMP = 1558928080
1
TIMESTAMP = 1560623854
2
SHA256 (mutt/mutt-1.12.0.tar.gz) = ca12448784ed7b6c86d498921e18bc7b152d45494a452df56a7a0c8aaf13f98f
2
SHA256 (mutt/mutt-1.12.1.tar.gz) = 01c565406ec4ffa85db90b45ece2260b25fac3646cc063bbc20a242c6ed4210c
3
SIZE (mutt/mutt-1.12.0.tar.gz) = 4668896
3
SIZE (mutt/mutt-1.12.1.tar.gz) = 4675166
4
SHA256 (mutt/mutt-1.12.0.vc.greeting) = 7596d930447e9834567c0cfddf9ac023ecbb99add64bee4131d87e0260eec591
4
SHA256 (mutt/mutt-1.12.0.vc.greeting) = 7596d930447e9834567c0cfddf9ac023ecbb99add64bee4131d87e0260eec591
5
SIZE (mutt/mutt-1.12.0.vc.greeting) = 4559
5
SIZE (mutt/mutt-1.12.0.vc.greeting) = 4559
6
SHA256 (mutt/patch-1.11.1.vvv.nntp.xz) = 2a6386a82cbf9afde162bfb1989e545fb222bf40c5f6fac169d9249d4c904c79
6
SHA256 (mutt/patch-1.11.1.vvv.nntp.xz) = 2a6386a82cbf9afde162bfb1989e545fb222bf40c5f6fac169d9249d4c904c79
(-)b/mail/mutt/files/extra-patch-ifdef (-5 / +5 lines)
Lines 1-8 Link Here
1
--- PATCHES.orig	2019-05-26 19:28:51 UTC
1
--- PATCHES.orig	2019-06-15 21:17:01 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-04-28 20:41:58 UTC
5
--- init.c.orig	2019-05-25 16:22:39 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-05-09 20:47:17 UTC
60
--- init.h.orig	2019-06-15 15:57:01 UTC
61
+++ init.h
61
+++ init.h
62
@@ -4309,6 +4309,7 @@ static int parse_lists (BUFFER *, BUFFER *, unsigned l
62
@@ -4330,6 +4330,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
@@ -4373,6 +4374,7 @@ const struct command_t Commands[] = {
70
@@ -4394,6 +4395,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 },
(-)b/mail/mutt/files/extra-patch-reverse_reply (-11 / +11 lines)
Lines 1-12 Link Here
1
--- PATCHES.orig	2019-05-26 19:28:51 UTC
1
--- PATCHES.orig	2019-06-15 21:17:02 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-05-26 19:28:51 UTC
5
--- init.h.orig	2019-06-15 21:17:01 UTC
6
+++ init.h
6
+++ init.h
7
@@ -2945,6 +2945,13 @@ struct option_t MuttVars[] = {
7
@@ -2966,6 +2966,13 @@ struct option_t MuttVars[] = {
8
   ** possibly including eventual real names.  When it is \fIunset\fP, mutt will
8
   ** In either case, a missing real name will be filled in afterwards
9
   ** override any such real names with the setting of the $$realname variable.
9
   ** using the value of $$realname.
10
   */
10
   */
11
+  { "reverse_reply",	DT_BOOL, R_NONE, OPTREVREPLY, 0 },
11
+  { "reverse_reply",	DT_BOOL, R_NONE, OPTREVREPLY, 0 },
12
+  /*
12
+  /*
Lines 18-26 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-04-28 20:41:58 UTC
21
--- mutt.h.orig	2019-06-15 21:17:01 UTC
22
+++ mutt.h
22
+++ mutt.h
23
@@ -490,6 +490,7 @@ enum
23
@@ -491,6 +491,7 @@ enum
24
   OPTREVALIAS,
24
   OPTREVALIAS,
25
   OPTREVNAME,
25
   OPTREVNAME,
26
   OPTREVREAL,
26
   OPTREVREAL,
Lines 28-34 Link Here
28
   OPTRFC2047PARAMS,
28
   OPTRFC2047PARAMS,
29
   OPTSAVEADDRESS,
29
   OPTSAVEADDRESS,
30
   OPTSAVEEMPTY,
30
   OPTSAVEEMPTY,
31
--- protos.h.orig	2019-04-28 20:41:58 UTC
31
--- protos.h.orig	2019-05-25 16:22:39 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-46 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-05-10 02:20:15 UTC
41
--- send.c.orig	2019-06-14 15:57:33 UTC
42
+++ send.c
42
+++ send.c
43
@@ -716,6 +716,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 */
45
   env->to = mutt_remove_duplicates (env->to);
45
   env->to = mutt_remove_duplicates (env->to);
46
   env->cc = mutt_remove_duplicates (env->cc);
46
   env->cc = mutt_remove_duplicates (env->cc);
Lines 51-57 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-05-09 00:19:59 UTC
54
--- sendlib.c.orig	2019-06-14 15:57:30 UTC
55
+++ sendlib.c
55
+++ sendlib.c
56
@@ -2764,6 +2764,35 @@ static void set_noconv_flags (BODY *b, short flag)
56
@@ -2764,6 +2764,35 @@ static void set_noconv_flags (BODY *b, short flag)
57
   }
57
   }
(-)b/mail/mutt/files/extra-patch-vvv.quote (-6 / +6 lines)
Lines 1-8 Link Here
1
--- PATCHES.orig	2017-12-03 03:10:17 UTC
1
--- PATCHES.orig	2019-06-15 21:17:01 UTC
2
+++ PATCHES
2
+++ PATCHES
3
@@ -0,0 +1 @@
3
@@ -0,0 +1 @@
4
+vvv.quote
4
+vvv.quote
5
--- handler.c.orig	2019-04-28 20:41:58 UTC
5
--- handler.c.orig	2019-05-31 16:21:33 UTC
6
+++ handler.c
6
+++ handler.c
7
@@ -1593,7 +1593,31 @@ static int text_plain_handler (BODY *b, STATE *s)
7
@@ -1593,7 +1593,31 @@ static int text_plain_handler (BODY *b, STATE *s)
8
 	buf[--l] = 0;
8
 	buf[--l] = 0;
Lines 46-54 Link Here
46
 	handler = rfc3676_handler;
46
 	handler = rfc3676_handler;
47
       else
47
       else
48
 	handler = text_plain_handler;
48
 	handler = text_plain_handler;
49
--- init.h.orig	2019-05-09 20:47:17 UTC
49
--- init.h.orig	2019-06-15 21:17:01 UTC
50
+++ init.h
50
+++ init.h
51
@@ -2731,6 +2731,19 @@ struct option_t MuttVars[] = {
51
@@ -2745,6 +2745,19 @@ struct option_t MuttVars[] = {
52
   ** have no effect, and if it is set to \fIask-yes\fP or \fIask-no\fP, you are
52
   ** have no effect, and if it is set to \fIask-yes\fP or \fIask-no\fP, you are
53
   ** prompted for confirmation when you try to quit.
53
   ** prompted for confirmation when you try to quit.
54
   */
54
   */
Lines 68-76 Link Here
68
   { "quote_regexp",	DT_RX,	 R_PAGER, UL &QuoteRegexp, UL "^([ \t]*[|>:}#])+" },
68
   { "quote_regexp",	DT_RX,	 R_PAGER, UL &QuoteRegexp, UL "^([ \t]*[|>:}#])+" },
69
   /*
69
   /*
70
   ** .pp
70
   ** .pp
71
--- mutt.h.orig	2019-04-28 20:41:58 UTC
71
--- mutt.h.orig	2019-06-14 01:29:29 UTC
72
+++ mutt.h
72
+++ mutt.h
73
@@ -478,6 +478,8 @@ enum
73
@@ -479,6 +479,8 @@ enum
74
   OPTPRINTDECODE,
74
   OPTPRINTDECODE,
75
   OPTPRINTSPLIT,
75
   OPTPRINTSPLIT,
76
   OPTPROMPTAFTER,
76
   OPTPROMPTAFTER,
(-)b/mail/mutt/files/patch-Makefile.in (-2 / +2 lines)
Lines 1-4 Link Here
1
--- Makefile.in.orig	2019-05-25 16:13:42 UTC
1
--- Makefile.in.orig	2019-06-15 16:07:04 UTC
2
+++ Makefile.in
2
+++ Makefile.in
3
@@ -537,7 +537,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign
3
@@ -537,7 +537,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign
4
 @BUILD_DOC_TRUE@DOC_SUBDIR = doc
4
 @BUILD_DOC_TRUE@DOC_SUBDIR = doc
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 version.h $(HCVERSION)
11
 BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c version.h $(HCVERSION)
12
@@ -1678,18 +1678,9 @@ install-exec-hook:
12
@@ -1676,18 +1676,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
(-)b/mail/mutt/files/patch-smime-sender (-6 / +5 lines)
Lines 1-4 Link Here
1
--- commands.c.orig	2019-04-28 20:41:58 UTC
1
--- commands.c.orig	2019-05-25 16:22:39 UTC
2
+++ commands.c
2
+++ commands.c
3
@@ -266,7 +266,7 @@ int mutt_display_message (HEADER *cur)
3
@@ -266,7 +266,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	2019-05-26 19:28:51 UTC
12
--- init.h.orig	2019-06-15 21:17:02 UTC
13
+++ init.h
13
+++ init.h
14
@@ -3357,6 +3357,15 @@ struct option_t MuttVars[] = {
14
@@ -3378,6 +3378,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	2019-05-26 19:28:52 UTC
30
--- mutt.h.orig	2019-06-15 21:17:02 UTC
31
+++ mutt.h
31
+++ mutt.h
32
@@ -566,6 +566,7 @@ enum
32
@@ -567,6 +567,7 @@ enum
33
   OPTSMIMEISDEFAULT,
33
   OPTSMIMEISDEFAULT,
34
   OPTSMIMESELFENCRYPT,
34
   OPTSMIMESELFENCRYPT,
35
   OPTASKCERTLABEL,
35
   OPTASKCERTLABEL,
36
- 

Return to bug 238589