diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-03-31 05:13:44 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-03-31 05:16:10 +0200 |
commit | 4cfdc7af5399d243be7723b870ecb7ca4eeb36d7 (patch) | |
tree | e37536229b5638095d72c7b8138f0ebd2839443f /pkgs/development/libraries/ldb | |
parent | f1582a04df910d585763ec647958e1f7dfbdbd4b (diff) | |
download | nixpkgs-4cfdc7af5399d243be7723b870ecb7ca4eeb36d7.tar nixpkgs-4cfdc7af5399d243be7723b870ecb7ca4eeb36d7.tar.gz nixpkgs-4cfdc7af5399d243be7723b870ecb7ca4eeb36d7.tar.bz2 nixpkgs-4cfdc7af5399d243be7723b870ecb7ca4eeb36d7.tar.lz nixpkgs-4cfdc7af5399d243be7723b870ecb7ca4eeb36d7.tar.xz nixpkgs-4cfdc7af5399d243be7723b870ecb7ca4eeb36d7.tar.zst nixpkgs-4cfdc7af5399d243be7723b870ecb7ca4eeb36d7.zip |
ldb: 1.3.3 → 2.1.1
* Move build tools to nativeBuildInputs * Switch to Python 3 as it is required by most Samba libraries * Do not yet enable the experimental lmdb backend introduced in 1.4.0 Changes: * https://git.samba.org/samba.git/?p=samba.git;a=commit;h=4e2eb5660a11cea215d39495844aa76ffb5a1a2e * https://git.samba.org/samba.git/?p=samba.git;a=commit;h=3eecdbcc38dbe084b285c9720443d819304f7b97 * https://git.samba.org/samba.git/?p=samba.git;a=commit;h=b7f0ee93f58e663bb8fc0b39985aa49b254582d9 * https://git.samba.org/samba.git/?p=samba.git;a=commit;h=bdbb9422c0430d74c3173822257e23a9dfb2713e * https://git.samba.org/samba.git/?p=samba.git;a=commit;h=340cb9ca97bc2a23f102f80897a8d8f4809f0072 * https://git.samba.org/samba.git/?p=samba.git;a=commit;h=de3bb5cd5236565f2b79644d99e55d03b254b65e * https://git.samba.org/samba.git/?p=samba.git;a=commit;h=09d281d69b668a71e4457889bb5e949414a664fb * https://git.samba.org/samba.git/?p=samba.git;a=commit;h=81648d576d56e924945b2214ac12ca6a40679db8 * https://git.samba.org/samba.git/?p=samba.git;a=commit;h=86d480ade25953a175b0837667ce5efb8b7e65df * https://git.samba.org/samba.git/?p=samba.git;a=commit;h=80bd467affbda1d962f4deb3caa8a42c6531425d * https://git.samba.org/samba.git/?p=samba.git;a=commit;h=bc0d16c9d8eacd254552ff28726a2ba5f2a1c8c0 * https://git.samba.org/samba.git/?p=samba.git;a=commit;h=c37b94fd0a7b24df93b664ad4c2d197c516c9dce * https://git.samba.org/samba.git/?p=samba.git;a=commit;h=79460b1b9f3452d6d68014b84f4a9dc3988bd916 * https://git.samba.org/samba.git/?p=samba.git;a=commit;h=0ca46a37268c8219192abc3ab5f2546a02ed8862
Diffstat (limited to 'pkgs/development/libraries/ldb')
-rw-r--r-- | pkgs/development/libraries/ldb/default.nix | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 036afbed599..7ee869b53c3 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, python +, python3 , pkg-config , readline , tdb @@ -16,49 +16,40 @@ stdenv.mkDerivation rec { pname = "ldb"; - version = "1.3.3"; + version = "2.1.1"; src = fetchurl { url = "mirror://samba/ldb/${pname}-${version}.tar.gz"; - sha256 = "14gsrm7dvyjpbpnc60z75j6fz2p187abm2h353lq95kx2bv70c1b"; + sha256 = "jO+y8l/KkT+hinktDvsDrwf4f1uVGkze0DD1uY8lx7A="; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkg-config + python3 wafHook + libxslt + docbook-xsl-nons + docbook_xml_dtd_42 ]; buildInputs = [ - python - readline + python3 + readline # required to build python tdb talloc tevent popt - libxslt - docbook-xsl-nons - docbook_xml_dtd_42 cmocka ]; - patches = [ - # CVE-2019-3824 - # downloading the patch from debian as they have ported the patch from samba to ldb but otherwise is identical to - # https://bugzilla.samba.org/attachment.cgi?id=14857 - (fetchurl { - name = "CVE-2019-3824.patch"; - url = "https://sources.debian.org/data/main/l/ldb/2:1.1.27-1+deb9u1/debian/patches/CVE-2019-3824-master-v4-5-02.patch"; - sha256 = "1idnqckvjh18rh9sbq90rr4sxfviha9nd1ca9pd6lai0y6r6q4yd"; - }) - ]; - wafPath = "buildtools/bin/waf"; wafConfigureFlags = [ "--bundled-libraries=NONE" "--builtin-libraries=replace" + "--without-ldb-lmdb" ]; stripDebugList = "bin lib modules"; |