changeset: 6796:ee0fe5834195
user:      Antonio Radici <anto...@dyne.org>
date:      Wed Sep 21 18:10:33 2016 -0700
link:      http://dev.mutt.org/hg/mutt/rev/ee0fe5834195

Mark some gpgme pgp menu keybinding translations as fuzzy. (closes #3874)

Some translations for crypt-gpgme.c are marked as fuzzy but the keybindings
attached to these translations are not, this creates confusions for the users
who see the english message but have the keybindings for a message in their own
language available.

As long as the translations are fuzzy, the keybindings should stay fuzzy.

changeset: 6797:f2ae8a2d6e1b
user:      Kevin McCarthy <ke...@8t8.us>
date:      Wed Sep 21 18:11:27 2016 -0700
link:      http://dev.mutt.org/hg/mutt/rev/f2ae8a2d6e1b

merge stable

diffs (949 lines):

diff -r 9f6e08ba6ff3 -r f2ae8a2d6e1b browser.c
--- a/browser.c Wed Sep 21 22:51:01 2016 +0200
+++ b/browser.c Wed Sep 21 18:11:27 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 9f6e08ba6ff3 -r f2ae8a2d6e1b configure.ac
--- a/configure.ac      Wed Sep 21 22:51:01 2016 +0200
+++ b/configure.ac      Wed Sep 21 18:11:27 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 9f6e08ba6ff3 -r f2ae8a2d6e1b crypt-gpgme.c
--- a/crypt-gpgme.c     Wed Sep 21 22:51:01 2016 +0200
+++ b/crypt-gpgme.c     Wed Sep 21 18:11:27 2016 -0700
@@ -869,14 +869,12 @@
 {
   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);
+  state_puts (p, s);
 }
 
 /* 
@@ -1141,7 +1139,7 @@
 
   if ((sum & GPGME_SIGSUM_KEY_REVOKED))
     {
-      state_attach_puts (_("Warning: One of the keys has been revoked\n"),s);
+      state_puts (_("Warning: One of the keys has been revoked\n"),s);
       severe = 1;
     }
 
@@ -1150,13 +1148,13 @@
       time_t at = key->subkeys->expires ? key->subkeys->expires : 0;
       if (at)
         {
-          state_attach_puts (_("Warning: The key used to create the "
+          state_puts (_("Warning: The key used to create the "
                                "signature expired at: "), s);
           print_time (at , s);
-          state_attach_puts ("\n", s);
+          state_puts ("\n", s);
         }
       else
-        state_attach_puts (_("Warning: At least one certification key "
+        state_puts (_("Warning: At least one certification key "
                              "has expired\n"), s);
     }
 
@@ -1172,29 +1170,29 @@
            sig = sig->next, i++)
         ;
       
-      state_attach_puts (_("Warning: The signature expired at: "), s);
+      state_puts (_("Warning: The signature expired at: "), s);
       print_time (sig ? sig->exp_timestamp : 0, s);
-      state_attach_puts ("\n", s);
+      state_puts ("\n", s);
     }
 
   if ((sum & GPGME_SIGSUM_KEY_MISSING))
-    state_attach_puts (_("Can't verify due to a missing "
+    state_puts (_("Can't verify due to a missing "
                          "key or certificate\n"), s);
 
   if ((sum & GPGME_SIGSUM_CRL_MISSING))
     {
-      state_attach_puts (_("The CRL is not available\n"), s);
+      state_puts (_("The CRL is not available\n"), s);
       severe = 1;
     }
 
   if ((sum & GPGME_SIGSUM_CRL_TOO_OLD))
     {
-      state_attach_puts (_("Available CRL is too old\n"), s);
+      state_puts (_("Available CRL is too old\n"), s);
       severe = 1;
     }
 
   if ((sum & GPGME_SIGSUM_BAD_POLICY))
-    state_attach_puts (_("A policy requirement was not met\n"), s);
+    state_puts (_("A policy requirement was not met\n"), s);
 
   if ((sum & GPGME_SIGSUM_SYS_ERROR))
     {
@@ -1203,7 +1201,7 @@
       gpgme_signature_t sig;
       unsigned int i;
 
-      state_attach_puts (_("A system error occurred"), s );
+      state_puts (_("A system error occurred"), s );
 
       /* Try to figure out some more detailed system error information. */
       result = gpgme_op_verify_result (ctx);
