git.iko.soy/typeable/nixpkgs
on master help sign in
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

commit4cfdc7af5399d243be7723b870ecb7ca4eeb36d7 authorJan Tojnar <jtojnar@gmail.com> dateTue 31 Mar 2020, 05:13 (7 years ago) parentf1582a0
2 files changed+11−22
pkgs/development/libraries/ldb/default.nix+10−19 pkgs/top-level/all-packages.nix+1−3
pkgs/development/libraries/ldb/default.nix+10−19
@@ -1,6 +1,6 @@
11{ stdenv
22, fetchurl
3−, python
3+, python3
44, pkg-config
55, readline
66, tdb
@@ -16,49 +16,40 @@
1616
1717stdenv.mkDerivation rec {
1818 pname = "ldb";
19− version = "1.3.3";
19+ version = "2.1.1";
2020
2121 src = fetchurl {
2222 url = "mirror://samba/ldb/${pname}-${version}.tar.gz";
23− sha256 = "14gsrm7dvyjpbpnc60z75j6fz2p187abm2h353lq95kx2bv70c1b";
23+ sha256 = "jO+y8l/KkT+hinktDvsDrwf4f1uVGkze0DD1uY8lx7A=";
2424 };
2525
2626 outputs = [ "out" "dev" ];
2727
2828 nativeBuildInputs = [
2929 pkg-config
30+ python3
3031 wafHook
32+ libxslt
33+ docbook-xsl-nons
34+ docbook_xml_dtd_42
3135 ];
3236
3337 buildInputs = [
34− python
35− readline
38+ python3
39+ readline # required to build python
3640 tdb
3741 talloc
3842 tevent
3943 popt
40− libxslt
41− docbook-xsl-nons
42− docbook_xml_dtd_42
4344 cmocka
4445 ];
4546
46− patches = [
47− # CVE-2019-3824
48− # downloading the patch from debian as they have ported the patch from samba to ldb but otherwise is identical to
49− # https://bugzilla.samba.org/attachment.cgi?id=14857
50− (fetchurl {
51− name = "CVE-2019-3824.patch";
52− 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";
53− sha256 = "1idnqckvjh18rh9sbq90rr4sxfviha9nd1ca9pd6lai0y6r6q4yd";
54− })
55− ];
56−
5747 wafPath = "buildtools/bin/waf";
5848
5949 wafConfigureFlags = [
6050 "--bundled-libraries=NONE"
6151 "--builtin-libraries=replace"
52+ "--without-ldb-lmdb"
6253 ];
6354
6455 stripDebugList = "bin lib modules";
pkgs/top-level/all-packages.nix+1−3
@@ -12341,9 +12341,7 @@ in
1234112341
1234212342 ldacbt = callPackage ../development/libraries/ldacbt { };
1234312343
12344− ldb = callPackage ../development/libraries/ldb {
12345− python = python2;
12346− };
12344+ ldb = callPackage ../development/libraries/ldb { };
1234712345
1234812346 lensfun = callPackage ../development/libraries/lensfun {};
1234912347