svn commit: r540778 - in branches/2020Q2/mail/mutt: . files
Niclas Zeising
zeising at FreeBSD.org
Mon Jun 29 14:58:52 UTC 2020
Author: zeising
Date: Mon Jun 29 14:58:48 2020
New Revision: 540778
URL: https://svnweb.freebsd.org/changeset/ports/540778
Log:
MFH: r530651 r534246 r535833 r536629 r538859 r540343
This updates mail/mutt to 1.14.5
This merges all changes to mail/mutt that have been done to FreeBSD ports
head branch during the 2020Q2 period. This is needed in order to update
mail/mutt to 1.14.5 in order to fix security issues.
mail/mutt: upgrade 1.13.4 -> 1.13.5
- Bring back vvv quote/initials patches
- Remove NNTP option (XML as well)
- Update default option patches context
PR: 245175
Submitted by: Derek Schrock <dereks at lifeofadishwasher.com> (maintainer)
Relnotes: https://marc.info/?l=mutt-users&m=158542977114051&w=2
mail/mutt: update 1.13.5 -> 1.14.0
- Default DEBUG option
(very small performance impact and ~4% binary size increase)
PR: 246270
Submitted by: Derek Schrock <dereks at lifeofadishwasher.com> (maintainer)
Relnotes: http://www.mutt.org/relnotes/1.14/
mail/mutt: update 1.14.0 -> 1.14.1
- Rename DEBUG option to DEBUG_LOGS
- Add lang/perl5 deps that triggers a Muttrc rebuild
- Make smime patch optional due to perl build deps.
- Remove unnecessary doc patches and REINPLACE_CMD
- Move build changing patches to make targets
- ASPELL updates the (pre)built Muttrc to not require a rebuild
PR: 246559
Submitted by: Derek Schrock <dereks at lifeofadishwasher.com> (maintainer)
Relnotes: https://marc.info/?l=mutt-users&m=158965668315387&w=2
mail/mutt: Update to 1.14.2
ChangeLog: http://www.mutt.org/
PR: 246731
Submitted by: dereks at lifeofadishwasher.com (maintainer)
mail/mutt: Update to 1.14.3
- Update to 1.14.3
- Muttrc removed from dist. making perl a BUILD_DEPENDS
- manual.txt removed from dist. making lynx a DOCS_BUILD_DEPENDS
- Remove MASTER_SITES not updated or can't connect
PR: 247266
Submitted by: Derek Schrock <dereks at lifeofadishwasher.com> (maintainer)
Relnotes: https://marc.info/?l=mutt-users&m=159217236324614&w=2
mail/mutt: Update to 1.14.5
Update mail/mutt to 1.14.5, this is a security fix release, with fixes for
CVE-2020-14093 and CVE-2020-14954
PR: 247400
Submitted by: Derek Schrock
Security: 5b397852-b1d0-11ea-a11c-4437e6ad11c4
29b13a34-b1d2-11ea-a11c-4437e6ad11c4
Approved by: ports-secteam (joenum)
Added:
branches/2020Q2/mail/mutt/files/extra-smime-sender
- copied unchanged from r535833, head/mail/mutt/files/extra-smime-sender
Deleted:
branches/2020Q2/mail/mutt/files/extra-nntp-depfiles
branches/2020Q2/mail/mutt/files/extra-patch-doc-ref
branches/2020Q2/mail/mutt/files/extra-patch-forcebase64-nntp
branches/2020Q2/mail/mutt/files/extra-patch-maildir-mtime-nntp
branches/2020Q2/mail/mutt/files/patch-Makefile.in
branches/2020Q2/mail/mutt/files/patch-contrib_Makefile.in
branches/2020Q2/mail/mutt/files/patch-doc_Makefile.in
branches/2020Q2/mail/mutt/files/patch-doc_manual.xml.head
branches/2020Q2/mail/mutt/files/patch-smime-sender
Modified:
branches/2020Q2/mail/mutt/Makefile
branches/2020Q2/mail/mutt/distinfo
branches/2020Q2/mail/mutt/files/extra-patch-ifdef
branches/2020Q2/mail/mutt/files/extra-patch-maildir-mtime
branches/2020Q2/mail/mutt/files/extra-patch-reverse_reply
branches/2020Q2/mail/mutt/files/extra-patch-smartdate
branches/2020Q2/mail/mutt/files/patch-browser.c
branches/2020Q2/mail/mutt/files/patch-date-conditional
branches/2020Q2/mail/mutt/files/patch-dgc-deepif
branches/2020Q2/mail/mutt/files/patch-muttlib.c
branches/2020Q2/mail/mutt/files/patch-threadcomplete
branches/2020Q2/mail/mutt/pkg-plist
Directory Properties:
branches/2020Q2/ (props changed)
Modified: branches/2020Q2/mail/mutt/Makefile
==============================================================================
--- branches/2020Q2/mail/mutt/Makefile Mon Jun 29 14:44:36 2020 (r540777)
+++ branches/2020Q2/mail/mutt/Makefile Mon Jun 29 14:58:48 2020 (r540778)
@@ -2,12 +2,10 @@
# $FreeBSD$
PORTNAME= mutt
-DISTVERSION= 1.13.4
+DISTVERSION= 1.14.5
CATEGORIES+= mail
MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \
- ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
https://bitbucket.org/mutt/mutt/downloads/ \
- 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
DIST_SUBDIR= mutt
@@ -25,7 +23,8 @@ LICENSE= GPLv2+
RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:misc/mime-support
-USES= cpe shebangfix ssl
+USES= cpe perl5 shebangfix ssl
+USE_PERL5= build
CONFLICTS= ja-mutt-[0-9]* ja-mutt-devel-[0-9]* mutt-1.4* mutt-devel-lite-[0-9]* mutt-lite-[0-9]* zh-mutt-devel-[0-9]*
@@ -46,10 +45,10 @@ GNU_CONFIGURE= yes
OPTIONS_SUB= yes
-OPTIONS_DEFINE= AUTOCRYPT DEBUG DOCS EXAMPLES FLOCK FORCEBASE64 GPGME \
+OPTIONS_DEFINE= AUTOCRYPT DEBUG_LOGS DOCS EXAMPLES FLOCK FORCEBASE64 GPGME \
GREETING_PATCH HTML ICONV IDN IFDEF_PATCH LOCALES_FIX \
- MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NLS QUOTE_PATCH NNTP \
- REVERSE_REPLY_PATCH SASL SMART_DATE SMTP URLVIEW XML
+ MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NLS QUOTE_PATCH \
+ REVERSE_REPLY_PATCH SASL SMIME SMART_DATE SMTP URLVIEW
OPTIONS_SINGLE= GSSAPI HCACHE SCREEN
OPTIONS_RADIO= SPELL
@@ -59,7 +58,7 @@ OPTIONS_SINGLE_HCACHE= HCACHE_BDB HCACHE_TOKYOCABINET
OPTIONS_SINGLE_SCREEN= NCURSES SLANG
AUTOCRYPT_DESC= Convenient End-to-End Encryption
-DEBUG_DESC= Debugging capabilities
+DEBUG_LOGS_DESC= Debugging capabilities
FLOCK_DESC= flock() usage
FORCEBASE64_DESC= Option to force base64 encoding for compose
GPGME_DESC= Gpgme interface
@@ -80,15 +79,15 @@ NLS_DESC= Native language support (implies ICONV)
QUOTE_PATCH_DESC= Extended quoting
REVERSE_REPLY_PATCH_DESC= Reverse_reply
SASL_DESC= SASL authentication
+SMIME_DESC= SMIME email check option patch
SLANG_DESC= SLANG support
SMART_DATE_DESC= Dynamic date formatting with "%@"
SMTP_DESC= SMTP relay support
URLVIEW_DESC= Use urlview for the URL selector menu
-XML_DESC= Use XML tools for rebuilding documentation
-OPTIONS_DEFAULT= AUTOCRYPT GPGME GSSAPI_NONE HCACHE_BDB HTML ICONV IDN \
+OPTIONS_DEFAULT= AUTOCRYPT DEBUG_LOGS GPGME GSSAPI_NONE HCACHE_BDB HTML ICONV IDN \
IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NCURSES \
- NLS REVERSE_REPLY_PATCH SASL SMART_DATE SMTP URLVIEW XML
+ NLS QUOTE_PATCH REVERSE_REPLY_PATCH SASL SMIME SMART_DATE SMTP URLVIEW
.ifmake makesum # for optional distfiles patchfiles
OPTIONS_OVERRIDE= ${OPTIONS_DEFINE} ${OPTIONS_DEFAULT}
@@ -110,8 +109,10 @@ ISPELL_BUILD_DEPENDS= ispell:textproc/aspell-ispell
ISPELL_RUN_DEPENDS= ispell:textproc/aspell-ispell
URLVIEW_RUN_DEPENDS= urlview:textproc/urlview
-DEBUG_CONFIGURE_ON= --enable-debug
+DEBUG_LOGS_CONFIGURE_ON= --enable-debug
+DOCS_BUILD_DEPENDS= lynx:www/lynx
+
# Handle ncurses/ncurses-port/slang
SLANG_CONFIGURE_ON= --with-slang=${LOCALBASE}
SLANG_LIB_DEPENDS= libslang.so:devel/libslang2
@@ -153,6 +154,8 @@ REVERSE_REPLY_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-p
SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
SASL_CONFIGURE_ON= --with-sasl=${LOCALBASE}
+SMIME_EXTRA_PATCHES= ${PATCHDIR}/extra-smime-sender
+
SMART_DATE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-smartdate
FLOCK_CONFIGURE_ENABLE= flock
@@ -173,98 +176,50 @@ GPGME_CONFIGURE_ENABLE= gpgme
SMTP_CONFIGURE_ENABLE= smtp
+FORCEBASE64_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-forcebase64
+
+MAILDIR_MTIME_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-maildir-mtime
+
GREETING_PATCH_PATCHFILES= mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc
-QUOTE_PATCH_BROKEN= QUOTE_PATCH broken on 1.13.0
QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv \
patch-${VVV_PATCH_VERSION}.vvv.quote.xz:vvv
-NNTP_BROKEN= NNTP_PATCH broken on 1.13.0
-NNTP_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.nntp.xz:-p1:vvv
-NNTP_EXTRA_PATCHES= ${PATCHDIR}/extra-nntp-depfiles
-NNTP_CONFIGURE_ON= --enable-nntp
-NNTP_VARS= XML_NEEDED=yes
-NNTP_CATEGORIES= news
-NNTP_USES= perl5
-
-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.12.1
-GREETING_PATCH_VERSION= 1.13.2
+VVV_PATCH_VERSION= 1.13.0
+GREETING_PATCH_VERSION= 1.14.3
-post-patch-NNTP-on:
-# Restore timestamps for autotools sources
- @${TOUCH} -r ${WRKSRC}/configure.ac.orig ${WRKSRC}/configure.ac
- @${TOUCH} -r ${WRKSRC}/Makefile.am.orig ${WRKSRC}/Makefile.am
-.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
-.if defined(${PATCH_DEBUG})
- @${ECHO} "===> Applying ${.TARGET} extra-patch-maildir-mtime-nntp"
-.endif
- @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime-nntp
-.endif
-.if ${PORT_OPTIONS:MFORCEBASE64}
-.if defined(PATCH_DEBUG)
- @${ECHO} "===> Applying ${.TARGET} extra-patch-forcebase64-nntp"
-.endif
- @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64-nntp
-.endif
-
-post-patch-NNTP-off:
-.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
-.if defined(PATCH_DEBUG)
- @${ECHO} "===> Applying ${.TARGET} extra-patch-maildir-mtime"
-.endif
- @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime
-.endif
-.if ${PORT_OPTIONS:MFORCEBASE64}
-.if defined(PATCH_DEBUG)
- @${ECHO} "===> Applying ${.TARGET} extra-patch-forcebase64"
-.endif
- @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64
-.endif
-
post-install:
${INSTALL_MAN} ${FILESDIR}/mailcap.5 ${STAGEDIR}${MANPREFIX}/man/man5
-post-install-NNTP-on:
- ${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}
-
pre-configure::
+ # Stop make from setgid mutt_dotlock
+ @${REINPLACE_CMD} \
+ -e '/if test.*mutt_dotlock.*DOTLOCK_GROUP/s/if/if ${FALSE} \&\&/' \
+ ${WRKSRC}/Makefile.in
+ # Base FreeBSD krb5-config --version returns "FreeBSD heimdal"
@${REINPLACE_CMD} -e 's,?eimdal\*),?eimdal*|\"FreeBSD heimdal\"*),' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
- @${REINPLACE_CMD} -e 's,pgp6,pgp,g' \
- ${WRKSRC}/contrib/pgp6.rc
- @${REINPLACE_CMD} -E -e 's#(/samples|samples/)#share/examples/mutt#g' \
- ${WRKSRC}/doc/reference.html \
- ${WRKSRC}/doc/manual.html \
- ${WRKSRC}/doc/manual.txt \
- ${WRKSRC}/doc/Muttrc \
- ${WRKSRC}/INSTALL \
- ${WRKSRC}/init.h
+ # Install contrib samples to ${EXAMPLESDIR}
@${REINPLACE_CMD} -e 's#$$(docdir)/samples#${EXAMPLESDIR}#g' \
${WRKSRC}/contrib/Makefile.in
-pre-configure-ASPELL-on:
- @${REINPLACE_CMD} -e '/^# append-hook/p' \
- -e 's/^# append-hook.*$$/set ispell="aspell --mode=email check"/' \
- ${WRKSRC}/doc/Muttrc.head
-
pre-configure-HCACHE_BDB-on:
@${REINPLACE_CMD} -E -e 's/BDB_VERSIONS="/&${BDB_LIB_NAME} db${BDB_VER} /' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-.if defined (XML_NEEDED) && ${PORT_OPTIONS:MXML}
-BUILD_DEPENDS+= xsltproc:textproc/libxslt \
- ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
- lynx:www/lynx
-.else
-pre-build::
- @${REINPLACE_CMD} \
- -e '/^BUILD_DOC_TARGETS/s/=.*/=/' \
- ${WRKSRC}/doc/Makefile
-.endif
+# Undo some dist. installed files
+post-stage::
+ @${MV} ${STAGEDIR}/${LOCALBASE}/etc/Muttrc.dist \
+ ${STAGEDIR}/${LOCALBASE}/etc/Muttrc.sample
+ @${RM} ${STAGEDIR}/${LOCALBASE}/etc/mime.types*
+
+# Change default ispell
+post-build-ASPELL-on:
+ @${REINPLACE_CMD} -e '/^# append-hook/p' \
+ -e 's/^# append-hook.*$$/set ispell="aspell --mode=email check"/' \
+ ${WRKSRC}/doc/Muttrc
.include <bsd.port.mk>
Modified: branches/2020Q2/mail/mutt/distinfo
==============================================================================
--- branches/2020Q2/mail/mutt/distinfo Mon Jun 29 14:44:36 2020 (r540777)
+++ branches/2020Q2/mail/mutt/distinfo Mon Jun 29 14:58:48 2020 (r540778)
@@ -1,11 +1,9 @@
-TIMESTAMP = 1581806451
-SHA256 (mutt/mutt-1.13.4.tar.gz) = b57d3f1040d8018114cf1033dab229f36e4becbcdf59c2edeb294fc044ffcd04
-SIZE (mutt/mutt-1.13.4.tar.gz) = 4901222
-SHA256 (mutt/mutt-1.13.2.vc.greeting) = b11fcfad1f53f16f89a8ecc334fba615698f5bcaa9373fd487a6c9d95c3872ad
-SIZE (mutt/mutt-1.13.2.vc.greeting) = 4573
-SHA256 (mutt/patch-1.12.1.vvv.nntp.xz) = 9c420584d549ac0bb49c52ddfd2ab5bee0f89e59cb938673444ec27ad7c782ad
-SIZE (mutt/patch-1.12.1.vvv.nntp.xz) = 49672
-SHA256 (mutt/patch-1.12.1.vvv.initials.xz) = 6c66fe6c23362b0f4970a5028a75a33454e1e53ba178e5801113939f1bc22920
-SIZE (mutt/patch-1.12.1.vvv.initials.xz) = 724
-SHA256 (mutt/patch-1.12.1.vvv.quote.xz) = 365200817a203a892094062445865b7b8f9ab37e8214ec526082876ffd0d8ab4
-SIZE (mutt/patch-1.12.1.vvv.quote.xz) = 1332
+TIMESTAMP = 1592947493
+SHA256 (mutt/mutt-1.14.5.tar.gz) = 316b11cabd41a21c1d981f11d93e000337a628800d50127df19fe2593f8e3d5c
+SIZE (mutt/mutt-1.14.5.tar.gz) = 5008208
+SHA256 (mutt/mutt-1.14.3.vc.greeting) = c6067f19e51e99e3c981c0c45a29fb442626d8bb3f0df56736ce4ee0eb0bfa83
+SIZE (mutt/mutt-1.14.3.vc.greeting) = 4472
+SHA256 (mutt/patch-1.13.0.vvv.initials.xz) = 8b25ad6596bd57d94f6551e7e73ceb8da620468e96fb507b2f51545d5b3eaa02
+SIZE (mutt/patch-1.13.0.vvv.initials.xz) = 720
+SHA256 (mutt/patch-1.13.0.vvv.quote.xz) = 788d25d1439d86d6c5007d141d1c219496e77940b5ce37819471c941f78f03e4
+SIZE (mutt/patch-1.13.0.vvv.quote.xz) = 1340
Modified: branches/2020Q2/mail/mutt/files/extra-patch-ifdef
==============================================================================
--- branches/2020Q2/mail/mutt/files/extra-patch-ifdef Mon Jun 29 14:44:36 2020 (r540777)
+++ branches/2020Q2/mail/mutt/files/extra-patch-ifdef Mon Jun 29 14:58:48 2020 (r540778)
@@ -1,10 +1,10 @@
---- PATCHES.orig 2019-12-14 21:57:56 UTC
+--- PATCHES.orig 2020-05-05 02:09:32 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.4.cd.ifdef.1
---- init.c.orig 2019-11-30 21:59:38 UTC
+--- init.c.orig 2020-05-02 21:08:56 UTC
+++ init.c
-@@ -651,6 +651,52 @@ static mbchar_table *parse_mbchar_table (const char *s
+@@ -643,6 +643,52 @@ static mbchar_table *parse_mbchar_table (const char *s
return t;
}
@@ -20,7 +20,7 @@
+ if (!(res = (mutt_option_index (tmp->data) != -1)))
+ for (i = 0; !res && i < MENU_MAX; i++)
+ {
-+ struct binding_t *b = km_get_table (Menus[i].value);
++ const struct binding_t *b = km_get_table (Menus[i].value);
+
+ if (!b)
+ continue;
@@ -43,7 +43,7 @@
+
+ if (res)
+ {
-+ if (mutt_parse_rc_line (tmp->data, &token, err) == -1)
++ if (mutt_parse_rc_buffer (tmp, &token, err) == -1)
+ {
+ mutt_error ("Erreur: %s", err->data);
+ FREE (&token.data);
@@ -57,9 +57,9 @@
static int parse_unignore (BUFFER *buf, BUFFER *s, union pointer_long_t udata, BUFFER *err)
{
do
---- init.h.orig 2019-12-14 19:24:06 UTC
+--- init.h.orig 2020-05-05 02:09:32 UTC
+++ init.h
-@@ -4503,6 +4503,7 @@ static int parse_lists (BUFFER *, BUFFER *, union poin
+@@ -4594,6 +4594,7 @@ static int parse_lists (BUFFER *, BUFFER *, union poin
static int parse_unlists (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
static int parse_alias (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
static int parse_unalias (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
@@ -67,7 +67,7 @@
static int parse_echo (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
static int parse_ignore (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
static int parse_unignore (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
-@@ -4567,6 +4568,7 @@ const struct command_t Commands[] = {
+@@ -4658,6 +4659,7 @@ const struct command_t Commands[] = {
{ "hdr_order", parse_list, {.p=&HeaderOrderList} },
#ifdef HAVE_ICONV
{ "iconv-hook", mutt_parse_hook, {.l=MUTT_ICONVHOOK} },
Modified: branches/2020Q2/mail/mutt/files/extra-patch-maildir-mtime
==============================================================================
--- branches/2020Q2/mail/mutt/files/extra-patch-maildir-mtime Mon Jun 29 14:44:36 2020 (r540777)
+++ branches/2020Q2/mail/mutt/files/extra-patch-maildir-mtime Mon Jun 29 14:58:48 2020 (r540778)
@@ -1,8 +1,8 @@
---- PATCHES.orig 2019-12-06 03:42:13 UTC
+--- PATCHES.orig 2020-05-05 02:09:32 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.7.ust.maildir-mtime.2
---- browser.c.orig 2019-12-06 03:42:13 UTC
+--- browser.c.orig 2020-05-02 21:08:56 UTC
+++ browser.c
@@ -32,6 +32,7 @@
#ifdef USE_IMAP
@@ -12,7 +12,7 @@
#include <stdlib.h>
#include <dirent.h>
-@@ -448,6 +449,21 @@ static void init_state (struct browser_state *state, M
+@@ -430,6 +431,21 @@ static void init_state (struct browser_state *state, M
menu->data = state->entry;
}
@@ -34,15 +34,15 @@
static int examine_directory (MUTTMENU *menu, struct browser_state *state,
const char *d, const char *prefix)
{
-@@ -514,6 +530,7 @@ static int examine_directory (MUTTMENU *menu, struct b
+@@ -496,6 +512,7 @@ static int examine_directory (MUTTMENU *menu, struct b
tmp = Incoming;
while (tmp && mutt_strcmp (mutt_b2s (full_path), mutt_b2s (tmp->pathbuf)))
tmp = tmp->next;
+ check_maildir_times (tmp, &s);
- if (tmp && Context &&
+ if (tmp && Context && !tmp->nopoll &&
!mutt_strcmp (tmp->realpath, Context->realpath))
{
-@@ -592,6 +609,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b
+@@ -579,6 +596,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b
s.st_mtime = st2.st_mtime;
}
Modified: branches/2020Q2/mail/mutt/files/extra-patch-reverse_reply
==============================================================================
--- branches/2020Q2/mail/mutt/files/extra-patch-reverse_reply Mon Jun 29 14:44:36 2020 (r540777)
+++ branches/2020Q2/mail/mutt/files/extra-patch-reverse_reply Mon Jun 29 14:58:48 2020 (r540778)
@@ -1,10 +1,10 @@
---- PATCHES.orig 2019-12-06 03:41:41 UTC
+--- PATCHES.orig 2020-05-05 02:09:33 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.6.cb.reverse_reply.2
---- init.h.orig 2019-12-06 03:41:41 UTC
+--- init.h.orig 2020-05-05 02:09:32 UTC
+++ init.h
-@@ -3021,6 +3021,13 @@ struct option_t MuttVars[] = {
+@@ -3111,6 +3111,13 @@ struct option_t MuttVars[] = {
** In either case, a missing real name will be filled in afterwards
** using the value of $$realname.
*/
@@ -18,9 +18,9 @@
{ "rfc2047_parameters", DT_BOOL, R_NONE, {.l=OPTRFC2047PARAMS}, {.l=0} },
/*
** .pp
---- mutt.h.orig 2019-11-20 20:16:28 UTC
+--- mutt.h.orig 2020-05-05 02:09:32 UTC
+++ mutt.h
-@@ -505,6 +505,7 @@ enum
+@@ -513,6 +513,7 @@ enum
OPTREVALIAS,
OPTREVNAME,
OPTREVREAL,
@@ -28,19 +28,19 @@
OPTRFC2047PARAMS,
OPTSAVEADDRESS,
OPTSAVEEMPTY,
---- protos.h.orig 2019-11-01 06:34:06 UTC
+--- protos.h.orig 2020-05-02 21:08:56 UTC
+++ protos.h
-@@ -88,6 +88,7 @@ ADDRESS *mutt_get_address (ENVELOPE *, char **);
+@@ -85,6 +85,7 @@ char* mutt_extract_message_id (const char *, const cha
+ ADDRESS *mutt_get_address (ENVELOPE *, char **);
ADDRESS *mutt_lookup_alias (const char *s);
ADDRESS *mutt_remove_duplicates (ADDRESS *);
- ADDRESS *mutt_remove_xrefs (ADDRESS *, ADDRESS *);
+ADDRESS *mutt_reverse_address (ADDRESS *);
ADDRESS *mutt_expand_aliases (ADDRESS *);
ADDRESS *mutt_parse_adrlist (ADDRESS *, const char *);
---- send.c.orig 2019-11-19 02:15:41 UTC
+--- send.c.orig 2020-05-02 21:08:56 UTC
+++ send.c
-@@ -723,6 +723,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env)
+@@ -725,6 +725,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,9 +51,9 @@
env->cc = mutt_remove_xrefs (env->to, env->cc);
if (env->cc && !env->to)
---- sendlib.c.orig 2019-11-08 03:35:30 UTC
+--- sendlib.c.orig 2020-05-02 21:08:56 UTC
+++ sendlib.c
-@@ -2974,6 +2974,35 @@ static void set_noconv_flags (BODY *b, short flag)
+@@ -2981,6 +2981,35 @@ static void set_noconv_flags (BODY *b, short flag)
}
}
@@ -86,6 +86,6 @@
+ return addr;
+}
+
- int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid, int post, const char *fcc)
+ int mutt_write_fcc (const char *path, SEND_CONTEXT *sctx, const char *msgid, int post, const char *fcc)
{
- CONTEXT f;
+ HEADER *hdr;
Modified: branches/2020Q2/mail/mutt/files/extra-patch-smartdate
==============================================================================
--- branches/2020Q2/mail/mutt/files/extra-patch-smartdate Mon Jun 29 14:44:36 2020 (r540777)
+++ branches/2020Q2/mail/mutt/files/extra-patch-smartdate Mon Jun 29 14:58:48 2020 (r540778)
@@ -1,6 +1,6 @@
---- hdrline.c.orig 2019-11-11 04:00:36 UTC
+--- hdrline.c.orig 2020-05-05 02:09:32 UTC
+++ hdrline.c
-@@ -248,6 +248,89 @@ static char *apply_subject_mods (ENVELOPE *env)
+@@ -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 */
@@ -90,7 +90,7 @@
static const char *
hdr_format_str (char *dest,
size_t destlen,
-@@ -421,7 +504,13 @@ hdr_format_str (char *dest,
+@@ -422,7 +505,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 2019-12-06 03:41:43 UTC
+--- mutt.h.orig 2020-05-05 02:09:33 UTC
+++ mutt.h
@@ -165,6 +165,16 @@ typedef enum
MUTT_WRITE_HEADER_MIME
Copied: branches/2020Q2/mail/mutt/files/extra-smime-sender (from r535833, head/mail/mutt/files/extra-smime-sender)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2020Q2/mail/mutt/files/extra-smime-sender Mon Jun 29 14:58:48 2020 (r540778, copy of r535833, head/mail/mutt/files/extra-smime-sender)
@@ -0,0 +1,39 @@
+--- commands.c.orig 2020-05-02 21:08:56 UTC
++++ commands.c
+@@ -302,7 +302,7 @@ int mutt_display_message (HEADER *cur)
+ {
+ if (cur->security & GOODSIGN)
+ {
+- if (!crypt_smime_verify_sender(cur))
++ if (option(OPTSMIMENOSENDER) || !crypt_smime_verify_sender(cur))
+ mutt_message ( _("S/MIME signature successfully verified."));
+ else
+ mutt_error ( _("S/MIME certificate owner does not match sender."));
+--- init.h.orig 2020-05-05 02:09:33 UTC
++++ init.h
+@@ -3608,6 +3608,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)
+ */
++ { "smime_dont_check_sender", DT_BOOL, R_NONE, {.l=OPTSMIMENOSENDER}, {.l=0} },
++ /*
++ ** .pp
++ ** This flag controls wether you want the skip the check for the sender's
++ ** email address against the email address stored in the certificate.
++ ** This can be useful if most of your email senders use SMIMEv3 which no
++ ** longer needs email-addresses as part of the certificates.
++ ** It is not set by default.
++ */
+ { "smime_self_encrypt_as", DT_SYN, R_NONE, {.p="smime_default_key"}, {.p=0} },
+ { "smime_default_key", DT_STR, R_NONE, {.p=&SmimeDefaultKey}, {.p=0} },
+ /*
+--- mutt.h.orig 2020-05-05 02:09:33 UTC
++++ mutt.h
+@@ -596,6 +596,7 @@ enum
+ OPTSMIMEISDEFAULT,
+ OPTSMIMESELFENCRYPT,
+ OPTASKCERTLABEL,
++ OPTSMIMENOSENDER,
+ OPTSDEFAULTDECRYPTKEY,
+ OPTPGPIGNORESUB,
+ OPTPGPCHECKEXIT,
Modified: branches/2020Q2/mail/mutt/files/patch-browser.c
==============================================================================
--- branches/2020Q2/mail/mutt/files/patch-browser.c Mon Jun 29 14:44:36 2020 (r540777)
+++ branches/2020Q2/mail/mutt/files/patch-browser.c Mon Jun 29 14:58:48 2020 (r540778)
@@ -1,6 +1,6 @@
---- browser.c.orig 2019-11-11 04:00:36 UTC
+--- browser.c.orig 2020-05-05 02:09:32 UTC
+++ browser.c
-@@ -86,6 +86,12 @@ static int browser_compare_subject (const void *a, con
+@@ -87,6 +87,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->display_name, pb->display_name);
return ((BrowserSort & SORT_REVERSE) ? -r : r);
-@@ -96,6 +102,12 @@ static int browser_compare_date (const void *a, const
+@@ -97,6 +103,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,7 +26,7 @@
int r = pa->mtime - pb->mtime;
return ((BrowserSort & SORT_REVERSE) ? -r : r);
-@@ -105,6 +117,12 @@ static int browser_compare_size (const void *a, const
+@@ -106,6 +118,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;
Modified: branches/2020Q2/mail/mutt/files/patch-date-conditional
==============================================================================
--- branches/2020Q2/mail/mutt/files/patch-date-conditional Mon Jun 29 14:44:36 2020 (r540777)
+++ branches/2020Q2/mail/mutt/files/patch-date-conditional Mon Jun 29 14:58:48 2020 (r540778)
@@ -1,10 +1,10 @@
---- PATCHES.orig 2019-12-06 03:41:54 UTC
+--- PATCHES.orig 2020-05-05 02:09:34 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.0.ats.date_conditional.1
---- hdrline.c.orig 2019-12-06 03:41:54 UTC
+--- hdrline.c.orig 2020-05-05 02:09:33 UTC
+++ hdrline.c
-@@ -427,6 +427,53 @@ hdr_format_str (char *dest,
+@@ -428,6 +428,53 @@ hdr_format_str (char *dest,
const char *cp;
struct tm *tm;
time_t T;
@@ -58,9 +58,9 @@
p = dest;
---- muttlib.c.orig 2019-10-17 08:01:01 UTC
+--- muttlib.c.orig 2020-05-02 21:08:56 UTC
+++ muttlib.c
-@@ -1563,7 +1563,16 @@ void mutt_FormatString (char *dest, /* output buffer
+@@ -1667,7 +1667,16 @@ void mutt_FormatString (char *dest, /* output buffer
if (*src == '?')
{
flags |= MUTT_FORMAT_OPTIONAL;
@@ -78,7 +78,7 @@
}
else
{
-@@ -1579,12 +1588,12 @@ void mutt_FormatString (char *dest, /* output buffer
+@@ -1683,12 +1692,12 @@ void mutt_FormatString (char *dest, /* output buffer
count++;
}
*cp = 0;
Modified: branches/2020Q2/mail/mutt/files/patch-dgc-deepif
==============================================================================
--- branches/2020Q2/mail/mutt/files/patch-dgc-deepif Mon Jun 29 14:44:36 2020 (r540777)
+++ branches/2020Q2/mail/mutt/files/patch-dgc-deepif Mon Jun 29 14:58:48 2020 (r540778)
@@ -1,6 +1,6 @@
---- muttlib.c.orig 2019-12-06 03:41:57 UTC
+--- muttlib.c.orig 2020-05-05 02:09:34 UTC
+++ muttlib.c
-@@ -1606,6 +1606,12 @@ void mutt_FormatString (char *dest, /* output buffer
+@@ -1710,6 +1710,12 @@ void mutt_FormatString (char *dest, /* output buffer
count = 0;
while (count < sizeof (ifstring) && *src && *src != '?' && *src != '&')
{
@@ -13,7 +13,7 @@
*cp++ = *src++;
count++;
}
-@@ -1618,7 +1624,13 @@ void mutt_FormatString (char *dest, /* output buffer
+@@ -1722,7 +1728,13 @@ void mutt_FormatString (char *dest, /* output buffer
count = 0;
while (count < sizeof (elsestring) && *src && *src != '?')
{
Modified: branches/2020Q2/mail/mutt/files/patch-muttlib.c
==============================================================================
--- branches/2020Q2/mail/mutt/files/patch-muttlib.c Mon Jun 29 14:44:36 2020 (r540777)
+++ branches/2020Q2/mail/mutt/files/patch-muttlib.c Mon Jun 29 14:58:48 2020 (r540778)
@@ -1,6 +1,6 @@
---- muttlib.c.orig 2019-12-06 03:42:05 UTC
+--- muttlib.c.orig 2020-05-05 02:09:34 UTC
+++ muttlib.c
-@@ -877,16 +877,15 @@ void _mutt_buffer_mktemp (BUFFER *buf, const char *pre
+@@ -930,16 +930,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)
{
Modified: branches/2020Q2/mail/mutt/files/patch-threadcomplete
==============================================================================
--- branches/2020Q2/mail/mutt/files/patch-threadcomplete Mon Jun 29 14:44:36 2020 (r540777)
+++ branches/2020Q2/mail/mutt/files/patch-threadcomplete Mon Jun 29 14:58:48 2020 (r540778)
@@ -1,6 +1,6 @@
---- mutt.h.orig 2019-12-06 03:42:11 UTC
+--- mutt.h.orig 2020-05-25 22:13:51 UTC
+++ mutt.h
-@@ -243,6 +243,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 2019-11-16 21:07:54 UTC
+--- pattern.c.orig 2020-05-25 20:41:30 UTC
+++ pattern.c
@@ -57,6 +57,7 @@ static const struct pattern_flags
}
@@ -16,9 +16,9 @@
{
+ { 'a', MUTT_THREADCOMPLETE, 0, NULL },
{ 'A', MUTT_ALL, 0, NULL },
- { 'b', MUTT_BODY, MUTT_FULL_MSG, eat_regexp },
- { 'B', MUTT_WHOLE_MSG, MUTT_FULL_MSG, eat_regexp },
-@@ -1342,6 +1343,16 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec
+ { 'b', MUTT_BODY, MUTT_FULL_MSG|MUTT_SEND_MODE_SEARCH, eat_regexp },
+ { 'B', MUTT_WHOLE_MSG, MUTT_FULL_MSG|MUTT_SEND_MODE_SEARCH, eat_regexp },
+@@ -1499,6 +1500,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: branches/2020Q2/mail/mutt/pkg-plist
==============================================================================
--- branches/2020Q2/mail/mutt/pkg-plist Mon Jun 29 14:44:36 2020 (r540777)
+++ branches/2020Q2/mail/mutt/pkg-plist Mon Jun 29 14:58:48 2020 (r540778)
@@ -30,7 +30,6 @@ man/man5/muttrc.5.gz
%%PORTDOCS%%%%DOCSDIR%%/manual.txt
%%PORTDOCS%%%%DOCSDIR%%/patch-notes.txt
%%PORTDOCS%%%%DOCSDIR%%/smime-notes.txt
-%%NNTP%%%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.nntp
%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/advancedusage.html
%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/configuration.html
%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/gettingstarted.html
@@ -47,6 +46,8 @@ man/man5/muttrc.5.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Pine.rc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tin.rc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ca-bundle.crt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgedit-detectgui.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgedit-screen-tmux.sh
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.default
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.linux
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpg.rc
@@ -71,6 +72,7 @@ man/man5/muttrc.5.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/markdown2html
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mutt_xtitle
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp2.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp5.rc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp6.rc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.mailcap
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc
More information about the svn-ports-branches
mailing list