From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Mon, 26 Aug 2019 06:02:31 +0000 (+0200)
Subject: Allow finding gpg2 binaries when gpg2 has an "unknown" version string
X-Git-Tag: emacs-27.0.90~1328^2~67
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=42ba6200af10c00c72ac13912d6fb42a7af88058;p=emacs.git

Allow finding gpg2 binaries when gpg2 has an "unknown" version string

* lisp/epg-config.el (epg-find-configuration): Allow finding a
usable configuration even if the version string looks like "gpg
(GnuPG) 2.2.15-unknown" (bug#35629).
---

diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index 54328290c8f..4a9cc7744cb 100644
--- a/lisp/epg-config.el
+++ b/lisp/epg-config.el
@@ -148,7 +148,11 @@ Otherwise, it tries the programs listed in the entry until the
 version requirement is met."
   (unless program-alist
     (setq program-alist epg-config--program-alist))
-  (let ((entry (assq protocol program-alist)))
+  (let ((entry (assq protocol program-alist))
+        ;; In many gnupg distributions (especially on Windows), the
+        ;; version string is "gpg (GnuPG) 2.2.15-unknown" or the like.
+        (version-regexp-alist (cons '("^[-._+ ]?unknown$" . -4)
+                                    version-regexp-alist)))
     (unless entry
       (error "Unknown protocol %S" protocol))
     (cl-destructuring-bind (symbol . alist)