summary refs log tree commit diff
path: root/pkgs/development/libraries/openldap
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2020-11-17 17:38:02 +0100
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2020-11-18 15:40:34 +0100
commitabbe6217245a13e78ee341082a4adf5abcadf107 (patch)
treec610580d92cde7695a3453f02a8935274720d298 /pkgs/development/libraries/openldap
parentda12fc683846f3dcac07eb353cf0ec69e907ccd0 (diff)
downloadnixpkgs-abbe6217245a13e78ee341082a4adf5abcadf107.tar
nixpkgs-abbe6217245a13e78ee341082a4adf5abcadf107.tar.gz
nixpkgs-abbe6217245a13e78ee341082a4adf5abcadf107.tar.bz2
nixpkgs-abbe6217245a13e78ee341082a4adf5abcadf107.tar.lz
nixpkgs-abbe6217245a13e78ee341082a4adf5abcadf107.tar.xz
nixpkgs-abbe6217245a13e78ee341082a4adf5abcadf107.tar.zst
nixpkgs-abbe6217245a13e78ee341082a4adf5abcadf107.zip
openldap: 2.4.51 -> 2.4.56
Drop patch for what became CVE-2020-25692, it was fixed in 2.4.55.

Fixes: CVE-2020-25709, CVE-2020-25710
Diffstat (limited to 'pkgs/development/libraries/openldap')
-rw-r--r--pkgs/development/libraries/openldap/default.nix17
1 files changed, 4 insertions, 13 deletions
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 1304799f56c..fdf3298a6fa 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -1,23 +1,14 @@
 { stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "openldap-2.4.51";
+  pname = "openldap";
+  version = "2.4.56";
 
   src = fetchurl {
-    url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz";
-    sha256 = "0qmy2jkk6v9iqwrsdsn8s7lwzaplr01a2mgf21r6nl66lig7g47l";
+    url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${pname}-${version}.tgz";
+    sha256 = "1q0m26kbab96r73y0dll0c36411kvfillal0i75kngy9cc1hwli5";
   };
 
-  patches = [
-    (fetchurl {
-      # Fix a null-ptr dereference for unauthenticated packet in slapd
-      # NO CVE yet
-      # https://bugs.openldap.org/show_bug.cgi?id=9370
-      url = "https://git.openldap.org/openldap/openldap/-/commit/4c774220a752bf8e3284984890dc0931fe73165d.patch";
-      sha256 = "1vkbb6szscnhch5zzf6iq104l3dkwd50rih8jk9y0s2vgyz76mil";
-    })
-  ];
-
   # TODO: separate "out" and "bin"
   outputs = [ "out" "dev" "man" "devdoc" ];