Index: head/mail/mutt/Makefile =================================================================== --- head/mail/mutt/Makefile (revision 470573) +++ head/mail/mutt/Makefile (revision 470574) @@ -1,277 +1,277 @@ # Created by: Udo Schweigert # $FreeBSD$ PORTNAME= mutt -DISTVERSION= 1.9.5 -PORTREVISION?= 1 +DISTVERSION= 1.10.0 +PORTREVISION?= 0 CATEGORIES+= mail ipv6 MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \ https://bitbucket.org/mutt/mutt/downloads/ \ ftp://ftp.demon.co.uk/pub/mirrors/mutt/ \ http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DIST_SUBDIR= mutt EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} PATCH_SITES+= http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ http://vc.org.ua/mutt/:vc PATCH_DIST_STRIP= -p1 MAINTAINER?= dereks@lifeofadishwasher.com COMMENT?= Small but powerful text based program for read/writing e-mail LICENSE= GPLv2+ CONFLICTS?= ja-mutt-[0-9]* ja-mutt-devel-[0-9]* mutt-1.4* mutt-devel-lite-[0-9]* mutt-lite-[0-9]* zh-mutt-devel-[0-9]* DOCSDIR?= ${PREFIX}/share/doc/mutt EXAMPLESDIR?= ${PREFIX}/share/examples/mutt DATADIR?= ${PREFIX}/share/mutt CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" CONFIGURE_ARGS= --disable-fcntl --with-ssl=${OPENSSLBASE} \ --with-docdir=${DOCSDIR} --sysconfdir=${PREFIX}/etc \ --enable-external-dotlock --enable-pop --enable-imap \ --enable-compressed --enable-sidebar USES+= cpe ncurses shebangfix ssl SHEBANG_FILES= doc/gen-map-doc smime_keys.pl contrib/smime_keys_test.pl .if defined(MUTT_CONFIGURE_ARGS) CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS} .endif GNU_CONFIGURE= yes OPTIONS_SUB= yes .if defined (MUTT_LITE) OPTIONS_EXCLUDE= NLS DOCS EXAMPLES .else OPTIONS_DEFINE= SASL DEBUG DOCS EXAMPLES FLOCK \ FORCEBASE64 GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \ LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \ NLS NNTP QUOTE_PATCH REVERSE_REPLY_PATCH SMART_DATE \ SMIME_OUTLOOK_COMPAT SMTP URLVIEW XML OPTIONS_SINGLE= GSSAPI HCACHE SCREEN OPTIONS_RADIO= SPELL OPTIONS_RADIO_SPELL= ASPELL ISPELL OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_SINGLE_HCACHE= HCACHE_BDB HCACHE_TOKYOCABINET HCACHE_KYOTOCABINET HCACHE_NONE OPTIONS_SINGLE_SCREEN= NCURSES SLANG SASL_DESC= SASL authentication DEBUG_DESC= Debugging capabilities FLOCK_DESC= flock() usage FORCEBASE64_DESC= Option to force base64 encoding for compose GPGME_DESC= Gpgme interface GREETING_PATCH_DESC= Greeting support HTML_DESC= HTML documentation IDN_DESC= International Domain Names (implies ICONV) IFDEF_PATCH_DESC= ifdef feature LOCALES_FIX_DESC= Locales fix MAILBOX_MANPAGES_DESC= Install mbox.5/mmdf.5 manpages MAILDIR_MTIME_PATCH_DESC= Maildir mtime patch NCURSES_DESC= Ncurses support NLS_DESC= Native language support (implies ICONV) QUOTE_PATCH_DESC= Extended quoting REVERSE_REPLY_PATCH_DESC= Reverse_reply SLANG_DESC= SLANG support SMART_DATE_DESC= Dynamic date formatting with "%@" SMIME_OUTLOOK_COMPAT_DESC= SMIME outlook compatibility SMTP_DESC= SMTP relay support HCACHE_DESC= Header Cache support HCACHE_BDB_DESC= Use Berkeley DB (BDB) HCACHE_TOKYOCABINET_DESC= Use Tokyo Cabinet HCACHE_KYOTOCABINET_DESC= Use Kyoto Cabinet HCACHE_NONE_DESC= Disable Header Cache URLVIEW_DESC= Use urlview for the URL selector menu XML_DESC= Use XML tools for rebuilding documentation OPTIONS_DEFAULT= GPGME HTML HCACHE_BDB ICONV IDN \ IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \ NLS NCURSES QUOTE_PATCH REVERSE_REPLY_PATCH SMART_DATE \ SMIME_OUTLOOK_COMPAT SASL SMTP URLVIEW XML GSSAPI_NONE .endif RUN_DEPENDS+= ${LOCALBASE}/etc/mime.types:misc/mime-support .if !defined (MUTT_LITE) ASPELL_BUILD_DEPENDS= aspell:textproc/aspell ASPELL_RUN_DEPENDS= aspell:textproc/aspell ISPELL_BUILD_DEPENDS= ispell:textproc/aspell-ispell ISPELL_RUN_DEPENDS= ispell:textproc/aspell-ispell URLVIEW_RUN_DEPENDS= urlview:textproc/urlview .endif .if defined (MUTT_LITE) PKGNAMESUFFIX= -lite USES+= ncurses PLIST_SUB+= MAILBOX_MANPAGES="" PLIST_SUB+= HTML="@comment " PLIST_SUB+= NNTP="@comment " # XXX bug in bpm ? PLIST_SUB+= NLS="@comment " CONFIGURE_ARGS+= --disable-nls --disable-iconv --without-idn .endif .ifmake makesum # for optional distfiles patchfiles PORT_DBDIR= /dev/null OPTIONS_DEFAULT= ${OPTIONS_DEFINE} .endif DEBUG_CONFIGURE_ON= --enable-debug # Handle ncurses/ncurses-port/slang SLANG_CONFIGURE_ON= --with-slang=${LOCALBASE} SLANG_LIB_DEPENDS= libslang.so:devel/libslang2 SLANG_VARS= PKGMESSAGE=${FILESDIR}/pkg-message.slang NCURSES_USES= ncurses NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls NLS_IMPLIES= ICONV # Handle GSSAPI from various places GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_NONE_CONFIGURE_ON= --without-gss HCACHE_NONE_CONFIGURE_ON= --disable-hcache HCACHE_NONE_CONFIGURE_OFF= --enable-hcache --without-qdbm --without-gdbm HCACHE_BDB_CONFIGURE_WITH= bdb HCACHE_BDB_USES= bdb:42+ HCACHE_TOKYOCABINET_CONFIGURE_WITH= tokyocabinet HCACHE_TOKYOCABINET_LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet HCACHE_KYOTOCABINET_CONFIGURE_WITH= kyotocabinet HCACHE_KYOTOCABINET_LIB_DEPENDS= libkyotocabinet.so:databases/kyotocabinet ICONV_USES= iconv:translit ICONV_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG} ICONV_CONFIGURE_OFF= --disable-iconv ASPELL_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-aspell REVERSE_REPLY_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-reverse_reply SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASL_CONFIGURE_ON= --with-sasl=${LOCALBASE} SMIME_OUTLOOK_COMPAT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-smime-outlook SMART_DATE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-smartdate FLOCK_CONFIGURE_ENABLE= flock LOCALES_FIX_CONFIGURE_ON= --enable-locales-fix -IDN_LIB_DEPENDS= libidn.so:dns/libidn -IDN_CONFIGURE_WITH= idn +IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 +IDN_CONFIGURE_WITH= idn2 IDN_IMPLIES= ICONV IFDEF_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ifdef GPGME_LIB_DEPENDS+= libgpgme.so:security/gpgme GPGME_LIB_DEPENDS+= libgpg-error.so:security/libgpg-error GPGME_LIB_DEPENDS+= libassuan.so:security/libassuan GPGME_CONFIGURE_ENABLE= gpgme SMTP_CONFIGURE_ENABLE= smtp GREETING_PATCH_PATCHFILES= mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \ patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv +NNTP_BROKEN= NNTP Patch needs updated for 1.10.x NNTP_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:-p1:vvv 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 # un/comment as each VERSION is created for PORTVERSION -#VVV_PATCH_VERSION= 1.9.5 -#GREETING_PATCH_VERSION= 1.9.5 +VVV_PATCH_VERSION= 1.9.5 +GREETING_PATCH_VERSION= 1.9.5 .if !defined(VVV_PATCH_VERSION) VVV_PATCH_VERSION= ${PORTVERSION} .endif .if !defined(GREETING_PATCH_VERSION) GREETING_PATCH_VERSION= ${PORTVERSION} .endif LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath=${LOCALBASE}/lib:/usr/lib -ltinfow 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} @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime-nntp .endif .if ${PORT_OPTIONS:MFORCEBASE64} @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64-nntp .endif post-patch-NNTP-off: .if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH} @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime .endif .if ${PORT_OPTIONS:MFORCEBASE64} @${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} WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} pre-configure:: @${REINPLACE_CMD} -e 's,?eimdal\*),?eimdal*|\"FreeBSD heimdal\"*),' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \ ${WRKSRC}/contrib/gpg.rc @${REINPLACE_CMD} -e 's,pgp6,pgp,g' \ ${WRKSRC}/contrib/pgp6.rc @${REINPLACE_CMD} -E -e 's#(/samples|samples/)#share/examples/mutt#g' \ ${WRKSRC}/doc/reference.html \ ${WRKSRC}/doc/manual.html \ ${WRKSRC}/doc/manual.txt \ ${WRKSRC}/doc/Muttrc \ ${WRKSRC}/INSTALL \ ${WRKSRC}/init.h @${REINPLACE_CMD} -e 's#$$(docdir)/samples#${EXAMPLESDIR}#g' \ ${WRKSRC}/contrib/Makefile.in pre-configure-HCACHE_BDB-on: @${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 's,manual.html stamp-doc-rc stamp-doc-chunked manual.txt,stamp-doc-rc,' \ ${WRKSRC}/doc/Makefile .endif .include Index: head/mail/mutt/distinfo =================================================================== --- head/mail/mutt/distinfo (revision 470573) +++ head/mail/mutt/distinfo (revision 470574) @@ -1,11 +1,11 @@ -TIMESTAMP = 1524260157 -SHA256 (mutt/mutt-1.9.5.tar.gz) = bf617e64ae4e08a998bef8e42a965a211587e051f1437a3a4884b351a9385753 -SIZE (mutt/mutt-1.9.5.tar.gz) = 4207937 +TIMESTAMP = 1526775216 +SHA256 (mutt/mutt-1.10.0.tar.gz) = 0215b5f90ef9cc33441a6ca842379b64412ed7f8da83ed68bfaa319179f5535b +SIZE (mutt/mutt-1.10.0.tar.gz) = 4249980 SHA256 (mutt/mutt-1.9.5.vc.greeting) = b4ac804c24a07c7eb8330ebfdc94cdbf6fd7a4671badfb32fb611df09c008317 SIZE (mutt/mutt-1.9.5.vc.greeting) = 4534 SHA256 (mutt/patch-1.9.5.vvv.nntp.gz) = fdb7021ff9a5085175b56d5d896a14c314b64fcc074860292fe3299b5efca584 SIZE (mutt/patch-1.9.5.vvv.nntp.gz) = 60668 SHA256 (mutt/patch-1.9.5.vvv.initials.gz) = 9670c70c2d1cd10630ae55cbc58b91e2d54402114db9959bec4a05f6a0f0ffbc SIZE (mutt/patch-1.9.5.vvv.initials.gz) = 681 SHA256 (mutt/patch-1.9.5.vvv.quote.gz) = 89c99727478c63dd83bc9b8d44f8881abfb6c07aea185f46fd602fbd05827d7f SIZE (mutt/patch-1.9.5.vvv.quote.gz) = 1279 Index: head/mail/mutt/files/extra-patch-aspell =================================================================== --- head/mail/mutt/files/extra-patch-aspell (revision 470573) +++ head/mail/mutt/files/extra-patch-aspell (revision 470574) @@ -1,11 +1,11 @@ ---- doc/Muttrc.head.orig 2017-04-12 23:01:06 UTC +--- doc/Muttrc.head.orig 2018-05-19 20:33:53 UTC +++ doc/Muttrc.head -@@ -34,6 +34,8 @@ bind browser y exit +@@ -35,6 +35,8 @@ # close-hook '\.gz$' "gzip -c '%t' > '%f'" # append-hook '\.gz$' "gzip -c '%t' >> '%f'" +set ispell="/usr/local/bin/aspell --mode=email check" + # If Mutt is unable to determine your site's domain name correctly, you can # set the default here. # Index: head/mail/mutt/files/extra-patch-ifdef =================================================================== --- head/mail/mutt/files/extra-patch-ifdef (revision 470573) +++ head/mail/mutt/files/extra-patch-ifdef (revision 470574) @@ -1,77 +1,77 @@ ---- PATCHES.orig 2017-09-04 23:34:26 UTC +--- init.h.orig 2018-05-19 23:45:18 UTC ++++ init.h +@@ -4114,6 +4114,7 @@ + static int parse_unlists (BUFFER *, BUFFER *, unsigned long, BUFFER *); + static int parse_alias (BUFFER *, BUFFER *, unsigned long, BUFFER *); + static int parse_unalias (BUFFER *, BUFFER *, unsigned long, BUFFER *); ++static int parse_ifdef (BUFFER *, BUFFER *, unsigned long, BUFFER *); + static int parse_echo (BUFFER *, BUFFER *, unsigned long, BUFFER *); + static int parse_ignore (BUFFER *, BUFFER *, unsigned long, BUFFER *); + static int parse_unignore (BUFFER *, BUFFER *, unsigned long, BUFFER *); +@@ -4178,6 +4178,7 @@ + { "hdr_order", parse_list, UL &HeaderOrderList }, + #ifdef HAVE_ICONV + { "iconv-hook", mutt_parse_hook, MUTT_ICONVHOOK }, ++ { "ifdef", parse_ifdef, 0 }, + #endif + { "ignore", parse_ignore, 0 }, + { "lists", parse_lists, 0 }, +--- PATCHES.orig 2018-05-19 23:44:00 UTC +++ PATCHES @@ -0,0 +1 @@ +patch-1.5.4.cd.ifdef.1 ---- init.c.orig 2017-09-04 23:34:22 UTC +--- init.c.orig 2018-05-19 23:44:00 UTC +++ init.c -@@ -656,6 +656,52 @@ static mbchar_table *parse_mbchar_table +@@ -650,6 +650,52 @@ return t; } +static int parse_ifdef (BUFFER *tmp, BUFFER *s, unsigned long data, BUFFER *err) +{ + int i, j, res = 0; + BUFFER token; + + memset (&token, 0, sizeof (token)); + mutt_extract_token (tmp, s, 0); + + /* is the item defined as a variable or a function? */ + 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); + + if (!b) + continue; + + for (j = 0; b[j].name; j++) + if (!ascii_strncasecmp (tmp->data, b[j].name, mutt_strlen (tmp->data)) + && (mutt_strlen (b[j].name) == mutt_strlen (tmp->data))) + { + res = 1; + break; + } + } + + if (!MoreArgs (s)) + { + snprintf (err->data, err->dsize, _("ifdef: too few arguments")); + return (-1); + } + mutt_extract_token (tmp, s, MUTT_TOKEN_SPACE); + + if (res) + { + if (mutt_parse_rc_line (tmp->data, &token, err) == -1) + { + mutt_error ("Erreur: %s", err->data); + FREE (&token.data); + return (-1); + } + FREE (&token.data); + } + return 0; +} + static int parse_unignore (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) { do ---- init.h.orig 2017-09-04 23:34:22 UTC -+++ init.h -@@ -4037,6 +4037,7 @@ static int parse_lists (BUFFER *, BUFFER - static int parse_unlists (BUFFER *, BUFFER *, unsigned long, BUFFER *); - static int parse_alias (BUFFER *, BUFFER *, unsigned long, BUFFER *); - static int parse_unalias (BUFFER *, BUFFER *, unsigned long, BUFFER *); -+static int parse_ifdef (BUFFER *, BUFFER *, unsigned long, BUFFER *); - static int parse_ignore (BUFFER *, BUFFER *, unsigned long, BUFFER *); - static int parse_unignore (BUFFER *, BUFFER *, unsigned long, BUFFER *); - static int parse_source (BUFFER *, BUFFER *, unsigned long, BUFFER *); -@@ -4099,6 +4100,7 @@ const struct command_t Commands[] = { - { "hdr_order", parse_list, UL &HeaderOrderList }, - #ifdef HAVE_ICONV - { "iconv-hook", mutt_parse_hook, MUTT_ICONVHOOK }, -+ { "ifdef", parse_ifdef, 0 }, - #endif - { "ignore", parse_ignore, 0 }, - { "lists", parse_lists, 0 }, Index: head/mail/mutt/files/extra-patch-maildir-mtime =================================================================== --- head/mail/mutt/files/extra-patch-maildir-mtime (revision 470573) +++ head/mail/mutt/files/extra-patch-maildir-mtime (revision 470574) @@ -1,52 +1,52 @@ ---- PATCHES.orig 2017-09-04 15:19:31.167205000 -0400 -+++ PATCHES 2017-09-04 15:19:31.168636000 -0400 +--- PATCHES.orig 2018-05-19 21:17:16 UTC ++++ PATCHES @@ -0,0 +1 @@ +patch-1.5.7.ust.maildir-mtime.2 ---- browser.c.orig 2017-09-04 15:19:27.714342000 -0400 -+++ browser.c 2017-09-04 15:19:31.178678000 -0400 +--- browser.c.orig 2018-05-19 20:33:53 UTC ++++ browser.c @@ -32,6 +32,7 @@ #ifdef USE_IMAP #include "imap.h" #endif +#include "mx.h" #include #include -@@ -413,6 +414,21 @@ +@@ -439,6 +439,21 @@ 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", buf->path); + if (lstat (buffer, &s) != 0) + return; + + st->st_mtime = s.st_mtime; +} + static int examine_directory (MUTTMENU *menu, struct browser_state *state, char *d, const char *prefix) { -@@ -476,6 +492,7 @@ +@@ -504,6 +504,7 @@ tmp = Incoming; while (tmp && mutt_strcmp (buffer, tmp->path)) tmp = tmp->next; + check_maildir_times (tmp, &s); if (tmp && Context && !mutt_strcmp (tmp->realpath, Context->realpath)) { -@@ -549,6 +566,7 @@ +@@ -578,6 +578,7 @@ s.st_mtime = st2.st_mtime; } + check_maildir_times (tmp, &s); add_folder (menu, state, buffer, &s, tmp); } while ((tmp = tmp->next)); Index: head/mail/mutt/files/extra-patch-reverse_reply =================================================================== --- head/mail/mutt/files/extra-patch-reverse_reply (revision 470573) +++ head/mail/mutt/files/extra-patch-reverse_reply (revision 470574) @@ -1,91 +1,92 @@ ---- PATCHES.orig 2017-09-04 23:35:30 UTC +--- PATCHES.orig 2018-05-19 20:39:17 UTC +++ PATCHES -@@ -0,0 +1 @@ +@@ -1 +1,2 @@ +patch-1.5.6.cb.reverse_reply.2 ---- init.h.orig 2017-09-04 23:35:27 UTC + patch-1.5.4.cd.ifdef.1 +--- init.h.orig 2018-05-19 20:37:42 UTC +++ init.h -@@ -2687,6 +2687,13 @@ struct option_t MuttVars[] = { +@@ -2748,6 +2748,13 @@ ** possibly including eventual real names. When it is \fIunset\fP, mutt will ** override any such real names with the setting of the $$realname variable. */ + { "reverse_reply", DT_BOOL, R_NONE, OPTREVREPLY, 0 }, + /* + ** .pp + ** When set, this variable uses the name from your aliases in the To and Cc + ** headers of reply mails you send, like $reverse_alias does in the index. + ** When unset, the headers taken from the original mail are left unchanged. + */ { "rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0 }, /* ** .pp ---- mutt.h.orig 2017-09-04 23:35:27 UTC +--- mutt.h.orig 2018-05-19 20:36:22 UTC +++ mutt.h -@@ -448,6 +448,7 @@ enum +@@ -466,6 +466,7 @@ OPTREVALIAS, OPTREVNAME, OPTREVREAL, + OPTREVREPLY, OPTRFC2047PARAMS, OPTSAVEADDRESS, OPTSAVEEMPTY, ---- protos.h.orig 2017-09-04 23:35:27 UTC +--- protos.h.orig 2018-05-19 20:33:53 UTC +++ protos.h -@@ -93,6 +93,7 @@ ADDRESS *mutt_get_address (ENVELOPE *, c +@@ -93,6 +93,7 @@ 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 2017-09-04 23:35:27 UTC +--- send.c.orig 2018-05-19 20:33:53 UTC +++ send.c -@@ -598,6 +598,10 @@ void mutt_fix_reply_recipients (ENVELOPE +@@ -598,6 +598,10 @@ /* the CC field can get cluttered, especially with lists */ env->to = mutt_remove_duplicates (env->to); env->cc = mutt_remove_duplicates (env->cc); + if (option (OPTREVREPLY)){ + env->to = mutt_reverse_address (env->to); + env->cc = mutt_reverse_address (env->cc); + } env->cc = mutt_remove_xrefs (env->to, env->cc); if (env->cc && !env->to) ---- sendlib.c.orig 2017-09-04 23:35:27 UTC +--- sendlib.c.orig 2018-05-19 20:33:53 UTC +++ sendlib.c -@@ -2753,6 +2753,35 @@ static void set_noconv_flags (BODY *b, s +@@ -2753,6 +2753,35 @@ } } +/* given a list of addresses, return a list of reverse_alias'ed addresses */ +ADDRESS *mutt_reverse_address (ADDRESS *addr) +{ + ADDRESS *top,*tmp,*alias; + + if (addr == NULL) + return NULL; + + if ((alias = alias_reverse_lookup (addr)) && alias->personal) { + tmp = rfc822_cpy_adr_real(alias); + tmp->next = addr->next; + addr->next = NULL; + rfc822_free_address(&addr); + addr = tmp; + } + + for (top = addr; top->next != NULL; top = tmp) { + tmp = top->next; + if ((alias = alias_reverse_lookup (tmp)) && alias->personal) { + top->next = rfc822_cpy_adr_real(alias); + top->next->next = tmp->next; + tmp->next = NULL; + rfc822_free_address(&tmp); + tmp = top->next; + } + } + return addr; +} + int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid, int post, char *fcc) { CONTEXT f; Index: head/mail/mutt/files/extra-patch-smartdate =================================================================== --- head/mail/mutt/files/extra-patch-smartdate (revision 470573) +++ head/mail/mutt/files/extra-patch-smartdate (revision 470574) @@ -1,126 +1,126 @@ ---- hdrline.c.orig 2018-01-27 22:22:49 UTC +--- hdrline.c.orig 2018-05-19 20:36:17 UTC +++ hdrline.c -@@ -249,6 +249,89 @@ static char *apply_subject_mods (ENVELOP +@@ -249,6 +249,89 @@ * %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label) * %Z = status flags */ +static void +format_smartdate( char *buf, size_t max, struct tm *tm, smartdate_type type ) +{ + char *strftime_fmt = NULL; + + switch( type ) { + case FUTURE: /* Date in the future */ + strftime_fmt = "%d%h%y!"; + break; + case SMARTTIME: /* Today */ + strftime_fmt = "%I:%M %p"; + break; + case YESTERDAY: /* Yesterday */ + strncpy( buf, "Yesterday", max ); + break; + case WEEKDAY: /* Within the last 7 days */ + strftime_fmt = "%A"; + break; + case STANDARD: /* Within the last six months */ + strftime_fmt = "%h %d"; + break; + case ANCIENT: /* Older than 6 months */ + strftime_fmt = "%h %Y"; + break; + } + + if( strftime_fmt != NULL ) { + strftime( buf, max, strftime_fmt, tm ); + } +} + +static void +smartdate( char *buf, size_t max, struct tm *tm ) +{ + smartdate_type type = 0; + + struct tm now; + + time_t sse = mktime( tm ); /* Seconds since epoch */ + time_t sse_now = time(NULL); /* Seconds since epoch until now */ + + int dse = 0; /* Days since epoch */ + int dse_now = 0; /* Days since epoch until today */ + + /* Calculate the number of days since epoch */ + dse = sse / (60*60*24); + dse_now = sse_now / (60*60*24); + + /* Default display type */ + type = STANDARD; + + /* Check if the date is in the future */ + if( dse > dse_now ) { + type = FUTURE; + } + else { + int diff = dse_now - dse; + if( diff == 0 ) type = SMARTTIME; + else if( diff == 1 ) type = YESTERDAY; + else if( diff < 7 ) type = WEEKDAY; + else if( diff > 215 ) type = ANCIENT; /* Surely older than six + months */ + else if( diff > 180 ) { + /* + * Slightly heavy calculation to check if the date is more + * than six months in the past. This calculation uses + * calendar months and not the exact number of days. So, + * January 31, 2003 would be considered more than six months + * old whether today's date is August 1 or August 31, 2003 + */ + int monthdiff; + localtime_r( &sse_now, &now ); + monthdiff = ( now.tm_mon - tm->tm_mon ) + + ( ( now.tm_year - tm->tm_year ) * 12 ); + if( monthdiff > 6 ) { + type = ANCIENT; + } + } + } + + format_smartdate( buf, max, tm, type ); +} + static const char * hdr_format_str (char *dest, size_t destlen, -@@ -422,7 +505,13 @@ hdr_format_str (char *dest, +@@ -422,7 +505,13 @@ if (!do_locales) setlocale (LC_TIME, "C"); - strftime (buf2, sizeof (buf2), dest, tm); + /* Identify the non-strftime smartdate pattern (%@) */ + if( strncmp( dest, "%@", 2 ) == 0 ) { + smartdate( buf2, sizeof( buf2 ), tm ); + } + else { + strftime (buf2, sizeof (buf2), dest, tm); + } if (!do_locales) setlocale (LC_TIME, ""); ---- mutt.h.orig 2018-01-27 22:22:49 UTC +--- mutt.h.orig 2018-05-19 20:44:10 UTC +++ mutt.h -@@ -134,6 +134,16 @@ typedef enum +@@ -148,6 +148,16 @@ MUTT_FORMAT_NOFILTER = (1<<7) /* do not allow filtering on this pass */ } format_flag; +/* flags for SmartDate */ +typedef enum { + FUTURE = 1, + SMARTTIME = 2, + YESTERDAY = 3, + WEEKDAY = 4, + STANDARD = 5, + ANCIENT = 6 +} smartdate_type; + /* types for mutt_add_hook() */ #define MUTT_FOLDERHOOK 1 #define MUTT_MBOXHOOK (1<<1) Index: head/mail/mutt/files/extra-patch-smime-outlook =================================================================== --- head/mail/mutt/files/extra-patch-smime-outlook (revision 470573) +++ head/mail/mutt/files/extra-patch-smime-outlook (revision 470574) @@ -1,11 +1,11 @@ ---- crypt.c.orig 2017-05-30 19:27:52 UTC +--- crypt.c.orig 2018-05-19 20:33:53 UTC +++ crypt.c -@@ -491,7 +491,7 @@ int mutt_is_application_smime (BODY *m) +@@ -501,7 +501,7 @@ { len++; if (!ascii_strcasecmp ((t+len), "p7m")) -#if 0 +#if 1 return SMIMEENCRYPT; #else /* Not sure if this is the correct thing to do, but Index: head/mail/mutt/files/patch-Makefile.in =================================================================== --- head/mail/mutt/files/patch-Makefile.in (revision 470573) +++ head/mail/mutt/files/patch-Makefile.in (revision 470574) @@ -1,30 +1,30 @@ ---- Makefile.in.orig 2018-03-04 01:36:55 UTC +--- Makefile.in.orig 2018-05-19 20:48:16 UTC +++ Makefile.in -@@ -471,7 +471,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign +@@ -471,7 +471,7 @@ @BUILD_DOC_TRUE@DOC_SUBDIR = doc @BUILD_IMAP_TRUE@IMAP_SUBDIR = imap @BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap -SUBDIRS = m4 po intl $(DOC_SUBDIR) contrib $(IMAP_SUBDIR) +SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) . $(DOC_SUBDIR) bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET) @BUILD_HCACHE_TRUE@HCVERSION = hcversion.h BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c $(HCVERSION) -@@ -1357,18 +1357,9 @@ install-exec-hook: +@@ -1355,18 +1355,9 @@ rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \ ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \ fi - if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x$(DOTLOCK_GROUP) != x ; then \ - chgrp $(DOTLOCK_GROUP) $(DESTDIR)$(bindir)/mutt_dotlock && \ - chmod $(DOTLOCK_PERMISSION) $(DESTDIR)$(bindir)/mutt_dotlock || \ - { echo "Can't fix mutt_dotlock's permissions! This is required to lock mailboxes in the mail spool directory." >&2 ; exit 1 ; } \ - fi install-data-local: $(MKDIR_P) $(DESTDIR)$(sysconfdir) - $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/mime.types.dist - -if [ ! -f $(DESTDIR)$(sysconfdir)/mime.types ]; then \ - $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir); \ - fi uninstall-local: for i in mime.types ; do \ Index: head/mail/mutt/files/patch-doc_Muttrc =================================================================== --- head/mail/mutt/files/patch-doc_Muttrc (revision 470573) +++ head/mail/mutt/files/patch-doc_Muttrc (revision 470574) @@ -1,10 +1,10 @@ ---- doc/Muttrc.orig 2016-10-08 19:48:13 UTC +--- doc/Muttrc.orig 2018-05-19 20:52:48 UTC +++ doc/Muttrc -@@ -649,6 +649,7 @@ attachments -I message/external-body +@@ -709,6 +709,7 @@ # will be saved for later references. Also see $record, # $save_name, $force_name and ``fcc-hook''. # +set followup_to=no # # set crypt_autoencrypt=no # Index: head/mail/mutt/files/patch-smime-sender =================================================================== --- head/mail/mutt/files/patch-smime-sender (revision 470573) +++ head/mail/mutt/files/patch-smime-sender (revision 470574) @@ -1,39 +1,39 @@ --- commands.c.orig 2017-09-08 22:18:16 UTC +++ commands.c -@@ -185,7 +185,7 @@ int mutt_display_message (HEADER *cur) +@@ -186,7 +186,7 @@ int mutt_display_message (HEADER *cur) { if (cur->security & GOODSIGN) { - if (!crypt_smime_verify_sender(cur)) + if (option(OPTSMIMENOSENDER) || !crypt_smime_verify_sender(cur)) mutt_message ( _("S/MIME signature successfully verified.")); else mutt_error ( _("S/MIME certificate owner does not match sender.")); --- init.h.orig 2017-09-08 22:18:16 UTC +++ init.h -@@ -3099,6 +3099,15 @@ struct option_t MuttVars[] = { +@@ -3160,6 +3169,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_dont_check_sender", DT_BOOL, R_NONE, OPTSMIMENOSENDER, 0 }, + /* + ** .pp + ** This flag controls wether you want the skip the check for the sender's + ** email address against the email address stored in the certificate. + ** This can be useful if most of your email senders use SMIMEv3 which no + ** longer needs email-addresses as part of the certificates. + ** It is not set by default. + */ - { "smime_sign_as", DT_SYN, R_NONE, UL "smime_default_key", 0 }, + { "smime_self_encrypt_as", DT_SYN, R_NONE, UL "smime_default_key", 0 }, { "smime_default_key", DT_STR, R_NONE, UL &SmimeDefaultKey, 0 }, /* --- mutt.h.orig 2017-09-08 22:18:16 UTC +++ mutt.h -@@ -521,6 +521,7 @@ enum +@@ -539,6 +540,7 @@ enum OPTSMIMEISDEFAULT, OPTSMIMESELFENCRYPT, OPTASKCERTLABEL, + OPTSMIMENOSENDER, OPTSDEFAULTDECRYPTKEY, OPTPGPIGNORESUB, OPTPGPCHECKEXIT, Index: head/mail/mutt/files/patch-threadcomplete =================================================================== --- head/mail/mutt/files/patch-threadcomplete (revision 470573) +++ head/mail/mutt/files/patch-threadcomplete (revision 470574) @@ -1,37 +1,37 @@ ---- mutt.h.orig 2017-09-04 23:39:03 UTC +--- mutt.h.orig 2018-05-19 21:17:16 UTC +++ mutt.h -@@ -211,6 +211,7 @@ enum +@@ -225,6 +225,7 @@ MUTT_EXPIRED, MUTT_SUPERSEDED, MUTT_TRASH, + MUTT_THREADCOMPLETE, /* actions for mutt_pattern_comp/mutt_pattern_exec */ MUTT_AND, ---- pattern.c.orig 2017-09-04 23:39:03 UTC +--- pattern.c.orig 2018-05-19 20:33:53 UTC +++ pattern.c -@@ -56,6 +56,7 @@ static const struct pattern_flags +@@ -57,6 +57,7 @@ } Flags[] = { + { '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 }, -@@ -1270,6 +1271,16 @@ mutt_pattern_exec (struct pattern_t *pat +@@ -1294,6 +1295,16 @@ else result = mutt_is_list_cc (pat->alladdr, h->env->to, h->env->cc); return (pat->not ^ result); + case MUTT_THREADCOMPLETE: + { static pattern_t tmp; + static short pattern_set = 0; + if(! pattern_set) { + memset (&tmp, 0, sizeof (tmp)); + tmp.op = MUTT_TAG; + pattern_set = 1; + } + return (pat->not ^ (h->env && match_threadcomplete(&tmp, flags, ctx, h->thread, 1, 1, 1, 1))); + } case MUTT_SUBSCRIBED_LIST: if (cache) {