This patch fixes locale canonicalization when using newer versions of
ICU.  It comes from the upstream repo, and should appear starting in
version 3.33.5.

From fe4ac94ce3c14f200e049a5d102fc0e4b811c71e Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Tue, 16 Jul 2019 07:22:07 +0200
Subject: [PATCH] I#137 - POSIX locale tests fail with ICU 64.x

Closes https://gitlab.gnome.org/GNOME/evolution-data-server/issues/137
---
 src/libedataserver/e-collator.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/libedataserver/e-collator.c b/src/libedataserver/e-collator.c
index 718eac5da..ec2cf7951 100644
--- a/src/libedataserver/e-collator.c
+++ b/src/libedataserver/e-collator.c
@@ -132,6 +132,11 @@ canonicalize_locale (const gchar *posix_locale,
 	gint   len;
 	const gchar *collation_type = NULL;
 
+	if (posix_locale && (
+	    g_ascii_strcasecmp (posix_locale, "C") == 0 ||
+	    g_ascii_strcasecmp (posix_locale, "POSIX") == 0))
+		posix_locale = "en_US_POSIX";
+
 	len = uloc_canonicalize (posix_locale, locale_buffer, LOCALE_BUFFER_LEN, &status);
 
 	if (U_FAILURE (status)) {
-- 
2.22.0

1516c4dcabb13d56418'>refs</a><a class='active' href='/guix/log/tests/guix-authenticate.sh'>log</a><a href='/guix/tree/tests/guix-authenticate.sh?id=fa8fe90edb4efaf7d52f71516c4dcabb13d56418'>tree</a><a href='/guix/commit/tests/guix-authenticate.sh?id=fa8fe90edb4efaf7d52f71516c4dcabb13d56418'>commit</a><a href='/guix/diff/tests/guix-authenticate.sh?id=fa8fe90edb4efaf7d52f71516c4dcabb13d56418'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/guix-authenticate.sh'>
<input type='hidden' name='id' value='fa8fe90edb4efaf7d52f71516c4dcabb13d56418'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=fa8fe90edb4efaf7d52f71516c4dcabb13d56418'>root</a>/<a href='/guix/log/tests?id=fa8fe90edb4efaf7d52f71516c4dcabb13d56418'>tests</a>/<a href='/guix/log/tests/guix-authenticate.sh?id=fa8fe90edb4efaf7d52f71516c4dcabb13d56418'>guix-authenticate.sh</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/guix-authenticate.sh?id=fa8fe90edb4efaf7d52f71516c4dcabb13d56418&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-09-14 15:42:55 +0200'>2020-09-14</span></td><td><a href='/guix/commit/tests/guix-authenticate.sh?id=64cf660f872fb7aaf0d2b463e45b4c756297f743'>daemon: Spawn 'guix authenticate' once for all.</a><span class='msg-avail'>...<span class='msg-tooltip'>Previously, we'd spawn 'guix authenticate' once for each item that has
to be signed (when exporting) or authenticated (when importing).  Now,
we spawn it once for all and then follow a request/reply protocol.  This
reduces the wall-clock time of:

  guix archive --export -r $(guix build coreutils -d)

from 30s to 2s.

* guix/scripts/authenticate.scm (sign-with-key): Return the signature
instead of displaying it.  Raise a &amp;formatted-message instead of calling
'leave'.
(validate-signature): Likewise.
(read-command): New procedure.
(define-enumerate-type, reply-code): New macros.
(guix-authenticate)[send-reply]: New procedure.
Change to read commands from current-input-port.
* nix/libstore/local-store.cc (runAuthenticationProgram): Remove.
(authenticationAgent, readInteger, readAuthenticateReply): New
functions.
(signHash, verifySignature): Rewrite in terms of the agent.
* tests/store.scm ("import not signed"): Remove 'pk' call.
("import signed by unauthorized key"): Check the error message of C.
* tests/guix-authenticate.sh: Rewrite using the new protocol.

fixlet
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-09-11 17:53:58 +0200'>2020-09-11</span></td><td><a href='/guix/commit/tests/guix-authenticate.sh?id=6dd8ffc57420ee2f6f19e79e41028e78fe9e6a7e'>daemon: Simplify interface with 'guix authenticate'.</a><span class='msg-avail'>...<span class='msg-tooltip'>There's no reason at this point to mimic the calling convention of the
'openssl' command.

* nix/libstore/local-store.cc (LocalStore::exportPath): Add only "sign"
and HASH to ARGS.  Remove 'tmpDir' and 'hashFile'.
(LocalStore::importPath): Add only "verify" and SIGNATURE to
* guix/scripts/authenticate.scm (guix-authenticate): Adjust
accordingly; remove the OpenSSL-style clauses.
(read-hash-data): Remove.
(sign-with-key): Replace 'port' with 'sha256' and adjust accordingly.
(validate-signature): Export SIGNATURE to be a canonical sexp.
* tests/guix-authenticate.sh: Adjust tests accordingly.
</span></span></td><td>Ludovic Courtès</td></tr>