Merge pull request #83832 from jtojnar/samba-things

Clean up & update samba things
This commit is contained in:
Jan Tojnar 2020-03-31 20:38:45 +02:00 committed by GitHub
commit 08306f3f26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 142 additions and 72 deletions

View file

@ -1,49 +1,62 @@
{ stdenv, fetchurl, python, pkgconfig, readline, tdb, talloc, tevent { stdenv
, popt, libxslt, docbook_xsl, docbook_xml_dtd_42, cmocka , fetchurl
, python3
, pkg-config
, readline
, tdb
, talloc
, tevent
, popt
, libxslt
, docbook-xsl-nons
, docbook_xml_dtd_42
, cmocka
, wafHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ldb-1.3.3"; pname = "ldb";
version = "2.1.1";
src = fetchurl { src = fetchurl {
url = "mirror://samba/ldb/${name}.tar.gz"; url = "mirror://samba/ldb/${pname}-${version}.tar.gz";
sha256 = "14gsrm7dvyjpbpnc60z75j6fz2p187abm2h353lq95kx2bv70c1b" ; sha256 = "jO+y8l/KkT+hinktDvsDrwf4f1uVGkze0DD1uY8lx7A=";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [
pkg-config
python3
wafHook
libxslt
docbook-xsl-nons
docbook_xml_dtd_42
];
buildInputs = [ buildInputs = [
python readline tdb talloc tevent popt python3
libxslt docbook_xsl docbook_xml_dtd_42 readline # required to build python
tdb
talloc
tevent
popt
cmocka cmocka
]; ];
patches = [ wafPath = "buildtools/bin/waf";
# 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";
})
];
preConfigure = '' wafConfigureFlags = [
sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,g' buildtools/bin/waf
'';
configureFlags = [
"--bundled-libraries=NONE" "--bundled-libraries=NONE"
"--builtin-libraries=replace" "--builtin-libraries=replace"
"--without-ldb-lmdb"
]; ];
stripDebugList = "bin lib modules"; stripDebugList = "bin lib modules";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A LDAP-like embedded database"; description = "A LDAP-like embedded database";
homepage = https://ldb.samba.org/; homepage = "https://ldb.samba.org/";
license = licenses.lgpl3Plus; license = licenses.lgpl3Plus;
platforms = platforms.all; platforms = platforms.all;
}; };

View file

