Date: Sun, 15 Dec 2019 21:36:03 +0000 (UTC) From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= <fernape@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r520200 - in head/mail/mutt: . files Message-ID: <201912152136.xBFLa31M043975@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fernape Date: Sun Dec 15 21:36:02 2019 New Revision: 520200 URL: https://svnweb.freebsd.org/changeset/ports/520200 Log: mail/mutt: update to 1.13.1 Too many changes to be listed here. ChangeLog: https://gitlab.com/muttmua/mutt/raw/stable/UPDATING PR: 242534 Submitted by: dereks@lifeofadishwasher.com (maintainer) Deleted: head/mail/mutt/files/patch-doc_Muttrc Modified: head/mail/mutt/Makefile head/mail/mutt/distinfo head/mail/mutt/files/extra-patch-doc-ref head/mail/mutt/files/extra-patch-forcebase64 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/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_manual.xml.head 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 Sun Dec 15 21:32:40 2019 (r520199) +++ head/mail/mutt/Makefile Sun Dec 15 21:36:02 2019 (r520200) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mutt -DISTVERSION= 1.12.2 +DISTVERSION= 1.13.1 CATEGORIES+= mail MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \ @@ -46,11 +46,10 @@ GNU_CONFIGURE= yes OPTIONS_SUB= yes -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 \ - SMTP URLVIEW XML +OPTIONS_DEFINE= AUTOCRYPT DEBUG 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 OPTIONS_SINGLE= GSSAPI HCACHE SCREEN OPTIONS_RADIO= SPELL @@ -59,12 +58,17 @@ OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSA OPTIONS_SINGLE_HCACHE= HCACHE_BDB HCACHE_TOKYOCABINET HCACHE_KYOTOCABINET HCACHE_NONE OPTIONS_SINGLE_SCREEN= NCURSES SLANG -SASL_DESC= SASL authentication +AUTOCRYPT_DESC= Convenient End-to-End Encryption DEBUG_DESC= Debugging capabilities FLOCK_DESC= flock() usage FORCEBASE64_DESC= Option to force base64 encoding for compose GPGME_DESC= Gpgme interface GREETING_PATCH_DESC= Greeting support +HCACHE_BDB_DESC= Use Berkeley DB (BDB) +HCACHE_DESC= Header Cache support +HCACHE_KYOTOCABINET_DESC= Use Kyoto Cabinet +HCACHE_NONE_DESC= Disable Header Cache +HCACHE_TOKYOCABINET_DESC= Use Tokyo Cabinet HTML_DESC= HTML documentation IDN_DESC= International Domain Names (implies ICONV) IFDEF_PATCH_DESC= ifdef feature @@ -75,33 +79,37 @@ NCURSES_DESC= Ncurses support NLS_DESC= Native language support (implies ICONV) QUOTE_PATCH_DESC= Extended quoting REVERSE_REPLY_PATCH_DESC= Reverse_reply +SASL_DESC= SASL authentication SLANG_DESC= SLANG support SMART_DATE_DESC= Dynamic date formatting with "%@" SMTP_DESC= SMTP relay support -HCACHE_DESC= Header Cache support -HCACHE_BDB_DESC= Use Berkeley DB (BDB) -HCACHE_TOKYOCABINET_DESC= Use Tokyo Cabinet -HCACHE_KYOTOCABINET_DESC= Use Kyoto Cabinet -HCACHE_NONE_DESC= Disable Header Cache URLVIEW_DESC= Use urlview for the URL selector menu 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 \ - SASL SMTP URLVIEW XML GSSAPI_NONE +OPTIONS_DEFAULT= AUTOCRYPT 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 +.ifmake makesum # for optional distfiles patchfiles +OPTIONS_OVERRIDE= ${OPTIONS_DEFINE} ${OPTIONS_DEFAULT} +.MAKEOVERRIDES+= OPTIONS_OVERRIDE +.endif + +AUTOCRYPT_CONFIGURE_ENABLE= autocrypt +AUTOCRYPT_IMPLIES= GPGME IDN +AUTOCRYPT_USES= sqlite:3 +AUTOCRYPT_CONFIGURE_WITH= sqlite3=${LOCALBASE} +AUTOCRYPT_DEPENDS= gnupg>=2.1:security/gnupg \ + gpgme>=1.8:security/gpgme +AUTOCRYPT_BUILD_DEPENDS= ${AUTOCRYPT_DEPENDS} +AUTOCRYPT_RUN_DEPENDS= ${AUTOCRYPT_DEPENDS} + ASPELL_BUILD_DEPENDS= aspell:textproc/aspell ASPELL_RUN_DEPENDS= aspell:textproc/aspell ISPELL_BUILD_DEPENDS= ispell:textproc/aspell-ispell ISPELL_RUN_DEPENDS= ispell:textproc/aspell-ispell URLVIEW_RUN_DEPENDS= urlview:textproc/urlview -.ifmake makesum # for optional distfiles patchfiles -PORT_DBDIR= /dev/null -OPTIONS_DEFAULT+= ${OPTIONS_DEFINE} -.endif - DEBUG_CONFIGURE_ON= --enable-debug # Handle ncurses/ncurses-port/slang @@ -167,9 +175,11 @@ SMTP_CONFIGURE_ENABLE= smtp 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 @@ -183,31 +193,36 @@ DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref # un/comment as each VERSION is created for PORTVERSION VVV_PATCH_VERSION= 1.12.1 -GREETING_PATCH_VERSION= 1.12.1 +GREETING_PATCH_VERSION= 1.13.0 -.if !defined(VVV_PATCH_VERSION) -VVV_PATCH_VERSION= ${PORTVERSION} -.endif -.if !defined(GREETING_PATCH_VERSION) -GREETING_PATCH_VERSION= ${PORTVERSION} -.endif - 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 @@ -217,8 +232,6 @@ post-install: post-install-NNTP-on: ${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR} -WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} - pre-configure:: @${REINPLACE_CMD} -e 's,?eimdal\*),?eimdal*|\"FreeBSD heimdal\"*),' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @@ -250,7 +263,7 @@ BUILD_DEPENDS+= xsltproc:textproc/libxslt \ .else pre-build:: @${REINPLACE_CMD} \ - -e 's,manual.html stamp-doc-rc stamp-doc-chunked manual.txt,stamp-doc-rc,' \ + -e '/^BUILD_DOC_TARGETS/s/=.*/=/' \ ${WRKSRC}/doc/Makefile .endif Modified: head/mail/mutt/distinfo ============================================================================== --- head/mail/mutt/distinfo Sun Dec 15 21:32:40 2019 (r520199) +++ head/mail/mutt/distinfo Sun Dec 15 21:36:02 2019 (r520200) @@ -1,8 +1,8 @@ -TIMESTAMP = 1569099378 -SHA256 (mutt/mutt-1.12.2.tar.gz) = bc42750ce8237742b9382f2148fc547a8d8601aa4a7cd28c55fe7ca045196882 -SIZE (mutt/mutt-1.12.2.tar.gz) = 4675774 -SHA256 (mutt/mutt-1.12.1.vc.greeting) = 54d1267c1ac496662b47131f9761b5ab53f44c93498938dc93d0156c6578e378 -SIZE (mutt/mutt-1.12.1.vc.greeting) = 4559 +TIMESTAMP = 1576360229 +SHA256 (mutt/mutt-1.13.1.tar.gz) = 1fb5951292e57428974d1fd8e60ae83292743f74e440efea3659ae83593e875d +SIZE (mutt/mutt-1.13.1.tar.gz) = 4895458 +SHA256 (mutt/mutt-1.13.0.vc.greeting) = b11fcfad1f53f16f89a8ecc334fba615698f5bcaa9373fd487a6c9d95c3872ad +SIZE (mutt/mutt-1.13.0.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 Modified: head/mail/mutt/files/extra-patch-doc-ref ============================================================================== --- head/mail/mutt/files/extra-patch-doc-ref Sun Dec 15 21:32:40 2019 (r520199) +++ head/mail/mutt/files/extra-patch-doc-ref Sun Dec 15 21:36:02 2019 (r520200) @@ -1,6 +1,6 @@ ---- doc/mutt.man.orig 2009-02-06 13:52:38.000000000 +0100 -+++ doc/mutt.man 2009-02-06 13:55:05.000000000 +0100 -@@ -67,7 +67,8 @@ +--- doc/mutt.man.orig 2019-05-25 16:22:39 UTC ++++ doc/mutt.man +@@ -67,7 +67,8 @@ mutt \- The Mutt Mail User Agent .PP Mutt is a small but very powerful text based program for reading and sending electronic mail under unix operating systems, including support for color terminals, MIME, Modified: head/mail/mutt/files/extra-patch-forcebase64 ============================================================================== --- head/mail/mutt/files/extra-patch-forcebase64 Sun Dec 15 21:32:40 2019 (r520199) +++ head/mail/mutt/files/extra-patch-forcebase64 Sun Dec 15 21:36:02 2019 (r520200) @@ -1,20 +1,20 @@ ---- init.h.orig 2017-04-12 23:01:17 UTC +--- init.h.orig 2019-12-08 02:41:29 UTC +++ init.h -@@ -871,6 +871,11 @@ struct option_t MuttVars[] = { +@@ -1079,6 +1079,11 @@ struct option_t MuttVars[] = { ** sent to both the list and your address, resulting in two copies ** of the same email for you. */ -+ { "force_base64", DT_BOOL, R_NONE, OPTFORCEBASE64, 0 }, ++ { "force_base64", DT_BOOL, R_NONE, {.l=OPTFORCEBASE64}, {.l=0} }, + /* + ** .pp + ** If you need to encode all text parts to base64, set this option. + */ - { "force_name", DT_BOOL, R_NONE, OPTFORCENAME, 0 }, + { "force_name", DT_BOOL, R_NONE, {.l=OPTFORCENAME}, {.l=0} }, /* ** .pp ---- mutt.h.orig 2017-04-12 23:01:17 UTC +--- mutt.h.orig 2019-12-08 02:41:29 UTC +++ mutt.h -@@ -355,6 +355,7 @@ enum +@@ -423,6 +423,7 @@ enum OPTFCCCLEAR, OPTFLAGSAFE, OPTFOLLOWUPTO, @@ -22,9 +22,9 @@ OPTFORCENAME, OPTFORWDECODE, OPTFORWQUOTE, ---- sendlib.c.orig 2017-04-12 23:01:08 UTC +--- sendlib.c.orig 2019-12-08 02:41:29 UTC +++ sendlib.c -@@ -1171,7 +1171,9 @@ static void mutt_set_encoding (BODY *b, +@@ -1218,7 +1218,9 @@ static void mutt_set_encoding (BODY *b, CONTENT *info) if (b->type == TYPETEXT) { char *chsname = mutt_get_body_charset (send_charset, sizeof (send_charset), b); Modified: head/mail/mutt/files/extra-patch-ifdef ============================================================================== --- head/mail/mutt/files/extra-patch-ifdef Sun Dec 15 21:32:40 2019 (r520199) +++ head/mail/mutt/files/extra-patch-ifdef Sun Dec 15 21:36:02 2019 (r520200) @@ -1,14 +1,14 @@ ---- PATCHES.orig 2017-12-03 03:10:17 UTC +--- PATCHES.orig 2019-12-14 21:57:56 UTC +++ PATCHES @@ -0,0 +1 @@ +patch-1.5.4.cd.ifdef.1 ---- init.c.orig 2019-09-21 19:18:34 UTC +--- init.c.orig 2019-11-30 21:59:38 UTC +++ init.c @@ -651,6 +651,52 @@ static mbchar_table *parse_mbchar_table (const char *s return t; } -+static int parse_ifdef (BUFFER *tmp, BUFFER *s, unsigned long data, BUFFER *err) ++static int parse_ifdef (BUFFER *tmp, BUFFER *s, union pointer_long_t data, BUFFER *err) +{ + int i, j, res = 0; + BUFFER token; @@ -54,24 +54,24 @@ + return 0; +} + - static int parse_unignore (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) + static int parse_unignore (BUFFER *buf, BUFFER *s, union pointer_long_t udata, BUFFER *err) { do ---- init.h.orig 2019-09-21 19:18:34 UTC +--- init.h.orig 2019-12-14 19:24:06 UTC +++ init.h -@@ -4343,6 +4343,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 *); -+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 *); -@@ -4407,6 +4407,7 @@ const struct command_t Commands[] = { - { "hdr_order", parse_list, UL &HeaderOrderList }, +@@ -4503,6 +4503,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 *); ++static int parse_ifdef (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *); + 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[] = { + { "hdr_order", parse_list, {.p=&HeaderOrderList} }, #ifdef HAVE_ICONV - { "iconv-hook", mutt_parse_hook, MUTT_ICONVHOOK }, -+ { "ifdef", parse_ifdef, 0 }, + { "iconv-hook", mutt_parse_hook, {.l=MUTT_ICONVHOOK} }, ++ { "ifdef", parse_ifdef, {.l=0} }, #endif - { "ignore", parse_ignore, 0 }, - { "index-format-hook",mutt_parse_idxfmt_hook, MUTT_IDXFMTHOOK }, + { "ignore", parse_ignore, {.l=0} }, + { "index-format-hook",mutt_parse_idxfmt_hook, {.l=MUTT_IDXFMTHOOK} }, Modified: head/mail/mutt/files/extra-patch-maildir-mtime ============================================================================== --- head/mail/mutt/files/extra-patch-maildir-mtime Sun Dec 15 21:32:40 2019 (r520199) +++ head/mail/mutt/files/extra-patch-maildir-mtime Sun Dec 15 21:36:02 2019 (r520200) @@ -1,8 +1,8 @@ ---- PATCHES.orig 2019-05-26 19:28:55 UTC +--- PATCHES.orig 2019-12-06 03:42:13 UTC +++ PATCHES @@ -0,0 +1 @@ +patch-1.5.7.ust.maildir-mtime.2 ---- browser.c.orig 2019-05-26 19:28:52 UTC +--- browser.c.orig 2019-12-06 03:42:13 UTC +++ browser.c @@ -32,6 +32,7 @@ #ifdef USE_IMAP @@ -12,7 +12,7 @@ #include <stdlib.h> #include <dirent.h> -@@ -460,6 +461,21 @@ static void init_state (struct browser_state *state, M +@@ -448,6 +449,21 @@ static void init_state (struct browser_state *state, M menu->data = state->entry; } @@ -34,19 +34,19 @@ static int examine_directory (MUTTMENU *menu, struct browser_state *state, const char *d, const char *prefix) { -@@ -526,6 +542,7 @@ static int examine_directory (MUTTMENU *menu, struct b +@@ -514,6 +530,7 @@ static int examine_directory (MUTTMENU *menu, struct b tmp = Incoming; - while (tmp && mutt_strcmp (mutt_b2s (buffer), mutt_b2s (tmp->pathbuf))) + while (tmp && mutt_strcmp (mutt_b2s (full_path), mutt_b2s (tmp->pathbuf))) tmp = tmp->next; + check_maildir_times (tmp, &s); if (tmp && Context && !mutt_strcmp (tmp->realpath, Context->realpath)) { -@@ -604,6 +621,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b +@@ -592,6 +609,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b s.st_mtime = st2.st_mtime; } + check_maildir_times (tmp, &s); - add_folder (menu, state, mutt_b2s (mailbox), &s, tmp); + add_folder (menu, state, mutt_b2s (mailbox), mutt_b2s (tmp->pathbuf), &s, tmp); } while ((tmp = tmp->next)); Modified: head/mail/mutt/files/extra-patch-reverse_reply ============================================================================== --- head/mail/mutt/files/extra-patch-reverse_reply Sun Dec 15 21:32:40 2019 (r520199) +++ head/mail/mutt/files/extra-patch-reverse_reply Sun Dec 15 21:36:02 2019 (r520200) @@ -1,26 +1,26 @@ ---- PATCHES.orig 2017-12-03 03:10:17 UTC +--- PATCHES.orig 2019-12-06 03:41:41 UTC +++ PATCHES @@ -0,0 +1 @@ +patch-1.5.6.cb.reverse_reply.2 ---- init.h.orig 2019-09-21 19:18:34 UTC +--- init.h.orig 2019-12-06 03:41:41 UTC +++ init.h -@@ -2966,6 +2966,13 @@ struct option_t MuttVars[] = { +@@ -3021,6 +3021,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 }, ++ { "reverse_reply", DT_BOOL, R_NONE, {.l=OPTREVREPLY}, {.l=0} }, + /* + ** .pp + ** When set, this variable uses the name from your aliases in the To and Cc + ** headers of reply mails you send, like $reverse_alias does in the index. + ** When unset, the headers taken from the original mail are left unchanged. + */ - { "rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0 }, + { "rfc2047_parameters", DT_BOOL, R_NONE, {.l=OPTRFC2047PARAMS}, {.l=0} }, /* ** .pp ---- mutt.h.orig 2019-09-21 19:18:34 UTC +--- mutt.h.orig 2019-11-20 20:16:28 UTC +++ mutt.h -@@ -491,6 +491,7 @@ enum +@@ -505,6 +505,7 @@ enum OPTREVALIAS, OPTREVNAME, OPTREVREAL, @@ -28,9 +28,9 @@ OPTRFC2047PARAMS, OPTSAVEADDRESS, OPTSAVEEMPTY, ---- protos.h.orig 2019-09-21 19:18:34 UTC +--- protos.h.orig 2019-11-01 06:34:06 UTC +++ protos.h -@@ -85,6 +85,7 @@ ADDRESS *mutt_get_address (ENVELOPE *, char **); +@@ -88,6 +88,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 2019-09-21 19:18:34 UTC +--- send.c.orig 2019-11-19 02:15:41 UTC +++ send.c -@@ -717,6 +717,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env) +@@ -723,6 +723,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-09-21 19:18:34 UTC +--- sendlib.c.orig 2019-11-08 03:35:30 UTC +++ sendlib.c -@@ -2765,6 +2765,35 @@ static void set_noconv_flags (BODY *b, short flag) +@@ -2974,6 +2974,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, char *fcc) + int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid, int post, const char *fcc) { CONTEXT f; Modified: head/mail/mutt/files/extra-patch-smartdate ============================================================================== --- head/mail/mutt/files/extra-patch-smartdate Sun Dec 15 21:32:40 2019 (r520199) +++ head/mail/mutt/files/extra-patch-smartdate Sun Dec 15 21:36:02 2019 (r520200) @@ -1,6 +1,6 @@ ---- hdrline.c.orig 2019-05-26 19:28:51 UTC +--- hdrline.c.orig 2019-11-11 04:00:36 UTC +++ hdrline.c -@@ -249,6 +249,89 @@ static char *apply_subject_mods (ENVELOPE *env) +@@ -248,6 +248,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, -@@ -422,7 +505,13 @@ hdr_format_str (char *dest, +@@ -421,7 +504,13 @@ hdr_format_str (char *dest, if (!do_locales) setlocale (LC_TIME, "C"); @@ -105,9 +105,9 @@ if (!do_locales) setlocale (LC_TIME, ""); ---- mutt.h.orig 2019-05-26 19:28:51 UTC +--- mutt.h.orig 2019-12-06 03:41:43 UTC +++ mutt.h -@@ -164,6 +164,16 @@ typedef enum +@@ -165,6 +165,16 @@ typedef enum MUTT_WRITE_HEADER_MIME } mutt_write_header_mode; Modified: head/mail/mutt/files/patch-Makefile.in ============================================================================== --- head/mail/mutt/files/patch-Makefile.in Sun Dec 15 21:32:40 2019 (r520199) +++ head/mail/mutt/files/patch-Makefile.in Sun Dec 15 21:36:02 2019 (r520200) @@ -1,15 +1,15 @@ ---- Makefile.in.orig 2019-06-15 16:07:04 UTC +--- Makefile.in.orig 2019-11-30 18:14:23 UTC +++ Makefile.in -@@ -537,7 +537,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign - @BUILD_DOC_TRUE@DOC_SUBDIR = doc - @BUILD_IMAP_TRUE@IMAP_SUBDIR = imap +@@ -540,7 +540,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign @BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap --SUBDIRS = m4 po intl $(DOC_SUBDIR) contrib $(IMAP_SUBDIR) -+SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) . $(DOC_SUBDIR) + @BUILD_AUTOCRYPT_TRUE@AUTOCRYPT_SUBDIR = autocrypt + @BUILD_AUTOCRYPT_TRUE@AUTOCRYPT_INCLUDES = -I$(top_srcdir)/autocrypt +-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR) $(AUTOCRYPT_SUBDIR) ++SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) $(AUTOCRYPT_SUBDIR) . doc 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) -@@ -1676,18 +1676,9 @@ install-exec-hook: +@@ -1690,18 +1690,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 Sun Dec 15 21:32:40 2019 (r520199) +++ head/mail/mutt/files/patch-browser.c Sun Dec 15 21:36:02 2019 (r520200) @@ -1,16 +1,16 @@ ---- browser.c.orig 2019-04-28 20:41:58 UTC +--- browser.c.orig 2019-11-11 04:00:36 UTC +++ browser.c @@ -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; + /* Always keep '..' in first menu position */ -+ if (!strncmp(pa->name, "..", 2)) ++ if (!strncmp(pa->display_name, "..", 2)) + return(-1); -+ if (!strncmp(pb->name, "..", 2)) ++ if (!strncmp(pb->display_name, "..", 2)) + return(1); + - int r = mutt_strcoll (pa->name, pb->name); + 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 @@ -18,9 +18,9 @@ struct folder_file *pb = (struct folder_file *) b; + /* Always keep '..' in first menu position */ -+ if (!strncmp(pa->name, "..", 2)) ++ if (!strncmp(pa->display_name, "..", 2)) + return(-1); -+ if (!strncmp(pb->name, "..", 2)) ++ if (!strncmp(pb->display_name, "..", 2)) + return(1); + int r = pa->mtime - pb->mtime; @@ -32,9 +32,9 @@ struct folder_file *pb = (struct folder_file *) b; + + /* Always keep '..' in first menu position */ -+ if (!strncmp(pa->name, "..", 2)) ++ if (!strncmp(pa->display_name, "..", 2)) + return(-1); -+ if (!strncmp(pb->name, "..", 2)) ++ if (!strncmp(pb->display_name, "..", 2)) + return(1); int r = pa->size - pb->size; Modified: head/mail/mutt/files/patch-contrib_Makefile.in ============================================================================== --- head/mail/mutt/files/patch-contrib_Makefile.in Sun Dec 15 21:32:40 2019 (r520199) +++ head/mail/mutt/files/patch-contrib_Makefile.in Sun Dec 15 21:36:02 2019 (r520200) @@ -1,6 +1,6 @@ ---- contrib/Makefile.in.orig 2019-05-25 16:13:42 UTC +--- contrib/Makefile.in.orig 2019-11-30 18:14:24 UTC +++ contrib/Makefile.in -@@ -278,7 +278,7 @@ top_build_prefix = @top_build_prefix@ +@@ -280,7 +280,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ subdir = contrib Modified: head/mail/mutt/files/patch-date-conditional ============================================================================== --- head/mail/mutt/files/patch-date-conditional Sun Dec 15 21:32:40 2019 (r520199) +++ head/mail/mutt/files/patch-date-conditional Sun Dec 15 21:36:02 2019 (r520200) @@ -1,10 +1,10 @@ ---- PATCHES.orig 2019-05-26 19:28:53 UTC +--- PATCHES.orig 2019-12-06 03:41:54 UTC +++ PATCHES @@ -0,0 +1 @@ +patch-1.5.0.ats.date_conditional.1 ---- hdrline.c.orig 2019-05-26 19:28:52 UTC +--- hdrline.c.orig 2019-12-06 03:41:54 UTC +++ hdrline.c -@@ -428,6 +428,53 @@ hdr_format_str (char *dest, +@@ -427,6 +427,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-04-28 20:41:58 UTC +--- muttlib.c.orig 2019-10-17 08:01:01 UTC +++ muttlib.c -@@ -1487,7 +1487,16 @@ void mutt_FormatString (char *dest, /* output buffer +@@ -1563,7 +1563,16 @@ void mutt_FormatString (char *dest, /* output buffer if (*src == '?') { flags |= MUTT_FORMAT_OPTIONAL; @@ -78,7 +78,7 @@ } else { -@@ -1503,12 +1512,12 @@ void mutt_FormatString (char *dest, /* output buffer +@@ -1579,12 +1588,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 Sun Dec 15 21:32:40 2019 (r520199) +++ head/mail/mutt/files/patch-dgc-deepif Sun Dec 15 21:36:02 2019 (r520200) @@ -1,6 +1,6 @@ ---- muttlib.c.orig 2019-05-26 19:28:53 UTC +--- muttlib.c.orig 2019-12-06 03:41:57 UTC +++ muttlib.c -@@ -1530,6 +1530,12 @@ void mutt_FormatString (char *dest, /* output buffer +@@ -1606,6 +1606,12 @@ void mutt_FormatString (char *dest, /* output buffer count = 0; while (count < sizeof (ifstring) && *src && *src != '?' && *src != '&') { @@ -13,7 +13,7 @@ *cp++ = *src++; count++; } -@@ -1542,7 +1548,13 @@ void mutt_FormatString (char *dest, /* output buffer +@@ -1618,7 +1624,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 Sun Dec 15 21:32:40 2019 (r520199) +++ head/mail/mutt/files/patch-doc_Makefile.in Sun Dec 15 21:36:02 2019 (r520200) @@ -1,8 +1,8 @@ ---- doc/Makefile.in.orig 2019-05-25 16:13:43 UTC +--- doc/Makefile.in.orig 2019-11-30 18:14:24 UTC +++ doc/Makefile.in -@@ -684,14 +684,7 @@ install-data-local: makedoc-all instdoc - -for f in $(HTML_DOCFILES) ; do \ - $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \ +@@ -691,14 +691,7 @@ install-data-local: makedoc-all instdoc + $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \ + fi \ done - $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist - -if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \ @@ -16,7 +16,7 @@ -if [ -f mutt.info ] ; then \ $(MKDIR_P) $(DESTDIR)$(infodir) ; \ $(INSTALL) -m 644 mutt.info $(DESTDIR)$(infodir) ; \ -@@ -727,9 +720,7 @@ uninstall-local: +@@ -734,9 +727,7 @@ uninstall-local: check: manual.txt: manual.html Modified: head/mail/mutt/files/patch-doc_manual.xml.head ============================================================================== --- head/mail/mutt/files/patch-doc_manual.xml.head Sun Dec 15 21:32:40 2019 (r520199) +++ head/mail/mutt/files/patch-doc_manual.xml.head Sun Dec 15 21:36:02 2019 (r520200) @@ -1,4 +1,4 @@ ---- doc/manual.xml.head.orig 2016-10-08 19:35:50 UTC +--- doc/manual.xml.head.orig 2019-11-24 03:39:46 UTC +++ doc/manual.xml.head @@ -1,6 +1,6 @@ <?xml version="1.0" standalone="no"?> Modified: head/mail/mutt/files/patch-muttlib.c ============================================================================== --- head/mail/mutt/files/patch-muttlib.c Sun Dec 15 21:32:40 2019 (r520199) +++ head/mail/mutt/files/patch-muttlib.c Sun Dec 15 21:36:02 2019 (r520200) @@ -1,6 +1,6 @@ ---- muttlib.c.orig 2019-05-26 19:28:53 UTC +--- muttlib.c.orig 2019-12-06 03:42:05 UTC +++ muttlib.c -@@ -856,16 +856,15 @@ void _mutt_buffer_mktemp (BUFFER *buf, const char *pre +@@ -877,16 +877,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: head/mail/mutt/files/patch-smime-sender ============================================================================== --- head/mail/mutt/files/patch-smime-sender Sun Dec 15 21:32:40 2019 (r520199) +++ head/mail/mutt/files/patch-smime-sender Sun Dec 15 21:36:02 2019 (r520200) @@ -1,6 +1,6 @@ ---- commands.c.orig 2019-05-25 16:22:39 UTC +--- commands.c.orig 2019-11-30 21:59:38 UTC +++ commands.c -@@ -266,7 +266,7 @@ int mutt_display_message (HEADER *cur) +@@ -285,7 +285,7 @@ int mutt_display_message (HEADER *cur) { if (cur->security & GOODSIGN) { @@ -9,13 +9,13 @@ mutt_message ( _("S/MIME signature successfully verified.")); else mutt_error ( _("S/MIME certificate owner does not match sender.")); ---- init.h.orig 2019-06-15 21:17:02 UTC +--- init.h.orig 2019-12-14 21:58:25 UTC +++ init.h -@@ -3378,6 +3378,15 @@ struct option_t MuttVars[] = { +@@ -3518,6 +3518,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, OPTSMIMENOSENDER, 0 }, ++ { "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 @@ -24,12 +24,12 @@ + ** longer needs email-addresses as part of the certificates. + ** It is not set by default. + */ - { "smime_self_encrypt_as", DT_SYN, R_NONE, UL "smime_default_key", 0 }, - { "smime_default_key", DT_STR, R_NONE, UL &SmimeDefaultKey, 0 }, + { "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 2019-06-15 21:17:02 UTC +--- mutt.h.orig 2019-12-14 21:58:25 UTC +++ mutt.h -@@ -567,6 +567,7 @@ enum +@@ -587,6 +587,7 @@ enum OPTSMIMEISDEFAULT, OPTSMIMESELFENCRYPT, OPTASKCERTLABEL, Modified: head/mail/mutt/files/patch-threadcomplete ============================================================================== --- head/mail/mutt/files/patch-threadcomplete Sun Dec 15 21:32:40 2019 (r520199) +++ head/mail/mutt/files/patch-threadcomplete Sun Dec 15 21:36:02 2019 (r520200) @@ -1,6 +1,6 @@ ---- mutt.h.orig 2019-05-26 19:28:54 UTC +--- mutt.h.orig 2019-12-06 03:42:11 UTC +++ mutt.h -@@ -242,6 +242,7 @@ enum +@@ -243,6 +243,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-05-10 01:46:06 UTC +--- pattern.c.orig 2019-11-16 21:07:54 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 }, -@@ -1338,6 +1339,16 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec +@@ -1342,6 +1343,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 Sun Dec 15 21:32:40 2019 (r520199) +++ head/mail/mutt/pkg-plist Sun Dec 15 21:36:02 2019 (r520200) @@ -68,6 +68,7 @@ man/man5/muttrc.5.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6-cjk.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.7.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/markdown2html %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mutt_xtitle %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp2.rc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp6.rc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912152136.xBFLa31M043975>