Make GnuPG 2.2.32 available and remove emacs-pinentry

  • Done
  • quality assurance status badge
Details
One participant
  • Leo Famulari
Owner
unassigned
Submitted by
Leo Famulari
Severity
normal
L
L
Leo Famulari wrote on 23 Dec 2021 00:59
(address . guix-patches@gnu.org)
YcO7x00+1nmQvvIF@jasmine.lan
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]
-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAmHDu8QACgkQJkb6MLrK
fwhKmg/+MVtQjEE4TQY7LI3RagjKP0AWq1jv6sI73bW4Apv8KiH+vW41pMrIgYte
o7/2qJwr5kUUs0E1ribQugvwfIsDnkJPUIlvyCUvBHbuDcqvB2sjaTpq3bBz+Ha7
30C+f9QtNQdqRV4hV+8aWtjpkXEo2eVoBqKF567LpcdEJKCzvkuMQUyhtzi0AJxU
xOb+D42eXFZ/fTZFeYfvM0v9vsKsaLLq2CR9b4BdsqpA/4XtAAKWQxGN1746UFlt
HWsoKGrd6fLQU5vtkMh1ld1+sqRMLuvbU5r2DOXrbWZ09Zjxo7lgD+P3zdaCPwLe
bd5CNIY7Q1yK+JerZA64fcvifxmqi/iVEhLpY6+HeJZM/qFEK6j/QnHzrPSbMzw+
Y0pxlrt6pyKCrMlaJbxOeI5anVZh7/iSQO0Q963w9SlnWGd7yML8ndS2Z2CmyzRg
nelu7Lp+UaW7EAvxK4zNL3EJR46UhBrmlrf2vAMav1eD1VXfssR180eIJpe01HTW
tATa/F+tAHJvupjDB5Z4nVzRdqy8kRNwnR17xLX0uaQhgiuenSUsZzhR3Uim4ryE
HdsLI6z2m0ktTJ0IWKiVRI9AAb4uBNpsarBtUkbRjHYn8e2MtZGeDEPqh/SukJSe
YBHBzDBqqK2ucJSCwlwsHEqTu2PASKfelra889JX0eP3pMvTDvQ=
=R7/3
-----END PGP SIGNATURE-----


L
L
Leo Famulari wrote on 23 Dec 2021 01:00
[PATCH 2/2] gnu: Remove emacs-pinentry.
(address . 52744@debbugs.gnu.org)
f2a1aacbb10c09789be250f6831201cc577e1f25.1640217633.git.leo@famulari.name
This package is apparently no longer useful and is abandoned upstream:


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

Toggle diff (43 lines)
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
L
L
Leo Famulari wrote on 23 Dec 2021 01:00
[PATCH 1/2] gnu: Make GnuPG 2.2.32 available for users.
(address . 52744@debbugs.gnu.org)
8f2757a28b4a5e72d3ca8c6059c6dbf908b3c5bc.1640217633.git.leo@famulari.name

* 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(-)

Toggle diff (44 lines)
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
L
L
Leo Famulari wrote on 26 Dec 2021 23:41
(address . 52744-done@debbugs.gnu.org)
YcjvpuW9C6FuUiA1@jasmine.lan
On Wed, Dec 22, 2021 at 07:00:33PM -0500, Leo Famulari wrote:
Toggle quote (7 lines)
>
> * 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.
Closed
?