Index: mail/mutt/Makefile =================================================================== --- mail/mutt/Makefile +++ mail/mutt/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= mutt -PORTVERSION= 1.8.2 -PORTREVISION?= 1 +PORTVERSION= 1.8.3 +PORTREVISION?= 0 CATEGORIES+= mail ipv6 MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \ @@ -17,10 +17,10 @@ PATCH_SITES+= http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ - https://www.schrab.com/aaron/mutt/:ats \ + https://github.com/aschrab/mutt/compare/dev-base...feature/:ats \ http://vc.org.ua/mutt/:vc PATCH_DIST_STRIP= -p1 -PATCHFILES= patch-1.7.0.ats.date_conditional.1:ats +PATCHFILES= date-conditional.diff:ats MAINTAINER?= dereks@lifeofadishwasher.com COMMENT?= Small but powerful text based program for read/writing e-mail @@ -187,6 +187,8 @@ IDN_CONFIGURE_WITH= idn 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 @@ -212,8 +214,8 @@ .include # un/comment as each VERSION is created for PORTVERSION -#VVV_PATCH_VERSION= 1.8.0 -#GREETING_PATCH_VERSION= 1.8.1 +VVV_PATCH_VERSION= 1.8.2 +#GREETING_PATCH_VERSION= 1.8.3 .if !defined(VVV_PATCH_VERSION) VVV_PATCH_VERSION= ${PORTVERSION} @@ -264,12 +266,9 @@ post-install-NNTP-on: ${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR} -post-patch-IFDEF_PATCH-on: - @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-ifdef - WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} -post-patch: +pre-configure:: @${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \ ${WRKSRC}/contrib/gpg.rc @${REINPLACE_CMD} -e 's,pgp6,pgp,g' \ Index: mail/mutt/distinfo =================================================================== --- mail/mutt/distinfo +++ mail/mutt/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1494678618 -SHA256 (mutt/mutt-1.8.2.tar.gz) = 1d057bf1b565f2c38ee50c9a661654cbbe4165f98e25bfa361ebbd707d96f235 -SIZE (mutt/mutt-1.8.2.tar.gz) = 4118429 +TIMESTAMP = 1496461712 +SHA256 (mutt/mutt-1.8.3.tar.gz) = 9b81746d67ffeca5ea44f60893b70dc93c86d4bc10187d4dd360185e4d42ed42 +SIZE (mutt/mutt-1.8.3.tar.gz) = 4122012 SHA256 (mutt/patch-1.8.2.vvv.nntp.gz) = 940cf7fd4fbea39f48bd5594180a7be5c3cc6714d62eeb3f2e5fbc0ab4b3545b SIZE (mutt/patch-1.8.2.vvv.nntp.gz) = 60675 SHA256 (mutt/patch-1.8.2.vvv.nntp_ru.gz) = c85a288ed6864c311cbc70b31bab9f0d0d1051846becb5e8fe737609fd939a9c SIZE (mutt/patch-1.8.2.vvv.nntp_ru.gz) = 3465 -SHA256 (mutt/patch-1.7.0.ats.date_conditional.1) = a7f65e0b6e59713582b3b0a1c3d3c0e54e5875f5dfe3bda285e51a5b6d96e14e -SIZE (mutt/patch-1.7.0.ats.date_conditional.1) = 2415 -SHA256 (mutt/mutt-1.8.2.vc.greeting) = 73113eb0a3eb761755315ab03c0b6bcb316c09603461a1f8a3f54bd870a576cc -SIZE (mutt/mutt-1.8.2.vc.greeting) = 4499 +SHA256 (mutt/date-conditional.diff) = 8936c5fe7a2a62a68f2a8d001c7a6dddf138c48186a338482b6639507ba9133e +SIZE (mutt/date-conditional.diff) = 2023 +SHA256 (mutt/mutt-1.8.3.vc.greeting) = 73113eb0a3eb761755315ab03c0b6bcb316c09603461a1f8a3f54bd870a576cc +SIZE (mutt/mutt-1.8.3.vc.greeting) = 4499 SHA256 (mutt/patch-1.8.2.vvv.initials.gz) = e929c863dd012624b2ac724cd296f346374cd2522f256020fa458e94890ca750 SIZE (mutt/patch-1.8.2.vvv.initials.gz) = 686 SHA256 (mutt/patch-1.8.2.vvv.quote.gz) = 03b1aa4aa9152b968fc1709e68207073df62b9b1a5da43ff1d680d6dfe17fe35 Index: mail/mutt/files/extra-patch-ifdef =================================================================== --- mail/mutt/files/extra-patch-ifdef +++ mail/mutt/files/extra-patch-ifdef @@ -1,8 +1,8 @@ ---- PATCHES.orig 2017-04-12 23:01:05 UTC +--- PATCHES.orig 2017-06-03 23:06:11 UTC +++ PATCHES @@ -0,0 +1 @@ +patch-1.5.4.cd.ifdef.1 ---- init.c.orig 2017-04-12 23:01:17 UTC +--- init.c.orig 2017-05-30 19:27:52 UTC +++ init.c @@ -656,6 +656,52 @@ static mbchar_table *parse_mbchar_table return t; @@ -57,9 +57,9 @@ static int parse_unignore (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) { do ---- init.h.orig 2017-04-12 23:01:17 UTC +--- init.h.orig 2017-06-03 23:06:11 UTC +++ init.h -@@ -3889,6 +3889,7 @@ static int parse_lists (BUFFER *, BUFFER +@@ -3904,6 +3904,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 *); @@ -67,7 +67,7 @@ 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 *); -@@ -3951,6 +3952,7 @@ const struct command_t Commands[] = { +@@ -3966,6 +3967,7 @@ const struct command_t Commands[] = { { "hdr_order", parse_list, UL &HeaderOrderList }, #ifdef HAVE_ICONV { "iconv-hook", mutt_parse_hook, MUTT_ICONVHOOK }, Index: mail/mutt/files/extra-patch-maildir-mtime =================================================================== --- mail/mutt/files/extra-patch-maildir-mtime +++ mail/mutt/files/extra-patch-maildir-mtime @@ -1,10 +1,10 @@ ---- PATCHES Dec 2002 17:44:54 -0000 3.6 -+++ PATCHES Feb 2004 13:19:42 -0000 +--- PATCHES.orig 2017-06-03 22:37:15 UTC ++++ PATCHES @@ -0,0 +1 @@ +patch-1.5.7.ust.maildir-mtime.2 ---- browser.c.orig Wed Jan 26 13:41:04 2005 -+++ browser.c Wed Feb 9 09:20:14 2005 -@@ -27,6 +27,7 @@ +--- browser.c.orig 2017-06-03 22:37:03 UTC ++++ browser.c +@@ -32,6 +32,7 @@ #ifdef USE_IMAP #include "imap.h" #endif @@ -12,7 +12,7 @@ #include #include -@@ -346,6 +347,21 @@ +@@ -413,6 +414,21 @@ static void init_state (struct browser_s menu->data = state->entry; } @@ -34,7 +34,7 @@ static int examine_directory (MUTTMENU *menu, struct browser_state *state, char *d, const char *prefix) { -@@ -409,6 +425,7 @@ +@@ -476,6 +492,7 @@ static int examine_directory (MUTTMENU * tmp = Incoming; while (tmp && mutt_strcmp (buffer, tmp->path)) tmp = tmp->next; @@ -42,7 +42,7 @@ if (tmp && Context && !mutt_strcmp (tmp->realpath, Context->realpath)) { -@@ -454,6 +471,7 @@ +@@ -549,6 +566,7 @@ static int examine_mailboxes (MUTTMENU * strfcpy (buffer, NONULL(tmp->path), sizeof (buffer)); mutt_pretty_mailbox (buffer, sizeof (buffer)); Index: mail/mutt/files/extra-patch-parent-child-match =================================================================== --- mail/mutt/files/extra-patch-parent-child-match +++ mail/mutt/files/extra-patch-parent-child-match @@ -1,6 +1,6 @@ ---- doc/manual.xml.head.orig 2017-02-24 18:29:36 UTC +--- doc/manual.xml.head.orig 2017-05-30 19:27:52 UTC +++ doc/manual.xml.head -@@ -4259,6 +4259,22 @@ variable all, which allow +@@ -4265,6 +4265,22 @@ variable all, which allow their system defaults. @@ -23,9 +23,9 @@ ---- mutt.h.orig 2017-02-24 18:29:36 UTC +--- mutt.h.orig 2017-06-03 23:16:03 UTC +++ mutt.h -@@ -863,6 +863,8 @@ typedef struct pattern_t +@@ -865,6 +865,8 @@ typedef struct pattern_t unsigned int alladdr : 1; unsigned int stringmatch : 1; unsigned int groupmatch : 1; @@ -34,7 +34,7 @@ unsigned int ign_case : 1; /* ignore case for local stringmatch searches */ unsigned int isalias : 1; int min; ---- pattern.c.orig 2017-02-24 18:29:37 UTC +--- pattern.c.orig 2017-05-30 19:26:40 UTC +++ pattern.c @@ -46,6 +46,7 @@ static int eat_regexp (pattern_t *pat, B static int eat_date (pattern_t *pat, BUFFER *, BUFFER *); Index: mail/mutt/files/extra-patch-reverse_reply =================================================================== --- mail/mutt/files/extra-patch-reverse_reply +++ mail/mutt/files/extra-patch-reverse_reply @@ -1,10 +1,10 @@ ---- PATCHES.orig 2017-04-12 23:01:05 UTC +--- PATCHES.orig 2017-06-03 23:21:18 UTC +++ PATCHES @@ -0,0 +1 @@ +patch-1.5.6.cb.reverse_reply.2 ---- init.h.orig 2017-04-12 23:01:17 UTC +--- init.h.orig 2017-06-03 23:21:18 UTC +++ init.h -@@ -2575,6 +2575,13 @@ struct option_t MuttVars[] = { +@@ -2588,6 +2588,13 @@ struct option_t MuttVars[] = { ** possibly including eventual real names. When it is \fIunset\fP, mutt will ** override any such real names with the setting of the $$realname variable. */ @@ -18,9 +18,9 @@ { "rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0 }, /* ** .pp ---- mutt.h.orig 2017-04-12 23:01:17 UTC +--- mutt.h.orig 2017-06-03 23:21:23 UTC +++ mutt.h -@@ -438,6 +438,7 @@ enum +@@ -440,6 +440,7 @@ enum OPTREVALIAS, OPTREVNAME, OPTREVREAL, @@ -28,7 +28,7 @@ OPTRFC2047PARAMS, OPTSAVEADDRESS, OPTSAVEEMPTY, ---- protos.h.orig 2017-04-12 23:01:17 UTC +--- protos.h.orig 2017-05-30 19:27:53 UTC +++ protos.h @@ -93,6 +93,7 @@ ADDRESS *mutt_get_address (ENVELOPE *, c ADDRESS *mutt_lookup_alias (const char *s); @@ -38,7 +38,7 @@ ADDRESS *mutt_expand_aliases (ADDRESS *); ADDRESS *mutt_parse_adrlist (ADDRESS *, const char *); ---- send.c.orig 2017-04-12 23:01:07 UTC +--- send.c.orig 2017-05-30 19:27:53 UTC +++ send.c @@ -585,6 +585,10 @@ void mutt_fix_reply_recipients (ENVELOPE /* the CC field can get cluttered, especially with lists */ @@ -51,7 +51,7 @@ env->cc = mutt_remove_xrefs (env->to, env->cc); if (env->cc && !env->to) ---- sendlib.c.orig 2017-04-12 23:01:08 UTC +--- sendlib.c.orig 2017-05-30 19:27:53 UTC +++ sendlib.c @@ -2714,6 +2714,35 @@ static void set_noconv_flags (BODY *b, s } Index: mail/mutt/files/extra-patch-smartdate =================================================================== --- mail/mutt/files/extra-patch-smartdate +++ mail/mutt/files/extra-patch-smartdate @@ -1,6 +1,6 @@ ---- hdrline.c.orig 2017-02-24 18:29:36 UTC +--- hdrline.c.orig 2017-06-03 23:31:21 UTC +++ hdrline.c -@@ -248,6 +248,89 @@ static char *apply_subject_mods (ENVELOP +@@ -249,6 +249,89 @@ static char *apply_subject_mods (ENVELOP * %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label) * %Z = status flags */ @@ -90,7 +90,7 @@ static const char * hdr_format_str (char *dest, size_t destlen, -@@ -421,7 +504,13 @@ hdr_format_str (char *dest, +@@ -469,7 +552,13 @@ hdr_format_str (char *dest, if (!do_locales) setlocale (LC_TIME, "C"); @@ -105,7 +105,7 @@ if (!do_locales) setlocale (LC_TIME, ""); ---- mutt.h.orig 2017-02-24 18:29:36 UTC +--- mutt.h.orig 2017-05-30 19:27:53 UTC +++ mutt.h @@ -134,6 +134,16 @@ typedef enum MUTT_FORMAT_NOFILTER = (1<<7) /* do not allow filtering on this pass */ Index: mail/mutt/files/extra-patch-smime-outlook =================================================================== --- mail/mutt/files/extra-patch-smime-outlook +++ mail/mutt/files/extra-patch-smime-outlook @@ -1,6 +1,6 @@ ---- crypt.c.orig Fri Mar 7 09:23:44 2003 -+++ crypt.c Fri Mar 21 00:06:48 2003 -@@ -440,7 +440,7 @@ +--- crypt.c.orig 2017-05-30 19:27:52 UTC ++++ crypt.c +@@ -491,7 +491,7 @@ int mutt_is_application_smime (BODY *m) { len++; if (!ascii_strcasecmp ((t+len), "p7m")) Index: mail/mutt/files/patch-dgc-deepif =================================================================== --- mail/mutt/files/patch-dgc-deepif +++ mail/mutt/files/patch-dgc-deepif @@ -1,6 +1,6 @@ ---- muttlib.c.orig 2017-04-19 01:05:29 UTC +--- muttlib.c.orig 2017-06-03 02:20:37 UTC +++ muttlib.c -@@ -1369,6 +1369,12 @@ +@@ -1378,6 +1378,12 @@ void mutt_FormatString (char *dest, /* count = 0; while (count < sizeof (ifstring) && *src && *src != '?' && *src != '&') { @@ -13,7 +13,7 @@ *cp++ = *src++; count++; } -@@ -1381,7 +1387,13 @@ +@@ -1390,7 +1396,13 @@ void mutt_FormatString (char *dest, /* count = 0; while (count < sizeof (elsestring) && *src && *src != '?') { Index: mail/mutt/files/patch-smime-self =================================================================== --- mail/mutt/files/patch-smime-self +++ mail/mutt/files/patch-smime-self @@ -1,4 +1,4 @@ ---- contrib/smime.rc.orig 2016-10-08 19:30:21 UTC +--- contrib/smime.rc.orig 2017-05-30 19:26:40 UTC +++ contrib/smime.rc @@ -23,8 +23,12 @@ set crypt_verify_sig = yes @@ -14,7 +14,7 @@ # Uncomment to make mutt ask what key to use when trying to decrypt a message. # It will use the default key above (if that was set) else. # unset smime_decrypt_use_default_key ---- crypt.c.orig 2016-10-08 19:35:50 UTC +--- crypt.c.orig 2017-06-04 00:05:52 UTC +++ crypt.c @@ -229,8 +229,18 @@ int mutt_protect (HEADER *msg, char *key if ((WithCrypto & APPLICATION_SMIME) @@ -37,9 +37,9 @@ { /* signed ? free it! */ return (-1); ---- init.h.orig 2016-10-08 19:35:50 UTC +--- init.h.orig 2017-06-04 00:05:52 UTC +++ init.h -@@ -2997,6 +2997,11 @@ struct option_t MuttVars[] = { +@@ -3017,6 +3017,11 @@ struct option_t MuttVars[] = { ** possible \fCprintf(3)\fP-like sequences. ** (S/MIME only) */ @@ -51,9 +51,9 @@ { "smime_encrypt_with", DT_STR, R_NONE, UL &SmimeCryptAlg, UL "aes256" }, /* ** .pp ---- mutt.h.orig 2016-10-08 19:30:21 UTC +--- mutt.h.orig 2017-06-04 00:05:52 UTC +++ mutt.h -@@ -274,6 +274,7 @@ enum +@@ -284,6 +284,7 @@ enum OPT_FORWEDIT, OPT_FCCATTACH, OPT_INCLUDE, Index: mail/mutt/files/patch-smime-sender =================================================================== --- mail/mutt/files/patch-smime-sender +++ mail/mutt/files/patch-smime-sender @@ -1,4 +1,4 @@ ---- commands.c.orig 2017-04-12 23:01:17 UTC +--- commands.c.orig 2017-05-30 19:27:52 UTC +++ commands.c @@ -185,7 +185,7 @@ int mutt_display_message (HEADER *cur) { @@ -9,7 +9,7 @@ mutt_message ( _("S/MIME signature successfully verified.")); else mutt_error ( _("S/MIME certificate owner does not match sender.")); ---- contrib/smime.rc.orig 2017-04-12 23:01:05 UTC +--- contrib/smime.rc.orig 2017-06-04 00:06:24 UTC +++ contrib/smime.rc @@ -8,7 +8,10 @@ set smime_is_default @@ -23,9 +23,9 @@ # Passphrase expiration set smime_timeout=300 ---- init.h.orig 2017-04-12 23:01:17 UTC +--- init.h.orig 2017-06-04 00:06:24 UTC +++ init.h -@@ -2980,6 +2980,15 @@ struct option_t MuttVars[] = { +@@ -3000,6 +3000,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) */ @@ -41,9 +41,9 @@ { "smime_sign_as", DT_SYN, R_NONE, UL "smime_default_key", 0 }, { "smime_default_key", DT_STR, R_NONE, UL &SmimeDefaultKey, 0 }, /* ---- mutt.h.orig 2017-04-12 23:01:17 UTC +--- mutt.h.orig 2017-06-04 00:06:24 UTC +++ mutt.h -@@ -499,6 +499,7 @@ enum +@@ -513,6 +513,7 @@ enum OPTCRYPTTIMESTAMP, OPTSMIMEISDEFAULT, OPTASKCERTLABEL, Index: mail/mutt/files/patch-threadcomplete =================================================================== --- mail/mutt/files/patch-threadcomplete +++ mail/mutt/files/patch-threadcomplete @@ -1,6 +1,6 @@ ---- mutt.h.orig 2017-02-27 01:20:29 UTC +--- mutt.h.orig 2017-06-03 22:52:35 UTC +++ mutt.h -@@ -201,6 +201,7 @@ enum +@@ -211,6 +211,7 @@ enum MUTT_EXPIRED, MUTT_SUPERSEDED, MUTT_TRASH, @@ -8,9 +8,9 @@ /* actions for mutt_pattern_comp/mutt_pattern_exec */ MUTT_AND, ---- pattern.c.orig 2017-02-27 01:20:06 UTC +--- pattern.c.orig 2017-06-03 22:52:35 UTC +++ pattern.c -@@ -56,6 +56,7 @@ static const struct pattern_flags +@@ -57,6 +57,7 @@ static const struct pattern_flags } Flags[] = { @@ -18,7 +18,7 @@ { 'A', MUTT_ALL, 0, NULL }, { 'b', MUTT_BODY, MUTT_FULL_MSG, eat_regexp }, { 'B', MUTT_WHOLE_MSG, MUTT_FULL_MSG, eat_regexp }, -@@ -1236,6 +1237,16 @@ mutt_pattern_exec (struct pattern_t *pat +@@ -1302,6 +1303,16 @@ pattern_exec (struct pattern_t *pat, pat else result = mutt_is_list_cc (pat->alladdr, h->env->to, h->env->cc); return (pat->not ^ result);