merge: upstream fixes (mutt/default)

 * Preserve forwarded attachment names in d_filename.
 * Updated Czech translation.
 * Mark IMAP fast-trash'ed messages as read before copying. (see #3860)
 * automatic post-release commit for mutt-1.7.1

ChangeLog

@@ -1,3 +1,161 @@
+2016-10-04 11:13 -0700  Kevin McCarthy  <kevin@8t8.us>  (5c5848dfa4ea)
+
+	* muttlib.c: Preserve forwarded attachment names in d_filename.
+
+	When forwarding an attachment with an non-ascii name,
+	mutt_copy_body() mangles the filename when calling mutt_adv_mktemp.
+	Preserve the original attachment filename in d_filename.
+
+	Remove the double copy of b->filename, which is a memory leak.
+
+2016-09-25 13:11 -0700  Kevin McCarthy  <kevin@8t8.us>  (586dad383893)
+
+	* parse.c: Reset invalid parsed received dates to 0. (closes #3878)
+
+	The actual problem in the ticket would be solved by d3f31cf9239e
+	(see #3798). However there is still the bug that Mutt considers a
+	(hdr->received != 0) to be set and usable, despite not checking the
+	return value of mutt_parse_date().
+
+	Change mutt_read_rfc822_header() to unset an invalid received value
+	back to 0. We don't do this inside mutt_read_rfc822_line() because
+	that would cause the next received line to be parsed.
+
+2016-09-21 18:10 -0700  Antonio Radici  <antonio@dyne.org>  (ee0fe5834195)
+
+	* po/de.po, po/es.po, po/it.po: 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.
+
+2016-09-21 22:51 +0200  Kevin McCarthy  <kevin@8t8.us>  (9f6e08ba6ff3)
+
+	* mx.c: Check for NULL mx_ops in mx.c
+
+	Eike Rathke reported this happening when in an IMAP index view the
+	underlying connection was terminated, ctx->mx_ops was NULL and thus
+	accessing ctx->mx_ops->check segfaulted.
+
+	Thanks also to Eike Rathke for the initial patch, for which I
+	expanded the checks to other functions.
+
+2016-09-20 13:58 -0700  Antonio Radici  <antonio@dyne.org>  (8ed017079800)
+
+	* crypt-gpgme.c: 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.
+
+2016-09-07 18:54 -0700  Kevin McCarthy  <kevin@8t8.us>  (a431c7618def)
+
+	* doc/manual.xml.head, init.h: Fix sidebar documentation a bit.
+	(closes #3859)
+
+	Sidebar_whitelist is a command, not a variable. Also add a blurb
+	about what it does.
+
+	Fix the sort order for $sidebar_divider_char and
+	$sidebar_delim_chars.
+
+2016-09-05 18:50 -0700  Kevin McCarthy  <kevin@8t8.us>  (cd127a968399)
+
+	* contrib/Makefile.am: Add missing sidebar contrib sample files to
+	dist tarball.
+
+	I previously added the files, but neglected to add them to the
+	contrib/Makefile.am file.
+
+	Thanks to isdtor for pointing out the problem and for the original
+	patch.
+
+2016-09-05 12:35 -0700  Kevin McCarthy  <kevin@8t8.us>  (bb25613ce8a4)
+
+	* getdomain.c: Stub out getdnsdomainname() unless HAVE_GETADDRINFO.
+
+	It seems unlikely there are systems without it (given that this
+	mistake has been in since 1.6.0), but for correctness we should stub
+	out the function for those without it.
+
+2016-09-05 12:22 -0700  Kevin McCarthy  <kevin@8t8.us>  (90c1b756d87d)
+
+	* configure.ac: Autoconf: always check for getaddrinfo().
+
+	The getdnsdomainname() function introduced in 1.6.0 uses
+	getaddrinfo().
+
+	Pull the dependency checks for libnsl, libsocket, and getaddrinfo()
+	outside of the "need_socket" block, so they are always checked for.
+
+2016-09-04 18:50 -0700  Guilhem Moulin  <guilhem@guilhem.org>  (b082bcd5d5e2)
+
+	* pgppubring.c: Fix pgpring reporting of DSA and Elgamal key lengths.
+	(closes #3867)
+
+	Patch provided by Guilhem Moulin from an original idea of Fabrizio
+	Tarizzo.
+
+	The key length is always the length of the first MPI for RSA, DSA,
+	and Elgamal.
+
+2016-09-02 19:32 -0700  Kevin McCarthy  <kevin@8t8.us>  (ba5d900a90db)
+
+	* doc/manual.xml.head, pattern.c: Disable ~X when message scoring.
+	(closes #3861)
+
+	mutt_score_message() purposely passes a NULL context to
+	mutt_pattern_exec(). The idea was to block slow patterns, and the
+	scoring documentation notes this by saying:
+
+	 "For efficiency reasons, patterns which scan information not
+	available in the index, such as ~b, ~B or ~h, may not be used"
+
+	~X needs the context to parse the messages (during message scoring
+	at least), and thus isn't suitable for message scoring either.
+
+	Block ~X from being used when the context is NULL. Add ~X to the
+	list of patterns noted as unusable in the message scoring
+	documentation.
+
+2016-09-02 16:20 -0700  Kevin McCarthy  <kevin@8t8.us>  (eef1e8abc46f)
+
+	* browser.c: Increase date buffer size for $folder_format. (closes
+	#3863)
+
+	The buffer size of 16 was sufficient to hold the %d format, but not
+	for using %D. Change to use a SHORT_STRING.
+
+	Thanks to Ian Zimmerman for the original patch, and to Antonio
+	Radici for forwarding it on to us.
+
+2016-08-17 20:17 -0700  Kevin McCarthy  <kevin@8t8.us>  (328e1a32034b)
+
+	* sys_socket.h: merge default into stable
+
+2016-08-17 20:14 -0700  Kevin McCarthy  <kevin@8t8.us>  (e5fcfc5f9c2e)
+
+	* .hgsigs: mutt-1.7.0 signed
+
+2016-08-17 20:12 -0700  Kevin McCarthy  <kevin@8t8.us>  (be1a70b1c080)
+
+	* .hgtags: Added tag mutt-1-7-rel for changeset a4e83f60e42f
+
+2016-08-17 20:12 -0700  Kevin McCarthy  <kevin@8t8.us>  (a4e83f60e42f)
+
+	* ChangeLog, UPDATING, VERSION, po/bg.po, po/ca.po, po/cs.po,
+	po/da.po, po/de.po, po/el.po, po/eo.po, po/es.po, po/et.po,
+	po/eu.po, po/fr.po, po/ga.po, po/gl.po, po/hu.po, po/id.po,
+	po/it.po, po/ja.po, po/ko.po, po/lt.po, po/nl.po, po/pl.po,
+	po/pt_BR.po, po/ru.po, po/sk.po, po/sv.po, po/tr.po, po/uk.po,
+	po/zh_CN.po, po/zh_TW.po: automatic post-release commit for
+	mutt-1.7.0
+
 2016-08-17 18:07 -0700  TAKAHASHI Tamotsu  <ttakah@lapis.plala.or.jp>  (c513c311026f)
 
 	* po/ja.po: Updated Japanese translation.

UPDATING

@@ -4,6 +4,10 @@ mutt. Please read this file carefully when upgrading your installation.
 The keys used are:
   !: modified feature, -: deleted feature, +: new feature
 
+1.7.1 (2016-10-08):
+
+  ! Bug fix release.  No features were modified or added.
+
 1.7.0 (2016-08-18):
 
   ! Improved alignment when using multi-column characters with

configure.ac

@@ -11,7 +11,7 @@ AC_CONFIG_SRCDIR(mutt.h)
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS([config.h])
 
-AC_DEFINE(MUTT_VERSION, "1.7.0", [Version of upstream Mutt])
+AC_DEFINE(MUTT_VERSION, "1.7.1", [Version of upstream Mutt])
 
 AC_USE_SYSTEM_EXTENSIONS
 

imap/imap.c

@@ -2117,6 +2117,14 @@ int imap_fast_trash (CONTEXT* ctx, char* dest)
   /* loop in case of TRYCREATE */
   do
   {
+    rc = imap_exec_msgset (idata, "UID STORE", "+FLAGS.SILENT (\\Seen)",
+                           MUTT_TRASH, 0, 0);
+    if (rc < 0)
+    {
+      dprint (1, (debugfile, "imap_fast_trash: Unable to mark messages as seen\n"));
+      goto out;
+    }
+
     rc = imap_exec_msgset (idata, "UID COPY", mmbox, MUTT_TRASH, 0, 0);
     if (!rc)
     {

muttlib.c

@@ -151,8 +151,11 @@ int mutt_copy_body (FILE *fp, BODY **tgt, BODY *src)
   b->xtype = safe_strdup (b->xtype);
   b->subtype = safe_strdup (b->subtype);
   b->form_name = safe_strdup (b->form_name);
-  b->filename = safe_strdup (b->filename);
   b->d_filename = safe_strdup (b->d_filename);
+  /* mutt_adv_mktemp() will mangle the filename in tmp,
+   * so preserve it in d_filename */
+  if (!b->d_filename && use_disp)
+    b->d_filename = safe_strdup (src->filename);
   b->description = safe_strdup (b->description);
 
   /* 

po/bg.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.5.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-17 20:11-0700\n"
+"POT-Creation-Date: 2016-10-08 12:54-0700\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CP1251\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1819,11 +1819,11 @@ msgstr "
 msgid "You are on the first message."
 msgstr "Òîâà å ïúðâîòî ïèñìî."
 
-#: curs_main.c:1586 menu.c:773 pager.c:2115 pattern.c:1491
+#: curs_main.c:1586 menu.c:773 pager.c:2115 pattern.c:1494
 msgid "Search wrapped to top."
 msgstr "Òúðñåíåòî å çàïî÷íàòî îòãîðå."
 
-#: curs_main.c:1595 pager.c:2137 pattern.c:1502
+#: curs_main.c:1595 pager.c:2137 pattern.c:1505
 msgid "Search wrapped to bottom."
 msgstr "Òúðñåíåòî å çàïî÷íàòî îòäîëó."
 
@@ -2364,7 +2364,7 @@ msgstr "
 msgid "Error opening mailbox"
 msgstr "Ãðåøêà ïðè îòâàðÿíå íà ïîùåíñêàòà êóòèÿ!"
 
-#: imap/imap.c:808 imap/imap.c:2147 imap/message.c:877 muttlib.c:1565
+#: imap/imap.c:808 imap/imap.c:2147 imap/message.c:877 muttlib.c:1568
 #, c-format
 msgid "Create %s?"
 msgstr "Æåëàåòå ëè äà ñúçäàäåòå %s?"
@@ -3101,15 +3101,15 @@ msgstr "
 msgid "You are on the first entry."
 msgstr "Òîâà å ïúðâèÿò çàïèñ."
 
-#: menu.c:747 pager.c:2159 pattern.c:1430
+#: menu.c:747 pager.c:2159 pattern.c:1433
 msgid "Search for: "
 msgstr "Òúðñåíå: "
 
-#: menu.c:747 pager.c:2159 pattern.c:1430
+#: menu.c:747 pager.c:2159 pattern.c:1433
 msgid "Reverse search for: "
 msgstr "Îáðàòíî òúðñåíå: "
 
-#: menu.c:791 pager.c:2112 pager.c:2134 pager.c:2254 pattern.c:1545
+#: menu.c:791 pager.c:2112 pager.c:2134 pager.c:2254 pattern.c:1548
 msgid "Not found."
 msgstr "Íÿìà ðåçóëòàòè îò òúðñåíåòî."
 
@@ -3450,45 +3450,45 @@ msgstr "
 #. L10N:
 #. Means "The path you specified as the destination file is a directory."
 #. See the msgid "Save to file: " (alias.c, recvattach.c)
-#: muttlib.c:976
+#: muttlib.c:979
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
 msgstr ""
 "Ôàéëúò å äèðåêòîðèÿ. Æåëàåòå ëè äà çàïèøåòå â íåÿ? [(y) äà, (n) íå, (a) "
 "âñè÷êè]"
 
-#: muttlib.c:976
+#: muttlib.c:979
 msgid "yna"
 msgstr "yna"
 
 #. L10N:
 #. Means "The path you specified as the destination file is a directory."
 #. See the msgid "Save to file: " (alias.c, recvattach.c)
-#: muttlib.c:995
+#: muttlib.c:998
 msgid "File is a directory, save under it?"
 msgstr "Ôàéëúò å äèðåêòîðèÿ. Æåëàåòå ëè äà çàïèøåòå â íåÿ?"
 
-#: muttlib.c:999
+#: muttlib.c:1002
 msgid "File under directory: "
 msgstr "Ôàéë â òàçè äèðåêòîðèÿ: "
 
-#: muttlib.c:1008
+#: muttlib.c:1011
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr "Ôàéëúò ñúùåñòâóâà. Ïðåçàïèñ(o), äîáàâÿíå(a) èëè îòêàç(c)?"
 
-#: muttlib.c:1008
+#: muttlib.c:1011
 msgid "oac"
 msgstr "oac"
 
-#: muttlib.c:1531
+#: muttlib.c:1534
 msgid "Can't save message to POP mailbox."
 msgstr "Çàïèñ íà ïèñìî íà POP ñúðâúð íå å âúçìîæíî."
 
-#: muttlib.c:1540
+#: muttlib.c:1543
 #, c-format
 msgid "Append messages to %s?"
 msgstr "Æåëàåòå ëè äà äîáàâèòå ïèñìàòà êúì %s?"
 
-#: muttlib.c:1552
+#: muttlib.c:1555
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s íå å ïîùåíñêà êóòèÿ!"
@@ -3699,37 +3699,37 @@ msgstr "
 msgid "empty pattern"
 msgstr "ïðàçåí øàáëîí"
 
-#: pattern.c:1226
+#: pattern.c:1229
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "ãðåøêà: íåïîçíàò îïåðàòîð %d (ìîëÿ, ñúîáùåòå çà òàçè ãðåøêà)."
 
-#: pattern.c:1309 pattern.c:1451
+#: pattern.c:1312 pattern.c:1454
 msgid "Compiling search pattern..."
 msgstr "Êîìïèëèðàíå íà øàáëîíà çà òúðñåíå..."
 
-#: pattern.c:1330
+#: pattern.c:1333
 msgid "Executing command on matching messages..."
 msgstr "Èçïúëíÿâàíå íà êîìàíäà âúðõó ïèñìàòà..."
 
-#: pattern.c:1399
+#: pattern.c:1402
 msgid "No messages matched criteria."
 msgstr "Íÿìà ïèñìà, îòãîâàðÿùè íà òîçè êðèòåðèé."
 
-#: pattern.c:1481
+#: pattern.c:1484
 #, fuzzy
 msgid "Searching..."
 msgstr "Çàïèñâàíå..."
 
-#: pattern.c:1494
+#: pattern.c:1497
 msgid "Search hit bottom without finding match"
 msgstr "Òúðñåíåòî äîñòèãíà äî êðàÿ, áåç äà áúäå íàìåðåíî ñúâïàäåíèå"
 
-#: pattern.c:1505
+#: pattern.c:1508
 msgid "Search hit top without finding match"
 msgstr "Òúðñåíåòî äîñòèãíà äî íà÷àëîòî, áåç äà áúäå íàìåðåíî ñúâïàäåíèå"
 
-#: pattern.c:1537
+#: pattern.c:1540
 msgid "Search interrupted."
 msgstr "Òúðñåíåòî å ïðåêúñíàòî."