Attachment #212847 for bug #245175

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




# $FreeBSD$

PORTNAME=	mutt
DISTVERSION=	1.13.5
CATEGORIES+=	mail
MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \


OPTIONS_DEFINE=	AUTOCRYPT DEBUG DOCS EXAMPLES FLOCK FORCEBASE64 GPGME \
		GREETING_PATCH HTML ICONV IDN IFDEF_PATCH LOCALES_FIX \
		MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NLS QUOTE_PATCH \
		REVERSE_REPLY_PATCH SASL SMART_DATE SMTP URLVIEW

OPTIONS_SINGLE=	GSSAPI HCACHE SCREEN
OPTIONS_RADIO=	SPELL

SMART_DATE_DESC=	Dynamic date formatting with "%@"
SMTP_DESC=	SMTP relay support
URLVIEW_DESC=	Use urlview for the URL selector menu
XML_DESC=	Use XML tools for rebuilding documentation

OPTIONS_DEFAULT=	AUTOCRYPT 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

.ifmake makesum # for optional distfiles patchfiles
OPTIONS_OVERRIDE=	${OPTIONS_DEFINE} ${OPTIONS_DEFAULT}


SMTP_CONFIGURE_ENABLE=	smtp

FORCEBASE64_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-forcebase64

MAILDIR_MTIME_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-maildir-mtime

GREETING_PATCH_PATCHFILES=	mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc

QUOTE_PATCH_BROKEN=	QUOTE_PATCH broken on 1.13.0
QUOTE_PATCH_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv \
	patch-${VVV_PATCH_VERSION}.vvv.quote.xz:vvv

NNTP_BROKEN=	NNTP_PATCH broken on 1.13.0
NNTP_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.nntp.xz:-p1:vvv
NNTP_EXTRA_PATCHES=	${PATCHDIR}/extra-nntp-depfiles
NNTP_CONFIGURE_ON=	--enable-nntp
NNTP_VARS=	XML_NEEDED=yes
NNTP_CATEGORIES=	news
NNTP_USES=	perl5

DOCS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-doc-ref

.include <bsd.port.options.mk>

# un/comment as each VERSION is created for PORTVERSION
VVV_PATCH_VERSION=	1.13.0
GREETING_PATCH_VERSION=	1.13.4

post-patch-NNTP-on:
# Restore timestamps for autotools sources
	@${TOUCH} -r ${WRKSRC}/configure.ac.orig ${WRKSRC}/configure.ac
	@${TOUCH} -r ${WRKSRC}/Makefile.am.orig ${WRKSRC}/Makefile.am
.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
.if 	defined(${PATCH_DEBUG})
		@${ECHO} "===>  Applying ${.TARGET} extra-patch-maildir-mtime-nntp"
.endif
	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime-nntp
.endif
.if ${PORT_OPTIONS:MFORCEBASE64}
.if 	defined(PATCH_DEBUG)
		@${ECHO} "===>  Applying ${.TARGET} extra-patch-forcebase64-nntp"
.endif
	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64-nntp
.endif

post-patch-NNTP-off:
.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
.if 	defined(PATCH_DEBUG)
		@${ECHO} "===>  Applying ${.TARGET} extra-patch-maildir-mtime"
.endif
	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime
.endif
.if ${PORT_OPTIONS:MFORCEBASE64}
.if 	defined(PATCH_DEBUG)
		@${ECHO} "===>  Applying ${.TARGET} extra-patch-forcebase64"
.endif
	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64
.endif

post-install:
	${INSTALL_MAN} ${FILESDIR}/mailcap.5 ${STAGEDIR}${MANPREFIX}/man/man5

post-install-NNTP-on:
	${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}

pre-configure::
	@${REINPLACE_CMD} -e 's,?eimdal\*),?eimdal*|\"FreeBSD heimdal\"*),' \
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}

	@${REINPLACE_CMD} -E -e 's/BDB_VERSIONS="/&${BDB_LIB_NAME} db${BDB_VER} /' \
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}

.if defined (XML_NEEDED) && ${PORT_OPTIONS:MXML}
BUILD_DEPENDS+=	xsltproc:textproc/libxslt \
		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
		lynx:www/lynx
.else
pre-build::
	@${REINPLACE_CMD} -e '/^BUILD_DOC_TARGETS/s/=.*/=/' ${WRKSRC}/doc/Makefile
		-e '/^BUILD_DOC_TARGETS/s/=.*/=/' \
		${WRKSRC}/doc/Makefile
.endif

.include <bsd.port.mk>

Lines 1-11 Link Here

