Author: Antero Mejr <antero@mailbox.org>
Upstream status: I didn't report upstream because they don't have an issue tracker and
PRs require signing the Google CLA. If someone willing to sign the CLA
wants to submit the patch, please go ahead.

diff --git a/tools/cpp/src/cpp-build/generate_geocoding_data.cc b/tools/cpp/src/cpp-build/generate_geocoding_data.cc
index 021cf5c8..5948e140 100644
--- a/tools/cpp/src/cpp-build/generate_geocoding_data.cc
+++ b/tools/cpp/src/cpp-build/generate_geocoding_data.cc
@@ -88,6 +88,7 @@ class DirEntry {

   const std::string& name() const { return name_; }
   DirEntryKinds kind() const { return kind_; }
+  bool operator<(const DirEntry& d) { return name_ < d.name(); }
 
  private:
   std::string name_;
@@ -115,6 +116,7 @@ bool ListDirectory(const string& path, vector<DirEntry>* entries) {
     errno = 0;
     entry = readdir(dir);
     if (entry == NULL) {
+      std::sort(entries->begin(), entries->end());
       return errno == 0;
     }
     if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) {
 href='/guix/refs/?id=f6b4d395fd321d43fd548ba832c78320ac3f8d51'>refs</a><a class='active' href='/guix/log/gnu/packages/debian.scm'>log</a><a href='/guix/tree/gnu/packages/debian.scm?id=f6b4d395fd321d43fd548ba832c78320ac3f8d51'>tree</a><a href='/guix/commit/gnu/packages/debian.scm?id=f6b4d395fd321d43fd548ba832c78320ac3f8d51'>commit</a><a href='/guix/diff/gnu/packages/debian.scm?id=f6b4d395fd321d43fd548ba832c78320ac3f8d51'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/debian.scm'>
<input type='hidden' name='id' value='f6b4d395fd321d43fd548ba832c78320ac3f8d51'/><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=f6b4d395fd321d43fd548ba832c78320ac3f8d51'>root</a>/<a href='/guix/log/gnu?id=f6b4d395fd321d43fd548ba832c78320ac3f8d51'>gnu</a>/<a href='/guix/log/gnu/packages?id=f6b4d395fd321d43fd548ba832c78320ac3f8d51'>packages</a>/<a href='/guix/log/gnu/packages/debian.scm?id=f6b4d395fd321d43fd548ba832c78320ac3f8d51'>debian.scm</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/gnu/packages/debian.scm?id=f6b4d395fd321d43fd548ba832c78320ac3f8d51&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-02-23 14:07:17 +0200'>2020-02-23</span></td><td><a href='/guix/commit/gnu/packages/debian.scm?id=3d314a5642a57aa70248c7ee61789d4d53aedae6'>gnu: debootstrap: Update to 1.0.118</a><span class='msg-avail'>...<span class='msg-tooltip'>The attached patch has been tested by creating
arm64, mipsel &amp; amd64 chroots and the amd64
one has been actually run.

--
Vincent Legoll

From a23b962c21e20c72f425675e6ea6e11cd0f944d0 Mon Sep 17 00:00:00 2001
From: Vincent Legoll &lt;vincent.legoll@gmail.com&gt;
Date: Fri, 21 Feb 2020 23:34:40 +0100
Subject: [PATCH] gnu: debootstrap: Update to 1.0.118. *
 gnu/packages/debian.scm (debootstrap): Update to 1.0.118.

Signed-off-by: Efraim Flashner &lt;efraim@flashner.co.il&gt;
</span></span></td><td>Vincent Legoll</td></tr>
<tr><td><span title='2019-06-05 09:54:49 -0700'>2019-06-05</span></td><td><a href='/guix/commit/gnu/packages/debian.scm?id=90041e9c28e71ee9736b5e9942625460f7deacd2'>gnu: debootstrap: Workaround for PATH issues.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/debian (debootstrap):
  [arguments]: Substitute PATH to include $PATH.
  [description]: Remove obsolete workaround from description.
</span></span></td><td>Vagrant Cascadian</td></tr>
<tr><td><span title='2019-06-01 18:35:36 -0700'>2019-06-01</span></td><td><a href='/guix/commit/gnu/packages/debian.scm?id=54d14302462a68a9d96360f0d88236fdc39c17a0'>gnu: debootstrap: Update to 114.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/debian (debootstrap): Update to 114.
</span></span></td><td>Vagrant Cascadian</td></tr>
<tr><td><span title='2019-06-01 17:38:48 -0700'>2019-06-01</span></td><td><a href='/guix/commit/gnu/packages/debian.scm?id=76513c949b63c675c602bc634e0738efc4f5d9ab'>gnu: debian-archive-keyring: Update to 2019.01.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/debian (debian-archive-keyring): Update to 2019.01.
</span></span></td><td>Vagrant Cascadian</td></tr>
<tr><td><span title='2018-12-01 23:34:43 +0200'>2018-12-01</span></td><td><a href='/guix/commit/gnu/packages/debian.scm?id=a0e813725ee73f3638078fb99c003e7abe92a5be'>gnu: debootstrap: Update to 1.0.111.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/debian.scm (debootstrap): Update to 1.0.111.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2018-12-01 23:34:43 +0200'>2018-12-01</span></td><td><a href='/guix/commit/gnu/packages/debian.scm?id=7111ea0d588aca0cdd8ddd204919effa2f2d8283'>gnu: debootstrap: Update build.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/debian.scm (debootstrap)[arguments]: Update the
substitutes during the custom 'patch-source phase. Add custom
'wrap-executable phase.
[inputs]: Remove coreutils, wget. Add tzdata.
[propagated-inputs]: Remove binutils, gnupg. Move perl ...
[native-inputs]: ... to here.
[description]: Add implementation hint.
</span></span></td><td>Efraim Flashner</td></tr>