From 6a9526ca34c107976f5a79c7347fa5302ead43fd Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Sat, 25 Nov 2023 12:33:50 +0100 Subject: 29.1: Don't enable pinentry loopback mode for gpgsm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ulrich Müller --- emacs/29.1/07_all_epg-gpmsm.patch | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 emacs/29.1/07_all_epg-gpmsm.patch (limited to 'emacs') diff --git a/emacs/29.1/07_all_epg-gpmsm.patch b/emacs/29.1/07_all_epg-gpmsm.patch new file mode 100644 index 0000000..646798c --- /dev/null +++ b/emacs/29.1/07_all_epg-gpmsm.patch @@ -0,0 +1,38 @@ +Don't enable pinentry loopback mode for gpgsm +Patch from master branch +https://debbugs.gnu.org/67012 + +commit e736a1b5a2aa2dd8dbaba32a408db70822fe434f +Author: Ulrich Müller +Date: Fri Nov 17 12:16:54 2023 +0100 + + Don't enable pinentry loopback mode for gpgsm + +--- a/doc/misc/epa.texi ++++ b/doc/misc/epa.texi +@@ -640,6 +640,9 @@ GnuPG Pinentry + Emacs. + @end enumerate + ++Note that loopback Pinentry does not work with @command{gpgsm}, ++therefore EasyPG will ignore this setting for it. ++ + There are other options available to use Emacs as Pinentry, you might + come across a Pinentry called @command{pinentry-emacs} or + @command{gpg-agent} option @code{allow-emacs-pinentry}. However, +--- a/lisp/epg.el ++++ b/lisp/epg.el +@@ -595,7 +595,12 @@ epg--start + (if (epg-context-textmode context) '("--textmode")) + (if (epg-context-output-file context) + (list "--output" (epg-context-output-file context))) +- (if (epg-context-pinentry-mode context) ++ (if (and (epg-context-pinentry-mode context) ++ (not ++ ;; loopback doesn't work with gpgsm ++ (and (eq (epg-context-protocol context) 'CMS) ++ (eq (epg-context-pinentry-mode context) ++ 'loopback)))) + (list "--pinentry-mode" + (symbol-name (epg-context-pinentry-mode + context)))) -- cgit v1.2.3-65-gdbad