[bug#52744] Make GnuPG 2.2.32 available and remove emacs-pinentry

[bug#52744] Make GnuPG 2.2.32 available and remove emacs-pinentry

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 505 bytes --]

As discussed in #52483 [0], our GnuPG package cannot do symmetric
encryption and decryption. However, we do have a hidden GnuPG package
that doesn't include this bug.

The first patch unhide that package, make the pinentry mechanism work on
Guix, and adjust the emacs-pinentry package to avoid needing to hide
this GnuPG variant in the first place.

The second patch removes emacs-pinentry entirely, because it is
apparently no longer useful and abandoned upstream.

[0]
https://issues.guix.gnu.org/52483

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#52744] [PATCH 1/2] gnu: Make GnuPG 2.2.32 available for users.

[Leo Famulari]

Fixes <https://issues.guix.gnu.org/52483>.

* gnu/packages/gnupg.scm (gnupg-2.2.32)[properties]: Unhide this package.
[source]: Add 'gnupg-default-pinentry.patch'.
* gnu/packages/emacs-xyz.scm (emacs-pinentry)[propagated-inputs]: Replace gnupg
with gnupg-2.2.32.
---
 gnu/packages/emacs-xyz.scm |  2 +-
 gnu/packages/gnupg.scm     | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index c85680eece..5228338458 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -21166,7 +21166,7 @@ (define-public emacs-pinentry
            "1lf30q6r8nz5cjzclbb9bbymsk2y75nskvb55hnjdv93gr3j0sik"))))
       (build-system emacs-build-system)
       (propagated-inputs
-       (list gnupg))
+       (list gnupg-2.2.32))
       (home-page "https://elpa.gnu.org/packages/pinentry.html")
       (synopsis "GnuPG Pinentry server implementation")
       (description
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 7706688b93..a3f0f85a0d 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -349,21 +349,17 @@ (define-public gnupg
     (properties '((ftp-server . "ftp.gnupg.org")
                   (ftp-directory . "/gcrypt/gnupg")))))
 
+;; This package fixes <https://issues.guix.gnu.org/52483>, "GnuPG 2.2.30 cannot
+;; do symmetric encryption"
 (define-public gnupg-2.2.32
   (package
     (inherit gnupg)
     (version "2.2.32")
-
-    ;; Hide this version because packages like 'emacs-pinentry' propagate the
-    ;; default GnuPG and "guix install gnupg emacs-pinentry" would fail with a
-    ;; collision error.
-    (properties `((hidden? . #t)
-                  ,@(package-properties gnupg)))
-
     (source (origin
               (inherit (package-source gnupg))
               (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
                                   ".tar.bz2"))
+              (patches (search-patches "gnupg-default-pinentry.patch"))
               (sha256
                (base32
                 "0506gv54z10c96z5821z9p0ksibk1pfilsmag39ffqrcz0sinmxj"))))))
-- 
2.34.0

[bug#52744] [PATCH 2/2] gnu: Remove emacs-pinentry.

[Leo Famulari]

This package is apparently no longer useful and is abandoned upstream:

https://issues.guix.gnu.org/52483

* gnu/packages/emacs-xyz.scm (emacs-pinentry): Remove variable.
---
 gnu/packages/emacs-xyz.scm | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 5228338458..4368cda580 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -21148,36 +21148,6 @@ (define-public emacs-mu4e-conversation
 maps the thread tree.")
       (license license:gpl3+))))
 
-(define-public emacs-pinentry
-  (let ((commit "dcc9ba03252ee5d39e03bba31b420e0708c3ba0c")
-        (revision "1"))
-    (package
-      (name "emacs-pinentry")
-      (version (git-version "0.1" revision commit))
-      (source
-       (origin
-         (method url-fetch)
-         (uri (string-append
-               "http://git.savannah.gnu.org/cgit/emacs/elpa.git/plain"
-               "/packages/pinentry/pinentry.el?id=" commit))
-         (file-name (string-append "pinentry.el"))
-         (sha256
-          (base32
-           "1lf30q6r8nz5cjzclbb9bbymsk2y75nskvb55hnjdv93gr3j0sik"))))
-      (build-system emacs-build-system)
-      (propagated-inputs
-       (list gnupg-2.2.32))
-      (home-page "https://elpa.gnu.org/packages/pinentry.html")
-      (synopsis "GnuPG Pinentry server implementation")
-      (description
-       "This package allows GnuPG passphrase to be prompted through the
-minibuffer instead of graphical dialog.
-
-To use, add @code{allow-emacs-pinentry} to @code{~/.gnupg/gpg-agent.conf},
-reload the configuration with @code{gpgconf --reload gpg-agent}, and start the
-server with @code{M-x pinentry-start}.")
-      (license license:gpl3+))))
-
 (define-public emacs-so-long
   (package
     (name "emacs-so-long")
-- 
2.34.0

bug#52744: [PATCH 1/2] gnu: Make GnuPG 2.2.32 available for users.

[Leo Famulari]

On Wed, Dec 22, 2021 at 07:00:33PM -0500, Leo Famulari wrote:
> Fixes <https://issues.guix.gnu.org/52483>.
> 
> * gnu/packages/gnupg.scm (gnupg-2.2.32)[properties]: Unhide this package.
> [source]: Add 'gnupg-default-pinentry.patch'.
> * gnu/packages/emacs-xyz.scm (emacs-pinentry)[propagated-inputs]: Replace gnupg
> with gnupg-2.2.32.

I pushed this patch as d03aa942def0037cb32ff1d0cc2ac5d13f1a63df

I did not push the second patch, which removes emacs-pinentry. I'll
close this ticket and let Emacs users decide what to do with
emacs-pinentry.