(-)b/mail/mutt/distinfo (-11 / +9 lines)
1	TIMESTAMP = 1581806451	1	TIMESTAMP = 1585430449
2	SHA256 (mutt/mutt-1.13.4.tar.gz) = b57d3f1040d8018114cf1033dab229f36e4becbcdf59c2edeb294fc044ffcd04	2	SHA256 (mutt/mutt-1.13.5.tar.gz) = 6cd71b5b3e6b255afef6bed3b5e1e8ee9819b3d7c9839fd95e798045882aa653
3	SIZE (mutt/mutt-1.13.4.tar.gz) = 4901222	3	SIZE (mutt/mutt-1.13.5.tar.gz) = 4902500
4	SHA256 (mutt/mutt-1.13.2.vc.greeting) = b11fcfad1f53f16f89a8ecc334fba615698f5bcaa9373fd487a6c9d95c3872ad	4	SHA256 (mutt/mutt-1.13.4.vc.greeting) = 572427c1ab8bd81ac11bf74feeab8e71f11c5732f274f445b9976527716dc80b
5	SIZE (mutt/mutt-1.13.2.vc.greeting) = 4573	5	SIZE (mutt/mutt-1.13.4.vc.greeting) = 4573
6	SHA256 (mutt/patch-1.12.1.vvv.nntp.xz) = 9c420584d549ac0bb49c52ddfd2ab5bee0f89e59cb938673444ec27ad7c782ad	6	SHA256 (mutt/patch-1.13.0.vvv.initials.xz) = 8b25ad6596bd57d94f6551e7e73ceb8da620468e96fb507b2f51545d5b3eaa02
7	SIZE (mutt/patch-1.12.1.vvv.nntp.xz) = 49672	7	SIZE (mutt/patch-1.13.0.vvv.initials.xz) = 720
8	SHA256 (mutt/patch-1.12.1.vvv.initials.xz) = 6c66fe6c23362b0f4970a5028a75a33454e1e53ba178e5801113939f1bc22920	8	SHA256 (mutt/patch-1.13.0.vvv.quote.xz) = 788d25d1439d86d6c5007d141d1c219496e77940b5ce37819471c941f78f03e4
9	SIZE (mutt/patch-1.12.1.vvv.initials.xz) = 724	9	SIZE (mutt/patch-1.13.0.vvv.quote.xz) = 1340
10	SHA256 (mutt/patch-1.12.1.vvv.quote.xz) = 365200817a203a892094062445865b7b8f9ab37e8214ec526082876ffd0d8ab4
11	SIZE (mutt/patch-1.12.1.vvv.quote.xz) = 1332




--- Makefile.in.orig	2018-12-22 21:21:33 UTC
+++ Makefile.in
@@ -240,7 +240,8 @@ am__depfiles_remade = $(DEPDIR)/mkdtemp.Po $(DEPDIR)/r
 	./$(DEPDIR)/mutt_sasl.Po ./$(DEPDIR)/mutt_socket.Po \
 	./$(DEPDIR)/mutt_ssl.Po ./$(DEPDIR)/mutt_ssl_gnutls.Po \
 	./$(DEPDIR)/mutt_tunnel.Po ./$(DEPDIR)/muttlib.Po \
-	./$(DEPDIR)/mx.Po ./$(DEPDIR)/pager.Po ./$(DEPDIR)/parse.Po \
+	./$(DEPDIR)/mx.Po ./$(DEPDIR)/newsrc.Po ./$(DEPDIR)/nntp.Po \
+	./$(DEPDIR)/pager.Po ./$(DEPDIR)/parse.Po \
 	./$(DEPDIR)/patchlist.Po ./$(DEPDIR)/pattern.Po \
 	./$(DEPDIR)/pgp.Po ./$(DEPDIR)/pgpewrap.Po \
 	./$(DEPDIR)/pgpinvoke.Po ./$(DEPDIR)/pgpkey.Po \

Lines 1-4 Link Here

(-)b/mail/mutt/files/extra-patch-doc-ref (-1 / +1 lines)
1	--- doc/mutt.man.orig 2019-05-25 16:22:39 UTC	1	--- doc/mutt.man.orig 2020-01-28 23:08:03 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




