Attachment #214215 for bug #246270

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

Lines 2-8 Link Here

(-)b/mail/mutt/Makefile (-3 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mutt	4	PORTNAME= mutt
5	DISTVERSION= 1.13.5	5	DISTVERSION= 1.14.0
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	ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \	8	ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
Lines 85-91 SMART_DATE_DESC= Dynamic date formatting with "%@" Link Here
85	SMTP_DESC= SMTP relay support	85	SMTP_DESC= SMTP relay support
86	URLVIEW_DESC= Use urlview for the URL selector menu	86	URLVIEW_DESC= Use urlview for the URL selector menu
87		87
88	OPTIONS_DEFAULT= AUTOCRYPT GPGME GSSAPI_NONE HCACHE_BDB HTML ICONV IDN \	88	OPTIONS_DEFAULT= AUTOCRYPT DEBUG GPGME GSSAPI_NONE HCACHE_BDB HTML ICONV IDN \
89	IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NCURSES \	89	IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NCURSES \
90	NLS QUOTE_PATCH REVERSE_REPLY_PATCH SASL SMART_DATE SMTP URLVIEW	90	NLS QUOTE_PATCH REVERSE_REPLY_PATCH SASL SMART_DATE SMTP URLVIEW
91		91
Lines 133-138 GSSAPI_NONE_CONFIGURE_ON= --without-gss Link Here
133		133
134	HCACHE_NONE_CONFIGURE_ON= --disable-hcache	134	HCACHE_NONE_CONFIGURE_ON= --disable-hcache
135	HCACHE_NONE_CONFIGURE_OFF= --enable-hcache --without-qdbm --without-gdbm	135	HCACHE_NONE_CONFIGURE_OFF= --enable-hcache --without-qdbm --without-gdbm
		136	HCACHE_NONE_USES_OFF= perl5
		137	HCACHE_NONE_VARS_OFF= USE_PERL5=build
136		138
137	HCACHE_BDB_CONFIGURE_WITH= bdb=${LOCALBASE}	139	HCACHE_BDB_CONFIGURE_WITH= bdb=${LOCALBASE}
138	HCACHE_BDB_USES= bdb:42+	140	HCACHE_BDB_USES= bdb:42+
Lines 187-193 DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref Link Here
187		189
188	# un/comment as each VERSION is created for PORTVERSION	190	# un/comment as each VERSION is created for PORTVERSION
189	VVV_PATCH_VERSION= 1.13.0	191	VVV_PATCH_VERSION= 1.13.0
190	GREETING_PATCH_VERSION= 1.13.4	192	GREETING_PATCH_VERSION= 1.14.0
191		193
192	post-install:	194	post-install:
193	${INSTALL_MAN} ${FILESDIR}/mailcap.5 ${STAGEDIR}${MANPREFIX}/man/man5	195	${INSTALL_MAN} ${FILESDIR}/mailcap.5 ${STAGEDIR}${MANPREFIX}/man/man5

Lines 1-8 Link Here

(-)b/mail/mutt/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1585430449	1	TIMESTAMP = 1588634875
2	SHA256 (mutt/mutt-1.13.5.tar.gz) = 6cd71b5b3e6b255afef6bed3b5e1e8ee9819b3d7c9839fd95e798045882aa653	2	SHA256 (mutt/mutt-1.14.0.tar.gz) = df2e82a83ad38c9a9fd36f44c5ab2b726defa4bb1a17de794dd3800f3353f9f8
3	SIZE (mutt/mutt-1.13.5.tar.gz) = 4902500	3	SIZE (mutt/mutt-1.14.0.tar.gz) = 5220515
4	SHA256 (mutt/mutt-1.13.4.vc.greeting) = 572427c1ab8bd81ac11bf74feeab8e71f11c5732f274f445b9976527716dc80b	4	SHA256 (mutt/mutt-1.14.0.vc.greeting) = 5da9ecdded840fd06063bc16bb1934fb4cae9217f0d4f531322ecd5a009e5b4f
5	SIZE (mutt/mutt-1.13.4.vc.greeting) = 4573	5	SIZE (mutt/mutt-1.14.0.vc.greeting) = 4470
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

Lines 1-4 Link Here

(-)b/mail/mutt/files/extra-patch-doc-ref (-1 / +1 lines)
1	--- doc/mutt.man.orig 2020-01-28 23:08:03 UTC	1	--- doc/mutt.man.orig 2020-05-02 21:08:56 UTC
2	+++ doc/mutt.man	2	+++ doc/mutt.man
3	@@ -67,7 +67,8 @@ mutt \- The Mutt Mail User Agent	3	@@ -67,7 +67,8 @@ mutt \- The Mutt Mail User Agent
4	.PP	4	.PP




--- PATCHES.orig	2020-05-05 02:09:32 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.4.cd.ifdef.1
--- init.c.orig	2020-05-02 21:08:56 UTC
+++ init.c
@@ -643,6 +643,52 @@ static mbchar_table *parse_mbchar_table (const char *s
   return t;
 }
 

+  if (!(res = (mutt_option_index (tmp->data) != -1)))
+    for (i = 0; !res && i < MENU_MAX; i++)
+    {
+      const struct binding_t *b = km_get_table (Menus[i].value);
+
+      if (!b)
+	continue;

+
+  if (res)
+  {
+    if (mutt_parse_rc_buffer (tmp, &token, err) == -1)
+    {
+      mutt_error ("Erreur: %s", err->data);
+      FREE (&token.data);

 static int parse_unignore (BUFFER *buf, BUFFER *s, union pointer_long_t udata, BUFFER *err)
 {
   do
--- init.h.orig	2020-05-05 02:09:32 UTC
+++ init.h
@@ -4594,6 +4594,7 @@ static int parse_lists (BUFFER *, BUFFER *, union poin
 static int parse_unlists (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
 static int parse_alias (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
 static int parse_unalias (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);

 static int parse_echo (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
 static int parse_ignore (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
 static int parse_unignore (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
@@ -4658,6 +4659,7 @@ const struct command_t Commands[] = {
   { "hdr_order",	parse_list,		{.p=&HeaderOrderList} },
 #ifdef HAVE_ICONV
   { "iconv-hook",	mutt_parse_hook,	{.l=MUTT_ICONVHOOK} },




--- PATCHES.orig	2020-05-05 02:09:32 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.7.ust.maildir-mtime.2
--- browser.c.orig	2020-05-02 21:08:56 UTC
+++ browser.c
@@ -32,6 +32,7 @@
 #ifdef USE_IMAP

     while (tmp && mutt_strcmp (mutt_b2s (full_path), mutt_b2s (tmp->pathbuf)))
       tmp = tmp->next;
+    check_maildir_times (tmp, &s);
     if (tmp && Context && !tmp->nopoll &&
         !mutt_strcmp (tmp->realpath, Context->realpath))
     {
@@ -579,6 +596,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b
 	s.st_mtime = st2.st_mtime;
     }
 




--- PATCHES.orig	2020-05-05 02:09:33 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.6.cb.reverse_reply.2
--- init.h.orig	2020-05-05 02:09:32 UTC
+++ init.h
@@ -3111,6 +3111,13 @@ struct option_t MuttVars[] = {
   ** In either case, a missing real name will be filled in afterwards
   ** using the value of $$realname.
   */

   { "rfc2047_parameters", DT_BOOL, R_NONE, {.l=OPTRFC2047PARAMS}, {.l=0} },
   /*
   ** .pp
--- mutt.h.orig	2020-05-05 02:09:32 UTC
+++ mutt.h
@@ -513,6 +513,7 @@ enum
   OPTREVALIAS,
   OPTREVNAME,
   OPTREVREAL,

   OPTRFC2047PARAMS,
   OPTSAVEADDRESS,
   OPTSAVEEMPTY,
--- protos.h.orig	2020-05-02 21:08:56 UTC
+++ protos.h
@@ -85,6 +85,7 @@ char* mutt_extract_message_id (const char *, const cha
 ADDRESS *mutt_get_address (ENVELOPE *, char **);
 ADDRESS *mutt_lookup_alias (const char *s);
 ADDRESS *mutt_remove_duplicates (ADDRESS *);
 ADDRESS *mutt_remove_xrefs (ADDRESS *, ADDRESS *);
+ADDRESS *mutt_reverse_address (ADDRESS *);
 ADDRESS *mutt_expand_aliases (ADDRESS *);
 ADDRESS *mutt_parse_adrlist (ADDRESS *, const char *);
 
--- send.c.orig	2020-05-02 21:08:56 UTC
+++ send.c
@@ -725,6 +725,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env)
   /* the CC field can get cluttered, especially with lists */
   env->to = mutt_remove_duplicates (env->to);
   env->cc = mutt_remove_duplicates (env->cc);

   env->cc = mutt_remove_xrefs (env->to, env->cc);
 
   if (env->cc && !env->to)
--- sendlib.c.orig	2020-05-02 21:08:56 UTC
+++ sendlib.c
@@ -2981,6 +2981,35 @@ static void set_noconv_flags (BODY *b, short flag)
   }
 }
 

+  return addr;
+}
+
 int mutt_write_fcc (const char *path, SEND_CONTEXT *sctx, const char *msgid, int post, const char *fcc)
 {
   HEADER *hdr;

Lines 1-4 Link Here

(-)b/mail/mutt/files/extra-patch-smartdate (-2 / +2 lines)
1	--- hdrline.c.orig 2020-03-29 21:24:30 UTC	1	--- hdrline.c.orig 2020-05-05 02:09:32 UTC
2	+++ hdrline.c	2	+++ hdrline.c
3	@@ -249,6 +249,89 @@ static char apply_subject_mods (ENVELOPE env)	3	@@ -249,6 +249,89 @@ static char apply_subject_mods (ENVELOPE env)
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)
Lines 105-111 Link Here
105	if (!do_locales)	105	if (!do_locales)
106	setlocale (LC_TIME, "");	106	setlocale (LC_TIME, "");
107		107
108	--- mutt.h.orig 2020-03-29 21:24:31 UTC	108	--- mutt.h.orig 2020-05-05 02:09:33 UTC
109	+++ mutt.h	109	+++ mutt.h
110	@@ -165,6 +165,16 @@ typedef enum	110	@@ -165,6 +165,16 @@ typedef enum
111	MUTT_WRITE_HEADER_MIME	111	MUTT_WRITE_HEADER_MIME

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-Makefile.in (-3 / +3 lines)
1	--- Makefile.in.orig 2020-03-28 18:22:01 UTC	1	--- Makefile.in.orig 2020-05-02 21:31:42 UTC
2	+++ Makefile.in	2	+++ Makefile.in
3	@@ -540,7 +540,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign	3	@@ -530,7 +530,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign
4	@BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap	4	@BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap
5	@BUILD_AUTOCRYPT_TRUE@AUTOCRYPT_SUBDIR = autocrypt	5	@BUILD_AUTOCRYPT_TRUE@AUTOCRYPT_SUBDIR = autocrypt
6	@BUILD_AUTOCRYPT_TRUE@AUTOCRYPT_INCLUDES = -I$(top_srcdir)/autocrypt	6	@BUILD_AUTOCRYPT_TRUE@AUTOCRYPT_INCLUDES = -I$(top_srcdir)/autocrypt
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	@@ -1690,18 +1690,9 @@ install-exec-hook:	12	@@ -1660,18 +1660,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-4 Link Here

(-)b/mail/mutt/files/patch-browser.c (-1 / +1 lines)
1	--- browser.c.orig 2020-03-29 21:24:30 UTC	1	--- browser.c.orig 2020-05-05 02:09:32 UTC
2	+++ browser.c	2	+++ browser.c
3	@@ -87,6 +87,12 @@ static int browser_compare_subject (const void *a, con	3	@@ -87,6 +87,12 @@ static int browser_compare_subject (const void *a, con
4	struct folder_file pa = (struct folder_file ) a;	4	struct folder_file pa = (struct folder_file ) a;

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-contrib_Makefile.in (-2 / +2 lines)
1	--- contrib/Makefile.in.orig 2020-03-28 18:22:01 UTC	1	--- contrib/Makefile.in.orig 2020-05-02 21:32:34 UTC
2	+++ contrib/Makefile.in	2	+++ contrib/Makefile.in
3	@@ -280,7 +280,7 @@ top_build_prefix = @top_build_prefix@	3	@@ -279,7 +279,7 @@ top_build_prefix = @top_build_prefix@
4	top_builddir = @top_builddir@	4	top_builddir = @top_builddir@
5	top_srcdir = @top_srcdir@	5	top_srcdir = @top_srcdir@
6	subdir = contrib	6	subdir = contrib




--- PATCHES.orig	2020-05-05 02:09:34 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.0.ats.date_conditional.1
--- hdrline.c.orig	2020-05-05 02:09:33 UTC
+++ hdrline.c
@@ -428,6 +428,53 @@ hdr_format_str (char *dest,
       const char *cp;

 
       p = dest;
 
--- muttlib.c.orig	2020-05-02 21:08:56 UTC
+++ muttlib.c
@@ -1667,7 +1667,16 @@ void mutt_FormatString (char *dest,		/* output buffer 
       if (*src == '?')
       {
 	flags |= MUTT_FORMAT_OPTIONAL;

       }
       else
       {
@@ -1683,12 +1692,12 @@ void mutt_FormatString (char *dest,		/* output buffer 
 	  count++;
 	}
 	*cp = 0;

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-dgc-deepif (-3 / +3 lines)
1	--- muttlib.c.orig 2020-03-29 21:24:32 UTC	1	--- muttlib.c.orig 2020-05-05 02:09:34 UTC
2	+++ muttlib.c	2	+++ muttlib.c
3	@@ -1606,6 +1606,12 @@ void mutt_FormatString (char dest, / output buffer	3	@@ -1710,6 +1710,12 @@ void mutt_FormatString (char dest, / output buffer
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	@@ -1618,7 +1624,13 @@ void mutt_FormatString (char dest, / output buffer	16	@@ -1722,7 +1728,13 @@ void mutt_FormatString (char dest, / output buffer
17	count = 0;	17	count = 0;
18	while (count < sizeof (elsestring) && src && src != '?')	18	while (count < sizeof (elsestring) && src && src != '?')
19	{	19	{

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-doc_Makefile.in (-3 / +3 lines)
1	--- doc/Makefile.in.orig 2020-03-28 18:22:01 UTC	1	--- doc/Makefile.in.orig 2020-05-02 21:31:43 UTC
2	+++ doc/Makefile.in	2	+++ doc/Makefile.in
3	@@ -691,14 +691,7 @@ install-data-local: makedoc-all instdoc	3	@@ -561,14 +561,7 @@ install-data-local: makedoc-all instdoc
4	$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \	4	$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
5	fi \	5	fi \
6	done	6	done
Lines 16-22 Link Here
16	-if [ -f mutt.info ] ; then \	16	-if [ -f mutt.info ] ; then \
17	$(MKDIR_P) $(DESTDIR)$(infodir) ; \	17	$(MKDIR_P) $(DESTDIR)$(infodir) ; \
18	$(INSTALL) -m 644 mutt.info $(DESTDIR)$(infodir) ; \	18	$(INSTALL) -m 644 mutt.info $(DESTDIR)$(infodir) ; \
19	@@ -734,9 +727,7 @@ uninstall-local:	19	@@ -604,9 +597,7 @@ uninstall-local:
20		20
21	check:	21	check:
22	manual.txt: manual.html	22	manual.txt: manual.html

Lines 1-4 Link Here

(-)b/mail/mutt/files/patch-doc_manual.xml.head (-1 / +1 lines)
1	--- doc/manual.xml.head.orig 2020-03-28 18:17:53 UTC	1	--- doc/manual.xml.head.orig 2020-05-02 21:08:56 UTC
2	+++ doc/manual.xml.head	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"?>

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-muttlib.c (-2 / +2 lines)
1	--- muttlib.c.orig 2020-03-29 21:24:32 UTC	1	--- muttlib.c.orig 2020-05-05 02:09:34 UTC
2	+++ muttlib.c	2	+++ muttlib.c
3	@@ -877,16 +877,15 @@ void _mutt_buffer_mktemp (BUFFER buf, const char pre	3	@@ -930,16 +930,15 @@ void _mutt_buffer_mktemp (BUFFER buf, const char pre
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	{




--- commands.c.orig	2020-05-02 21:08:56 UTC
+++ commands.c
@@ -302,7 +302,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."));
--- init.h.orig	2020-05-05 02:09:33 UTC
+++ init.h
@@ -3608,6 +3608,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, {.p="smime_default_key"}, {.p=0} },
   { "smime_default_key",		DT_STR,	 R_NONE, {.p=&SmimeDefaultKey}, {.p=0} },
   /*
--- mutt.h.orig	2020-05-05 02:09:33 UTC
+++ mutt.h
@@ -596,6 +596,7 @@ enum
   OPTSMIMEISDEFAULT,
   OPTSMIMESELFENCRYPT,
   OPTASKCERTLABEL,




--- mutt.h.orig	2020-05-05 02:09:35 UTC
+++ mutt.h
@@ -242,6 +242,7 @@ enum
   MUTT_EXPIRED,

 
   /* actions for mutt_pattern_comp/mutt_pattern_exec */
   MUTT_AND,
--- pattern.c.orig	2020-05-02 21:08:56 UTC
+++ pattern.c
@@ -57,6 +57,7 @@ static const struct pattern_flags
 }

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

Lines 46-51 man/man5/muttrc.5.gz Link Here

(-)b/mail/mutt/pkg-plist (-1 / +2 lines)
46	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Pine.rc	46	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Pine.rc
47	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tin.rc	47	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tin.rc
48	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ca-bundle.crt	48	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ca-bundle.crt
		49	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgedit-detectgui.sh
		50	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgedit-screen-tmux.sh
49	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.default	51	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.default
50	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.linux	52	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.linux
51	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpg.rc	53	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpg.rc
52	-

Return to bug 246270

Lines 1-10 Link Here

(-)b/mail/mutt/files/extra-patch-ifdef (-8 / +8 lines)
1	--- PATCHES.orig 2020-03-29 21:24:30 UTC	1	--- PATCHES.orig 2020-05-05 02:09:32 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-03-28 18:17:53 UTC	5	--- init.c.orig 2020-05-02 21:08:56 UTC
6	+++ init.c	6	+++ init.c
7	@@ -651,6 +651,52 @@ static mbchar_table parse_mbchar_table (const char s	7	@@ -643,6 +643,52 @@ static mbchar_table parse_mbchar_table (const char s
8	return t;	8	return t;
9	}	9	}
10		10
Lines 20-26 Link Here
20	+ if (!(res = (mutt_option_index (tmp->data) != -1)))	20	+ if (!(res = (mutt_option_index (tmp->data) != -1)))
21	+ for (i = 0; !res && i < MENU_MAX; i++)	21	+ for (i = 0; !res && i < MENU_MAX; i++)
22	+ {	22	+ {
23	+ struct binding_t *b = km_get_table (Menus[i].value);	23	+ const struct binding_t *b = km_get_table (Menus[i].value);
24	+	24	+
25	+ if (!b)	25	+ if (!b)
26	+ continue;	26	+ continue;
Lines 43-49 Link Here
43	+	43	+
44	+ if (res)	44	+ if (res)
45	+ {	45	+ {
46	+ if (mutt_parse_rc_line (tmp->data, &token, err) == -1)	46	+ if (mutt_parse_rc_buffer (tmp, &token, err) == -1)
47	+ {	47	+ {
48	+ mutt_error ("Erreur: %s", err->data);	48	+ mutt_error ("Erreur: %s", err->data);
49	+ FREE (&token.data);	49	+ FREE (&token.data);
Lines 57-65 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-03-29 21:24:30 UTC	60	--- init.h.orig 2020-05-05 02:09:32 UTC
61	+++ init.h	61	+++ init.h
62	@@ -4516,6 +4516,7 @@ static int parse_lists (BUFFER , BUFFER , union poin	62	@@ -4594,6 +4594,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 *);
64	static int parse_alias (BUFFER , BUFFER , union pointer_long_t, BUFFER *);	64	static int parse_alias (BUFFER , BUFFER , union pointer_long_t, BUFFER *);
65	static int parse_unalias (BUFFER , BUFFER , union pointer_long_t, BUFFER *);	65	static int parse_unalias (BUFFER , BUFFER , union pointer_long_t, BUFFER *);
Lines 67-73 Link Here
67	static int parse_echo (BUFFER , BUFFER , union pointer_long_t, BUFFER *);	67	static int parse_echo (BUFFER , BUFFER , union pointer_long_t, BUFFER *);
68	static int parse_ignore (BUFFER , BUFFER , union pointer_long_t, BUFFER *);	68	static int parse_ignore (BUFFER , BUFFER , union pointer_long_t, BUFFER *);
69	static int parse_unignore (BUFFER , BUFFER , union pointer_long_t, BUFFER *);	69	static int parse_unignore (BUFFER , BUFFER , union pointer_long_t, BUFFER *);
70	@@ -4580,6 +4581,7 @@ const struct command_t Commands[] = {	70	@@ -4658,6 +4659,7 @@ const struct command_t Commands[] = {
71	{ "hdr_order", parse_list, {.p=&HeaderOrderList} },	71	{ "hdr_order", parse_list, {.p=&HeaderOrderList} },
72	#ifdef HAVE_ICONV	72	#ifdef HAVE_ICONV
73	{ "iconv-hook", mutt_parse_hook, {.l=MUTT_ICONVHOOK} },	73	{ "iconv-hook", mutt_parse_hook, {.l=MUTT_ICONVHOOK} },

Lines 1-8 Link Here

(-)b/mail/mutt/files/extra-patch-maildir-mtime (-4 / +4 lines)
1	--- PATCHES.orig 2020-03-29 21:24:30 UTC	1	--- PATCHES.orig 2020-05-05 02:09:32 UTC
2	+++ PATCHES	2	+++ PATCHES
3	@@ -0,0 +1 @@	3	@@ -0,0 +1 @@
4	+patch-1.5.7.ust.maildir-mtime.2	4	+patch-1.5.7.ust.maildir-mtime.2
5	--- browser.c.orig 2020-03-28 18:17:53 UTC	5	--- browser.c.orig 2020-05-02 21:08:56 UTC
6	+++ browser.c	6	+++ browser.c
7	@@ -32,6 +32,7 @@	7	@@ -32,6 +32,7 @@
8	#ifdef USE_IMAP	8	#ifdef USE_IMAP
Lines 39-48 Link Here
39	while (tmp && mutt_strcmp (mutt_b2s (full_path), mutt_b2s (tmp->pathbuf)))	39	while (tmp && mutt_strcmp (mutt_b2s (full_path), mutt_b2s (tmp->pathbuf)))
40	tmp = tmp->next;	40	tmp = tmp->next;
41	+ check_maildir_times (tmp, &s);	41	+ check_maildir_times (tmp, &s);
42	if (tmp && Context &&	42	if (tmp && Context && !tmp->nopoll &&
43	!mutt_strcmp (tmp->realpath, Context->realpath))	43	!mutt_strcmp (tmp->realpath, Context->realpath))
44	{	44	{
45	@@ -574,6 +591,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b	45	@@ -579,6 +596,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b
46	s.st_mtime = st2.st_mtime;	46	s.st_mtime = st2.st_mtime;
47	}	47	}
48		48

Lines 1-10 Link Here

(-)b/mail/mutt/files/extra-patch-reverse_reply (-14 / +14 lines)
1	--- PATCHES.orig 2020-03-29 21:24:31 UTC	1	--- PATCHES.orig 2020-05-05 02:09:33 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-03-29 21:24:30 UTC	5	--- init.h.orig 2020-05-05 02:09:32 UTC
6	+++ init.h	6	+++ init.h
7	@@ -3034,6 +3034,13 @@ struct option_t MuttVars[] = {	7	@@ -3111,6 +3111,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
9	** using the value of $$realname.	9	** using the value of $$realname.
10	*/	10	*/
Lines 18-26 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-03-29 21:24:30 UTC	21	--- mutt.h.orig 2020-05-05 02:09:32 UTC
22	+++ mutt.h	22	+++ mutt.h
23	@@ -506,6 +506,7 @@ enum	23	@@ -513,6 +513,7 @@ enum
24	OPTREVALIAS,	24	OPTREVALIAS,
25	OPTREVNAME,	25	OPTREVNAME,
26	OPTREVREAL,	26	OPTREVREAL,
Lines 28-46 Link Here
28	OPTRFC2047PARAMS,	28	OPTRFC2047PARAMS,
29	OPTSAVEADDRESS,	29	OPTSAVEADDRESS,
30	OPTSAVEEMPTY,	30	OPTSAVEEMPTY,
31	--- protos.h.orig 2020-03-28 18:17:53 UTC	31	--- protos.h.orig 2020-05-02 21:08:56 UTC
32	+++ protos.h	32	+++ protos.h
33	@@ -87,6 +87,7 @@ ADDRESS mutt_get_address (ENVELOPE , char **);	33	@@ -85,6 +85,7 @@ char* mutt_extract_message_id (const char *, const cha
		34	ADDRESS mutt_get_address (ENVELOPE , char **);
34	ADDRESS mutt_lookup_alias (const char s);	35	ADDRESS mutt_lookup_alias (const char s);
35	ADDRESS mutt_remove_duplicates (ADDRESS );	36	ADDRESS mutt_remove_duplicates (ADDRESS );
36	ADDRESS mutt_remove_xrefs (ADDRESS , ADDRESS *);
37	+ADDRESS mutt_reverse_address (ADDRESS );	37	+ADDRESS mutt_reverse_address (ADDRESS );
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-03-28 18:17:53 UTC	41	--- send.c.orig 2020-05-02 21:08:56 UTC
42	+++ send.c	42	+++ send.c
43	@@ -723,6 +723,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env)	43	@@ -725,6 +725,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-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-03-28 18:17:53 UTC	54	--- sendlib.c.orig 2020-05-02 21:08:56 UTC
55	+++ sendlib.c	55	+++ sendlib.c
56	@@ -2974,6 +2974,35 @@ static void set_noconv_flags (BODY *b, short flag)	56	@@ -2981,6 +2981,35 @@ static void set_noconv_flags (BODY *b, short flag)
57	}	57	}
58	}	58	}
59		59
Lines 86-91 Link Here
86	+ return addr;	86	+ return addr;
87	+}	87	+}
88	+	88	+
89	int mutt_write_fcc (const char path, HEADER hdr, const char msgid, int post, const char fcc)	89	int mutt_write_fcc (const char path, SEND_CONTEXT sctx, const char msgid, int post, const char fcc)
90	{	90	{
91	CONTEXT f;	91	HEADER *hdr;

Lines 1-8 Link Here

(-)b/mail/mutt/files/patch-date-conditional (-5 / +5 lines)
1	--- PATCHES.orig 2020-03-29 21:24:32 UTC	1	--- PATCHES.orig 2020-05-05 02:09:34 UTC
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 2020-03-29 21:24:31 UTC	5	--- hdrline.c.orig 2020-05-05 02:09:33 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 2020-03-28 18:17:53 UTC	61	--- muttlib.c.orig 2020-05-02 21:08:56 UTC
62	+++ muttlib.c	62	+++ muttlib.c
63	@@ -1563,7 +1563,16 @@ void mutt_FormatString (char dest, / output buffer	63	@@ -1667,7 +1667,16 @@ void mutt_FormatString (char dest, / output buffer
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	@@ -1579,12 +1588,12 @@ void mutt_FormatString (char dest, / output buffer	81	@@ -1683,12 +1692,12 @@ void mutt_FormatString (char dest, / output buffer
82	count++;	82	count++;
83	}	83	}
84	*cp = 0;	84	*cp = 0;

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-smime-sender (-6 / +6 lines)
1	--- commands.c.orig 2020-02-21 20:17:47 UTC	1	--- commands.c.orig 2020-05-02 21:08:56 UTC
2	+++ commands.c	2	+++ commands.c
3	@@ -285,7 +285,7 @@ int mutt_display_message (HEADER *cur)	3	@@ -302,7 +302,7 @@ int mutt_display_message (HEADER *cur)
4	{	4	{
5	if (cur->security & GOODSIGN)	5	if (cur->security & GOODSIGN)
6	{	6	{
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 2020-03-29 21:24:31 UTC	12	--- init.h.orig 2020-05-05 02:09:33 UTC
13	+++ init.h	13	+++ init.h
14	@@ -3531,6 +3531,15 @@ struct option_t MuttVars[] = {	14	@@ -3608,6 +3608,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, {.p="smime_default_key"}, {.p=0} },	27	{ "smime_self_encrypt_as", DT_SYN, R_NONE, {.p="smime_default_key"}, {.p=0} },
28	{ "smime_default_key", DT_STR, R_NONE, {.p=&SmimeDefaultKey}, {.p=0} },	28	{ "smime_default_key", DT_STR, R_NONE, {.p=&SmimeDefaultKey}, {.p=0} },
29	/*	29	/*
30	--- mutt.h.orig 2020-03-29 21:24:31 UTC	30	--- mutt.h.orig 2020-05-05 02:09:33 UTC
31	+++ mutt.h	31	+++ mutt.h
32	@@ -588,6 +588,7 @@ enum	32	@@ -596,6 +596,7 @@ enum
33	OPTSMIMEISDEFAULT,	33	OPTSMIMEISDEFAULT,
34	OPTSMIMESELFENCRYPT,	34	OPTSMIMESELFENCRYPT,
35	OPTASKCERTLABEL,	35	OPTASKCERTLABEL,

Lines 1-4 Link Here

(-)b/mail/mutt/files/patch-threadcomplete (-5 / +5 lines)
1	--- mutt.h.orig 2020-03-29 21:24:33 UTC	1	--- mutt.h.orig 2020-05-05 02:09:35 UTC
2	+++ mutt.h	2	+++ mutt.h
3	@@ -242,6 +242,7 @@ enum	3	@@ -242,6 +242,7 @@ enum
4	MUTT_EXPIRED,	4	MUTT_EXPIRED,
Lines 8-14 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 2020-03-28 18:17:53 UTC	11	--- pattern.c.orig 2020-05-02 21:08:56 UTC
12	+++ pattern.c	12	+++ pattern.c
13	@@ -57,6 +57,7 @@ static const struct pattern_flags	13	@@ -57,6 +57,7 @@ static const struct pattern_flags
14	}	14	}
Lines 16-24 Link Here
16	{	16	{
17	+ { 'a', MUTT_THREADCOMPLETE, 0, NULL },	17	+ { 'a', MUTT_THREADCOMPLETE, 0, NULL },
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\|MUTT_SEND_MODE_SEARCH, eat_regexp },
20	{ 'B', MUTT_WHOLE_MSG, MUTT_FULL_MSG, eat_regexp },	20	{ 'B', MUTT_WHOLE_MSG, MUTT_FULL_MSG\|MUTT_SEND_MODE_SEARCH, eat_regexp },
21	@@ -1342,6 +1343,16 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec	21	@@ -1493,6 +1494,16 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec
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);