Attachment 214215 Details for Bug 246270 – Update to 1.14.0

[patch] Update to 1.14.0

0001-mail-mutt-Update-to-1.14.0.patch (text/plain), 19.75 KB, created by Derek Schrock on 2020-05-07 02:14:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Derek Schrock

Created: 2020-05-07 02:14:32 UTC

Size: 19.75 KB

patch

obsolete

>From 0e95067cb8d00d74579f46f13cc1939ff4907ad5 Mon Sep 17 00:00:00 2001
>From: Derek Schrock <dereks@lifeofadishwasher.com>
>Date: Tue, 5 May 2020 00:14:26 -0400
>Subject: [PATCH] mail/mutt: Update to 1.14.0
>
>- Update to 1.14.0 [1]
>- Default DEBUG option
>
>[1] http://www.mutt.org/relnotes/1.14/
>---
> mail/mutt/Makefile                        |  8 ++++---
> mail/mutt/distinfo                        | 10 ++++----
> mail/mutt/files/extra-patch-doc-ref       |  2 +-
> mail/mutt/files/extra-patch-ifdef         | 16 ++++++-------
> mail/mutt/files/extra-patch-maildir-mtime |  8 +++----
> mail/mutt/files/extra-patch-reverse_reply | 28 +++++++++++------------
> mail/mutt/files/extra-patch-smartdate     |  4 ++--
> mail/mutt/files/patch-Makefile.in         |  6 ++---
> mail/mutt/files/patch-browser.c           |  2 +-
> mail/mutt/files/patch-contrib_Makefile.in |  4 ++--
> mail/mutt/files/patch-date-conditional    | 10 ++++----
> mail/mutt/files/patch-dgc-deepif          |  6 ++---
> mail/mutt/files/patch-doc_Makefile.in     |  6 ++---
> mail/mutt/files/patch-doc_manual.xml.head |  2 +-
> mail/mutt/files/patch-muttlib.c           |  4 ++--
> mail/mutt/files/patch-smime-sender        | 12 +++++-----
> mail/mutt/files/patch-threadcomplete      | 10 ++++----
> mail/mutt/pkg-plist                       |  2 ++
> 18 files changed, 72 insertions(+), 68 deletions(-)
>
>diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
>index 0a5c8bd4dab9..d6dfb3ae5c25 100644
>--- a/mail/mutt/Makefile
>+++ b/mail/mutt/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	mutt
>-DISTVERSION=	1.13.5
>+DISTVERSION=	1.14.0
> CATEGORIES+=	mail
> MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
> 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
>@@ -85,7 +85,7 @@ SMART_DATE_DESC=	Dynamic date formatting with "%@"
> SMTP_DESC=	SMTP relay support
> URLVIEW_DESC=	Use urlview for the URL selector menu
> 
>-OPTIONS_DEFAULT=	AUTOCRYPT GPGME GSSAPI_NONE HCACHE_BDB HTML ICONV IDN \
>+OPTIONS_DEFAULT=	AUTOCRYPT DEBUG GPGME GSSAPI_NONE HCACHE_BDB HTML ICONV IDN \
> 		IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NCURSES \
> 		NLS QUOTE_PATCH REVERSE_REPLY_PATCH SASL SMART_DATE SMTP URLVIEW
> 
>@@ -133,6 +133,8 @@ GSSAPI_NONE_CONFIGURE_ON=	--without-gss
> 
> HCACHE_NONE_CONFIGURE_ON=	--disable-hcache
> HCACHE_NONE_CONFIGURE_OFF=	--enable-hcache --without-qdbm --without-gdbm
>+HCACHE_NONE_USES_OFF=		perl5
>+HCACHE_NONE_VARS_OFF=		USE_PERL5=build
> 
> HCACHE_BDB_CONFIGURE_WITH=	bdb=${LOCALBASE}
> HCACHE_BDB_USES=	bdb:42+
>@@ -187,7 +189,7 @@ DOCS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-doc-ref
> 
> # un/comment as each VERSION is created for PORTVERSION
> VVV_PATCH_VERSION=	1.13.0
>-GREETING_PATCH_VERSION=	1.13.4
>+GREETING_PATCH_VERSION=	1.14.0
> 
> post-install:
> 	${INSTALL_MAN} ${FILESDIR}/mailcap.5 ${STAGEDIR}${MANPREFIX}/man/man5
>diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
>index 9b590f6305c0..06082081cda9 100644
>--- a/mail/mutt/distinfo
>+++ b/mail/mutt/distinfo
>@@ -1,8 +1,8 @@
>-TIMESTAMP = 1585430449
>-SHA256 (mutt/mutt-1.13.5.tar.gz) = 6cd71b5b3e6b255afef6bed3b5e1e8ee9819b3d7c9839fd95e798045882aa653
>-SIZE (mutt/mutt-1.13.5.tar.gz) = 4902500
>-SHA256 (mutt/mutt-1.13.4.vc.greeting) = 572427c1ab8bd81ac11bf74feeab8e71f11c5732f274f445b9976527716dc80b
>-SIZE (mutt/mutt-1.13.4.vc.greeting) = 4573
>+TIMESTAMP = 1588634875
>+SHA256 (mutt/mutt-1.14.0.tar.gz) = df2e82a83ad38c9a9fd36f44c5ab2b726defa4bb1a17de794dd3800f3353f9f8
>+SIZE (mutt/mutt-1.14.0.tar.gz) = 5220515
>+SHA256 (mutt/mutt-1.14.0.vc.greeting) = 5da9ecdded840fd06063bc16bb1934fb4cae9217f0d4f531322ecd5a009e5b4f
>+SIZE (mutt/mutt-1.14.0.vc.greeting) = 4470
> SHA256 (mutt/patch-1.13.0.vvv.initials.xz) = 8b25ad6596bd57d94f6551e7e73ceb8da620468e96fb507b2f51545d5b3eaa02
> SIZE (mutt/patch-1.13.0.vvv.initials.xz) = 720
> SHA256 (mutt/patch-1.13.0.vvv.quote.xz) = 788d25d1439d86d6c5007d141d1c219496e77940b5ce37819471c941f78f03e4
>diff --git a/mail/mutt/files/extra-patch-doc-ref b/mail/mutt/files/extra-patch-doc-ref
>index 28cdbf09cd5a..362192f310c8 100644
>--- a/mail/mutt/files/extra-patch-doc-ref
>+++ b/mail/mutt/files/extra-patch-doc-ref
>@@ -1,4 +1,4 @@
>---- doc/mutt.man.orig	2020-01-28 23:08:03 UTC
>+--- doc/mutt.man.orig	2020-05-02 21:08:56 UTC
> +++ doc/mutt.man
> @@ -67,7 +67,8 @@ mutt \- The Mutt Mail User Agent
>  .PP
>diff --git a/mail/mutt/files/extra-patch-ifdef b/mail/mutt/files/extra-patch-ifdef
>index 3599a040daf0..5e4be3a5e9b4 100644
>--- a/mail/mutt/files/extra-patch-ifdef
>+++ b/mail/mutt/files/extra-patch-ifdef
>@@ -1,10 +1,10 @@
>---- PATCHES.orig	2020-03-29 21:24:30 UTC
>+--- PATCHES.orig	2020-05-05 02:09:32 UTC
> +++ PATCHES
> @@ -0,0 +1 @@
> +patch-1.5.4.cd.ifdef.1
>---- init.c.orig	2020-03-28 18:17:53 UTC
>+--- init.c.orig	2020-05-02 21:08:56 UTC
> +++ init.c
>-@@ -651,6 +651,52 @@ static mbchar_table *parse_mbchar_table (const char *s
>+@@ -643,6 +643,52 @@ static mbchar_table *parse_mbchar_table (const char *s
>    return t;
>  }
>  
>@@ -20,7 +20,7 @@
> +  if (!(res = (mutt_option_index (tmp->data) != -1)))
> +    for (i = 0; !res && i < MENU_MAX; i++)
> +    {
>-+      struct binding_t *b = km_get_table (Menus[i].value);
>++      const struct binding_t *b = km_get_table (Menus[i].value);
> +
> +      if (!b)
> +	continue;
>@@ -43,7 +43,7 @@
> +
> +  if (res)
> +  {
>-+    if (mutt_parse_rc_line (tmp->data, &token, err) == -1)
>++    if (mutt_parse_rc_buffer (tmp, &token, err) == -1)
> +    {
> +      mutt_error ("Erreur: %s", err->data);
> +      FREE (&token.data);
>@@ -57,9 +57,9 @@
>  static int parse_unignore (BUFFER *buf, BUFFER *s, union pointer_long_t udata, BUFFER *err)
>  {
>    do
>---- init.h.orig	2020-03-29 21:24:30 UTC
>+--- init.h.orig	2020-05-05 02:09:32 UTC
> +++ init.h
>-@@ -4516,6 +4516,7 @@ static int parse_lists (BUFFER *, BUFFER *, union poin
>+@@ -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 *);
>@@ -67,7 +67,7 @@
>  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 *);
>-@@ -4580,6 +4581,7 @@ const struct command_t Commands[] = {
>+@@ -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} },
>diff --git a/mail/mutt/files/extra-patch-maildir-mtime b/mail/mutt/files/extra-patch-maildir-mtime
>index cbdc33598e8b..0b8f5506bfe8 100644
>--- a/mail/mutt/files/extra-patch-maildir-mtime
>+++ b/mail/mutt/files/extra-patch-maildir-mtime
>@@ -1,8 +1,8 @@
>---- PATCHES.orig	2020-03-29 21:24:30 UTC
>+--- 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-03-28 18:17:53 UTC
>+--- browser.c.orig	2020-05-02 21:08:56 UTC
> +++ browser.c
> @@ -32,6 +32,7 @@
>  #ifdef USE_IMAP
>@@ -39,10 +39,10 @@
>      while (tmp && mutt_strcmp (mutt_b2s (full_path), mutt_b2s (tmp->pathbuf)))
>        tmp = tmp->next;
> +    check_maildir_times (tmp, &s);
>-     if (tmp && Context &&
>+     if (tmp && Context && !tmp->nopoll &&
>          !mutt_strcmp (tmp->realpath, Context->realpath))
>      {
>-@@ -574,6 +591,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b
>+@@ -579,6 +596,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b
>  	s.st_mtime = st2.st_mtime;
>      }
>  
>diff --git a/mail/mutt/files/extra-patch-reverse_reply b/mail/mutt/files/extra-patch-reverse_reply
>index dc9f4488a961..a543a7776d30 100644
>--- a/mail/mutt/files/extra-patch-reverse_reply
>+++ b/mail/mutt/files/extra-patch-reverse_reply
>@@ -1,10 +1,10 @@
>---- PATCHES.orig	2020-03-29 21:24:31 UTC
>+--- 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-03-29 21:24:30 UTC
>+--- init.h.orig	2020-05-05 02:09:32 UTC
> +++ init.h
>-@@ -3034,6 +3034,13 @@ struct option_t MuttVars[] = {
>+@@ -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.
>    */
>@@ -18,9 +18,9 @@
>    { "rfc2047_parameters", DT_BOOL, R_NONE, {.l=OPTRFC2047PARAMS}, {.l=0} },
>    /*
>    ** .pp
>---- mutt.h.orig	2020-03-29 21:24:30 UTC
>+--- mutt.h.orig	2020-05-05 02:09:32 UTC
> +++ mutt.h
>-@@ -506,6 +506,7 @@ enum
>+@@ -513,6 +513,7 @@ enum
>    OPTREVALIAS,
>    OPTREVNAME,
>    OPTREVREAL,
>@@ -28,19 +28,19 @@
>    OPTRFC2047PARAMS,
>    OPTSAVEADDRESS,
>    OPTSAVEEMPTY,
>---- protos.h.orig	2020-03-28 18:17:53 UTC
>+--- protos.h.orig	2020-05-02 21:08:56 UTC
> +++ protos.h
>-@@ -87,6 +87,7 @@ ADDRESS *mutt_get_address (ENVELOPE *, char **);
>+@@ -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-03-28 18:17:53 UTC
>+--- send.c.orig	2020-05-02 21:08:56 UTC
> +++ send.c
>-@@ -723,6 +723,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env)
>+@@ -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);
>@@ -51,9 +51,9 @@
>    env->cc = mutt_remove_xrefs (env->to, env->cc);
>  
>    if (env->cc && !env->to)
>---- sendlib.c.orig	2020-03-28 18:17:53 UTC
>+--- sendlib.c.orig	2020-05-02 21:08:56 UTC
> +++ sendlib.c
>-@@ -2974,6 +2974,35 @@ static void set_noconv_flags (BODY *b, short flag)
>+@@ -2981,6 +2981,35 @@ static void set_noconv_flags (BODY *b, short flag)
>    }
>  }
>  
>@@ -86,6 +86,6 @@
> +  return addr;
> +}
> +
>- int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid, int post, const char *fcc)
>+ int mutt_write_fcc (const char *path, SEND_CONTEXT *sctx, const char *msgid, int post, const char *fcc)
>  {
>-   CONTEXT f;
>+   HEADER *hdr;
>diff --git a/mail/mutt/files/extra-patch-smartdate b/mail/mutt/files/extra-patch-smartdate
>index f138b9d11f94..2dd079b79f2e 100644
>--- a/mail/mutt/files/extra-patch-smartdate
>+++ b/mail/mutt/files/extra-patch-smartdate
>@@ -1,4 +1,4 @@
>---- hdrline.c.orig	2020-03-29 21:24:30 UTC
>+--- hdrline.c.orig	2020-05-05 02:09:32 UTC
> +++ hdrline.c
> @@ -249,6 +249,89 @@ static char *apply_subject_mods (ENVELOPE *env)
>   * %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label)
>@@ -105,7 +105,7 @@
>        if (!do_locales)
>          setlocale (LC_TIME, "");
>  
>---- mutt.h.orig	2020-03-29 21:24:31 UTC
>+--- mutt.h.orig	2020-05-05 02:09:33 UTC
> +++ mutt.h
> @@ -165,6 +165,16 @@ typedef enum
>    MUTT_WRITE_HEADER_MIME
>diff --git a/mail/mutt/files/patch-Makefile.in b/mail/mutt/files/patch-Makefile.in
>index 307213ad2d48..a0c8916a6b69 100644
>--- a/mail/mutt/files/patch-Makefile.in
>+++ b/mail/mutt/files/patch-Makefile.in
>@@ -1,6 +1,6 @@
>---- Makefile.in.orig	2020-03-28 18:22:01 UTC
>+--- Makefile.in.orig	2020-05-02 21:31:42 UTC
> +++ Makefile.in
>-@@ -540,7 +540,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign
>+@@ -530,7 +530,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign
>  @BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap
>  @BUILD_AUTOCRYPT_TRUE@AUTOCRYPT_SUBDIR = autocrypt
>  @BUILD_AUTOCRYPT_TRUE@AUTOCRYPT_INCLUDES = -I$(top_srcdir)/autocrypt
>@@ -9,7 +9,7 @@
>  bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET)
>  @BUILD_HCACHE_TRUE@HCVERSION = hcversion.h
>  BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c version.h $(HCVERSION)
>-@@ -1690,18 +1690,9 @@ install-exec-hook:
>+@@ -1660,18 +1660,9 @@ install-exec-hook:
>  		rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;		\
>  		ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
>  	fi
>diff --git a/mail/mutt/files/patch-browser.c b/mail/mutt/files/patch-browser.c
>index ac8879528c76..9fe71577c5fe 100644
>--- a/mail/mutt/files/patch-browser.c
>+++ b/mail/mutt/files/patch-browser.c
>@@ -1,4 +1,4 @@
>---- browser.c.orig	2020-03-29 21:24:30 UTC
>+--- browser.c.orig	2020-05-05 02:09:32 UTC
> +++ browser.c
> @@ -87,6 +87,12 @@ static int browser_compare_subject (const void *a, con
>    struct folder_file *pa = (struct folder_file *) a;
>diff --git a/mail/mutt/files/patch-contrib_Makefile.in b/mail/mutt/files/patch-contrib_Makefile.in
>index 13e5c2d4401c..1985e152c6db 100644
>--- a/mail/mutt/files/patch-contrib_Makefile.in
>+++ b/mail/mutt/files/patch-contrib_Makefile.in
>@@ -1,6 +1,6 @@
>---- contrib/Makefile.in.orig	2020-03-28 18:22:01 UTC
>+--- contrib/Makefile.in.orig	2020-05-02 21:32:34 UTC
> +++ contrib/Makefile.in
>-@@ -280,7 +280,7 @@ top_build_prefix = @top_build_prefix@
>+@@ -279,7 +279,7 @@ top_build_prefix = @top_build_prefix@
>  top_builddir = @top_builddir@
>  top_srcdir = @top_srcdir@
>  subdir = contrib
>diff --git a/mail/mutt/files/patch-date-conditional b/mail/mutt/files/patch-date-conditional
>index 3a8f2560baaa..8bbad9b84ef1 100644
>--- a/mail/mutt/files/patch-date-conditional
>+++ b/mail/mutt/files/patch-date-conditional
>@@ -1,8 +1,8 @@
>---- PATCHES.orig	2020-03-29 21:24:32 UTC
>+--- 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-03-29 21:24:31 UTC
>+--- hdrline.c.orig	2020-05-05 02:09:33 UTC
> +++ hdrline.c
> @@ -428,6 +428,53 @@ hdr_format_str (char *dest,
>        const char *cp;
>@@ -58,9 +58,9 @@
>  
>        p = dest;
>  
>---- muttlib.c.orig	2020-03-28 18:17:53 UTC
>+--- muttlib.c.orig	2020-05-02 21:08:56 UTC
> +++ muttlib.c
>-@@ -1563,7 +1563,16 @@ void mutt_FormatString (char *dest,		/* output buffer 
>+@@ -1667,7 +1667,16 @@ void mutt_FormatString (char *dest,		/* output buffer 
>        if (*src == '?')
>        {
>  	flags |= MUTT_FORMAT_OPTIONAL;
>@@ -78,7 +78,7 @@
>        }
>        else
>        {
>-@@ -1579,12 +1588,12 @@ void mutt_FormatString (char *dest,		/* output buffer 
>+@@ -1683,12 +1692,12 @@ void mutt_FormatString (char *dest,		/* output buffer 
>  	  count++;
>  	}
>  	*cp = 0;
>diff --git a/mail/mutt/files/patch-dgc-deepif b/mail/mutt/files/patch-dgc-deepif
>index 7a7d948d02d3..6ca74d71f4a3 100644
>--- a/mail/mutt/files/patch-dgc-deepif
>+++ b/mail/mutt/files/patch-dgc-deepif
>@@ -1,6 +1,6 @@
>---- muttlib.c.orig	2020-03-29 21:24:32 UTC
>+--- muttlib.c.orig	2020-05-05 02:09:34 UTC
> +++ muttlib.c
>-@@ -1606,6 +1606,12 @@ void mutt_FormatString (char *dest,		/* output buffer 
>+@@ -1710,6 +1710,12 @@ void mutt_FormatString (char *dest,		/* output buffer 
>  	count = 0;
>          while (count < sizeof (ifstring) && *src && *src != '?' && *src != '&')
>  	{
>@@ -13,7 +13,7 @@
>            *cp++ = *src++;
>  	  count++;
>  	}
>-@@ -1618,7 +1624,13 @@ void mutt_FormatString (char *dest,		/* output buffer 
>+@@ -1722,7 +1728,13 @@ void mutt_FormatString (char *dest,		/* output buffer 
>  	count = 0;
>  	while (count < sizeof (elsestring) && *src && *src != '?')
>  	{
>diff --git a/mail/mutt/files/patch-doc_Makefile.in b/mail/mutt/files/patch-doc_Makefile.in
>index 81d5cb8b199b..eb3d77f9d6af 100644
>--- a/mail/mutt/files/patch-doc_Makefile.in
>+++ b/mail/mutt/files/patch-doc_Makefile.in
>@@ -1,6 +1,6 @@
>---- doc/Makefile.in.orig	2020-03-28 18:22:01 UTC
>+--- doc/Makefile.in.orig	2020-05-02 21:31:43 UTC
> +++ doc/Makefile.in
>-@@ -691,14 +691,7 @@ install-data-local: makedoc-all instdoc
>+@@ -561,14 +561,7 @@ install-data-local: makedoc-all instdoc
>  	    $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
>  	  fi \
>  	done
>@@ -16,7 +16,7 @@
>  	-if [ -f mutt.info ] ; then \
>  	  $(MKDIR_P) $(DESTDIR)$(infodir) ; \
>  	  $(INSTALL) -m 644 mutt.info $(DESTDIR)$(infodir) ; \
>-@@ -734,9 +727,7 @@ uninstall-local:
>+@@ -604,9 +597,7 @@ uninstall-local:
>  
>  check:
>  manual.txt: manual.html
>diff --git a/mail/mutt/files/patch-doc_manual.xml.head b/mail/mutt/files/patch-doc_manual.xml.head
>index 5feeaf07eb09..c95fd1ee64d3 100644
>--- a/mail/mutt/files/patch-doc_manual.xml.head
>+++ b/mail/mutt/files/patch-doc_manual.xml.head
>@@ -1,4 +1,4 @@
>---- doc/manual.xml.head.orig	2020-03-28 18:17:53 UTC
>+--- doc/manual.xml.head.orig	2020-05-02 21:08:56 UTC
> +++ doc/manual.xml.head
> @@ -1,6 +1,6 @@
>  <?xml version="1.0" standalone="no"?>
>diff --git a/mail/mutt/files/patch-muttlib.c b/mail/mutt/files/patch-muttlib.c
>index 275f9604cb7f..15e36d47262a 100644
>--- a/mail/mutt/files/patch-muttlib.c
>+++ b/mail/mutt/files/patch-muttlib.c
>@@ -1,6 +1,6 @@
>---- muttlib.c.orig	2020-03-29 21:24:32 UTC
>+--- muttlib.c.orig	2020-05-05 02:09:34 UTC
> +++ muttlib.c
>-@@ -877,16 +877,15 @@ void _mutt_buffer_mktemp (BUFFER *buf, const char *pre
>+@@ -930,16 +930,15 @@ void _mutt_buffer_mktemp (BUFFER *buf, const char *pre
>  void _mutt_mktemp (char *s, size_t slen, const char *prefix, const char *suffix,
>                     const char *src, int line)
>  {
>diff --git a/mail/mutt/files/patch-smime-sender b/mail/mutt/files/patch-smime-sender
>index 4a18e4a8ffb4..351bba964cc6 100644
>--- a/mail/mutt/files/patch-smime-sender
>+++ b/mail/mutt/files/patch-smime-sender
>@@ -1,6 +1,6 @@
>---- commands.c.orig	2020-02-21 20:17:47 UTC
>+--- commands.c.orig	2020-05-02 21:08:56 UTC
> +++ commands.c
>-@@ -285,7 +285,7 @@ int mutt_display_message (HEADER *cur)
>+@@ -302,7 +302,7 @@ int mutt_display_message (HEADER *cur)
>      {
>        if (cur->security & GOODSIGN)
>        {
>@@ -9,9 +9,9 @@
>  	  mutt_message ( _("S/MIME signature successfully verified."));
>  	else
>  	  mutt_error ( _("S/MIME certificate owner does not match sender."));
>---- init.h.orig	2020-03-29 21:24:31 UTC
>+--- init.h.orig	2020-05-05 02:09:33 UTC
> +++ init.h
>-@@ -3531,6 +3531,15 @@ struct option_t MuttVars[] = {
>+@@ -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)
>    */
>@@ -27,9 +27,9 @@
>    { "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-03-29 21:24:31 UTC
>+--- mutt.h.orig	2020-05-05 02:09:33 UTC
> +++ mutt.h
>-@@ -588,6 +588,7 @@ enum
>+@@ -596,6 +596,7 @@ enum
>    OPTSMIMEISDEFAULT,
>    OPTSMIMESELFENCRYPT,
>    OPTASKCERTLABEL,
>diff --git a/mail/mutt/files/patch-threadcomplete b/mail/mutt/files/patch-threadcomplete
>index 017bfeb9ceac..19b28935f2f4 100644
>--- a/mail/mutt/files/patch-threadcomplete
>+++ b/mail/mutt/files/patch-threadcomplete
>@@ -1,4 +1,4 @@
>---- mutt.h.orig	2020-03-29 21:24:33 UTC
>+--- mutt.h.orig	2020-05-05 02:09:35 UTC
> +++ mutt.h
> @@ -242,6 +242,7 @@ enum
>    MUTT_EXPIRED,
>@@ -8,7 +8,7 @@
>  
>    /* actions for mutt_pattern_comp/mutt_pattern_exec */
>    MUTT_AND,
>---- pattern.c.orig	2020-03-28 18:17:53 UTC
>+--- pattern.c.orig	2020-05-02 21:08:56 UTC
> +++ pattern.c
> @@ -57,6 +57,7 @@ static const struct pattern_flags
>  }
>@@ -16,9 +16,9 @@
>  {
> +  { 'a', MUTT_THREADCOMPLETE,	0,		NULL },
>    { 'A', MUTT_ALL,			0,		NULL },
>-   { 'b', MUTT_BODY,		MUTT_FULL_MSG,	eat_regexp },
>-   { 'B', MUTT_WHOLE_MSG,		MUTT_FULL_MSG,	eat_regexp },
>-@@ -1342,6 +1343,16 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec
>+   { '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);
>diff --git a/mail/mutt/pkg-plist b/mail/mutt/pkg-plist
>index b8d2c9321cfe..f85acccb6af4 100644
>--- a/mail/mutt/pkg-plist
>+++ b/mail/mutt/pkg-plist
>@@ -46,6 +46,8 @@ man/man5/muttrc.5.gz
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Pine.rc
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tin.rc
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ca-bundle.crt
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgedit-detectgui.sh
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgedit-screen-tmux.sh
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.default
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.linux
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpg.rc
>-- 
>2.26.2
>

Flags:

dereks: maintainer-approval+

Actions: View | Diff

Attachments on bug 246270: 214215