Index: head/mail/mutt/Makefile =================================================================== --- head/mail/mutt/Makefile +++ head/mail/mutt/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mutt -PORTVERSION= 1.8.3 +PORTVERSION= 1.9.0 PORTREVISION?= 0 CATEGORIES+= mail ipv6 MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ @@ -38,7 +38,7 @@ --enable-external-dotlock --enable-pop --enable-imap \ --enable-compressed -USES+= cpe shebangfix ssl +USES+= cpe ncurses shebangfix ssl SHEBANG_FILES= doc/gen-map-doc smime_keys.pl contrib/smime_keys_test.pl .if defined(MUTT_CONFIGURE_ARGS) @@ -57,9 +57,8 @@ 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 PARENT_CHILD_MATCH_PATCH QUOTE_PATCH \ - REVERSE_REPLY_PATCH SIDEBAR SMART_DATE SMIME_OUTLOOK_COMPAT \ - SMTP URLVIEW XML + NLS NNTP QUOTE_PATCH REVERSE_REPLY_PATCH SIDEBAR SMART_DATE \ + SMIME_OUTLOOK_COMPAT SMTP URLVIEW XML OPTIONS_SINGLE= GSSAPI HCACHE SCREEN OPTIONS_RADIO= SPELL @@ -82,7 +81,6 @@ MAILDIR_MTIME_PATCH_DESC= Maildir mtime patch NCURSES_DESC= Ncurses support NLS_DESC= Native language support (implies ICONV) -PARENT_CHILD_MATCH_PATCH_DESC= Parent/child match QUOTE_PATCH_DESC= Extended quoting REVERSE_REPLY_PATCH_DESC= Reverse_reply SIDEBAR_DESC= Sidebar support @@ -100,9 +98,8 @@ OPTIONS_DEFAULT= GPGME HTML HCACHE_BDB ICONV IDN \ IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \ - NLS NCURSES PARENT_CHILD_MATCH_PATCH QUOTE_PATCH \ - REVERSE_REPLY_PATCH SMART_DATE SMIME_OUTLOOK_COMPAT SASL SMTP \ - URLVIEW XML GSSAPI_NONE + 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 @@ -170,7 +167,6 @@ ICONV_CONFIGURE_OFF= --disable-iconv ASPELL_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-aspell -PARENT_CHILD_MATCH_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-parent-child-match REVERSE_REPLY_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-reverse_reply SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 @@ -201,11 +197,11 @@ QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \ patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv -NNTP_DISTFILES= patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:vvv \ - patch-${VVV_PATCH_VERSION}.vvv.nntp_ru.gz:vvv +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_BROKEN= NNTP fails to apply to 1.9.0 SIDEBAR_CONFIGURE_ENABLE= sidebar @@ -214,7 +210,7 @@ .include # un/comment as each VERSION is created for PORTVERSION -VVV_PATCH_VERSION= 1.8.2 +VVV_PATCH_VERSION= 1.8.3 #GREETING_PATCH_VERSION= 1.8.3 .if !defined(VVV_PATCH_VERSION) @@ -237,12 +233,6 @@ LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath=${LOCALBASE}/lib:/usr/lib -ltinfow CFLAGS+= ${CFLAGS_ADD} LDFLAGS+= ${LDFLAGS_ADD} - -pre-patch-NNTP-on: - @${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${VVV_PATCH_VERSION}.vvv.nntp.gz > ${WRKDIR}/patch-nntp - @${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \ - ${WRKDIR}/patch-nntp - @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-nntp post-patch-NNTP-on: .if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH} Index: head/mail/mutt/distinfo =================================================================== --- head/mail/mutt/distinfo +++ head/mail/mutt/distinfo @@ -1,15 +1,13 @@ -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 +TIMESTAMP = 1504471107 +SHA256 (mutt/mutt-1.9.0.tar.gz) = ec6d7595d3a1f26ae9f565b5ba5ffee94f9b2dc0683b0014684f2dc874f9e2d4 +SIZE (mutt/mutt-1.9.0.tar.gz) = 4191932 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 -SIZE (mutt/patch-1.8.2.vvv.quote.gz) = 1282 +SHA256 (mutt/mutt-1.9.0.vc.greeting) = b4ac804c24a07c7eb8330ebfdc94cdbf6fd7a4671badfb32fb611df09c008317 +SIZE (mutt/mutt-1.9.0.vc.greeting) = 4534 +SHA256 (mutt/patch-1.8.3.vvv.nntp.gz) = 940cf7fd4fbea39f48bd5594180a7be5c3cc6714d62eeb3f2e5fbc0ab4b3545b +SIZE (mutt/patch-1.8.3.vvv.nntp.gz) = 60675 +SHA256 (mutt/patch-1.8.3.vvv.initials.gz) = e929c863dd012624b2ac724cd296f346374cd2522f256020fa458e94890ca750 +SIZE (mutt/patch-1.8.3.vvv.initials.gz) = 686 +SHA256 (mutt/patch-1.8.3.vvv.quote.gz) = 03b1aa4aa9152b968fc1709e68207073df62b9b1a5da43ff1d680d6dfe17fe35 +SIZE (mutt/patch-1.8.3.vvv.quote.gz) = 1282 Index: head/mail/mutt/files/extra-patch-ifdef =================================================================== --- head/mail/mutt/files/extra-patch-ifdef +++ head/mail/mutt/files/extra-patch-ifdef @@ -1,8 +1,8 @@ ---- PATCHES.orig 2017-06-03 23:06:11 UTC +--- PATCHES.orig 2017-09-04 23:34:26 UTC +++ PATCHES @@ -0,0 +1 @@ +patch-1.5.4.cd.ifdef.1 ---- init.c.orig 2017-05-30 19:27:52 UTC +--- init.c.orig 2017-09-04 23:34:22 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-06-03 23:06:11 UTC +--- init.h.orig 2017-09-04 23:34:22 UTC +++ init.h -@@ -3904,6 +3904,7 @@ static int parse_lists (BUFFER *, BUFFER +@@ -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 *); @@ -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 *); -@@ -3966,6 +3967,7 @@ const struct command_t Commands[] = { +@@ -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 }, Index: head/mail/mutt/files/extra-patch-maildir-mtime =================================================================== --- head/mail/mutt/files/extra-patch-maildir-mtime +++ head/mail/mutt/files/extra-patch-maildir-mtime @@ -1,9 +1,9 @@ ---- PATCHES.orig 2017-06-03 22:37:15 UTC -+++ PATCHES +--- PATCHES.orig 2017-09-04 15:19:31.167205000 -0400 ++++ PATCHES 2017-09-04 15:19:31.168636000 -0400 @@ -0,0 +1 @@ +patch-1.5.7.ust.maildir-mtime.2 ---- browser.c.orig 2017-06-03 22:37:03 UTC -+++ browser.c +--- browser.c.orig 2017-09-04 15:19:27.714342000 -0400 ++++ browser.c 2017-09-04 15:19:31.178678000 -0400 @@ -32,6 +32,7 @@ #ifdef USE_IMAP #include "imap.h" @@ -12,7 +12,7 @@ #include #include -@@ -413,6 +414,21 @@ static void init_state (struct browser_s +@@ -413,6 +414,21 @@ menu->data = state->entry; } @@ -34,7 +34,7 @@ static int examine_directory (MUTTMENU *menu, struct browser_state *state, char *d, const char *prefix) { -@@ -476,6 +492,7 @@ static int examine_directory (MUTTMENU * +@@ -476,6 +492,7 @@ tmp = Incoming; while (tmp && mutt_strcmp (buffer, tmp->path)) tmp = tmp->next; @@ -42,9 +42,9 @@ if (tmp && Context && !mutt_strcmp (tmp->realpath, Context->realpath)) { -@@ -549,6 +566,7 @@ static int examine_mailboxes (MUTTMENU * - strfcpy (buffer, NONULL(tmp->path), sizeof (buffer)); - mutt_pretty_mailbox (buffer, sizeof (buffer)); +@@ -549,6 +566,7 @@ + s.st_mtime = st2.st_mtime; + } + check_maildir_times (tmp, &s); add_folder (menu, state, buffer, &s, tmp); Index: head/mail/mutt/files/extra-patch-reverse_reply =================================================================== --- head/mail/mutt/files/extra-patch-reverse_reply +++ head/mail/mutt/files/extra-patch-reverse_reply @@ -1,10 +1,10 @@ ---- PATCHES.orig 2017-06-03 23:21:18 UTC +--- PATCHES.orig 2017-09-04 23:35:30 UTC +++ PATCHES @@ -0,0 +1 @@ +patch-1.5.6.cb.reverse_reply.2 ---- init.h.orig 2017-06-03 23:21:18 UTC +--- init.h.orig 2017-09-04 23:35:27 UTC +++ init.h -@@ -2588,6 +2588,13 @@ struct option_t MuttVars[] = { +@@ -2687,6 +2687,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-06-03 23:21:23 UTC +--- mutt.h.orig 2017-09-04 23:35:27 UTC +++ mutt.h -@@ -440,6 +440,7 @@ enum +@@ -448,6 +448,7 @@ enum OPTREVALIAS, OPTREVNAME, OPTREVREAL, @@ -28,7 +28,7 @@ OPTRFC2047PARAMS, OPTSAVEADDRESS, OPTSAVEEMPTY, ---- protos.h.orig 2017-05-30 19:27:53 UTC +--- protos.h.orig 2017-09-04 23:35:27 UTC +++ protos.h @@ -93,6 +93,7 @@ ADDRESS *mutt_get_address (ENVELOPE *, c ADDRESS *mutt_lookup_alias (const char *s); @@ -38,9 +38,9 @@ ADDRESS *mutt_expand_aliases (ADDRESS *); ADDRESS *mutt_parse_adrlist (ADDRESS *, const char *); ---- send.c.orig 2017-05-30 19:27:53 UTC +--- send.c.orig 2017-09-04 23:35:27 UTC +++ send.c -@@ -585,6 +585,10 @@ void mutt_fix_reply_recipients (ENVELOPE +@@ -598,6 +598,10 @@ void mutt_fix_reply_recipients (ENVELOPE /* 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 2017-05-30 19:27:53 UTC +--- sendlib.c.orig 2017-09-04 23:35:27 UTC +++ sendlib.c -@@ -2714,6 +2714,35 @@ static void set_noconv_flags (BODY *b, s +@@ -2753,6 +2753,35 @@ static void set_noconv_flags (BODY *b, s } } Index: head/mail/mutt/files/patch-smime-self =================================================================== --- head/mail/mutt/files/patch-smime-self +++ head/mail/mutt/files/patch-smime-self @@ -1,63 +0,0 @@ ---- contrib/smime.rc.orig 2017-05-30 19:26:40 UTC -+++ contrib/smime.rc -@@ -23,8 +23,12 @@ set crypt_verify_sig = yes - - # The (default) keyfile for signing/decrypting. Uncomment the following - # line and replace the keyid with your own. --set smime_default_key="12345678.0" -+# set smime_default_key="12345678.0" - -+# Uncomment the following line in addition to the one above, if you want that -+# all encrypted messages are also encrypted with your default key. -+# set smime_encrypt_self = yes -+ - # 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 2017-06-04 00:05:52 UTC -+++ crypt.c -@@ -229,8 +229,18 @@ int mutt_protect (HEADER *msg, char *key - if ((WithCrypto & APPLICATION_SMIME) - && (msg->security & APPLICATION_SMIME)) - { -- if (!(tmp_pbody = crypt_smime_build_smime_entity (tmp_smime_pbody, -- keylist))) -+ char *new_keylist = keylist; -+ -+ if (SmimeDefaultKey && query_quadoption(OPT_SMIMEENCRYPTSELF, _("Encrypt message to S/MIME Default Key also?")) == MUTT_YES) -+ { -+ int size = mutt_strlen(keylist) + mutt_strlen (SmimeDefaultKey) + 2; /* +1 for NULL, +1 for \n */ -+ new_keylist = safe_malloc(size); -+ snprintf(new_keylist, size, "%s%s\n", keylist, SmimeDefaultKey); -+ } -+ -+ tmp_pbody = crypt_smime_build_smime_entity (tmp_smime_pbody, new_keylist); -+ safe_free((void **)&new_keylist); -+ if (!tmp_pbody) - { - /* signed ? free it! */ - return (-1); ---- init.h.orig 2017-06-04 00:05:52 UTC -+++ init.h -@@ -3017,6 +3017,11 @@ struct option_t MuttVars[] = { - ** possible \fCprintf(3)\fP-like sequences. - ** (S/MIME only) - */ -+ { "smime_encrypt_self", DT_QUAD, R_NONE, OPT_SMIMEENCRYPTSELF, 1 }, -+ /* -+ ** .pp -+ ** Encrypt the message to smime_default_key too. -+ */ - { "smime_encrypt_with", DT_STR, R_NONE, UL &SmimeCryptAlg, UL "aes256" }, - /* - ** .pp ---- mutt.h.orig 2017-06-04 00:05:52 UTC -+++ mutt.h -@@ -284,6 +284,7 @@ enum - OPT_FORWEDIT, - OPT_FCCATTACH, - OPT_INCLUDE, -+ OPT_SMIMEENCRYPTSELF, - OPT_MFUPTO, - OPT_MIMEFWD, - OPT_MIMEFWDREST, Index: head/mail/mutt/files/patch-smime-sender =================================================================== --- head/mail/mutt/files/patch-smime-sender +++ head/mail/mutt/files/patch-smime-sender @@ -1,4 +1,4 @@ ---- commands.c.orig 2017-05-30 19:27:52 UTC +--- commands.c.orig 2017-09-08 22:18:16 UTC +++ commands.c @@ -185,7 +185,7 @@ int mutt_display_message (HEADER *cur) { @@ -9,23 +9,9 @@ mutt_message ( _("S/MIME signature successfully verified.")); else mutt_error ( _("S/MIME certificate owner does not match sender.")); ---- contrib/smime.rc.orig 2017-06-04 00:06:24 UTC -+++ contrib/smime.rc -@@ -8,7 +8,10 @@ set smime_is_default - - # Uncomment this if you don't want to set labels for certificates you add. - # unset smime_ask_cert_label -- -+ -+# Uncomment this if you don't want to check for sender's email address -+# set smime_dont_check_sender = yes -+ - # Passphrase expiration - set smime_timeout=300 - ---- init.h.orig 2017-06-04 00:06:24 UTC +--- init.h.orig 2017-09-08 22:18:16 UTC +++ init.h -@@ -3000,6 +3000,15 @@ struct option_t MuttVars[] = { +@@ -3099,6 +3099,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,11 +27,11 @@ { "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-06-04 00:06:24 UTC +--- mutt.h.orig 2017-09-08 22:18:16 UTC +++ mutt.h -@@ -513,6 +513,7 @@ enum - OPTCRYPTTIMESTAMP, +@@ -521,6 +521,7 @@ enum OPTSMIMEISDEFAULT, + OPTSMIMESELFENCRYPT, OPTASKCERTLABEL, + OPTSMIMENOSENDER, OPTSDEFAULTDECRYPTKEY, Index: head/mail/mutt/files/patch-threadcomplete =================================================================== --- head/mail/mutt/files/patch-threadcomplete +++ head/mail/mutt/files/patch-threadcomplete @@ -1,4 +1,4 @@ ---- mutt.h.orig 2017-06-03 22:52:35 UTC +--- mutt.h.orig 2017-09-04 23:39:03 UTC +++ mutt.h @@ -211,6 +211,7 @@ enum MUTT_EXPIRED, @@ -8,9 +8,9 @@ /* actions for mutt_pattern_comp/mutt_pattern_exec */ MUTT_AND, ---- pattern.c.orig 2017-06-03 22:52:35 UTC +--- pattern.c.orig 2017-09-04 23:39:03 UTC +++ pattern.c -@@ -57,6 +57,7 @@ static const struct pattern_flags +@@ -56,6 +56,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 }, -@@ -1302,6 +1303,16 @@ pattern_exec (struct pattern_t *pat, pat +@@ -1270,6 +1271,16 @@ mutt_pattern_exec (struct pattern_t *pat else result = mutt_is_list_cc (pat->alladdr, h->env->to, h->env->cc); return (pat->not ^ result);