@ -1,32 +1,48 @@
{ stdenv, fetchurl, python, pkgconfig, readline, gettext, libxslt { stdenv
, docbook_xsl, docbook_xml_dtd_42 , fetchurl
, python3
, pkg-config
, readline
, gettext
, libxslt
, docbook-xsl-nons
, docbook_xml_dtd_42
, wafHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ntdb-1.0"; pname = "ntdb";
version = "1.0";
src = fetchurl { src = fetchurl {
url = "mirror://samba/tdb/${name}.tar.gz"; url = "mirror://samba/tdb/${pname}-${version}.tar.gz";
sha256 = "0jdzgrz5sr25k83yrw7wqb3r0yj1v04z4s3lhsmnr5z6n5ifhyl1"; sha256 = "0jdzgrz5sr25k83yrw7wqb3r0yj1v04z4s3lhsmnr5z6n5ifhyl1";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [
buildInputs = [ pkg-config
python readline gettext libxslt docbook_xsl docbook_xml_dtd_42 gettext
libxslt
docbook-xsl-nons
docbook_xml_dtd_42
wafHook
]; ];
preConfigure = '' buildInputs = [
patchShebangs buildtools/bin/waf python3
''; readline # required to build python
];
configureFlags = [ wafPath = "buildtools/bin/waf";
wafConfigureFlags = [
"--bundled-libraries=NONE" "--bundled-libraries=NONE"
"--builtin-libraries=replace,ccan" "--builtin-libraries=replace,ccan"
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The not-so trivial database"; description = "The not-so trivial database";
homepage = https://tdb.samba.org/; homepage = "https://tdb.samba.org/";
license = licenses.lgpl3Plus; license = licenses.lgpl3Plus;
platforms = platforms.all; platforms = platforms.all;
}; };

View file

@ -1,5 +1,12 @@
{ stdenv, fetchurl, python, pkgconfig, readline, libxslt { stdenv
, docbook_xsl, docbook_xml_dtd_42, fixDarwinDylibNames , fetchurl
, python
, pkg-config
, readline
, libxslt
, docbook-xsl-nons
, docbook_xml_dtd_42
, fixDarwinDylibNames
, wafHook , wafHook
}: }:
@ -12,9 +19,19 @@ stdenv.mkDerivation rec {
sha256 = "0xwzgzrqamfdlklwacp9d219pqkah0yfrhxb1j7bxlmgzp924j7g"; sha256 = "0xwzgzrqamfdlklwacp9d219pqkah0yfrhxb1j7bxlmgzp924j7g";
}; };
nativeBuildInputs = [ pkgconfig fixDarwinDylibNames python wafHook nativeBuildInputs = [
docbook_xsl docbook_xml_dtd_42 ]; pkg-config
buildInputs = [ readline libxslt ]; fixDarwinDylibNames
python
wafHook
docbook-xsl-nons
docbook_xml_dtd_42
];
buildInputs = [
readline
libxslt
];
wafPath = "buildtools/bin/waf"; wafPath = "buildtools/bin/waf";

View file

@ -1,23 +1,34 @@
{ stdenv, fetchurl, pkgconfig { stdenv
, wafHook, python3, readline , fetchurl
, libxslt, docbook_xsl, docbook_xml_dtd_45 , pkg-config
, wafHook
, python3
, readline
, libxslt
, docbook-xsl-nons
, docbook_xml_dtd_45
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tdb-1.4.3"; pname = "tdb";
version = "1.4.3";
src = fetchurl { src = fetchurl {
url = "mirror://samba/tdb/${name}.tar.gz"; url = "mirror://samba/tdb/${pname}-${version}.tar.gz";
sha256 = "06waz0k50c7v3chd08mzp2rv7w4k4q9isbxx3vhlfpx1vy9q61f8"; sha256 = "06waz0k50c7v3chd08mzp2rv7w4k4q9isbxx3vhlfpx1vy9q61f8";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig wafHook pkg-config
libxslt docbook_xsl docbook_xml_dtd_45 wafHook
libxslt
docbook-xsl-nons
docbook_xml_dtd_45
]; ];
buildInputs = [ buildInputs = [
python3 readline python3
readline # required to build python
]; ];
wafPath = "buildtools/bin/waf"; wafPath = "buildtools/bin/waf";
@ -35,7 +46,7 @@ stdenv.mkDerivation rec {
and uses locking internally to keep writers from trampling on each and uses locking internally to keep writers from trampling on each
other. TDB is also extremely small. other. TDB is also extremely small.
''; '';
homepage = https://tdb.samba.org/; homepage = "https://tdb.samba.org/";
license = licenses.lgpl3Plus; license = licenses.lgpl3Plus;
platforms = platforms.all; platforms = platforms.all;
}; };

View file

@ -1,32 +1,51 @@
{ stdenv, fetchurl, python, pkgconfig, readline, talloc { stdenv
, libxslt, docbook_xsl, docbook_xml_dtd_42 , fetchurl
, python3
, pkg-config
, readline
, talloc
, libxslt
, docbook-xsl-nons
, docbook_xml_dtd_42
, which
, wafHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tevent-0.9.37"; pname = "tevent";
version = "0.10.2";
src = fetchurl { src = fetchurl {
url = "mirror://samba/tevent/${name}.tar.gz"; url = "mirror://samba/tevent/${pname}-${version}.tar.gz";
sha256 = "1q77vbjic2bb79li2a54ffscnrnwwww55fbpry2kgh7acpnlb0qn"; sha256 = "+EJ4IuWyh4+4so1vUNloSHNPPzEwYS+1dP3S0hSKZpY=";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [
buildInputs = [ pkg-config
python readline talloc libxslt docbook_xsl docbook_xml_dtd_42 which
python3
libxslt
docbook-xsl-nons
docbook_xml_dtd_42
wafHook
]; ];
preConfigure = '' buildInputs = [
sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,g' buildtools/bin/waf python3
''; readline # required to build python
talloc
];
configureFlags = [ wafPath = "buildtools/bin/waf";
wafConfigureFlags = [
"--bundled-libraries=NONE" "--bundled-libraries=NONE"
"--builtin-libraries=replace" "--builtin-libraries=replace"
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "An event system based on the talloc memory management library"; description = "An event system based on the talloc memory management library";
homepage = https://tevent.samba.org/; homepage = "https://tevent.samba.org/";
license = licenses.lgpl3Plus; license = licenses.lgpl3Plus;
platforms = platforms.all; platforms = platforms.all;
}; };

View file

@ -12351,9 +12351,7 @@ in
ldacbt = callPackage ../development/libraries/ldacbt { }; ldacbt = callPackage ../development/libraries/ldacbt { };
ldb = callPackage ../development/libraries/ldb { ldb = callPackage ../development/libraries/ldb { };
python = python2;
};
lensfun = callPackage ../development/libraries/lensfun {}; lensfun = callPackage ../development/libraries/lensfun {};
@ -14633,9 +14631,7 @@ in
tclx = callPackage ../development/libraries/tclx { }; tclx = callPackage ../development/libraries/tclx { };
ntdb = callPackage ../development/libraries/ntdb { ntdb = callPackage ../development/libraries/ntdb { };
python = python2;
};
tdb = callPackage ../development/libraries/tdb {}; tdb = callPackage ../development/libraries/tdb {};
@ -14657,9 +14653,7 @@ in
termbox = callPackage ../development/libraries/termbox { }; termbox = callPackage ../development/libraries/termbox { };
tevent = callPackage ../development/libraries/tevent { tevent = callPackage ../development/libraries/tevent { };
python = python2;
};
tet = callPackage ../development/tools/misc/tet { }; tet = callPackage ../development/tools/misc/tet { };