tjh.dev
Merge pull request #78574 from bachp/samba-4.11.5
samba: 4.10.11 -> 4.11.5
authored by Niklas Hambüchen and committed by GitHub 6f1095b0 34c71aa7
+10
-8
pkgs/servers/samba/4.x.nix
+10
-8
pkgs/servers/samba/4.x.nix
···
1
-
{ lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl, rpcgen
1
+
{ lib, stdenv, fetchurl, fetchpatch, python, pkgconfig, perl, libxslt, docbook_xsl, rpcgen
2
2
, fixDarwinDylibNames
3
3
, docbook_xml_dtd_42, readline
4
4
, popt, iniparser, libbsd, libarchive, libiconv, gettext
···
20
20
21
21
stdenv.mkDerivation rec {
22
22
pname = "samba";
23
-
version = "4.10.11";
23
+
version = "4.11.5";
24
24
25
25
src = fetchurl {
26
26
url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz";
27
-
sha256 = "157qvz8x2s7994rzxhcmpc79cfk86zc0rq5qwg8alvjcw0r457v0";
27
+
sha256 = "0gyr773dl0krcra6pvyp8i9adj3r16ihrrm2b71c0974cbzrkqpk";
28
28
};
29
29
30
30
outputs = [ "out" "dev" "man" ];
···
34
34
./patch-source3__libads__kerberos_keytab.c.patch
35
35
./4.x-no-persistent-install-dynconfig.patch
36
36
./4.x-fix-makeflags-parsing.patch
37
+
(fetchpatch {
38
+
name = "test-oLschema2ldif-fmemopen.patch";
39
+
url = "https://gitlab.com/samba-team/samba/commit/5e517e57c9d4d35e1042a49d3592652b05f0c45b.patch";
40
+
sha256 = "1bbldf794svsdvcbp649imghmj0jck7545d3k9xs953qkkgwkbxi";
41
+
})
37
42
];
38
43
39
44
nativeBuildInputs = optionals stdenv.isDarwin [ rpcgen fixDarwinDylibNames ];
···
41
46
buildInputs = [
42
47
python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /*
43
48
docbook_xml_dtd_45 */ readline popt iniparser jansson
44
-
libbsd libarchive zlib fam libiconv gettext libunwind krb5Full
49
+
libbsd libarchive zlib fam libiconv gettext libunwind krb5Full gnutls
45
50
] ++ optionals stdenv.isLinux [ libaio systemd ]
46
51
++ optional enableLDAP openldap
47
52
++ optional (enablePrinting && stdenv.isLinux) cups
48
53
++ optional enableMDNS avahi
49
-
++ optionals enableDomainController [ gnutls gpgme lmdb ]
54
+
++ optionals enableDomainController [ gpgme lmdb ]
50
55
++ optional enableRegedit ncurses
51
56
++ optional (enableCephFS && stdenv.isLinux) libceph
52
57
++ optionals (enableGlusterFS && stdenv.isLinux) [ glusterfs libuuid ]
···
61
66
sed -i "s,\(XML_CATALOG_FILES=\"\),\1$XML_CATALOG_FILES ,g" buildtools/wafsamba/wafsamba.py
62
67
63
68
patchShebangs ./buildtools/bin
64
-
'' + optionalString stdenv.isDarwin ''
65
-
substituteInPlace libcli/dns/wscript_build \
66
-
--replace "bld.SAMBA_BINARY('resolvconftest'" "True or bld.SAMBA_BINARY('resolvconftest'"
67
69
'';
68
70
69
71
configureFlags = [