--- init.h.orig	2017-09-10 22:12:31 UTC
+++ init.h
@@ -911,6 +911,11 @@ struct option_t MuttVars[] = {
   ** message via mail.
   */
 #endif
+   { "force_base64",   DT_BOOL, R_NONE, OPTFORCEBASE64, 0 },
+   /*
+   ** .pp
+   ** If you need to encode all text parts to base64, set this option.
+   */
   { "force_name",	DT_BOOL, R_NONE, OPTFORCENAME, 0 },
   /*
   ** .pp
--- mutt.h.orig	2017-09-10 22:12:31 UTC
+++ mutt.h
@@ -379,6 +379,7 @@ enum
   OPTFCCCLEAR,
   OPTFLAGSAFE,
   OPTFOLLOWUPTO,
+  OPTFORCEBASE64,
   OPTFORCENAME,
   OPTFORWDECODE,
   OPTFORWQUOTE,
--- sendlib.c.orig	2017-09-10 22:12:31 UTC
+++ sendlib.c
@@ -1180,7 +1180,9 @@ static void mutt_set_encoding (BODY *b, 
   if (b->type == TYPETEXT)
   {
     char *chsname = mutt_get_body_charset (send_charset, sizeof (send_charset), b);
-    if ((info->lobin && ascii_strncasecmp (chsname, "iso-2022", 8)) || info->linemax > 990 || (info->from && option (OPTENCODEFROM)))
+    if (option (OPTFORCEBASE64))
+      b->encoding = ENCBASE64;
+    else if ((info->lobin && ascii_strncasecmp (chsname, "iso-2022", 8)) || info->linemax > 990 || (info->from && option (OPTENCODEFROM)))
       b->encoding = ENCQUOTEDPRINTABLE;
     else if (info->hibin)
       b->encoding = option (OPTALLOW8BIT) ? ENC8BIT : ENCQUOTEDPRINTABLE;




--- PATCHES.orig	2020-03-29 21:24:30 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.4.cd.ifdef.1
--- init.c.orig	2020-03-28 18:17:53 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, union pointer_long_t udata, BUFFER *err)
 {
   do
--- init.h.orig	2020-03-29 21:24:30 UTC
+++ init.h
@@ -4516,6 +4516,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 *);
@@ -4580,6 +4581,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-03-29 21:24:30 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
@@ -32,6 +32,7 @@
 #ifdef USE_IMAP

 
 #include <stdlib.h>
 #include <dirent.h>
@@ -430,6 +431,21 @@ static void init_state (struct browser_state *state, M
     menu->data = state->entry;
 }
 

 static int examine_directory (MUTTMENU *menu, struct browser_state *state,
 			      const char *d, const char *prefix)
 {
@@ -496,6 +512,7 @@ static int examine_directory (MUTTMENU *menu, struct b
     tmp = Incoming;
     while (tmp && mutt_strcmp (mutt_b2s (full_path), mutt_b2s (tmp->pathbuf)))
       tmp = tmp->next;

     if (tmp && Context &&
         !mutt_strcmp (tmp->realpath, Context->realpath))
     {
@@ -574,6 +591,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b
 	s.st_mtime = st2.st_mtime;
     }
 




--- PATCHES.orig	2019-08-15 02:24:43 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.7.ust.maildir-mtime.2
--- browser.c.orig	2019-08-15 02:24:39 UTC
+++ browser.c
@@ -35,6 +35,7 @@
 #ifdef USE_NNTP
 #include "nntp.h"
 #endif
+#include "mx.h"
 
 #include <stdlib.h>
 #include <dirent.h>
@@ -592,6 +593,21 @@ static void init_state (struct browser_state *state, M
     menu->data = state->entry;
 }
 
+static void check_maildir_times (BUFFY *buf, struct stat *st)
+{
+  char buffer[_POSIX_PATH_MAX + SHORT_STRING];
+  struct stat s;
+
+  if(!buf || buf->magic != MUTT_MAILDIR)
+    return;
+
+  snprintf (buffer, sizeof (buffer), "%s/tmp", mutt_b2s(buf->pathbuf));
+  if (lstat (buffer, &s) != 0)
+    return;
+
+  st->st_mtime = s.st_mtime;
+}
+
 /* get list of all files/newsgroups with mask */
 static int examine_directory (MUTTMENU *menu, struct browser_state *state,
 			      const char *d, const char *prefix)
@@ -684,6 +700,7 @@ static int examine_directory (MUTTMENU *menu, struct b
     tmp = Incoming;
     while (tmp && mutt_strcmp (mutt_b2s (buffer), mutt_b2s (tmp->pathbuf)))
       tmp = tmp->next;
+    check_maildir_times (tmp, &s);
     if (tmp && Context &&
         !mutt_strcmp (tmp->realpath, Context->realpath))
     {
@@ -792,6 +809,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b
 	s.st_mtime = st2.st_mtime;
     }
 
+    check_maildir_times (tmp, &s);
     add_folder (menu, state, mutt_b2s (mailbox), &s, tmp, NULL);
   }
   while ((tmp = tmp->next));




--- PATCHES.orig	2020-03-29 21:24:31 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
@@ -3034,6 +3034,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-03-29 21:24:30 UTC
+++ mutt.h
@@ -506,6 +506,7 @@ enum
   OPTREVALIAS,
   OPTREVNAME,
   OPTREVREAL,

   OPTRFC2047PARAMS,
   OPTSAVEADDRESS,
   OPTSAVEEMPTY,
--- protos.h.orig	2020-03-28 18:17:53 UTC
+++ protos.h
@@ -87,6 +87,7 @@ 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_expand_aliases (ADDRESS *);
 ADDRESS *mutt_parse_adrlist (ADDRESS *, const char *);
 
--- send.c.orig	2020-03-28 18:17:53 UTC
+++ send.c
@@ -723,6 +723,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	2020-03-28 18:17:53 UTC
+++ sendlib.c
@@ -2974,6 +2974,35 @@ static void set_noconv_flags (BODY *b, short flag)
   }




