openldap: Fix some issues by applying patches
These patches are from the 2.6 support branch and will hence make it into 2.6.3 at a later point. At this point however, I cannot use slapd as a syncrepl slave because it segfaults on startup. This also fixes parallel build.
This commit is contained in:
parent
5934fd9ec8
commit
b32df807ea
|
@ -1,6 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchurl
|
, fetchurl
|
||||||
|
, fetchpatch
|
||||||
|
|
||||||
# dependencies
|
# dependencies
|
||||||
, cyrus_sasl
|
, cyrus_sasl
|
||||||
|
@ -21,6 +22,39 @@ stdenv.mkDerivation rec {
|
||||||
hash = "sha256-gdCTRSMutiSG7PWsrNLFbAxFtKbIwGZhLn9CGiOhz4c";
|
hash = "sha256-gdCTRSMutiSG7PWsrNLFbAxFtKbIwGZhLn9CGiOhz4c";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# ITS#9840 - ldif-filter: fix parallel build failure
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/openldap/openldap/commit/7d977f51e6dfa570a471d163b9e8255bdd3dc12f.patch";
|
||||||
|
hash = "sha256:1vid6pj2gmqywbghnd380x19ml241ldc1fyslb6br6q27zpgbdlp";
|
||||||
|
})
|
||||||
|
# ITS#9840 - libraries/Makefile.in: ignore the mkdir errors
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/openldap/openldap/commit/71f24015c312171c00ce94c9ff9b9c6664bdca8d.patch";
|
||||||
|
hash = "sha256:1a81vv6nkhgiadnj4g1wyzgzdp2zd151h0vkwvv9gzmqvhwcnc04";
|
||||||
|
})
|
||||||
|
# ITS#7165 back-mdb: check for stale readers on
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/openldap/openldap/commit/7e7f01c301db454e8c507999c77b55a1d97efc21.patch";
|
||||||
|
hash = "sha256:1fc2yck2gn3zlpfqjdn56ar206npi8cmb8yg5ny4lww0ygmyzdfz";
|
||||||
|
})
|
||||||
|
# ITS#9858 back-mdb: delay indexer task startup
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/openldap/openldap/commit/ac061c684cc79d64ab4089fe3020921a0064a307.patch";
|
||||||
|
hash = "sha256:01f0y50zlcj6n5mfkmb0di4p5vrlgn31zccx4a9k5m8vzxaqmw9d";
|
||||||
|
})
|
||||||
|
# ITS#9858 back-mdb: fix index reconfig
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/openldap/openldap/commit/c43c7a937cfb3a781f99b458b7ad71eb564a2bc2.patch";
|
||||||
|
hash = "sha256:02yh0c8cyx14iir5qhfam5shrg5d3115s2nv0pmqdj6najrqc5mm";
|
||||||
|
})
|
||||||
|
# ITS#9157: check for NULL ld
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/openldap/openldap/commit/6675535cd6ad01f9519ecd5d75061a74bdf095c7.patch";
|
||||||
|
hash = "sha256:0dali5ifcwba8400s065f0fizl9h44i0mzb06qgxhygff6yfrgif";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
# TODO: separate "out" and "bin"
|
# TODO: separate "out" and "bin"
|
||||||
outputs = [
|
outputs = [
|
||||||
"out"
|
"out"
|
||||||
|
@ -59,7 +93,7 @@ stdenv.mkDerivation rec {
|
||||||
"ac_cv_func_memcmp_working=yes"
|
"ac_cv_func_memcmp_working=yes"
|
||||||
] ++ lib.optional stdenv.isFreeBSD "--with-pic";
|
] ++ lib.optional stdenv.isFreeBSD "--with-pic";
|
||||||
|
|
||||||
makeFlags= [
|
makeFlags = [
|
||||||
"CC=${stdenv.cc.targetPrefix}cc"
|
"CC=${stdenv.cc.targetPrefix}cc"
|
||||||
"STRIP=" # Disable install stripping as it breaks cross-compiling. We strip binaries anyway in fixupPhase.
|
"STRIP=" # Disable install stripping as it breaks cross-compiling. We strip binaries anyway in fixupPhase.
|
||||||
"prefix=${placeholder "out"}"
|
"prefix=${placeholder "out"}"
|
||||||
|
@ -116,6 +150,6 @@ stdenv.mkDerivation rec {
|
||||||
description = "An open source implementation of the Lightweight Directory Access Protocol";
|
description = "An open source implementation of the Lightweight Directory Access Protocol";
|
||||||
license = licenses.openldap;
|
license = licenses.openldap;
|
||||||
maintainers = with maintainers; [ ajs124 das_j hexa ];
|
maintainers = with maintainers; [ ajs124 das_j hexa ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue