Date: Mon, 21 May 2018 20:39:16 +0000 (UTC) From: Kirill Ponomarev <krion@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470574 - in head/mail/mutt: . files Message-ID: <201805212039.w4LKdGN5092016@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: krion Date: Mon May 21 20:39:16 2018 New Revision: 470574 URL: https://svnweb.freebsd.org/changeset/ports/470574 Log: Update to 1.10.0 PR: 228387 Submitted by: maintainer Modified: head/mail/mutt/Makefile head/mail/mutt/distinfo head/mail/mutt/files/extra-patch-aspell head/mail/mutt/files/extra-patch-ifdef head/mail/mutt/files/extra-patch-maildir-mtime head/mail/mutt/files/extra-patch-reverse_reply head/mail/mutt/files/extra-patch-smartdate head/mail/mutt/files/extra-patch-smime-outlook head/mail/mutt/files/patch-Makefile.in head/mail/mutt/files/patch-doc_Muttrc head/mail/mutt/files/patch-smime-sender head/mail/mutt/files/patch-threadcomplete Modified: head/mail/mutt/Makefile ============================================================================== --- head/mail/mutt/Makefile Mon May 21 20:00:48 2018 (r470573) +++ head/mail/mutt/Makefile Mon May 21 20:39:16 2018 (r470574) @@ -2,8 +2,8 @@ # $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/ \ @@ -11,7 +11,6 @@ MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ 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} @@ -174,8 +173,8 @@ 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 @@ -192,6 +191,7 @@ GREETING_PATCH_PATCHFILES= mutt-${GREETING_PATCH_VERSI 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 @@ -203,8 +203,8 @@ 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.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} Modified: head/mail/mutt/distinfo ============================================================================== --- head/mail/mutt/distinfo Mon May 21 20:00:48 2018 (r470573) +++ head/mail/mutt/distinfo Mon May 21 20:39:16 2018 (r470574) @@ -1,6 +1,6 @@ -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 Modified: head/mail/mutt/files/extra-patch-aspell ============================================================================== --- head/mail/mutt/files/extra-patch-aspell Mon May 21 20:00:48 2018 (r470573) +++ head/mail/mutt/files/extra-patch-aspell Mon May 21 20:39:16 2018 (r470574) @@ -1,6 +1,6 @@ ---- 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'" Modified: head/mail/mutt/files/extra-patch-ifdef ============================================================================== --- head/mail/mutt/files/extra-patch-ifdef Mon May 21 20:00:48 2018 (r470573) +++ head/mail/mutt/files/extra-patch-ifdef Mon May 21 20:39:16 2018 (r470574) @@ -1,10 +1,28 @@ ---- 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; } @@ -57,21 +75,3 @@ 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 }, Modified: head/mail/mutt/files/extra-patch-maildir-mtime ============================================================================== --- head/mail/mutt/files/extra-patch-maildir-mtime Mon May 21 20:00:48 2018 (r470573) +++ head/mail/mutt/files/extra-patch-maildir-mtime Mon May 21 20:39:16 2018 (r470574) @@ -1,9 +1,9 @@ ---- 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" @@ -12,7 +12,7 @@ #include <stdlib.h> #include <dirent.h> -@@ -413,6 +414,21 @@ +@@ -439,6 +439,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 @@ +@@ -504,6 +504,7 @@ 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)) { -@@ -549,6 +566,7 @@ +@@ -578,6 +578,7 @@ s.st_mtime = st2.st_mtime; } Modified: head/mail/mutt/files/extra-patch-reverse_reply ============================================================================== --- head/mail/mutt/files/extra-patch-reverse_reply Mon May 21 20:00:48 2018 (r470573) +++ head/mail/mutt/files/extra-patch-reverse_reply Mon May 21 20:39:16 2018 (r470574) @@ -1,10 +1,11 @@ ---- 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. */ @@ -18,9 +19,9 @@ { "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, @@ -28,9 +29,9 @@ 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 *); @@ -38,9 +39,9 @@ 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); @@ -51,9 +52,9 @@ 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 @@ } } Modified: head/mail/mutt/files/extra-patch-smartdate ============================================================================== --- head/mail/mutt/files/extra-patch-smartdate Mon May 21 20:00:48 2018 (r470573) +++ head/mail/mutt/files/extra-patch-smartdate Mon May 21 20:39:16 2018 (r470574) @@ -1,6 +1,6 @@ ---- 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 */ @@ -90,7 +90,7 @@ 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"); @@ -105,9 +105,9 @@ 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; Modified: head/mail/mutt/files/extra-patch-smime-outlook ============================================================================== --- head/mail/mutt/files/extra-patch-smime-outlook Mon May 21 20:00:48 2018 (r470573) +++ head/mail/mutt/files/extra-patch-smime-outlook Mon May 21 20:39:16 2018 (r470574) @@ -1,6 +1,6 @@ ---- 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")) Modified: head/mail/mutt/files/patch-Makefile.in ============================================================================== --- head/mail/mutt/files/patch-Makefile.in Mon May 21 20:00:48 2018 (r470573) +++ head/mail/mutt/files/patch-Makefile.in Mon May 21 20:39:16 2018 (r470574) @@ -1,6 +1,6 @@ ---- 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 @@ -9,7 +9,7 @@ bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET) @BUILD_HCACHE_TRUE@HCVERSION = hcversion.h BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c $(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 Modified: head/mail/mutt/files/patch-doc_Muttrc ============================================================================== --- head/mail/mutt/files/patch-doc_Muttrc Mon May 21 20:00:48 2018 (r470573) +++ head/mail/mutt/files/patch-doc_Muttrc Mon May 21 20:39:16 2018 (r470574) @@ -1,6 +1,6 @@ ---- 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''. # Modified: head/mail/mutt/files/patch-smime-sender ============================================================================== --- head/mail/mutt/files/patch-smime-sender Mon May 21 20:00:48 2018 (r470573) +++ head/mail/mutt/files/patch-smime-sender Mon May 21 20:39:16 2018 (r470574) @@ -1,6 +1,6 @@ --- 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) { @@ -11,7 +11,7 @@ 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) */ @@ -24,12 +24,12 @@ + ** 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, Modified: head/mail/mutt/files/patch-threadcomplete ============================================================================== --- head/mail/mutt/files/patch-threadcomplete Mon May 21 20:00:48 2018 (r470573) +++ head/mail/mutt/files/patch-threadcomplete Mon May 21 20:39:16 2018 (r470574) @@ -1,6 +1,6 @@ ---- 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, @@ -8,9 +8,9 @@ /* 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[] = { @@ -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 }, -@@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805212039.w4LKdGN5092016>