diff options
Diffstat (limited to 'pkgs/development/libraries/libgcrypt')
-rw-r--r-- | pkgs/development/libraries/libgcrypt/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/libraries/libgcrypt/fix-jent-locking.patch | 29 |
2 files changed, 2 insertions, 34 deletions
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index d8708114c8e6..6912817419f6 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -6,11 +6,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { name = "libgcrypt-${version}"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "0z5gs1khzyknyfjr19k8gk4q148s6q987ya85cpn0iv70fz91v36"; + sha256 = "09r27ywj9zplq6n9qw3mn7zmvf6y2jdmwx5d1kg8yqkj0qx18f7n"; }; outputs = [ "out" "dev" "info" ]; @@ -21,9 +21,6 @@ stdenv.mkDerivation rec { # The build enables -O2 by default for everything else. hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify"; - # Accepted upstream, should be in next update: #42150, https://dev.gnupg.org/T4034 - patches = [ ./fix-jent-locking.patch ]; - depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ libgpgerror ] diff --git a/pkgs/development/libraries/libgcrypt/fix-jent-locking.patch b/pkgs/development/libraries/libgcrypt/fix-jent-locking.patch deleted file mode 100644 index 5394e51468e6..000000000000 --- a/pkgs/development/libraries/libgcrypt/fix-jent-locking.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bbe989be6ca5e093d5244413590bd80e12c2ec9b Mon Sep 17 00:00:00 2001 -From: Will Dietz <w@wdtz.org> -Date: Sun, 17 Jun 2018 18:53:58 -0500 -Subject: [PATCH] rndjent: move locking to fix trying to obtain held lock, - hanging - ---- - random/rndjent.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/random/rndjent.c b/random/rndjent.c -index 0c5a820b..3740ddd4 100644 ---- a/random/rndjent.c -+++ b/random/rndjent.c -@@ -334,9 +334,10 @@ _gcry_rndjent_get_version (int *r_active) - { - if (r_active) - { -- lock_rng (); - /* Make sure the RNG is initialized. */ - _gcry_rndjent_poll (NULL, 0, 0); -+ -+ lock_rng (); - /* To ease debugging we store 2 for a clock_gettime based - * implementation and 1 for a rdtsc based code. */ - *r_active = jent_rng_collector? is_rng_available () : 0; --- -2.18.0-rc2 - |