ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity

Make gpgkey2ssh use absolute path to gpg2, fixes #11912

Browse Source
This commit is contained in:
Arda Xi 2015-12-27 20:56:52 +01:00
parent ee0fae473c
commit 7c17302848
4 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/security/gnupg/20.nix
View File

@ -23,7 +23,9 @@ stdenv.mkDerivation rec {
= [ readline zlib libgpgerror libgcrypt libassuan libksba pth = [ readline zlib libgpgerror libgcrypt libassuan libksba pth
openldap bzip2 libusb curl libiconv ]; openldap bzip2 libusb curl libiconv ];
patchPhase = '' patches = [ ./gpgkey2ssh-20.patch ];
prePatch = ''
find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i
'' + stdenv.lib.optionalString stdenv.isLinux '' '' + stdenv.lib.optionalString stdenv.isLinux ''
sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
@ -35,6 +37,8 @@ stdenv.mkDerivation rec {
configureFlags = optional x11Support "--with-pinentry-pgm=${pinentry}/bin/pinentry"; configureFlags = optional x11Support "--with-pinentry-pgm=${pinentry}/bin/pinentry";
postConfigure = "substituteAllInPlace tools/gpgkey2ssh.c";
checkPhase="GNUPGHOME=`pwd` ./agent/gpg-agent --daemon make check"; checkPhase="GNUPGHOME=`pwd` ./agent/gpg-agent --daemon make check";
doCheck = true; doCheck = true;

4
pkgs/tools/security/gnupg/21.nix
View File

@ -20,10 +20,14 @@ stdenv.mkDerivation rec {
sha256 = "1ybcsazjm21i2ys1wh49cz4azmqz7ghx5rb6hm4gm93i2zc5igck"; sha256 = "1ybcsazjm21i2ys1wh49cz4azmqz7ghx5rb6hm4gm93i2zc5igck";
}; };
patches = [ ./gpgkey2ssh-21.patch ];
postPatch = stdenv.lib.optionalString stdenv.isLinux '' postPatch = stdenv.lib.optionalString stdenv.isLinux ''
sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
''; #" fix Emacs syntax highlighting :-( ''; #" fix Emacs syntax highlighting :-(
postConfigure = "substituteAllInPlace tools/gpgkey2ssh.c";
buildInputs = [ buildInputs = [
pkgconfig libgcrypt libassuan libksba libiconv npth pkgconfig libgcrypt libassuan libksba libiconv npth
autoreconfHook gettext texinfo autoreconfHook gettext texinfo

14
pkgs/tools/security/gnupg/gpgkey2ssh-20.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/tools/gpgkey2ssh.c b/tools/gpgkey2ssh.c
index 903fb5b..d5611dc 100644
--- a/tools/gpgkey2ssh.c
+++ b/tools/gpgkey2ssh.c
@@ -266,7 +266,7 @@ main (int argc, char **argv)
keyid = argv[1];
ret = asprintf (&command,
- "gpg --list-keys --with-colons --with-key-data '%s'",
+ "@out@/bin/gpg2 --list-keys --with-colons --with-key-data '%s'",
keyid);
assert (ret > 0);

13
pkgs/tools/security/gnupg/gpgkey2ssh-21.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/tools/gpgkey2ssh.c b/tools/gpgkey2ssh.c
index f12c5f4..2e3f2ac 100644
--- a/tools/gpgkey2ssh.c
+++ b/tools/gpgkey2ssh.c
@@ -281,7 +281,7 @@ main (int argc, char **argv)
keyid = argv[1];
asprintf (&command,
- "gpg2 --list-keys --with-colons --with-key-data '%s'",
+ "@out@/bin/gpg2 --list-keys --with-colons --with-key-data '%s'",
keyid);
if (! command)
{