@@ -1218,17 +1216,17 @@
 
       if (t0 || t1)
         {
-          state_attach_puts (": ", s);
+          state_puts (": ", s);
           if (t0)
-              state_attach_puts (t0, s);
+              state_puts (t0, s);
           if (t1 && !(t0 && !strcmp (t0, t1)))
             {
               if (t0)
-                state_attach_puts (",", s);
-              state_attach_puts (t1, s);
+                state_puts (",", s);
+              state_puts (t1, s);
             }
         }
-      state_attach_puts ("\n", s);
+      state_puts ("\n", s);
     }
 
 #ifdef HAVE_GPGME_PKA_TRUST
@@ -1237,16 +1235,16 @@
     {
       if (sig->pka_trust == 1 && sig->pka_address)
        {
-         state_attach_puts (_("WARNING: PKA entry does not match "
+         state_puts (_("WARNING: PKA entry does not match "
                               "signer's address: "), s);
-         state_attach_puts (sig->pka_address, s);
-         state_attach_puts ("\n", s);
+         state_puts (sig->pka_address, s);
+         state_puts ("\n", s);
        }
       else if (sig->pka_trust == 2 && sig->pka_address)
        {
-         state_attach_puts (_("PKA verified signer's address is: "), s);
-         state_attach_puts (sig->pka_address, s);
-         state_attach_puts ("\n", s);
+         state_puts (_("PKA verified signer's address is: "), s);
+         state_puts (sig->pka_address, s);
+         state_puts ("\n", s);
        }
     }
 
@@ -1303,7 +1301,7 @@
     *p++ = *s;
   *p++ = '\n';
   *p = 0;
-  state_attach_puts (buf, state);
+  state_puts (buf, state);
   FREE (&buf);
 }
 
@@ -1341,7 +1339,7 @@
        break;
       }
   if (txt)
-    state_attach_puts (txt, s);
+    state_puts (txt, s);
 }
 
 static void print_smime_keyinfo (const char* msg, gpgme_signature_t sig,
@@ -1351,8 +1349,8 @@
   gpgme_user_id_t uids = NULL;
   int i, aka = 0;
 
-  state_attach_puts (msg, s);
-  state_attach_puts (" ", s);
+  state_puts (msg, s);
+  state_puts (" ", s);
   /* key is NULL when not present in the user's keyring */
   if (key)
   {
@@ -1366,30 +1364,30 @@
          * and "aka" translation length */
        msglen = mutt_strlen (msg) - 4;
        for (i = 0; i < msglen; i++)
-         state_attach_puts(" ", s);
-       state_attach_puts(_("aka: "), s);
+         state_puts(" ", s);
+       state_puts(_("aka: "), s);
       }
-      state_attach_puts (uids->uid, s);
-      state_attach_puts ("\n", s);
+      state_puts (uids->uid, s);
+      state_puts ("\n", s);
 
       aka = 1;
     }
   }
   else
   {
-    state_attach_puts (_("KeyID "), s);
-    state_attach_puts (sig->fpr, s);
-    state_attach_puts ("\n", s);
+    state_puts (_("KeyID "), s);
+    state_puts (sig->fpr, s);
+    state_puts ("\n", s);
   }
 
   msglen = mutt_strlen (msg) - 8;
   /* TODO: need to account for msg wide characters
    * and "created" translation length */
   for (i = 0; i < msglen; i++)
-    state_attach_puts(" ", s);
-  state_attach_puts (_("created: "), s);
+    state_puts(" ", s);
+  state_puts (_("created: "), s);
   print_time (sig->timestamp, s);
-  state_attach_puts ("\n", s);  
+  state_puts ("\n", s);
 }
 
 /* Show information about one signature.  This function is called with
@@ -1461,7 +1459,7 @@
           snprintf (buf, sizeof (buf),
               _("Error getting key information for KeyID %s: %s\n"),
               fpr, gpgme_strerror (err));
-          state_attach_puts (buf, s);
+          state_puts (buf, s);
           anybad = 1;
        }
       else if ((sum & GPGME_SIGSUM_GREEN))
@@ -1496,9 +1494,9 @@
           /* L10N:
              This is trying to match the width of the
              "Problem signature from:" translation just above. */
-         state_attach_puts (_("               expires: "), s);
+         state_puts (_("               expires: "), s);
          print_time (sig->exp_timestamp, s);
