me
/
guix
Archived
1
0
Fork 0
Code

gnu: GnuPG: Really use ~/.guix-profile/bin/pinentry by default. 

Fixes <https://bugs.gnu.org/24076>.

* gnu/packages/patches/gnupg-default-pinentry.patch: New file. Use $HOME to find
the user's Guix profile and installed pinentry.
* gnu/local.mk (dist_patch_DATA): Add the patch.
* gnu/packages/gnupg.scm (gnupg)[source]: Use it.
master
Leo Famulari 2020-03-27 18:44:48 -04:00
parent 8f83699ba0
commit e5b44b06b3
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
3 changed files with 68 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnu/local.mk
View File

@ -973,6 +973,7 @@ dist_patch_DATA = \
%D%/packages/patches/gmp-faulty-test.patch \
%D%/packages/patches/gnome-shell-theme.patch \
%D%/packages/patches/gnome-tweaks-search-paths.patch \
%D%/packages/patches/gnupg-default-pinentry.patch \
%D%/packages/patches/gnutls-skip-trust-store-test.patch \
%D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
%D%/packages/patches/gobject-introspection-cc.patch \

3
gnu/packages/gnupg.scm
View File

@ -11,7 +11,7 @@
;;; Copyright © 2016 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2016 Mike Gerwitz <mtg@gnu.org>
;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Petter <petter@mykolab.ch>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com>
@ -252,6 +252,7 @@ compatible to GNU Pth.")
(method url-fetch)
(uri (string-append "mirror://gnupg/gnupg/gnupg-" version
".tar.bz2"))
(patches (search-patches "gnupg-default-pinentry.patch"))
(sha256
(base32
"0c6a4v9p6qzhsw1pfcwc459bxpc8hma0w9z8iqb9khvligack9q4"))))

65
gnu/packages/patches/gnupg-default-pinentry.patch 100644
View File

@ -0,0 +1,65 @@
Make GnuPG automatically find a pinentry installed by Guix. Try using
$HOME or, if that variable is not set, use the system password database,
or fall back to looking in "/".
More information:
https://bugs.gnu.org/24076
diff --git a/common/homedir.c b/common/homedir.c
index 4b6e46e88..f7ae68ba5 100644
--- a/common/homedir.c
+++ b/common/homedir.c
@@ -33,6 +33,7 @@
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
+#include <pwd.h>
#ifdef HAVE_W32_SYSTEM
#include <winsock2.h> /* Due to the stupid mingw64 requirement to
@@ -67,6 +68,10 @@
* gnupg_homedir and gnupg_set_homedir. Malloced. */
static char *the_gnupg_homedir;
+/* The user's home directory. Used in Guix to help GnuPG find the
+ * pinentry. */
+static char *the_user_homedir;
+
/* Flag indicating that home directory is not the default one. */
static byte non_default_homedir;
@@ -509,6 +514,25 @@ gnupg_homedir (void)
return the_gnupg_homedir;
}
+/* Return the user's home directory */
+const char *
+user_homedir (void)
+{
+ const char *dir;
+ dir = getenv("HOME");
+ if (dir == NULL)
+ {
+ struct passwd *pw = NULL;
+ pw = getpwuid (getuid ());
+ if (pw != NULL)
+ dir = pw->pw_dir;
+ else
+ dir = "/";
+ }
+ if (!the_user_homedir)
+ the_user_homedir = make_absfilename (dir, NULL);
+ return the_user_homedir;
+}
/* Return whether the home dir is the default one. */
int
@@ -971,6 +995,7 @@ get_default_pinentry_name (int reset)
} names[] = {
/* The first entry is what we return in case we found no
other pinentry. */
+ { user_homedir, "/.guix-profile/bin/pinentry" },
{ gnupg_bindir, DIRSEP_S "pinentry" EXEEXT_S },
#ifdef HAVE_W32_SYSTEM
/* Try Gpg4win directory (with bin and without.) */