changeset: 6791:8ed017079800 user: Antonio Radici <anto...@dyne.org> date: Tue Sep 20 13:58:47 2016 -0700 link: http://dev.mutt.org/hg/mutt/rev/8ed017079800
Fix gpgme segfault when querying candidates with a '+' in the address. (closes #3873) list_to_pattern() was not allocating enough space for the '+' to '%2B' transformation. changeset: 6792:c41562a8118b user: Kevin McCarthy <ke...@8t8.us> date: Tue Sep 20 14:01:09 2016 -0700 link: http://dev.mutt.org/hg/mutt/rev/c41562a8118b merge stable diffs (615 lines): diff -r a431c7618def -r c41562a8118b browser.c --- a/browser.c Wed Sep 07 18:54:54 2016 -0700 +++ b/browser.c Tue Sep 20 14:01:09 2016 -0700 @@ -176,11 +176,12 @@ tnow = time (NULL); t_fmt = tnow - folder->ff->mtime < 31536000 ? "%b %d %H:%M" : "%b %d %Y"; } - if (do_locales) - setlocale(LC_TIME, NONULL (Locale)); /* use environment if $locale is not set */ - else - setlocale(LC_TIME, "C"); - strftime (date, sizeof (date), t_fmt, localtime (&folder->ff->mtime)); + + if (!do_locales) + setlocale (LC_TIME, "C"); + strftime (date, sizeof (date), t_fmt, localtime (&folder->ff->mtime)); + if (!do_locales) + setlocale (LC_TIME, ""); mutt_format_s (dest, destlen, fmt, date); } diff -r a431c7618def -r c41562a8118b configure.ac --- a/configure.ac Wed Sep 07 18:54:54 2016 -0700 +++ b/configure.ac Tue Sep 20 14:01:09 2016 -0700 @@ -689,13 +689,16 @@ crypto_libs="" AC_CHECK_LIB(z, deflate, [crypto_libs=-lz]) - AC_CHECK_LIB(crypto, X509_new, - [crypto_libs="-lcrypto $crypto_libs"],, [$crypto_libs]) + AC_CHECK_LIB(crypto, X509_STORE_CTX_new, + [crypto_libs="-lcrypto $crypto_libs"], + AC_MSG_ERROR([Unable to find SSL library]), [$crypto_libs]) AC_CHECK_LIB(ssl, SSL_new,, AC_MSG_ERROR([Unable to find SSL library]), [$crypto_libs]) LIBS="$LIBS $crypto_libs" AC_CHECK_FUNCS(RAND_status RAND_egd) + AC_CHECK_DECLS([SSL_set_mode, SSL_MODE_AUTO_RETRY],, + AC_MSG_ERROR([Unable to find decent SSL header]), [[#include <openssl/ssl.h>]]) AC_DEFINE(USE_SSL,1,[ Define if you want support for SSL. ]) AC_DEFINE(USE_SSL_OPENSSL,1,[ Define if you want support for SSL via OpenSSL. ]) diff -r a431c7618def -r c41562a8118b crypt-gpgme.c --- a/crypt-gpgme.c Wed Sep 07 18:54:54 2016 -0700 +++ b/crypt-gpgme.c Tue Sep 20 14:01:09 2016 -0700 @@ -869,13 +869,11 @@ { char p[STRING]; - setlocale (LC_TIME, ""); #ifdef HAVE_LANGINFO_D_T_FMT strftime (p, sizeof (p), nl_langinfo (D_T_FMT), localtime (&t)); #else strftime (p, sizeof (p), "%c", localtime (&t)); #endif - setlocale (LC_TIME, "C"); state_attach_puts (p, s); } @@ -2815,9 +2813,6 @@ } *p = 0; - if (do_locales && Locale) - setlocale (LC_TIME, Locale); - { time_t tt = 0; @@ -2826,11 +2821,13 @@ tm = localtime (&tt); } - strftime (buf2, sizeof (buf2), dest, tm); - - if (do_locales) - setlocale (LC_TIME, "C"); - + + if (!do_locales) + setlocale (LC_TIME, "C"); + strftime (buf2, sizeof (buf2), dest, tm); + if (!do_locales) + setlocale (LC_TIME, ""); + snprintf (fmt, sizeof (fmt), "%%%ss", prefix); snprintf (dest, destlen, fmt, buf2); if (len > 0) @@ -3371,9 +3368,6 @@ int i; gpgme_user_id_t uid = NULL; - if (Locale) - setlocale (LC_TIME, Locale); - is_pgp = key->protocol == GPGME_PROTOCOL_OpenPGP; for (idx = 0, uid = key->uids; uid; idx++, uid = uid->next) @@ -3613,9 +3607,6 @@ putc ('\n', fp); } } - - if (Locale) - setlocale (LC_TIME, "C"); } @@ -3708,7 +3699,7 @@ { for(s = l->data; *s; s++) { - if (*s == '%') + if (*s == '%' || *s == '+') n += 2; n++; } diff -r a431c7618def -r c41562a8118b crypt.c --- a/crypt.c Wed Sep 07 18:54:54 2016 -0700 +++ b/crypt.c Tue Sep 20 14:01:09 2016 -0700 @@ -64,9 +64,7 @@ if (option (OPTCRYPTTIMESTAMP)) { t = time(NULL); - setlocale (LC_TIME, ""); strftime (p, sizeof (p), _(" (current time: %c)"), localtime (&t)); - setlocale (LC_TIME, "C"); } else *p = '\0'; diff -r a431c7618def -r c41562a8118b doc/manual.xml.head --- a/doc/manual.xml.head Wed Sep 07 18:54:54 2016 -0700 +++ b/doc/manual.xml.head Tue Sep 20 14:01:09 2016 -0700 @@ -3624,8 +3624,8 @@ <para> Another typical use for this command is to change the values of the <link linkend="attribution">$attribution</link>, <link -linkend="signature">$signature</link> and <link -linkend="locale">$locale</link> variables in order to change the +linkend="attribution-locale">$attribution_locale</link>, and <link +linkend="signature">$signature</link> variables in order to change the language of the attributions and signatures based upon the recipients. </para> @@ -8291,6 +8291,14 @@ <arg choice="opt" rep="repeat"> <replaceable class="parameter">mailbox</replaceable> </arg> + + <command>unsidebar_whitelist<anchor id="unsidebar-whitelist"/></command> + <arg choice="plain"> + <replaceable class="parameter">*</replaceable> + </arg> + <arg choice="plain" rep="repeat"> + <replaceable class="parameter">mailbox</replaceable> + </arg> </cmdsynopsis> <para> @@ -8299,6 +8307,12 @@ linkend="sidebar-new-mail-only">$sidebar_new_mail_only</link> is set and the mailbox does not contain new mail. </para> + + <para> + The <quote>unsidebar_whitelist</quote> command is used to remove a mailbox from + the list of whitelisted mailboxes. Use <quote>unsidebar_whitelist *</quote> + to remove all mailboxes. + </para> </sect2> <sect2 id="sidebar-colors"> @@ -9571,13 +9585,24 @@ <cmdsynopsis> <command><link linkend="sidebar-whitelist">sidebar_whitelist</link></command> <arg choice="plain"> -<replaceable class="parameter">item</replaceable> -</arg> -<arg choice="plain"> -<replaceable class="parameter">command</replaceable> -</arg> +<replaceable class="parameter">mailbox</replaceable> +</arg> +<arg choice="opt" rep="repeat"> +<replaceable class="parameter">mailbox</replaceable> +</arg> + +<command><link linkend="unsidebar-whitelist">unsidebar_whitelist</link></command> +<group choice="req"> +<arg choice="plain"> +<replaceable class="parameter">*</replaceable> +</arg> +<arg choice="plain" rep="repeat"> +<replaceable class="parameter">mailbox</replaceable> +</arg> +</group> </cmdsynopsis> </listitem> + <listitem> <cmdsynopsis> <command><link linkend="source">source</link></command> diff -r a431c7618def -r c41562a8118b edit.c --- a/edit.c Wed Sep 07 18:54:54 2016 -0700 +++ b/edit.c Tue Sep 20 14:01:09 2016 -0700 @@ -29,6 +29,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> +#include <locale.h> #include <ctype.h> #include <sys/stat.h> #include <fcntl.h> @@ -160,7 +161,9 @@ /* add the attribution */ if (Attribution) { + setlocale (LC_TIME, NONULL (AttributionLocale)); mutt_make_string (tmp, sizeof (tmp) - 1, Attribution, Context, Context->hdrs[n]); + setlocale (LC_TIME, ""); strcat (tmp, "\n"); /* __STRCAT_CHECKED__ */ } diff -r a431c7618def -r c41562a8118b globals.h --- a/globals.h Wed Sep 07 18:54:54 2016 -0700 +++ b/globals.h Tue Sep 20 14:01:09 2016 -0700 @@ -36,6 +36,7 @@ WHERE char *AssumedCharset; WHERE char *AttachSep; WHERE char *Attribution; +WHERE char *AttributionLocale; WHERE char *AttachCharset; WHERE char *AttachFormat; WHERE char *Charset; @@ -66,7 +67,6 @@ #endif WHERE char *Inbox; WHERE char *Ispell; -WHERE char *Locale; WHERE char *MailcapPath; WHERE char *Maildir; #if defined(USE_IMAP) || defined(USE_POP) diff -r a431c7618def -r c41562a8118b hdrline.c --- a/hdrline.c Wed Sep 07 18:54:54 2016 -0700 +++ b/hdrline.c Tue Sep 20 14:01:09 2016 -0700 @@ -383,9 +383,6 @@ } *p = 0; - if (do_locales && Locale) - setlocale (LC_TIME, Locale); - if (op == '[' || op == 'D') tm = localtime (&hdr->date_sent); else if (op == '(') @@ -406,10 +403,11 @@ tm = gmtime (&T); } - strftime (buf2, sizeof (buf2), dest, tm); - - if (do_locales) - setlocale (LC_TIME, "C"); + if (!do_locales) + setlocale (LC_TIME, "C"); + strftime (buf2, sizeof (buf2), dest, tm); + if (!do_locales) + setlocale (LC_TIME, ""); mutt_format_s (dest, destlen, prefix, buf2); if (len > 0 && op != 'd' && op != 'D') /* Skip ending op */ diff -r a431c7618def -r c41562a8118b init.h --- a/init.h Wed Sep 07 18:54:54 2016 -0700 +++ b/init.h Tue Sep 20 14:01:09 2016 -0700 @@ -266,6 +266,18 @@ ** in a reply. For a full listing of defined \fCprintf(3)\fP-like sequences see ** the section on $$index_format. */ + { "attribution_locale", DT_STR, R_NONE, UL &AttributionLocale, UL "" }, + /* + ** .pp + ** The locale used by \fCstrftime(3)\fP to format dates in the + ** $attribution string. Legal values are the strings your system + ** accepts for the locale environment variable \fC$$$LC_TIME\fP. + ** .pp + ** This variable is to allow the attribution date format to be + ** customized by recipient or folder using hooks. By default, Mutt + ** will use your locale environment, so there is no need to set + ** this except to override that default. + */ { "auto_tag", DT_BOOL, R_NONE, OPTAUTOTAG, 0 }, /* ** .pp @@ -599,8 +611,8 @@ ** function to process the date, see the man page for the proper syntax. ** .pp ** Unless the first character in the string is a bang (``!''), the month - ** and week day names are expanded according to the locale specified in - ** the variable $$locale. If the first character in the string is a + ** and week day names are expanded according to the locale. + ** If the first character in the string is a ** bang, the bang is discarded, and the month and week day names in the ** rest of the string are expanded in the \fIC\fP locale (that is in US ** English). @@ -1395,12 +1407,6 @@ ** from your spool mailbox to your $$mbox mailbox, or as a result of ** a ``$mbox-hook'' command. */ - { "locale", DT_STR, R_BOTH, UL &Locale, UL "C" }, - /* - ** .pp - ** The locale used by \fCstrftime(3)\fP to format dates. Legal values are - ** the strings your system accepts for the locale environment variable \fC$$$LC_TIME\fP. - */ { "mail_check", DT_NUM, R_NONE, UL &BuffyTimeout, 5 }, /* ** .pp @@ -3928,6 +3934,7 @@ { "set", parse_set, 0 }, #ifdef USE_SIDEBAR { "sidebar_whitelist",parse_list, UL &SidebarWhitelist }, + { "unsidebar_whitelist",parse_unlist, UL &SidebarWhitelist }, #endif { "source", parse_source, 0 }, { "spam", parse_spam_list, MUTT_SPAM }, diff -r a431c7618def -r c41562a8118b main.c --- a/main.c Wed Sep 07 18:54:54 2016 -0700 +++ b/main.c Tue Sep 20 14:01:09 2016 -0700 @@ -597,15 +597,14 @@ exit(1); } + setlocale (LC_ALL, ""); + #ifdef ENABLE_NLS /* FIXME what about init.c:1439 ? */ - setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, MUTTLOCALEDIR); textdomain (PACKAGE); #endif - setlocale (LC_CTYPE, ""); - mutt_error = mutt_nocurses_error; mutt_message = mutt_nocurses_error; SRAND (time (NULL)); diff -r a431c7618def -r c41562a8118b mbyte.c --- a/mbyte.c Wed Sep 07 18:54:54 2016 -0700 +++ b/mbyte.c Tue Sep 20 14:01:09 2016 -0700 @@ -530,6 +530,7 @@ if (wc == (wchar_t)0x200f || /* bidi markers: #3827 */ wc == (wchar_t)0x200e || wc == (wchar_t)0x00ad || /* soft hyphen: #3848 */ + wc == (wchar_t)0xfeff || /* zero width no-break space */ (wc >= (wchar_t)0x202a && /* misc directional markers: #3854 */ wc <= (wchar_t)0x202e)) return 1; diff -r a431c7618def -r c41562a8118b mutt_ssl.c --- a/mutt_ssl.c Wed Sep 07 18:54:54 2016 -0700 +++ b/mutt_ssl.c Tue Sep 20 14:01:09 2016 -0700 @@ -37,12 +37,6 @@ #include "mutt_ssl.h" #include "mutt_idna.h" -#if OPENSSL_VERSION_NUMBER >= 0x00904000L -#define READ_X509_KEY(fp, key) PEM_read_X509(fp, key, NULL, NULL) -#else -#define READ_X509_KEY(fp, key) PEM_read_X509(fp, key, NULL) -#endif - /* Just in case OpenSSL doesn't define DEVRANDOM */ #ifndef DEVRANDOM #define DEVRANDOM "/dev/urandom" @@ -406,11 +400,7 @@ int err; const char* errmsg; -#if OPENSSL_VERSION_NUMBER >= 0x00906000L - /* This only exists in 0.9.6 and above. Without it we may get interrupted - * reads or writes. Bummer. */ SSL_set_mode (ssldata->ssl, SSL_MODE_AUTO_RETRY); -#endif if ((err = SSL_connect (ssldata->ssl)) != 1) { @@ -631,7 +621,7 @@ static int check_certificate_by_signer (X509 *peercert) { - X509_STORE_CTX xsc; + X509_STORE_CTX *xsc; X509_STORE *ctx; int pass = 0, i; @@ -661,23 +651,25 @@ return 0; } - X509_STORE_CTX_init (&xsc, ctx, peercert, SslSessionCerts); + xsc = X509_STORE_CTX_new(); + if (xsc == NULL) return 0; + X509_STORE_CTX_init (xsc, ctx, peercert, SslSessionCerts); - pass = (X509_verify_cert (&xsc) > 0); + pass = (X509_verify_cert (xsc) > 0); #ifdef DEBUG if (! pass) { char buf[SHORT_STRING]; int err; - err = X509_STORE_CTX_get_error (&xsc); + err = X509_STORE_CTX_get_error (xsc); snprintf (buf, sizeof (buf), "%s (%d)", X509_verify_cert_error_string(err), err); dprint (2, (debugfile, "X509_verify_cert: %s\n", buf)); dprint (2, (debugfile, " [%s]\n", peercert->name)); } #endif - X509_STORE_CTX_cleanup (&xsc); + X509_STORE_CTX_free (xsc); X509_STORE_free (ctx); return pass; @@ -766,7 +758,7 @@ return 0; } - while ((cert = READ_X509_KEY (fp, &cert)) != NULL) + while ((cert = PEM_read_X509 (fp, &cert, NULL, NULL)) != NULL) { pass = compare_certificates (cert, peercert, peermd, peermdlen) ? 0 : 1; @@ -1123,6 +1115,7 @@ } unset_option(OPTIGNOREMACROEVENTS); mutt_menuDestroy (&menu); + set_option (OPTNEEDREDRAW); dprint (2, (debugfile, "ssl interactive_check_cert: done=%d\n", done)); return (done == 2); } diff -r a431c7618def -r c41562a8118b muttlib.c --- a/muttlib.c Wed Sep 07 18:54:54 2016 -0700 +++ b/muttlib.c Tue Sep 20 14:01:09 2016 -0700 @@ -311,6 +311,26 @@ } } +LIST *mutt_copy_list (LIST *p) +{ + LIST *t, *r=NULL, *l=NULL; + + for (; p; p = p->next) + { + t = (LIST *) safe_malloc (sizeof (LIST)); + t->data = safe_strdup (p->data); + t->next = NULL; + if (l) + { + r->next = t; + r = r->next; + } + else + l = r = t; + } + return (l); +} + HEADER *mutt_dup_header(HEADER *h) { HEADER *hnew; diff -r a431c7618def -r c41562a8118b pgpkey.c --- a/pgpkey.c Wed Sep 07 18:54:54 2016 -0700 +++ b/pgpkey.c Tue Sep 20 14:01:09 2016 -0700 @@ -195,15 +195,14 @@ } *p = 0; - if (do_locales && Locale) - setlocale (LC_TIME, Locale); tm = localtime (&key->gen_time); - strftime (buf2, sizeof (buf2), dest, tm); - - if (do_locales) - setlocale (LC_TIME, "C"); + if (!do_locales) + setlocale (LC_TIME, "C"); + strftime (buf2, sizeof (buf2), dest, tm); + if (!do_locales) + setlocale (LC_TIME, ""); snprintf (fmt, sizeof (fmt), "%%%ss", prefix); snprintf (dest, destlen, fmt, buf2); diff -r a431c7618def -r c41562a8118b postpone.c --- a/postpone.c Wed Sep 07 18:54:54 2016 -0700 +++ b/postpone.c Tue Sep 20 14:01:09 2016 -0700 @@ -535,9 +535,17 @@ } - +/* args: + * fp If not NULL, file containing the template + * ctx If fp is NULL, the context containing the header with the template + * newhdr The template is read into this HEADER + * hdr The message to recall/resend + * resend Set if resending (as opposed to recalling a postponed msg). + * Resent messages enable header weeding, and also + * discard any existing Message-ID and Mail-Followup-To. + */ int mutt_prepare_template (FILE *fp, CONTEXT *ctx, HEADER *newhdr, HEADER *hdr, - short weed) + short resend) { MESSAGE *msg = NULL; char file[_POSIX_PATH_MAX]; @@ -560,15 +568,16 @@ fseeko (fp, hdr->offset, 0); newhdr->offset = hdr->offset; - newhdr->env = mutt_read_rfc822_header (fp, newhdr, 1, weed); + /* enable header weeding for resent messages */ + newhdr->env = mutt_read_rfc822_header (fp, newhdr, 1, resend); newhdr->content->length = hdr->content->length; mutt_parse_part (fp, newhdr->content); - /* If message_id is set, then we are resending a message and don't want - * message_id or mail_followup_to. Otherwise, we are resuming a - * postponed message, and want to keep the mail_followup_to. + /* If resending a message, don't keep message_id or mail_followup_to. + * Otherwise, we are resuming a postponed message, and want to keep those + * headers if they exist. */ - if (newhdr->env->message_id != NULL) + if (resend) { FREE (&newhdr->env->message_id); FREE (&newhdr->env->mail_followup_to); diff -r a431c7618def -r c41562a8118b send.c --- a/send.c Wed Sep 07 18:54:54 2016 -0700 +++ b/send.c Tue Sep 20 14:01:09 2016 -0700 @@ -34,6 +34,7 @@ #include <ctype.h> #include <stdlib.h> +#include <locale.h> #include <unistd.h> #include <string.h> #include <errno.h> @@ -323,26 +324,6 @@ } } -LIST *mutt_copy_list (LIST *p) -{ - LIST *t, *r=NULL, *l=NULL; - - for (; p; p = p->next) - { - t = (LIST *) safe_malloc (sizeof (LIST)); - t->data = safe_strdup (p->data); - t->next = NULL; - if (l) - { - r->next = t; - r = r->next; - } - else - l = r = t; - } - return (l); -} - void mutt_forward_intro (FILE *fp, HEADER *cur) { char buffer[STRING]; @@ -401,7 +382,9 @@ char buffer[LONG_STRING]; if (Attribution) { + setlocale (LC_TIME, NONULL (AttributionLocale)); mutt_make_string (buffer, sizeof (buffer), Attribution, ctx, cur); + setlocale (LC_TIME, ""); fputs (buffer, out); fputc ('\n', out); } diff -r a431c7618def -r c41562a8118b sort.h --- a/sort.h Wed Sep 07 18:54:54 2016 -0700 +++ b/sort.h Tue Sep 20 14:01:09 2016 -0700 @@ -36,9 +36,19 @@ #define SORT_FLAGGED 17 #define SORT_PATH 18 -/* dgc: Sort & SortAux are shorts, so I'm bumping these bitflags up from - * bits 4 & 5 to bits 8 & 9 to make room for more sort keys in the future. */ -#define SORT_MASK 0xff +/* Sort and sort_aux are shorts, and are a composite of a + * constant sort operation number and a set of compounded + * bitflags. + * + * Everything below SORT_MASK is a constant. There's room for + * SORT_MASK constant SORT_ values. + * + * Everything above is a bitflag. It's OK to move SORT_MASK + * down by powers of 2 if we need more, so long as we don't + * collide with the constants above. (Or we can just expand + * sort and sort_aux to uint32_t.) + */ +#define SORT_MASK ((1<<8) - 1) #define SORT_REVERSE (1<<8) #define SORT_LAST (1<<9)