-         state_attach_puts ("\n", s);
+         state_puts ("\n", s);
        }
        show_sig_summary (sum, ctx, key, idx, s, sig);
         anywarn = 1;
@@ -1557,7 +1555,7 @@
       snprintf (buf, sizeof(buf)-1, 
                 _("Error: verification failed: %s\n"),
                 gpgme_strerror (err));
-      state_attach_puts (buf, s);
+      state_puts (buf, s);
     }
   else
     { /* Verification succeeded, see what the result is. */
@@ -1606,7 +1604,7 @@
            snprintf (buf, sizeof (buf),
                      _("*** Begin Notation (signature by: %s) ***\n"),
                      signature->fpr);
-           state_attach_puts (buf, s);
+           state_puts (buf, s);
            for (notation = signature->notations; notation;
                  notation = notation->next)
            {
@@ -1615,18 +1613,18 @@
 
              if (notation->name)
              {
-               state_attach_puts (notation->name, s);
-               state_attach_puts ("=", s);
+               state_puts (notation->name, s);
+               state_puts ("=", s);
              }
              if (notation->value)
              {
-               state_attach_puts (notation->value, s);
+               state_puts (notation->value, s);
                if (!(*notation->value
                       && (notation->value[strlen (notation->value)-1]=='\n')))
-                 state_attach_puts ("\n", s);
+                 state_puts ("\n", s);
              }
            }
-           state_attach_puts (_("*** End Notation ***\n"), s);
+           state_puts (_("*** End Notation ***\n"), s);
          }
        }
       }
@@ -2440,7 +2438,7 @@
                   snprintf (errbuf, sizeof(errbuf)-1, 
                             _("Error: decryption/verification failed: %s\n"),
                             gpgme_strerror (err));
