@@ -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";