Merge branch 'master'.

4 files changed, 31 insertions, 4 deletions

diff --git a/imap/ChangeLog b/imap/ChangeLog
index f34442c..ba51db1 100644
--- a/imap/ChangeLog
+++ b/imap/ChangeLog
@@ -1,3 +1,10 @@
+2018-07-17  Sam Varshavchik  <mrsam@courier-mta.com>
+
+	* courier-imap, sqwebmail: update Courier-IMAP to support UTF8 IMAP.
+	Convert maildir folders to use UTF-8 for folder names. Add
+	--checkutf8 and --convutf8 options to maildirmake to convert
+	pre-UTF8 maildirs to UTF8 maildirs, a mandatory upgrade procedure.
+
 2018-07-08  Sam Varshavchik  <mrsam@courier-mta.com>
 
 	* waitlib/configure.ac: Fix typo.
diff --git a/imap/imapd.c b/imap/imapd.c
index 78a689c..56cdc61 100644
--- a/imap/imapd.c
+++ b/imap/imapd.c
@@ -3995,6 +3995,8 @@ static int append(const char *tag, const char *mailbox, const char *path)
 	if (enabled_utf8 && curtoken->tokentype == IT_ATOM &&
 	    strcmp(curtoken->tokenbuf, "UTF8") == 0)
 	{
+		/* See also: https://bugs.python.org/issue34138 */
+
 		curtoken=nexttoken();
 		if (curtoken->tokentype != IT_LPAREN)
 		{
diff --git a/maildir/maildirmake.sgml b/maildir/maildirmake.sgml
index 6ad9aaa..053ee73 100644
--- a/maildir/maildirmake.sgml
+++ b/maildir/maildirmake.sgml
@@ -451,7 +451,7 @@ Updating /home/mrsam/.mailfilter</programlisting>
 
       <note>
 	<para>
-	  Any manual work is only needed if maildirs have folders with
+	  All this work is only needed if maildirs have folders with
 	  non-English names. Ignore everything you've just read if all
 	  folder names are English-only.
 	  <option>--checkutf8</option> and
@@ -467,11 +467,22 @@ Updating /home/mrsam/.mailfilter</programlisting>
       <itemizedlist>
 	<listitem>
 	  <para>
-	    Write a shell script to run <option>--checkutf8</option> on
-	    all your mailboxes. It's ok to explicitly specify each mailbox's
+	    A shell script needs to run the <option>--checkutf8</option>
+	    option for every mailbox. A list of each account's maildir
+	    needs to be prepared in advance, together with the corresponding
+	    <filename>.mailfilter</filename> (where appropriate).
+	    courier-authlib's <command>authenumerate</command> command is usually
+	    a good starting point.
+	    It's ok to explicitly specify each mailbox's
 	    <filename>.mailfilter</filename>, when using
 	    <application>SqWebMail</application> even if a particular
 	    mailbox does not use it. It will be ignored.
+	    The list of all accounts' maildirs gets converted to a shell
+	    script that runs <command>maildirmake</command> with the
+	    <option>--checkutf8</option> option. The script should report
+	    any maildir whose <option>--checkutf8</option> option reports
+	    an error, and
+	    <command>maildirmake</command> exits with a non-zero status.
 	  </para>
 
 	  <para>
@@ -559,7 +570,7 @@ Updating /home/mrsam/.mailfilter</programlisting>
 
       <para>
 	Encountering a bad folder during conversion strongly suggests the
-	usage of an IMAP client that does not correctly encode non-English
+	presence of an IMAP client that does not correctly encode non-English
 	folder names. Such an IMAP client will likely have problems after
 	the conversion.
       </para>
diff --git a/sqwebmail/ChangeLog b/sqwebmail/ChangeLog
index 5b814ea..6bb3679 100644
--- a/sqwebmail/ChangeLog
+++ b/sqwebmail/ChangeLog
@@ -1,3 +1,10 @@
+2018-07-17  Sam Varshavchik  <mrsam@courier-mta.com>
+
+	* courier-imap, sqwebmail: update Courier-IMAP to support UTF8 IMAP.
+	Convert maildir folders to use UTF-8 for folder names. Add
+	--checkutf8 and --convutf8 options to maildirmake to convert
+	pre-UTF8 maildirs to UTF8 maildirs, a mandatory upgrade procedure.
+
 5.9.2
 
 2017-11-26  Sam Varshavchik  <mrsam@courier-mta.com>