-                  state_attach_puts (errbuf, s);
+                  state_puts (errbuf, s);
                 }
               else
                 { /* Decryption/Verification succeeded */
@@ -2483,7 +2481,7 @@
                   if (!tmpfname)
                     {
                       pgpout = NULL;
-                      state_attach_puts (_("Error: copy data failed\n"), s);
+                      state_puts (_("Error: copy data failed\n"), s);
                     }
                   else
                     {
@@ -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");
 }
 
 
diff -r 9f6e08ba6ff3 -r f2ae8a2d6e1b crypt.c
--- a/crypt.c   Wed Sep 21 22:51:01 2016 +0200
+++ b/crypt.c   Wed Sep 21 18:11:27 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 9f6e08ba6ff3 -r f2ae8a2d6e1b doc/manual.xml.head
--- a/doc/manual.xml.head       Wed Sep 21 22:51:01 2016 +0200
+++ b/doc/manual.xml.head       Wed Sep 21 18:11:27 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 9f6e08ba6ff3 -r f2ae8a2d6e1b edit.c
--- a/edit.c    Wed Sep 21 22:51:01 2016 +0200
+++ b/edit.c    Wed Sep 21 18:11:27 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 9f6e08ba6ff3 -r f2ae8a2d6e1b globals.h
--- a/globals.h Wed Sep 21 22:51:01 2016 +0200
+++ b/globals.h Wed Sep 21 18:11:27 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 9f6e08ba6ff3 -r f2ae8a2d6e1b hdrline.c
--- a/hdrline.c Wed Sep 21 22:51:01 2016 +0200
+++ b/hdrline.c Wed Sep 21 18:11:27 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 9f6e08ba6ff3 -r f2ae8a2d6e1b init.h
--- a/init.h    Wed Sep 21 22:51:01 2016 +0200
+++ b/init.h    Wed Sep 21 18:11:27 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 9f6e08ba6ff3 -r f2ae8a2d6e1b main.c
--- a/main.c    Wed Sep 21 22:51:01 2016 +0200
+++ b/main.c    Wed Sep 21 18:11:27 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 9f6e08ba6ff3 -r f2ae8a2d6e1b mbyte.c
--- a/mbyte.c   Wed Sep 21 22:51:01 2016 +0200
+++ b/mbyte.c   Wed Sep 21 18:11:27 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 9f6e08ba6ff3 -r f2ae8a2d6e1b mutt_ssl.c
--- a/mutt_ssl.c        Wed Sep 21 22:51:01 2016 +0200
+++ b/mutt_ssl.c        Wed Sep 21 18:11:27 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 9f6e08ba6ff3 -r f2ae8a2d6e1b muttlib.c
--- a/muttlib.c Wed Sep 21 22:51:01 2016 +0200
+++ b/muttlib.c Wed Sep 21 18:11:27 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 9f6e08ba6ff3 -r f2ae8a2d6e1b pgpkey.c
--- a/pgpkey.c  Wed Sep 21 22:51:01 2016 +0200
+++ b/pgpkey.c  Wed Sep 21 18:11:27 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 9f6e08ba6ff3 -r f2ae8a2d6e1b po/de.po
--- a/po/de.po  Wed Sep 21 22:51:01 2016 +0200
+++ b/po/de.po  Wed Sep 21 18:11:27 2016 -0700
@@ -1371,6 +1371,7 @@
 "PGP (v)erschl., (s)ign., sign. (a)ls, (b)eides, s/(m)ime, (u)nverschl.?"
 
 #: crypt-gpgme.c:4733
+#, fuzzy
 msgid "samfco"
 msgstr ""
 
@@ -1407,6 +1408,7 @@
 "S/MIME (v)erschl., (s)ign., sign. (a)ls, (b)eides, (p)gp, (u)nverschl.?"
 
 #: crypt-gpgme.c:4764
+#, fuzzy
 msgid "esabpfc"
 msgstr "vsabpku"
 
@@ -1417,6 +1419,7 @@
 "PGP (v)erschl., (s)ign., sign. (a)ls, (b)eides, s/(m)ime, (u)nverschl.?"
 
 #: crypt-gpgme.c:4770
+#, fuzzy
 msgid "esabmfc"
 msgstr "vsabmku"
 
diff -r 9f6e08ba6ff3 -r f2ae8a2d6e1b po/es.po
--- a/po/es.po  Wed Sep 21 22:51:01 2016 +0200
+++ b/po/es.po  Wed Sep 21 18:11:27 2016 -0700
@@ -1419,6 +1419,7 @@
 msgstr "┬┐co(d)ificar, f(i)rmar (c)omo, amb(o)s, inc(l)uido, o ca(n)celar? "
 
 #: crypt-gpgme.c:4733
+#, fuzzy
 msgid "samfco"
 msgstr ""
 
diff -r 9f6e08ba6ff3 -r f2ae8a2d6e1b po/it.po
--- a/po/it.po  Wed Sep 21 22:51:01 2016 +0200
+++ b/po/it.po  Wed Sep 21 18:11:27 2016 -0700
@@ -1358,6 +1358,7 @@
 #. Alternatively, you may duplicate the letter 'c' is translated to.
 #. This comment also applies to the five following letter sequences.
 #: crypt-gpgme.c:4727
+#, fuzzy
 msgid "sapfco"
 msgstr ""
 
@@ -1368,6 +1369,7 @@
 "PGP: cifra(e), firma(s), firma (c)ome, entram(b)i, s/(m)ime, annullare(c)?"
 
 #: crypt-gpgme.c:4733
+#, fuzzy
 msgid "samfco"
 msgstr ""
 
@@ -1404,6 +1406,7 @@
 "S/MIME cifra(e), firma(s), firma (c)ome, entram(b)i, (p)gp, annullare(c)?"
 
 #: crypt-gpgme.c:4764
+#, fuzzy
 msgid "esabpfc"
 msgstr "esabpfc"
 
@@ -1414,6 +1417,7 @@
 "PGP: cifra(e), firma(s), firma (c)ome, entram(b)i, s/(m)ime, annullare(c)?"
 
 #: crypt-gpgme.c:4770
+#, fuzzy
 msgid "esabmfc"
 msgstr "esabmfc"
 
diff -r 9f6e08ba6ff3 -r f2ae8a2d6e1b postpone.c
--- a/postpone.c        Wed Sep 21 22:51:01 2016 +0200
+++ b/postpone.c        Wed Sep 21 18:11:27 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 9f6e08ba6ff3 -r f2ae8a2d6e1b send.c
--- a/send.c    Wed Sep 21 22:51:01 2016 +0200
+++ b/send.c    Wed Sep 21 18:11:27 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 9f6e08ba6ff3 -r f2ae8a2d6e1b sort.h
--- a/sort.h    Wed Sep 21 22:51:01 2016 +0200
+++ b/sort.h    Wed Sep 21 18:11:27 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)
 

Reply via email to