--- hdrline.c.orig	2020-03-29 21:24:30 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)
  * %Z = status flags	*/
 

 static const char *
 hdr_format_str (char *dest,
 		size_t destlen,
@@ -422,7 +505,13 @@ hdr_format_str (char *dest,
 
       if (!do_locales)
         setlocale (LC_TIME, "C");

       if (!do_locales)
         setlocale (LC_TIME, "");
 
--- mutt.h.orig	2020-03-29 21:24:31 UTC
+++ mutt.h
@@ -165,6 +165,16 @@ typedef enum
   MUTT_WRITE_HEADER_MIME

Lines 1-4 Link Here

(-)b/mail/mutt/files/patch-Makefile.in (-1 / +1 lines)
1	--- Makefile.in.orig 2019-11-30 18:14:23 UTC	1	--- Makefile.in.orig 2020-03-28 18:22:01 UTC
2	+++ Makefile.in	2	+++ Makefile.in
3	@@ -540,7 +540,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign	3	@@ -540,7 +540,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




--- browser.c.orig	2020-03-29 21:24:30 UTC
+++ browser.c
@@ -87,6 +87,12 @@ static int browser_compare_subject (const void *a, con
   struct folder_file *pa = (struct folder_file *) a;
   struct folder_file *pb = (struct folder_file *) b;
 

   int r = mutt_strcoll (pa->display_name, pb->display_name);
 
   return ((BrowserSort & SORT_REVERSE) ? -r : r);
@@ -97,6 +103,12 @@ static int browser_compare_date (const void *a, const 
   struct folder_file *pa = (struct folder_file *) a;
   struct folder_file *pb = (struct folder_file *) b;
 

   int r = pa->mtime - pb->mtime;
 
   return ((BrowserSort & SORT_REVERSE) ? -r : r);
@@ -106,6 +118,12 @@ static int browser_compare_size (const void *a, const 
 {
   struct folder_file *pa = (struct folder_file *) a;
   struct folder_file *pb = (struct folder_file *) b;

Lines 1-4 Link Here

(-)b/mail/mutt/files/patch-contrib_Makefile.in (-1 / +1 lines)
1	--- contrib/Makefile.in.orig 2019-11-30 18:14:24 UTC	1	--- contrib/Makefile.in.orig 2020-03-28 18:22:01 UTC
2	+++ contrib/Makefile.in	2	+++ contrib/Makefile.in
3	@@ -280,7 +280,7 @@ top_build_prefix = @top_build_prefix@	3	@@ -280,7 +280,7 @@ top_build_prefix = @top_build_prefix@
4	top_builddir = @top_builddir@	4	top_builddir = @top_builddir@




--- PATCHES.orig	2020-03-29 21:24:32 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
@@ -428,6 +428,53 @@ hdr_format_str (char *dest,
       const char *cp;
       struct tm *tm;
       time_t T;

 
       p = dest;
 
--- muttlib.c.orig	2020-03-28 18:17:53 UTC
+++ muttlib.c
@@ -1563,7 +1563,16 @@ void mutt_FormatString (char *dest,		/* output buffer 
       if (*src == '?')

Lines 1-4 Link Here

(-)b/mail/mutt/files/patch-dgc-deepif (-1 / +1 lines)
1	--- muttlib.c.orig 2019-12-06 03:41:57 UTC	1	--- muttlib.c.orig 2020-03-29 21:24:32 UTC
2	+++ muttlib.c	2	+++ muttlib.c
3	@@ -1606,6 +1606,12 @@ void mutt_FormatString (char dest, / output buffer	3	@@ -1606,6 +1606,12 @@ void mutt_FormatString (char dest, / output buffer
4	count = 0;	4	count = 0;

Lines 1-4 Link Here

(-)b/mail/mutt/files/patch-doc_Makefile.in (-1 / +1 lines)
1	--- doc/Makefile.in.orig 2019-11-30 18:14:24 UTC	1	--- doc/Makefile.in.orig 2020-03-28 18:22:01 UTC
2	+++ doc/Makefile.in	2	+++ doc/Makefile.in
3	@@ -691,14 +691,7 @@ install-data-local: makedoc-all instdoc	3	@@ -691,14 +691,7 @@ install-data-local: makedoc-all instdoc
4	$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \	4	$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \

Lines 1-4 Link Here

(-)b/mail/mutt/files/patch-doc_manual.xml.head (-1 / +1 lines)
1	--- doc/manual.xml.head.orig 2019-11-24 03:39:46 UTC	1	--- doc/manual.xml.head.orig 2020-03-28 18:17:53 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-4 Link Here

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




--- commands.c.orig	2020-02-21 20:17:47 UTC
+++ commands.c
@@ -285,7 +285,7 @@ int mutt_display_message (HEADER *cur)
     {

 	  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
@@ -3531,6 +3531,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-03-29 21:24:31 UTC
+++ mutt.h
@@ -588,6 +588,7 @@ enum
   OPTSMIMEISDEFAULT,
   OPTSMIMESELFENCRYPT,
   OPTASKCERTLABEL,

Lines 1-6 Link Here

(-)b/mail/mutt/files/patch-threadcomplete (-3 / +3 lines)
1	--- mutt.h.orig 2019-12-06 03:42:11 UTC	1	--- mutt.h.orig 2020-03-29 21:24:33 UTC
2	+++ mutt.h	2	+++ mutt.h
3	@@ -243,6 +243,7 @@ enum	3	@@ -242,6 +242,7 @@ enum
4	MUTT_EXPIRED,	4	MUTT_EXPIRED,
5	MUTT_SUPERSEDED,	5	MUTT_SUPERSEDED,
6	MUTT_TRASH,	6	MUTT_TRASH,
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 2019-11-16 21:07:54 UTC	11	--- pattern.c.orig 2020-03-28 18:17:53 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 30-36 man/man5/muttrc.5.gz Link Here

(-)b/mail/mutt/pkg-plist (-2 lines)
30	%%PORTDOCS%%%%DOCSDIR%%/manual.txt	30	%%PORTDOCS%%%%DOCSDIR%%/manual.txt
31	%%PORTDOCS%%%%DOCSDIR%%/patch-notes.txt	31	%%PORTDOCS%%%%DOCSDIR%%/patch-notes.txt
32	%%PORTDOCS%%%%DOCSDIR%%/smime-notes.txt	32	%%PORTDOCS%%%%DOCSDIR%%/smime-notes.txt
33	%%NNTP%%%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.nntp
34	%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/advancedusage.html	33	%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/advancedusage.html
35	%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/configuration.html	34	%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/configuration.html
36	%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/gettingstarted.html	35	%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/gettingstarted.html
37	-

Return to bug 245175

Lines 2-8 Link Here

(-)b/mail/mutt/Makefile (-59 / +11 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mutt	4	PORTNAME= mutt
5	DISTVERSION= 1.13.4	5	DISTVERSION= 1.13.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	ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \	8	ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
Lines 48-55 OPTIONS_SUB= yes Link Here
48		48
49	OPTIONS_DEFINE= AUTOCRYPT DEBUG DOCS EXAMPLES FLOCK FORCEBASE64 GPGME \	49	OPTIONS_DEFINE= AUTOCRYPT DEBUG DOCS EXAMPLES FLOCK FORCEBASE64 GPGME \
50	GREETING_PATCH HTML ICONV IDN IFDEF_PATCH LOCALES_FIX \	50	GREETING_PATCH HTML ICONV IDN IFDEF_PATCH LOCALES_FIX \
51	MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NLS QUOTE_PATCH NNTP \	51	MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NLS QUOTE_PATCH \
52	REVERSE_REPLY_PATCH SASL SMART_DATE SMTP URLVIEW XML	52	REVERSE_REPLY_PATCH SASL SMART_DATE SMTP URLVIEW
53		53
54	OPTIONS_SINGLE= GSSAPI HCACHE SCREEN	54	OPTIONS_SINGLE= GSSAPI HCACHE SCREEN
55	OPTIONS_RADIO= SPELL	55	OPTIONS_RADIO= SPELL
Lines 84-94 SLANG_DESC= SLANG support Link Here
84	SMART_DATE_DESC= Dynamic date formatting with "%@"	84	SMART_DATE_DESC= Dynamic date formatting with "%@"
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	XML_DESC= Use XML tools for rebuilding documentation
88		87
89	OPTIONS_DEFAULT= AUTOCRYPT GPGME GSSAPI_NONE HCACHE_BDB HTML ICONV IDN \	88	OPTIONS_DEFAULT= AUTOCRYPT GPGME GSSAPI_NONE HCACHE_BDB HTML ICONV IDN \
90	IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NCURSES \	89	IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NCURSES \
91	NLS REVERSE_REPLY_PATCH SASL SMART_DATE SMTP URLVIEW XML	90	NLS QUOTE_PATCH REVERSE_REPLY_PATCH SASL SMART_DATE SMTP URLVIEW
92		91
93	.ifmake makesum # for optional distfiles patchfiles	92	.ifmake makesum # for optional distfiles patchfiles
94	OPTIONS_OVERRIDE= ${OPTIONS_DEFINE} ${OPTIONS_DEFAULT}	93	OPTIONS_OVERRIDE= ${OPTIONS_DEFINE} ${OPTIONS_DEFAULT}
Lines 173-237 GPGME_CONFIGURE_ENABLE= gpgme Link Here
173		172
174	SMTP_CONFIGURE_ENABLE= smtp	173	SMTP_CONFIGURE_ENABLE= smtp
175		174
		175	FORCEBASE64_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-forcebase64
		176
		177	MAILDIR_MTIME_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-maildir-mtime
		178
176	GREETING_PATCH_PATCHFILES= mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc	179	GREETING_PATCH_PATCHFILES= mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc
177		180
178	QUOTE_PATCH_BROKEN= QUOTE_PATCH broken on 1.13.0
179	QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv \	181	QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv \
180	patch-${VVV_PATCH_VERSION}.vvv.quote.xz:vvv	182	patch-${VVV_PATCH_VERSION}.vvv.quote.xz:vvv
181		183
182	NNTP_BROKEN= NNTP_PATCH broken on 1.13.0
183	NNTP_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.nntp.xz:-p1:vvv
184	NNTP_EXTRA_PATCHES= ${PATCHDIR}/extra-nntp-depfiles
185	NNTP_CONFIGURE_ON= --enable-nntp
186	NNTP_VARS= XML_NEEDED=yes
187	NNTP_CATEGORIES= news
188	NNTP_USES= perl5
189
190	DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref	184	DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref
191		185
192	.include <bsd.port.options.mk>	186	.include <bsd.port.options.mk>
193		187
194	# un/comment as each VERSION is created for PORTVERSION	188	# un/comment as each VERSION is created for PORTVERSION
195	VVV_PATCH_VERSION= 1.12.1	189	VVV_PATCH_VERSION= 1.13.0
196	GREETING_PATCH_VERSION= 1.13.2	190	GREETING_PATCH_VERSION= 1.13.4
197
198	post-patch-NNTP-on:
199	# Restore timestamps for autotools sources
200	@${TOUCH} -r ${WRKSRC}/configure.ac.orig ${WRKSRC}/configure.ac
201	@${TOUCH} -r ${WRKSRC}/Makefile.am.orig ${WRKSRC}/Makefile.am
202	.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
203	.if defined(${PATCH_DEBUG})
204	@${ECHO} "===> Applying ${.TARGET} extra-patch-maildir-mtime-nntp"
205	.endif
206	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime-nntp
207	.endif
208	.if ${PORT_OPTIONS:MFORCEBASE64}
209	.if defined(PATCH_DEBUG)
210	@${ECHO} "===> Applying ${.TARGET} extra-patch-forcebase64-nntp"
211	.endif
212	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64-nntp
213	.endif
214
215	post-patch-NNTP-off:
216	.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
217	.if defined(PATCH_DEBUG)
218	@${ECHO} "===> Applying ${.TARGET} extra-patch-maildir-mtime"
219	.endif
220	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime
221	.endif
222	.if ${PORT_OPTIONS:MFORCEBASE64}
223	.if defined(PATCH_DEBUG)
224	@${ECHO} "===> Applying ${.TARGET} extra-patch-forcebase64"
225	.endif
226	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64
227	.endif
228		191
229	post-install:	192	post-install:
230	${INSTALL_MAN} ${FILESDIR}/mailcap.5 ${STAGEDIR}${MANPREFIX}/man/man5	193	${INSTALL_MAN} ${FILESDIR}/mailcap.5 ${STAGEDIR}${MANPREFIX}/man/man5
231		194
232	post-install-NNTP-on:
233	${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}
234
235	pre-configure::	195	pre-configure::
236	@${REINPLACE_CMD} -e 's,?eimdal\),?eimdal\|\"FreeBSD heimdal\"*),' \	196	@${REINPLACE_CMD} -e 's,?eimdal\),?eimdal\|\"FreeBSD heimdal\"*),' \
237	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}	197	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
Lines 256-270 pre-configure-HCACHE_BDB-on: Link Here
256	@${REINPLACE_CMD} -E -e 's/BDB_VERSIONS="/&${BDB_LIB_NAME} db${BDB_VER} /' \	216	@${REINPLACE_CMD} -E -e 's/BDB_VERSIONS="/&${BDB_LIB_NAME} db${BDB_VER} /' \
257	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}	217	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
258		218
259	.if defined (XML_NEEDED) && ${PORT_OPTIONS:MXML}
260	BUILD_DEPENDS+= xsltproc:textproc/libxslt \
261	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
262	lynx:www/lynx
263	.else
264	pre-build::	219	pre-build::
265	@${REINPLACE_CMD} \	220	@${REINPLACE_CMD} -e '/^BUILD_DOC_TARGETS/s/=.*/=/' ${WRKSRC}/doc/Makefile
266	-e '/^BUILD_DOC_TARGETS/s/=.*/=/' \
267	${WRKSRC}/doc/Makefile
268	.endif
269		221
270	.include <bsd.port.mk>	222	.include <bsd.port.mk>

Removed Link Here

(-)a/mail/mutt/files/extra-nntp-depfiles (-12 lines)
1	--- Makefile.in.orig 2018-12-22 21:21:33 UTC
2	+++ Makefile.in
3	@@ -240,7 +240,8 @@ am__depfiles_remade = $(DEPDIR)/mkdtemp.Po $(DEPDIR)/r
4	./$(DEPDIR)/mutt_sasl.Po ./$(DEPDIR)/mutt_socket.Po \
5	./$(DEPDIR)/mutt_ssl.Po ./$(DEPDIR)/mutt_ssl_gnutls.Po \
6	./$(DEPDIR)/mutt_tunnel.Po ./$(DEPDIR)/muttlib.Po \
7	- ./$(DEPDIR)/mx.Po ./$(DEPDIR)/pager.Po ./$(DEPDIR)/parse.Po \
8	+ ./$(DEPDIR)/mx.Po ./$(DEPDIR)/newsrc.Po ./$(DEPDIR)/nntp.Po \
9	+ ./$(DEPDIR)/pager.Po ./$(DEPDIR)/parse.Po \
10	./$(DEPDIR)/patchlist.Po ./$(DEPDIR)/pattern.Po \
11	./$(DEPDIR)/pgp.Po ./$(DEPDIR)/pgpewrap.Po \
12	./$(DEPDIR)/pgpinvoke.Po ./$(DEPDIR)/pgpkey.Po \

Removed Link Here

(-)a/mail/mutt/files/extra-patch-forcebase64-nntp (-37 lines)
1	--- init.h.orig 2017-09-10 22:12:31 UTC
2	+++ init.h
3	@@ -911,6 +911,11 @@ struct option_t MuttVars[] = {
4	** message via mail.
5	*/
6	#endif
7	+ { "force_base64", DT_BOOL, R_NONE, OPTFORCEBASE64, 0 },
8	+ /*
9	+ ** .pp
10	+ ** If you need to encode all text parts to base64, set this option.
11	+ */
12	{ "force_name", DT_BOOL, R_NONE, OPTFORCENAME, 0 },
13	/*
14	** .pp
15	--- mutt.h.orig 2017-09-10 22:12:31 UTC
16	+++ mutt.h
17	@@ -379,6 +379,7 @@ enum
18	OPTFCCCLEAR,
19	OPTFLAGSAFE,
20	OPTFOLLOWUPTO,
21	+ OPTFORCEBASE64,
22	OPTFORCENAME,
23	OPTFORWDECODE,
24	OPTFORWQUOTE,
25	--- sendlib.c.orig 2017-09-10 22:12:31 UTC
26	+++ sendlib.c
27	@@ -1180,7 +1180,9 @@ static void mutt_set_encoding (BODY *b,
28	if (b->type == TYPETEXT)
29	{
30	char *chsname = mutt_get_body_charset (send_charset, sizeof (send_charset), b);
31	- if ((info->lobin && ascii_strncasecmp (chsname, "iso-2022", 8)) \|\| info->linemax > 990 \|\| (info->from && option (OPTENCODEFROM)))
32	+ if (option (OPTFORCEBASE64))
33	+ b->encoding = ENCBASE64;
34	+ else if ((info->lobin && ascii_strncasecmp (chsname, "iso-2022", 8)) \|\| info->linemax > 990 \|\| (info->from && option (OPTENCODEFROM)))
35	b->encoding = ENCQUOTEDPRINTABLE;
36	else if (info->hibin)
37	b->encoding = option (OPTALLOW8BIT) ? ENC8BIT : ENCQUOTEDPRINTABLE;

Lines 1-8 Link Here

(-)b/mail/mutt/files/extra-patch-ifdef (-5 / +5 lines)
1	--- PATCHES.orig 2019-12-14 21:57:56 UTC	1	--- PATCHES.orig 2020-03-29 21:24:30 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-11-30 21:59:38 UTC	5	--- init.c.orig 2020-03-28 18:17:53 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, 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 2019-12-14 19:24:06 UTC	60	--- init.h.orig 2020-03-29 21:24:30 UTC
61	+++ init.h	61	+++ init.h
62	@@ -4503,6 +4503,7 @@ static int parse_lists (BUFFER , BUFFER , union poin	62	@@ -4516,6 +4516,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	@@ -4567,6 +4568,7 @@ const struct command_t Commands[] = {	70	@@ -4580,6 +4581,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 (-5 / +5 lines)
1	--- PATCHES.orig 2019-12-06 03:42:13 UTC	1	--- PATCHES.orig 2020-03-29 21:24:30 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 2019-12-06 03:42:13 UTC	5	--- browser.c.orig 2020-03-28 18:17:53 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 12-18 Link Here
12		12
13	#include <stdlib.h>	13	#include <stdlib.h>
14	#include <dirent.h>	14	#include <dirent.h>
15	@@ -448,6 +449,21 @@ static void init_state (struct browser_state *state, M	15	@@ -430,6 +431,21 @@ static void init_state (struct browser_state *state, M
16	menu->data = state->entry;	16	menu->data = state->entry;
17	}	17	}
18		18
Lines 34-40 Link Here
34	static int examine_directory (MUTTMENU menu, struct browser_state state,	34	static int examine_directory (MUTTMENU menu, struct browser_state state,
35	const char d, const char prefix)	35	const char d, const char prefix)
36	{	36	{
37	@@ -514,6 +530,7 @@ static int examine_directory (MUTTMENU *menu, struct b	37	@@ -496,6 +512,7 @@ static int examine_directory (MUTTMENU *menu, struct b
38	tmp = Incoming;	38	tmp = Incoming;
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;
Lines 42-48 Link Here
42	if (tmp && Context &&	42	if (tmp && Context &&
43	!mutt_strcmp (tmp->realpath, Context->realpath))	43	!mutt_strcmp (tmp->realpath, Context->realpath))
44	{	44	{
45	@@ -592,6 +609,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b	45	@@ -574,6 +591,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

Removed Link Here

(-)a/mail/mutt/files/extra-patch-maildir-mtime-nntp (-52 lines)
1	--- PATCHES.orig 2019-08-15 02:24:43 UTC
2	+++ PATCHES
3	@@ -0,0 +1 @@
4	+patch-1.5.7.ust.maildir-mtime.2
5	--- browser.c.orig 2019-08-15 02:24:39 UTC
6	+++ browser.c
7	@@ -35,6 +35,7 @@
8	#ifdef USE_NNTP
9	#include "nntp.h"
10	#endif
11	+#include "mx.h"
12
13	#include <stdlib.h>
14	#include <dirent.h>
15	@@ -592,6 +593,21 @@ static void init_state (struct browser_state *state, M
16	menu->data = state->entry;
17	}
18
19	+static void check_maildir_times (BUFFY buf, struct stat st)
20	+{
21	+ char buffer[_POSIX_PATH_MAX + SHORT_STRING];
22	+ struct stat s;
23	+
24	+ if(!buf \|\| buf->magic != MUTT_MAILDIR)
25	+ return;
26	+
27	+ snprintf (buffer, sizeof (buffer), "%s/tmp", mutt_b2s(buf->pathbuf));
28	+ if (lstat (buffer, &s) != 0)
29	+ return;
30	+
31	+ st->st_mtime = s.st_mtime;
32	+}
33	+
34	/* get list of all files/newsgroups with mask */
35	static int examine_directory (MUTTMENU menu, struct browser_state state,
36	const char d, const char prefix)
37	@@ -684,6 +700,7 @@ static int examine_directory (MUTTMENU *menu, struct b
38	tmp = Incoming;
39	while (tmp && mutt_strcmp (mutt_b2s (buffer), mutt_b2s (tmp->pathbuf)))
40	tmp = tmp->next;
41	+ check_maildir_times (tmp, &s);
42	if (tmp && Context &&
43	!mutt_strcmp (tmp->realpath, Context->realpath))
44	{
45	@@ -792,6 +809,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b
46	s.st_mtime = st2.st_mtime;
47	}
48
49	+ check_maildir_times (tmp, &s);
50	add_folder (menu, state, mutt_b2s (mailbox), &s, tmp, NULL);
51	}
52	while ((tmp = tmp->next));

Lines 1-10 Link Here

(-)b/mail/mutt/files/extra-patch-reverse_reply (-9 / +9 lines)
1	--- PATCHES.orig 2019-12-06 03:41:41 UTC	1	--- PATCHES.orig 2020-03-29 21:24:31 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-12-06 03:41:41 UTC	5	--- init.h.orig 2020-03-29 21:24:30 UTC
6	+++ init.h	6	+++ init.h
7	@@ -3021,6 +3021,13 @@ struct option_t MuttVars[] = {	7	@@ -3034,6 +3034,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 2019-11-20 20:16:28 UTC	21	--- mutt.h.orig 2020-03-29 21:24:30 UTC
22	+++ mutt.h	22	+++ mutt.h
23	@@ -505,6 +505,7 @@ enum	23	@@ -506,6 +506,7 @@ enum
24	OPTREVALIAS,	24	OPTREVALIAS,
25	OPTREVNAME,	25	OPTREVNAME,
26	OPTREVREAL,	26	OPTREVREAL,
Lines 28-36 Link Here
28	OPTRFC2047PARAMS,	28	OPTRFC2047PARAMS,
29	OPTSAVEADDRESS,	29	OPTSAVEADDRESS,
30	OPTSAVEEMPTY,	30	OPTSAVEEMPTY,
31	--- protos.h.orig 2019-11-01 06:34:06 UTC	31	--- protos.h.orig 2020-03-28 18:17:53 UTC
32	+++ protos.h	32	+++ protos.h
33	@@ -88,6 +88,7 @@ ADDRESS mutt_get_address (ENVELOPE , char **);	33	@@ -87,6 +87,7 @@ ADDRESS mutt_get_address (ENVELOPE , char **);
34	ADDRESS mutt_lookup_alias (const char s);	34	ADDRESS mutt_lookup_alias (const char s);
35	ADDRESS mutt_remove_duplicates (ADDRESS );	35	ADDRESS mutt_remove_duplicates (ADDRESS );
36	ADDRESS mutt_remove_xrefs (ADDRESS , ADDRESS *);	36	ADDRESS mutt_remove_xrefs (ADDRESS , ADDRESS *);
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-11-19 02:15:41 UTC	41	--- send.c.orig 2020-03-28 18:17:53 UTC
42	+++ send.c	42	+++ send.c
43	@@ -723,6 +723,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env)	43	@@ -723,6 +723,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-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-11-08 03:35:30 UTC	54	--- sendlib.c.orig 2020-03-28 18:17:53 UTC
55	+++ sendlib.c	55	+++ sendlib.c
56	@@ -2974,6 +2974,35 @@ static void set_noconv_flags (BODY *b, short flag)	56	@@ -2974,6 +2974,35 @@ static void set_noconv_flags (BODY *b, short flag)
57	}	57	}

Lines 1-6 Link Here

(-)b/mail/mutt/files/extra-patch-smartdate (-4 / +4 lines)
1	--- hdrline.c.orig 2019-11-11 04:00:36 UTC	1	--- hdrline.c.orig 2020-03-29 21:24:30 UTC
2	+++ hdrline.c	2	+++ hdrline.c
3	@@ -248,6 +248,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)
5	* %Z = status flags */	5	* %Z = status flags */
6		6
Lines 90-96 Link Here
90	static const char *	90	static const char *
91	hdr_format_str (char *dest,	91	hdr_format_str (char *dest,
92	size_t destlen,	92	size_t destlen,
93	@@ -421,7 +504,13 @@ hdr_format_str (char *dest,	93	@@ -422,7 +505,13 @@ hdr_format_str (char *dest,
94		94
95	if (!do_locales)	95	if (!do_locales)
96	setlocale (LC_TIME, "C");	96	setlocale (LC_TIME, "C");
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 2019-12-06 03:41:43 UTC	108	--- mutt.h.orig 2020-03-29 21:24:31 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-browser.c (-4 / +4 lines)
1	--- browser.c.orig 2019-11-11 04:00:36 UTC	1	--- browser.c.orig 2020-03-29 21:24:30 UTC
2	+++ browser.c	2	+++ browser.c
3	@@ -86,6 +86,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;
5	struct folder_file pb = (struct folder_file ) b;	5	struct folder_file pb = (struct folder_file ) b;
6		6
Lines 13-19 Link Here
13	int r = mutt_strcoll (pa->display_name, pb->display_name);	13	int r = mutt_strcoll (pa->display_name, pb->display_name);
14		14
15	return ((BrowserSort & SORT_REVERSE) ? -r : r);	15	return ((BrowserSort & SORT_REVERSE) ? -r : r);
16	@@ -96,6 +102,12 @@ static int browser_compare_date (const void *a, const	16	@@ -97,6 +103,12 @@ static int browser_compare_date (const void *a, const
17	struct folder_file pa = (struct folder_file ) a;	17	struct folder_file pa = (struct folder_file ) a;
18	struct folder_file pb = (struct folder_file ) b;	18	struct folder_file pb = (struct folder_file ) b;
19		19
Lines 26-32 Link Here
26	int r = pa->mtime - pb->mtime;	26	int r = pa->mtime - pb->mtime;
27		27
28	return ((BrowserSort & SORT_REVERSE) ? -r : r);	28	return ((BrowserSort & SORT_REVERSE) ? -r : r);
29	@@ -105,6 +117,12 @@ static int browser_compare_size (const void *a, const	29	@@ -106,6 +118,12 @@ static int browser_compare_size (const void *a, const
30	{	30	{
31	struct folder_file pa = (struct folder_file ) a;	31	struct folder_file pa = (struct folder_file ) a;
32	struct folder_file pb = (struct folder_file ) b;	32	struct folder_file pb = (struct folder_file ) b;

Lines 1-10 Link Here

(-)b/mail/mutt/files/patch-date-conditional (-4 / +4 lines)
1	--- PATCHES.orig 2019-12-06 03:41:54 UTC	1	--- PATCHES.orig 2020-03-29 21:24:32 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 2019-12-06 03:41:54 UTC	5	--- hdrline.c.orig 2020-03-29 21:24:31 UTC
6	+++ hdrline.c	6	+++ hdrline.c
7	@@ -427,6 +427,53 @@ hdr_format_str (char *dest,	7	@@ -428,6 +428,53 @@ hdr_format_str (char *dest,
8	const char *cp;	8	const char *cp;
9	struct tm *tm;	9	struct tm *tm;
10	time_t T;	10	time_t T;
Lines 58-64 Link Here
58		58
59	p = dest;	59	p = dest;
60		60
61	--- muttlib.c.orig 2019-10-17 08:01:01 UTC	61	--- muttlib.c.orig 2020-03-28 18:17:53 UTC
62	+++ muttlib.c	62	+++ muttlib.c
63	@@ -1563,7 +1563,16 @@ void mutt_FormatString (char dest, / output buffer	63	@@ -1563,7 +1563,16 @@ void mutt_FormatString (char dest, / output buffer
64	if (*src == '?')	64	if (*src == '?')

Lines 1-4 Link Here

(-)b/mail/mutt/files/patch-smime-sender (-5 / +5 lines)
1	--- commands.c.orig 2019-11-30 21:59:38 UTC	1	--- commands.c.orig 2020-02-21 20:17:47 UTC
2	+++ commands.c	2	+++ commands.c
3	@@ -285,7 +285,7 @@ int mutt_display_message (HEADER *cur)	3	@@ -285,7 +285,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-12-14 21:58:25 UTC	12	--- init.h.orig 2020-03-29 21:24:31 UTC
13	+++ init.h	13	+++ init.h
14	@@ -3518,6 +3518,15 @@ struct option_t MuttVars[] = {	14	@@ -3531,6 +3531,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 2019-12-14 21:58:25 UTC	30	--- mutt.h.orig 2020-03-29 21:24:31 UTC
31	+++ mutt.h	31	+++ mutt.h
32	@@ -587,6 +587,7 @@ enum	32	@@ -588,6 +588,7 @@ enum
33	OPTSMIMEISDEFAULT,	33	OPTSMIMEISDEFAULT,
34	OPTSMIMESELFENCRYPT,	34	OPTSMIMESELFENCRYPT,
35	OPTASKCERTLABEL,	35	OPTASKCERTLABEL,