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) {
<a href='/guix/refs/?id=28618b05f002720bc56bae76659717a0eba4dd8b'>refs</a><a href='/guix/log/'>log</a><a href='/guix/tree/?id=28618b05f002720bc56bae76659717a0eba4dd8b'>tree</a><a href='/guix/commit/?id=28618b05f002720bc56bae76659717a0eba4dd8b'>commit</a><a href='/guix/diff/?id=28618b05f002720bc56bae76659717a0eba4dd8b'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/'>
<input type='hidden' name='id' value='28618b05f002720bc56bae76659717a0eba4dd8b'/><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='content'><div id='summary'><pre>
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018, 2022 Arun Isaac &lt;arunisaac@systemreboot.net&gt;
;;; Copyright © 2020 Tobias Geerinckx-Rice &lt;me@tobias.gr&gt;
;;; Copyright © 2021 Brice Waegeneire &lt;brice@waegenei.re&gt;
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix.  If not, see &lt;http://www.gnu.org/licenses/&gt;.

(define-module (gnu services security-token)
  #:use-module (gnu services)
  #:use-module (gnu services shepherd)
  #:use-module (gnu packages admin)
  #:use-module (gnu packages base)
  #:use-module (gnu packages security-token)
  #:use-module (gnu system shadow)
  #:use-module (guix gexp)
  #:use-module (guix modules)
  #:use-module (guix records)
  #:use-module (ice-9 match)
  #:use-module (srfi srfi-26)
  #:export (pcscd-configuration
            pcscd-configuration?
            pcscd-configuration-pcsc-lite
            pcscd-configuration-usb-drivers
            pcscd-service-type))

;;;
;;; PC/SC Smart Card Daemon
;;;

(define-record-type* &lt;pcscd-configuration&gt;
  pcscd-configuration make-pcscd-configuration pcscd-configuration?
  (pcsc-lite pcscd-configuration-pcsc-lite
             (default pcsc-lite))
  (usb-drivers pcscd-configuration-usb-drivers
               (default (list ccid))))

(define pcscd-shepherd-service
  (match-lambda
    (($ &lt;pcscd-configuration&gt; pcsc-lite)
     (shepherd-service
      (documentation &quot;PC/SC Smart Card Daemon&quot;)
      (provision &apos;(pcscd))
      (requirement &apos;(syslogd))
      (start #~(lambda _
                 (let ((socket &quot;/run/pcscd/pcscd.comm&quot;))
                   (when (file-exists? socket)
                     (delete-file socket)))
                 (fork+exec-command
                  (list #$(file-append pcsc-lite &quot;/sbin/pcscd&quot;)
                        &quot;--foreground&quot;)
                  #:log-file &quot;/var/log/pcscd.log&quot;)))
      (stop #~(make-kill-destructor))))))

(define pcscd-activation
  (match-lambda
    (($ &lt;pcscd-configuration&gt; pcsc-lite usb-drivers)
     (with-imported-modules (source-module-closure
                             &apos;((guix build utils)))
       #~(begin
           (use-modules (guix build utils))

           (mkdir-p &quot;/var/lib&quot;)
           (switch-symlinks &quot;/var/lib/pcsc&quot;
                            #$(directory-union
                               &quot;pcsc&quot;
                               (map (cut file-append &lt;&gt; &quot;/pcsc&quot;)
                                    usb-drivers))))))))

(define pcscd-service-type
  (service-type
   (name &apos;pcscd)
   (description
    &quot;Run @command{pcscd}, the PC/SC smart card daemon.&quot;)
   (extensions
    (list (service-extension shepherd-root-service-type
                             (compose list pcscd-shepherd-service))
          (service-extension activation-service-type
                             pcscd-activation)))
   (default-value (pcscd-configuration))))
</pre>
</div></div> <!-- class=content -->
                         <div class=footer>generated by
                             <a href="https://git.zx2c4.com/cgit/about/">
                                 cgit
                             </a>
                         </div>
                        </div> <!-- id=cgit -->
</body>
</html>