svn commit: r502978 - in head/mail/mutt: . files
Alex Kozlov
ak at FreeBSD.org
Wed May 29 17:41:39 UTC 2019
Author: ak
Date: Wed May 29 17:41:34 2019
New Revision: 502978
URL: https://svnweb.freebsd.org/changeset/ports/502978
Log:
- Update to 1.12.0 [*]
- Clean up patches due to upstream whitespace cleanup/changes
- Mark NNTP patch broken with 1.12.0
- VVV quote patch broken. Add to files/ fixed version until updated upstream
- Update extra-patch-maildir-mtime* due to upstream 6317a30369e
- Remove extra-patch-smime-outlook. The code [2] backing this patch was removed
[*] http://www.mutt.org/relnotes/1.12/
PR: 238179
Submitted by: Derek Schrock <dereks at lifeofadishwasher.com> (maintainer)
Added:
head/mail/mutt/files/extra-patch-vvv.quote (contents, props changed)
Deleted:
head/mail/mutt/files/extra-patch-smime-outlook
Modified:
head/mail/mutt/Makefile
head/mail/mutt/distinfo
head/mail/mutt/files/extra-patch-ifdef
head/mail/mutt/files/extra-patch-maildir-mtime
head/mail/mutt/files/extra-patch-maildir-mtime-nntp
head/mail/mutt/files/extra-patch-reverse_reply
head/mail/mutt/files/extra-patch-smartdate
head/mail/mutt/files/patch-Makefile.in
head/mail/mutt/files/patch-browser.c
head/mail/mutt/files/patch-contrib_Makefile.in
head/mail/mutt/files/patch-date-conditional
head/mail/mutt/files/patch-dgc-deepif
head/mail/mutt/files/patch-doc_Makefile.in
head/mail/mutt/files/patch-doc_Muttrc
head/mail/mutt/files/patch-muttlib.c
head/mail/mutt/files/patch-smime-sender
head/mail/mutt/files/patch-threadcomplete
head/mail/mutt/pkg-plist
Modified: head/mail/mutt/Makefile
==============================================================================
--- head/mail/mutt/Makefile Wed May 29 17:29:03 2019 (r502977)
+++ head/mail/mutt/Makefile Wed May 29 17:41:34 2019 (r502978)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mutt
-DISTVERSION= 1.11.4
-#PORTREVISION= 0
+DISTVERSION= 1.12.0
CATEGORIES+= mail ipv6
MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \
ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
@@ -51,7 +50,7 @@ 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
+ SMTP URLVIEW XML
OPTIONS_SINGLE= GSSAPI HCACHE SCREEN
OPTIONS_RADIO= SPELL
@@ -78,7 +77,6 @@ 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)
@@ -91,7 +89,7 @@ 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
+ SASL SMTP URLVIEW XML GSSAPI_NONE
ASPELL_BUILD_DEPENDS= aspell:textproc/aspell
ASPELL_RUN_DEPENDS= aspell:textproc/aspell
@@ -147,7 +145,6 @@ REVERSE_REPLY_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-p
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
@@ -170,9 +167,10 @@ SMTP_CONFIGURE_ENABLE= smtp
GREETING_PATCH_PATCHFILES= mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc
-QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv \
- patch-${VVV_PATCH_VERSION}.vvv.quote.xz:vvv
+QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv
+QUOTE_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-vvv.quote
+NNTP_BROKEN= NNTP broken with 1.12.0
NNTP_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.nntp.xz:-p1:vvv
NNTP_EXTRA_PATCHES= ${PATCHDIR}/extra-nntp-depfiles
NNTP_CONFIGURE_ON= --enable-nntp
@@ -186,7 +184,7 @@ DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref
# un/comment as each VERSION is created for PORTVERSION
VVV_PATCH_VERSION= 1.11.1
-GREETING_PATCH_VERSION= 1.11.4
+GREETING_PATCH_VERSION= 1.12.0
.if !defined(VVV_PATCH_VERSION)
VVV_PATCH_VERSION= ${PORTVERSION}
Modified: head/mail/mutt/distinfo
==============================================================================
--- head/mail/mutt/distinfo Wed May 29 17:29:03 2019 (r502977)
+++ head/mail/mutt/distinfo Wed May 29 17:41:34 2019 (r502978)
@@ -1,11 +1,9 @@
-TIMESTAMP = 1552485673
-SHA256 (mutt/mutt-1.11.4.tar.gz) = b651357ea6c8762178080493991c77ecb111d916d171d422500257ab48be2801
-SIZE (mutt/mutt-1.11.4.tar.gz) = 4582417
-SHA256 (mutt/mutt-1.11.4.vc.greeting) = 57bd75016350e3ab8516f27154016e23a29176d2f1163258d31531f4aa722afc
-SIZE (mutt/mutt-1.11.4.vc.greeting) = 4560
+TIMESTAMP = 1558928080
+SHA256 (mutt/mutt-1.12.0.tar.gz) = ca12448784ed7b6c86d498921e18bc7b152d45494a452df56a7a0c8aaf13f98f
+SIZE (mutt/mutt-1.12.0.tar.gz) = 4668896
+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
SIZE (mutt/patch-1.11.1.vvv.nntp.xz) = 49384
SHA256 (mutt/patch-1.11.1.vvv.initials.xz) = af45defbda3a85f86db3f8ef5235ddb6613a36fdc35540cdc9afa38409114a07
SIZE (mutt/patch-1.11.1.vvv.initials.xz) = 712
-SHA256 (mutt/patch-1.11.1.vvv.quote.xz) = 36896cbdebbe22f1ffea00e79a8735847246063f6498935d4dde3d5492b71c6c
-SIZE (mutt/patch-1.11.1.vvv.quote.xz) = 1316
Modified: head/mail/mutt/files/extra-patch-ifdef
==============================================================================
--- head/mail/mutt/files/extra-patch-ifdef Wed May 29 17:29:03 2019 (r502977)
+++ head/mail/mutt/files/extra-patch-ifdef Wed May 29 17:41:34 2019 (r502978)
@@ -1,10 +1,10 @@
---- PATCHES.orig 2018-11-29 22:49:51 UTC
+--- PATCHES.orig 2019-05-26 19:28:51 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.4.cd.ifdef.1
---- init.c.orig 2018-11-24 19:06:11 UTC
+--- init.c.orig 2019-04-28 20:41:58 UTC
+++ init.c
-@@ -650,6 +650,52 @@ static mbchar_table *parse_mbchar_table
+@@ -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 2018-11-29 22:49:51 UTC
+--- init.h.orig 2019-05-09 20:47:17 UTC
+++ init.h
-@@ -4195,6 +4195,7 @@ static int parse_lists (BUFFER *, BUFFER
+@@ -4309,6 +4309,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 *);
-@@ -4259,6 +4260,7 @@ const struct command_t Commands[] = {
+@@ -4373,6 +4374,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-maildir-mtime
==============================================================================
--- head/mail/mutt/files/extra-patch-maildir-mtime Wed May 29 17:29:03 2019 (r502977)
+++ head/mail/mutt/files/extra-patch-maildir-mtime Wed May 29 17:41:34 2019 (r502978)
@@ -1,8 +1,8 @@
---- PATCHES.orig 2018-05-19 21:17:16 UTC
+--- PATCHES.orig 2019-05-26 19:28:55 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.7.ust.maildir-mtime.2
---- browser.c.orig 2018-05-19 20:33:53 UTC
+--- browser.c.orig 2019-05-26 19:28:52 UTC
+++ browser.c
@@ -32,6 +32,7 @@
#ifdef USE_IMAP
@@ -12,7 +12,7 @@
#include <stdlib.h>
#include <dirent.h>
-@@ -439,6 +439,21 @@
+@@ -460,6 +461,21 @@ static void init_state (struct browser_state *state, M
menu->data = state->entry;
}
@@ -24,7 +24,7 @@
+ if(!buf || buf->magic != MUTT_MAILDIR)
+ return;
+
-+ snprintf (buffer, sizeof (buffer), "%s/tmp", buf->path);
++ snprintf (buffer, sizeof (buffer), "%s/tmp", mutt_b2s(buf->pathbuf));
+ if (lstat (buffer, &s) != 0)
+ return;
+
@@ -32,21 +32,21 @@
+}
+
static int examine_directory (MUTTMENU *menu, struct browser_state *state,
- char *d, const char *prefix)
+ const char *d, const char *prefix)
{
-@@ -504,6 +504,7 @@
+@@ -526,6 +542,7 @@ static int examine_directory (MUTTMENU *menu, struct b
tmp = Incoming;
- while (tmp && mutt_strcmp (buffer, tmp->path))
+ while (tmp && mutt_strcmp (mutt_b2s (buffer), mutt_b2s (tmp->pathbuf)))
tmp = tmp->next;
+ check_maildir_times (tmp, &s);
if (tmp && Context &&
!mutt_strcmp (tmp->realpath, Context->realpath))
{
-@@ -578,6 +578,7 @@
+@@ -604,6 +621,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b
s.st_mtime = st2.st_mtime;
}
+ check_maildir_times (tmp, &s);
- add_folder (menu, state, buffer, &s, tmp);
+ add_folder (menu, state, mutt_b2s (mailbox), &s, tmp);
}
while ((tmp = tmp->next));
Modified: head/mail/mutt/files/extra-patch-maildir-mtime-nntp
==============================================================================
--- head/mail/mutt/files/extra-patch-maildir-mtime-nntp Wed May 29 17:29:03 2019 (r502977)
+++ head/mail/mutt/files/extra-patch-maildir-mtime-nntp Wed May 29 17:41:34 2019 (r502978)
@@ -24,7 +24,7 @@
+ if(!buf || buf->magic != MUTT_MAILDIR)
+ return;
+
-+ snprintf (buffer, sizeof (buffer), "%s/tmp", buf->path);
++ snprintf (buffer, sizeof (buffer), "%s/tmp", mutt_b2s(buf->pathbuf));
+ if (lstat (buffer, &s) != 0)
+ return;
+
Modified: head/mail/mutt/files/extra-patch-reverse_reply
==============================================================================
--- head/mail/mutt/files/extra-patch-reverse_reply Wed May 29 17:29:03 2019 (r502977)
+++ head/mail/mutt/files/extra-patch-reverse_reply Wed May 29 17:41:34 2019 (r502978)
@@ -1,10 +1,10 @@
---- PATCHES.orig 2018-11-29 22:55:14 UTC
+--- PATCHES.orig 2019-05-26 19:28:51 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.6.cb.reverse_reply.2
---- init.h.orig 2018-11-29 22:55:14 UTC
+--- init.h.orig 2019-05-26 19:28:51 UTC
+++ init.h
-@@ -2820,6 +2820,13 @@ struct option_t MuttVars[] = {
+@@ -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.
*/
@@ -18,9 +18,9 @@
{ "rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0 },
/*
** .pp
---- mutt.h.orig 2018-11-29 22:55:14 UTC
+--- mutt.h.orig 2019-04-28 20:41:58 UTC
+++ mutt.h
-@@ -478,6 +478,7 @@ enum
+@@ -490,6 +490,7 @@ enum
OPTREVALIAS,
OPTREVNAME,
OPTREVREAL,
@@ -28,9 +28,9 @@
OPTRFC2047PARAMS,
OPTSAVEADDRESS,
OPTSAVEEMPTY,
---- protos.h.orig 2018-11-24 19:06:21 UTC
+--- protos.h.orig 2019-04-28 20:41:58 UTC
+++ protos.h
-@@ -85,6 +85,7 @@ ADDRESS *mutt_get_address (ENVELOPE *, c
+@@ -85,6 +85,7 @@ ADDRESS *mutt_get_address (ENVELOPE *, char **);
ADDRESS *mutt_lookup_alias (const char *s);
ADDRESS *mutt_remove_duplicates (ADDRESS *);
ADDRESS *mutt_remove_xrefs (ADDRESS *, ADDRESS *);
@@ -38,9 +38,9 @@
ADDRESS *mutt_expand_aliases (ADDRESS *);
ADDRESS *mutt_parse_adrlist (ADDRESS *, const char *);
---- send.c.orig 2018-10-04 22:30:10 UTC
+--- send.c.orig 2019-05-10 02:20:15 UTC
+++ send.c
-@@ -600,6 +600,10 @@ void mutt_fix_reply_recipients (ENVELOPE
+@@ -716,6 +716,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);
@@ -49,11 +49,11 @@
+ env->cc = mutt_reverse_address (env->cc);
+ }
env->cc = mutt_remove_xrefs (env->to, env->cc);
-
+
if (env->cc && !env->to)
---- sendlib.c.orig 2018-11-24 19:06:11 UTC
+--- sendlib.c.orig 2019-05-09 00:19:59 UTC
+++ sendlib.c
-@@ -2754,6 +2754,35 @@ static void set_noconv_flags (BODY *b, s
+@@ -2764,6 +2764,35 @@ static void set_noconv_flags (BODY *b, short flag)
}
}
Modified: head/mail/mutt/files/extra-patch-smartdate
==============================================================================
--- head/mail/mutt/files/extra-patch-smartdate Wed May 29 17:29:03 2019 (r502977)
+++ head/mail/mutt/files/extra-patch-smartdate Wed May 29 17:41:34 2019 (r502978)
@@ -1,6 +1,6 @@
---- hdrline.c.orig 2018-11-29 23:19:39 UTC
+--- hdrline.c.orig 2019-05-26 19:28:51 UTC
+++ hdrline.c
-@@ -249,6 +249,89 @@ static char *apply_subject_mods (ENVELOP
+@@ -249,6 +249,89 @@ static char *apply_subject_mods (ENVELOPE *env)
* %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label)
* %Z = status flags */
@@ -92,9 +92,9 @@
size_t destlen,
@@ -422,7 +505,13 @@ hdr_format_str (char *dest,
- if (!do_locales)
- setlocale (LC_TIME, "C");
-- strftime (buf2, sizeof (buf2), dest, tm);
+ 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 );
@@ -102,14 +102,14 @@
+ else {
+ strftime (buf2, sizeof (buf2), dest, tm);
+ }
- if (!do_locales)
- setlocale (LC_TIME, "");
+ if (!do_locales)
+ setlocale (LC_TIME, "");
---- mutt.h.orig 2018-11-29 23:17:47 UTC
+--- mutt.h.orig 2019-05-26 19:28:51 UTC
+++ mutt.h
-@@ -156,6 +156,16 @@ typedef enum
- MUTT_FORMAT_NOFILTER = (1<<7) /* do not allow filtering on this pass */
- } format_flag;
+@@ -164,6 +164,16 @@ typedef enum
+ MUTT_WRITE_HEADER_MIME
+ } mutt_write_header_mode;
+/* flags for SmartDate */
+typedef enum {
Added: head/mail/mutt/files/extra-patch-vvv.quote
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/mutt/files/extra-patch-vvv.quote Wed May 29 17:41:34 2019 (r502978)
@@ -0,0 +1,81 @@
+--- PATCHES.orig 2017-12-03 03:10:17 UTC
++++ PATCHES
+@@ -0,0 +1 @@
++vvv.quote
+--- handler.c.orig 2019-04-28 20:41:58 UTC
++++ handler.c
+@@ -1593,7 +1593,31 @@ static int text_plain_handler (BODY *b, STATE *s)
+ buf[--l] = 0;
+ }
+ if (s->prefix)
+- state_puts (s->prefix, s);
++ {
++ int i;
++ char qbuf[2 * LONG_STRING];
++ int j = 0, offset = 0;
++ regmatch_t pmatch[1];
++
++ while (regexec ((regex_t *) QuoteRegexp.rx, &buf[offset], 1, pmatch, 0) == 0)
++ offset += pmatch->rm_eo;
++
++ if (!option (OPTQUOTEEMPTY) && !*buf)
++ strcpy (qbuf, buf);
++ else if (option (OPTQUOTEQUOTED) && offset)
++ {
++ for (i = 0; i < offset; i++)
++ if (buf[i] != ' ')
++ j = i;
++ strncpy (qbuf, buf, j + 1);
++ strcpy (qbuf + j + 1, buf + j);
++ }
++ else
++ snprintf (qbuf, sizeof (qbuf), "%s%s", NONULL(s->prefix), buf);
++
++ state_puts (qbuf, s);
++ }
++ else
+ state_puts (buf, s);
+ state_putc ('\n', s);
+ }
+@@ -1779,7 +1803,7 @@ int mutt_body_handler (BODY *b, STATE *s)
+ */
+ if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (b))
+ encrypted_handler = handler = crypt_pgp_application_pgp_handler;
+- else if (option(OPTREFLOWTEXT) && ascii_strcasecmp ("flowed", mutt_get_parameter ("format", b->parameter)) == 0)
++ else if (option(OPTREFLOWTEXT) && ascii_strcasecmp ("flowed", mutt_get_parameter ("format", b->parameter)) == 0 && !s->prefix)
+ handler = rfc3676_handler;
+ else
+ handler = text_plain_handler;
+--- init.h.orig 2019-05-09 20:47:17 UTC
++++ init.h
+@@ -2731,6 +2731,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.
+ */
++ { "quote_empty", DT_BOOL, R_NONE, OPTQUOTEEMPTY, 1 },
++ /*
++ ** .pp
++ ** Controls whether or not empty lines will be quoted using
++ ** ``$indent_string''.
++ */
++ { "quote_quoted", DT_BOOL, R_NONE, OPTQUOTEQUOTED, 0 },
++ /*
++ ** .pp
++ ** Controls how quoted lines will be quoted. If set, one quote
++ ** character will be added to the end of existing prefix. Otherwise,
++ ** quoted lines will be prepended by ``$indent_string''.
++ */
+ { "quote_regexp", DT_RX, R_PAGER, UL &QuoteRegexp, UL "^([ \t]*[|>:}#])+" },
+ /*
+ ** .pp
+--- mutt.h.orig 2019-04-28 20:41:58 UTC
++++ mutt.h
+@@ -478,6 +478,8 @@ enum
+ OPTPRINTDECODE,
+ OPTPRINTSPLIT,
+ OPTPROMPTAFTER,
++ OPTQUOTEEMPTY,
++ OPTQUOTEQUOTED,
+ OPTREADONLY,
+ OPTREFLOWSPACEQUOTES,
+ OPTREFLOWTEXT,
Modified: head/mail/mutt/files/patch-Makefile.in
==============================================================================
--- head/mail/mutt/files/patch-Makefile.in Wed May 29 17:29:03 2019 (r502977)
+++ head/mail/mutt/files/patch-Makefile.in Wed May 29 17:41:34 2019 (r502978)
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2018-11-25 17:43:43 UTC
+--- Makefile.in.orig 2019-05-25 16:13:42 UTC
+++ Makefile.in
-@@ -531,7 +531,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign
+@@ -537,7 +537,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign
@BUILD_DOC_TRUE at DOC_SUBDIR = doc
@BUILD_IMAP_TRUE at IMAP_SUBDIR = imap
@BUILD_IMAP_TRUE at IMAP_INCLUDES = -I$(top_srcdir)/imap
@@ -8,8 +8,8 @@
+SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) . $(DOC_SUBDIR)
bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET)
@BUILD_HCACHE_TRUE at HCVERSION = hcversion.h
- BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c $(HCVERSION)
-@@ -1667,18 +1667,9 @@ install-exec-hook:
+ BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c version.h $(HCVERSION)
+@@ -1678,18 +1678,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-browser.c
==============================================================================
--- head/mail/mutt/files/patch-browser.c Wed May 29 17:29:03 2019 (r502977)
+++ head/mail/mutt/files/patch-browser.c Wed May 29 17:41:34 2019 (r502978)
@@ -1,6 +1,6 @@
---- browser.c.orig 2016-10-08 19:35:50 UTC
+--- browser.c.orig 2019-04-28 20:41:58 UTC
+++ browser.c
-@@ -80,6 +80,12 @@ static int browser_compare_subject (cons
+@@ -86,6 +86,12 @@ static int browser_compare_subject (const void *a, con
struct folder_file *pa = (struct folder_file *) a;
struct folder_file *pb = (struct folder_file *) b;
@@ -13,7 +13,7 @@
int r = mutt_strcoll (pa->name, pb->name);
return ((BrowserSort & SORT_REVERSE) ? -r : r);
-@@ -90,6 +96,12 @@ static int browser_compare_date (const v
+@@ -96,6 +102,12 @@ static int browser_compare_date (const void *a, const
struct folder_file *pa = (struct folder_file *) a;
struct folder_file *pb = (struct folder_file *) b;
@@ -26,16 +26,16 @@
int r = pa->mtime - pb->mtime;
return ((BrowserSort & SORT_REVERSE) ? -r : r);
-@@ -100,6 +112,12 @@ static int browser_compare_size (const v
+@@ -105,6 +117,12 @@ static int browser_compare_size (const void *a, const
+ {
struct folder_file *pa = (struct folder_file *) a;
struct folder_file *pb = (struct folder_file *) b;
-
++
+ /* Always keep '..' in first menu position */
+ if (!strncmp(pa->name, "..", 2))
+ return(-1);
+ if (!strncmp(pb->name, "..", 2))
+ return(1);
-+
+
int r = pa->size - pb->size;
- return ((BrowserSort & SORT_REVERSE) ? -r : r);
Modified: head/mail/mutt/files/patch-contrib_Makefile.in
==============================================================================
--- head/mail/mutt/files/patch-contrib_Makefile.in Wed May 29 17:29:03 2019 (r502977)
+++ head/mail/mutt/files/patch-contrib_Makefile.in Wed May 29 17:41:34 2019 (r502978)
@@ -1,11 +1,11 @@
---- contrib/Makefile.in.orig 2018-11-25 17:43:43 UTC
+--- contrib/Makefile.in.orig 2019-05-25 16:13:42 UTC
+++ contrib/Makefile.in
-@@ -272,7 +272,7 @@ top_build_prefix = @top_build_prefix@
+@@ -278,7 +278,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
subdir = contrib
-SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
+SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp6.rc Tin.rc \
sample.mailcap sample.muttrc sample.muttrc-sidebar sample.muttrc-tlr \
- sample.muttrc-compress sample.vimrc-sidebar colors.default colors.linux smime.rc \
- ca-bundle.crt smime_keys_test.pl mutt_xtitle
+ sample.muttrc-compress sample.muttrc-starter \
+ sample.vimrc-sidebar colors.default colors.linux smime.rc \
Modified: head/mail/mutt/files/patch-date-conditional
==============================================================================
--- head/mail/mutt/files/patch-date-conditional Wed May 29 17:29:03 2019 (r502977)
+++ head/mail/mutt/files/patch-date-conditional Wed May 29 17:41:34 2019 (r502978)
@@ -1,13 +1,13 @@
---- PATCHES.orig 2017-12-03 03:10:17 UTC
+--- PATCHES.orig 2019-05-26 19:28:53 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.0.ats.date_conditional.1
---- hdrline.c.orig 2018-11-24 19:06:11 UTC
+--- hdrline.c.orig 2019-05-26 19:28:52 UTC
+++ hdrline.c
@@ -428,6 +428,53 @@ hdr_format_str (char *dest,
- const char *cp;
- struct tm *tm;
- time_t T;
+ const char *cp;
+ struct tm *tm;
+ time_t T;
+ int i = 0, invert = 0;
+
+ if (optional && (op == '[' || op == '(')) {
@@ -56,11 +56,11 @@
+ break;
+ }
- p = dest;
+ p = dest;
---- muttlib.c.orig 2018-11-24 19:06:21 UTC
+--- muttlib.c.orig 2019-04-28 20:41:58 UTC
+++ muttlib.c
-@@ -1382,7 +1382,16 @@ void mutt_FormatString (char *dest, /*
+@@ -1487,7 +1487,16 @@ void mutt_FormatString (char *dest, /* output buffer
if (*src == '?')
{
flags |= MUTT_FORMAT_OPTIONAL;
@@ -78,7 +78,7 @@
}
else
{
-@@ -1398,12 +1407,12 @@ void mutt_FormatString (char *dest, /*
+@@ -1503,12 +1512,12 @@ void mutt_FormatString (char *dest, /* output buffer
count++;
}
*cp = 0;
Modified: head/mail/mutt/files/patch-dgc-deepif
==============================================================================
--- head/mail/mutt/files/patch-dgc-deepif Wed May 29 17:29:03 2019 (r502977)
+++ head/mail/mutt/files/patch-dgc-deepif Wed May 29 17:41:34 2019 (r502978)
@@ -1,6 +1,6 @@
---- muttlib.c.orig 2017-06-03 02:20:37 UTC
+--- muttlib.c.orig 2019-05-26 19:28:53 UTC
+++ muttlib.c
-@@ -1425,6 +1425,12 @@ void mutt_FormatString (char *dest, /*
+@@ -1530,6 +1530,12 @@ void mutt_FormatString (char *dest, /* output buffer
count = 0;
while (count < sizeof (ifstring) && *src && *src != '?' && *src != '&')
{
@@ -13,7 +13,7 @@
*cp++ = *src++;
count++;
}
-@@ -1437,7 +1437,13 @@ void mutt_FormatString (char *dest, /*
+@@ -1542,7 +1548,13 @@ void mutt_FormatString (char *dest, /* output buffer
count = 0;
while (count < sizeof (elsestring) && *src && *src != '?')
{
Modified: head/mail/mutt/files/patch-doc_Makefile.in
==============================================================================
--- head/mail/mutt/files/patch-doc_Makefile.in Wed May 29 17:29:03 2019 (r502977)
+++ head/mail/mutt/files/patch-doc_Makefile.in Wed May 29 17:41:34 2019 (r502978)
@@ -1,6 +1,6 @@
---- doc/Makefile.in.orig 2018-12-01 04:54:52 UTC
+--- doc/Makefile.in.orig 2019-05-25 16:13:43 UTC
+++ doc/Makefile.in
-@@ -678,14 +678,7 @@ install-data-local: makedoc-all instdoc
+@@ -684,14 +684,7 @@ install-data-local: makedoc-all instdoc
-for f in $(HTML_DOCFILES) ; do \
$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
done
@@ -16,7 +16,7 @@
-if [ -f mutt.info ] ; then \
$(MKDIR_P) $(DESTDIR)$(infodir) ; \
$(INSTALL) -m 644 mutt.info $(DESTDIR)$(infodir) ; \
-@@ -721,9 +714,7 @@ uninstall-local:
+@@ -727,9 +720,7 @@ uninstall-local:
check:
manual.txt: manual.html
Modified: head/mail/mutt/files/patch-doc_Muttrc
==============================================================================
--- head/mail/mutt/files/patch-doc_Muttrc Wed May 29 17:29:03 2019 (r502977)
+++ head/mail/mutt/files/patch-doc_Muttrc Wed May 29 17:41:34 2019 (r502978)
@@ -1,6 +1,6 @@
---- doc/Muttrc.orig 2018-05-19 20:52:48 UTC
+--- doc/Muttrc.orig 2019-05-25 16:14:02 UTC
+++ doc/Muttrc
-@@ -709,6 +709,7 @@
+@@ -723,6 +723,7 @@ attachments -I message/external-body
# will be saved for later references. Also see $record,
# $save_name, $force_name and ``fcc-hook''.
#
Modified: head/mail/mutt/files/patch-muttlib.c
==============================================================================
--- head/mail/mutt/files/patch-muttlib.c Wed May 29 17:29:03 2019 (r502977)
+++ head/mail/mutt/files/patch-muttlib.c Wed May 29 17:41:34 2019 (r502978)
@@ -1,17 +1,17 @@
---- muttlib.c.orig 2018-11-24 19:06:21 UTC
+--- muttlib.c.orig 2019-05-26 19:28:53 UTC
+++ muttlib.c
-@@ -845,16 +845,15 @@ void _mutt_buffer_mktemp (BUFFER *buf, c
+@@ -856,16 +856,15 @@ void _mutt_buffer_mktemp (BUFFER *buf, const char *pre
void _mutt_mktemp (char *s, size_t slen, const char *prefix, const char *suffix,
const char *src, int line)
{
- size_t n = snprintf (s, slen, "%s/%s-%s-%d-%d-%ld%ld%s%s",
-- NONULL (Tempdir), NONULL (prefix), NONULL (Hostname),
-- (int) getuid (), (int) getpid (), random (), random (),
-- suffix ? "." : "", NONULL (suffix));
+- NONULL (Tempdir), NONULL (prefix), NONULL (Hostname),
+- (int) getuid (), (int) getpid (), random (), random (),
+- suffix ? "." : "", NONULL (suffix));
+ size_t n = snprintf (s, slen, "%s/mutt-%s-XXXXXXXX", NONULL (Tempdir), NONULL (Hostname));
if (n >= slen)
dprint (1, (debugfile, "%s:%d: ERROR: insufficient buffer space to hold temporary filename! slen=%zu but need %zu\n",
- src, line, slen, n));
+ src, line, slen, n));
- dprint (3, (debugfile, "%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s));
- if (unlink (s) && errno != ENOENT)
- dprint (1, (debugfile, "%s:%d: ERROR: unlink(\"%s\"): %s (errno %d)\n", src, line, s, strerror (errno), errno));
@@ -22,4 +22,4 @@
+ }
}
- void mutt_free_alias (ALIAS **p)
+ /* these characters must be escaped in regular expressions */
Modified: head/mail/mutt/files/patch-smime-sender
==============================================================================
--- head/mail/mutt/files/patch-smime-sender Wed May 29 17:29:03 2019 (r502977)
+++ head/mail/mutt/files/patch-smime-sender Wed May 29 17:41:34 2019 (r502978)
@@ -1,6 +1,6 @@
---- commands.c.orig 2018-10-04 22:30:10 UTC
+--- commands.c.orig 2019-04-28 20:41:58 UTC
+++ commands.c
-@@ -186,7 +186,7 @@ int mutt_display_message (HEADER *cur)
+@@ -266,7 +266,7 @@ int mutt_display_message (HEADER *cur)
{
if (cur->security & GOODSIGN)
{
@@ -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 2018-11-24 19:06:11 UTC
+--- init.h.orig 2019-05-26 19:28:51 UTC
+++ init.h
-@@ -3232,6 +3232,15 @@ struct option_t MuttVars[] = {
+@@ -3357,6 +3357,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 2018-11-24 19:06:11 UTC
+--- mutt.h.orig 2019-05-26 19:28:52 UTC
+++ mutt.h
-@@ -551,6 +551,7 @@ enum
+@@ -566,6 +566,7 @@ enum
OPTSMIMEISDEFAULT,
OPTSMIMESELFENCRYPT,
OPTASKCERTLABEL,
Modified: head/mail/mutt/files/patch-threadcomplete
==============================================================================
--- head/mail/mutt/files/patch-threadcomplete Wed May 29 17:29:03 2019 (r502977)
+++ head/mail/mutt/files/patch-threadcomplete Wed May 29 17:41:34 2019 (r502978)
@@ -1,6 +1,6 @@
---- mutt.h.orig 2018-11-24 19:06:11 UTC
+--- mutt.h.orig 2019-05-26 19:28:54 UTC
+++ mutt.h
-@@ -234,6 +234,7 @@ enum
+@@ -242,6 +242,7 @@ enum
MUTT_EXPIRED,
MUTT_SUPERSEDED,
MUTT_TRASH,
@@ -8,7 +8,7 @@
/* actions for mutt_pattern_comp/mutt_pattern_exec */
MUTT_AND,
---- pattern.c.orig 2018-11-24 19:06:11 UTC
+--- pattern.c.orig 2019-05-10 01:46:06 UTC
+++ pattern.c
@@ -57,6 +57,7 @@ static const struct pattern_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 },
-@@ -1343,6 +1344,16 @@ mutt_pattern_exec (struct pattern_t *pat
+@@ -1338,6 +1339,16 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec
else
result = mutt_is_list_cc (pat->alladdr, h->env->to, h->env->cc);
return (pat->not ^ result);
Modified: head/mail/mutt/pkg-plist
==============================================================================
--- head/mail/mutt/pkg-plist Wed May 29 17:29:03 2019 (r502977)
+++ head/mail/mutt/pkg-plist Wed May 29 17:41:34 2019 (r502978)
@@ -75,6 +75,7 @@ man/man5/muttrc.5.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-compress
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-sidebar
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-starter
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-tlr
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.vimrc-sidebar
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smime.rc
More information about the svn-ports-head
mailing list