Date: Sun, 30 Jun 2019 20:13:42 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r505472 - in head/mail/mutt: . files Message-ID: <201906302013.x5UKDgpf011112@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Sun Jun 30 20:13:41 2019 New Revision: 505472 URL: https://svnweb.freebsd.org/changeset/ports/505472 Log: mail/mutt: 1.12.1 PR: 238589 Submitted by: Derek Schrock <dereks@lifeofadishwasher.com> (maintainer) Modified: head/mail/mutt/Makefile (contents, props changed) head/mail/mutt/distinfo (contents, props changed) head/mail/mutt/files/extra-patch-ifdef (contents, props changed) head/mail/mutt/files/extra-patch-reverse_reply (contents, props changed) head/mail/mutt/files/extra-patch-vvv.quote (contents, props changed) head/mail/mutt/files/patch-Makefile.in (contents, props changed) head/mail/mutt/files/patch-smime-sender (contents, props changed) Modified: head/mail/mutt/Makefile ============================================================================== --- head/mail/mutt/Makefile Sun Jun 30 20:12:04 2019 (r505471) +++ head/mail/mutt/Makefile Sun Jun 30 20:13:41 2019 (r505472) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mutt -DISTVERSION= 1.12.0 +DISTVERSION= 1.12.1 CATEGORIES+= mail ipv6 MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \ Modified: head/mail/mutt/distinfo ============================================================================== --- head/mail/mutt/distinfo Sun Jun 30 20:12:04 2019 (r505471) +++ head/mail/mutt/distinfo Sun Jun 30 20:13:41 2019 (r505472) @@ -1,6 +1,6 @@ -TIMESTAMP = 1558928080 -SHA256 (mutt/mutt-1.12.0.tar.gz) = ca12448784ed7b6c86d498921e18bc7b152d45494a452df56a7a0c8aaf13f98f -SIZE (mutt/mutt-1.12.0.tar.gz) = 4668896 +TIMESTAMP = 1560623854 +SHA256 (mutt/mutt-1.12.1.tar.gz) = 01c565406ec4ffa85db90b45ece2260b25fac3646cc063bbc20a242c6ed4210c +SIZE (mutt/mutt-1.12.1.tar.gz) = 4675166 SHA256 (mutt/mutt-1.12.0.vc.greeting) = 7596d930447e9834567c0cfddf9ac023ecbb99add64bee4131d87e0260eec591 SIZE (mutt/mutt-1.12.0.vc.greeting) = 4559 SHA256 (mutt/patch-1.11.1.vvv.nntp.xz) = 2a6386a82cbf9afde162bfb1989e545fb222bf40c5f6fac169d9249d4c904c79 Modified: head/mail/mutt/files/extra-patch-ifdef ============================================================================== --- head/mail/mutt/files/extra-patch-ifdef Sun Jun 30 20:12:04 2019 (r505471) +++ head/mail/mutt/files/extra-patch-ifdef Sun Jun 30 20:13:41 2019 (r505472) @@ -1,8 +1,8 @@ ---- PATCHES.orig 2019-05-26 19:28:51 UTC +--- PATCHES.orig 2019-06-15 21:17:01 UTC +++ PATCHES @@ -0,0 +1 @@ +patch-1.5.4.cd.ifdef.1 ---- init.c.orig 2019-04-28 20:41:58 UTC +--- init.c.orig 2019-05-25 16:22:39 UTC +++ init.c @@ -651,6 +651,52 @@ static mbchar_table *parse_mbchar_table (const char *s return t; @@ -57,9 +57,9 @@ static int parse_unignore (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) { do ---- init.h.orig 2019-05-09 20:47:17 UTC +--- init.h.orig 2019-06-15 15:57:01 UTC +++ init.h -@@ -4309,6 +4309,7 @@ static int parse_lists (BUFFER *, BUFFER *, unsigned l +@@ -4330,6 +4330,7 @@ static int parse_lists (BUFFER *, BUFFER *, unsigned l 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_echo (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_ignore (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unignore (BUFFER *, BUFFER *, unsigned long, BUFFER *); -@@ -4373,6 +4374,7 @@ const struct command_t Commands[] = { +@@ -4394,6 +4395,7 @@ const struct command_t Commands[] = { { "hdr_order", parse_list, UL &HeaderOrderList }, #ifdef HAVE_ICONV { "iconv-hook", mutt_parse_hook, MUTT_ICONVHOOK }, Modified: head/mail/mutt/files/extra-patch-reverse_reply ============================================================================== --- head/mail/mutt/files/extra-patch-reverse_reply Sun Jun 30 20:12:04 2019 (r505471) +++ head/mail/mutt/files/extra-patch-reverse_reply Sun Jun 30 20:13:41 2019 (r505472) @@ -1,12 +1,12 @@ ---- PATCHES.orig 2019-05-26 19:28:51 UTC +--- PATCHES.orig 2019-06-15 21:17:02 UTC +++ PATCHES @@ -0,0 +1 @@ +patch-1.5.6.cb.reverse_reply.2 ---- init.h.orig 2019-05-26 19:28:51 UTC +--- init.h.orig 2019-06-15 21:17:01 UTC +++ init.h -@@ -2945,6 +2945,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. +@@ -2966,6 +2966,13 @@ struct option_t MuttVars[] = { + ** In either case, a missing real name will be filled in afterwards + ** using the value of $$realname. */ + { "reverse_reply", DT_BOOL, R_NONE, OPTREVREPLY, 0 }, + /* @@ -18,9 +18,9 @@ { "rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0 }, /* ** .pp ---- mutt.h.orig 2019-04-28 20:41:58 UTC +--- mutt.h.orig 2019-06-15 21:17:01 UTC +++ mutt.h -@@ -490,6 +490,7 @@ enum +@@ -491,6 +491,7 @@ enum OPTREVALIAS, OPTREVNAME, OPTREVREAL, @@ -28,7 +28,7 @@ OPTRFC2047PARAMS, OPTSAVEADDRESS, OPTSAVEEMPTY, ---- protos.h.orig 2019-04-28 20:41:58 UTC +--- protos.h.orig 2019-05-25 16:22:39 UTC +++ protos.h @@ -85,6 +85,7 @@ ADDRESS *mutt_get_address (ENVELOPE *, char **); 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 2019-05-10 02:20:15 UTC +--- send.c.orig 2019-06-14 15:57:33 UTC +++ send.c -@@ -716,6 +716,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env) +@@ -717,6 +717,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env) /* the CC field can get cluttered, especially with lists */ env->to = mutt_remove_duplicates (env->to); env->cc = mutt_remove_duplicates (env->cc); @@ -51,7 +51,7 @@ env->cc = mutt_remove_xrefs (env->to, env->cc); if (env->cc && !env->to) ---- sendlib.c.orig 2019-05-09 00:19:59 UTC +--- sendlib.c.orig 2019-06-14 15:57:30 UTC +++ sendlib.c @@ -2764,6 +2764,35 @@ static void set_noconv_flags (BODY *b, short flag) } Modified: head/mail/mutt/files/extra-patch-vvv.quote ============================================================================== --- head/mail/mutt/files/extra-patch-vvv.quote Sun Jun 30 20:12:04 2019 (r505471) +++ head/mail/mutt/files/extra-patch-vvv.quote Sun Jun 30 20:13:41 2019 (r505472) @@ -1,8 +1,8 @@ ---- PATCHES.orig 2017-12-03 03:10:17 UTC +--- PATCHES.orig 2019-06-15 21:17:01 UTC +++ PATCHES @@ -0,0 +1 @@ +vvv.quote ---- handler.c.orig 2019-04-28 20:41:58 UTC +--- handler.c.orig 2019-05-31 16:21:33 UTC +++ handler.c @@ -1593,7 +1593,31 @@ static int text_plain_handler (BODY *b, STATE *s) buf[--l] = 0; @@ -46,9 +46,9 @@ handler = rfc3676_handler; else handler = text_plain_handler; ---- init.h.orig 2019-05-09 20:47:17 UTC +--- init.h.orig 2019-06-15 21:17:01 UTC +++ init.h -@@ -2731,6 +2731,19 @@ struct option_t MuttVars[] = { +@@ -2745,6 +2745,19 @@ struct option_t MuttVars[] = { ** have no effect, and if it is set to \fIask-yes\fP or \fIask-no\fP, you are ** prompted for confirmation when you try to quit. */ @@ -68,9 +68,9 @@ { "quote_regexp", DT_RX, R_PAGER, UL &QuoteRegexp, UL "^([ \t]*[|>:}#])+" }, /* ** .pp ---- mutt.h.orig 2019-04-28 20:41:58 UTC +--- mutt.h.orig 2019-06-14 01:29:29 UTC +++ mutt.h -@@ -478,6 +478,8 @@ enum +@@ -479,6 +479,8 @@ enum OPTPRINTDECODE, OPTPRINTSPLIT, OPTPROMPTAFTER, Modified: head/mail/mutt/files/patch-Makefile.in ============================================================================== --- head/mail/mutt/files/patch-Makefile.in Sun Jun 30 20:12:04 2019 (r505471) +++ head/mail/mutt/files/patch-Makefile.in Sun Jun 30 20:13:41 2019 (r505472) @@ -1,4 +1,4 @@ ---- Makefile.in.orig 2019-05-25 16:13:42 UTC +--- Makefile.in.orig 2019-06-15 16:07:04 UTC +++ Makefile.in @@ -537,7 +537,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign @BUILD_DOC_TRUE@DOC_SUBDIR = doc @@ -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 version.h $(HCVERSION) -@@ -1678,18 +1678,9 @@ install-exec-hook: +@@ -1676,18 +1676,9 @@ install-exec-hook: rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \ ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \ fi Modified: head/mail/mutt/files/patch-smime-sender ============================================================================== --- head/mail/mutt/files/patch-smime-sender Sun Jun 30 20:12:04 2019 (r505471) +++ head/mail/mutt/files/patch-smime-sender Sun Jun 30 20:13:41 2019 (r505472) @@ -1,4 +1,4 @@ ---- commands.c.orig 2019-04-28 20:41:58 UTC +--- commands.c.orig 2019-05-25 16:22:39 UTC +++ commands.c @@ -266,7 +266,7 @@ int mutt_display_message (HEADER *cur) { @@ -9,9 +9,9 @@ mutt_message ( _("S/MIME signature successfully verified.")); else mutt_error ( _("S/MIME certificate owner does not match sender.")); ---- init.h.orig 2019-05-26 19:28:51 UTC +--- init.h.orig 2019-06-15 21:17:02 UTC +++ init.h -@@ -3357,6 +3357,15 @@ struct option_t MuttVars[] = { +@@ -3378,6 +3378,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) */ @@ -27,9 +27,9 @@ { "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 2019-05-26 19:28:52 UTC +--- mutt.h.orig 2019-06-15 21:17:02 UTC +++ mutt.h -@@ -566,6 +566,7 @@ enum +@@ -567,6 +567,7 @@ enum OPTSMIMEISDEFAULT, OPTSMIMESELFENCRYPT, OPTASKCERTLABEL,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906302013.x5UKDgpf011112>