public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #78574 from bachp/samba-4.11.5

Browse Source 
samba: 4.10.11 -> 4.11.5
This commit is contained in:
Niklas Hambüchen 2020-01-27 13:41:14 +01:00 committed by GitHub
commit 6f1095b0ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/servers/samba/4.x.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl, rpcgen { lib, stdenv, fetchurl, fetchpatch, python, pkgconfig, perl, libxslt, docbook_xsl, rpcgen
, fixDarwinDylibNames , fixDarwinDylibNames
, docbook_xml_dtd_42, readline , docbook_xml_dtd_42, readline
, popt, iniparser, libbsd, libarchive, libiconv, gettext , popt, iniparser, libbsd, libarchive, libiconv, gettext
@ -20,11 +20,11 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "samba"; pname = "samba";
version = "4.10.11"; version = "4.11.5";
src = fetchurl { src = fetchurl {
url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz";
sha256 = "157qvz8x2s7994rzxhcmpc79cfk86zc0rq5qwg8alvjcw0r457v0"; sha256 = "0gyr773dl0krcra6pvyp8i9adj3r16ihrrm2b71c0974cbzrkqpk";
}; };
outputs = [ "out" "dev" "man" ]; outputs = [ "out" "dev" "man" ];
@ -34,6 +34,11 @@ stdenv.mkDerivation rec {
./patch-source3__libads__kerberos_keytab.c.patch ./patch-source3__libads__kerberos_keytab.c.patch
./4.x-no-persistent-install-dynconfig.patch ./4.x-no-persistent-install-dynconfig.patch
./4.x-fix-makeflags-parsing.patch ./4.x-fix-makeflags-parsing.patch
(fetchpatch {
name = "test-oLschema2ldif-fmemopen.patch";
url = "https://gitlab.com/samba-team/samba/commit/5e517e57c9d4d35e1042a49d3592652b05f0c45b.patch";
sha256 = "1bbldf794svsdvcbp649imghmj0jck7545d3k9xs953qkkgwkbxi";
})
]; ];
nativeBuildInputs = optionals stdenv.isDarwin [ rpcgen fixDarwinDylibNames ]; nativeBuildInputs = optionals stdenv.isDarwin [ rpcgen fixDarwinDylibNames ];
@ -41,12 +46,12 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /* python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /*
docbook_xml_dtd_45 */ readline popt iniparser jansson docbook_xml_dtd_45 */ readline popt iniparser jansson
libbsd libarchive zlib fam libiconv gettext libunwind krb5Full libbsd libarchive zlib fam libiconv gettext libunwind krb5Full gnutls
] ++ optionals stdenv.isLinux [ libaio systemd ] ] ++ optionals stdenv.isLinux [ libaio systemd ]
++ optional enableLDAP openldap ++ optional enableLDAP openldap
++ optional (enablePrinting && stdenv.isLinux) cups ++ optional (enablePrinting && stdenv.isLinux) cups
++ optional enableMDNS avahi ++ optional enableMDNS avahi
++ optionals enableDomainController [ gnutls gpgme lmdb ] ++ optionals enableDomainController [ gpgme lmdb ]
++ optional enableRegedit ncurses ++ optional enableRegedit ncurses
++ optional (enableCephFS && stdenv.isLinux) libceph ++ optional (enableCephFS && stdenv.isLinux) libceph
++ optionals (enableGlusterFS && stdenv.isLinux) [ glusterfs libuuid ] ++ optionals (enableGlusterFS && stdenv.isLinux) [ glusterfs libuuid ]
@ -61,9 +66,6 @@ stdenv.mkDerivation rec {
sed -i "s,\(XML_CATALOG_FILES=\"\),\1$XML_CATALOG_FILES ,g" buildtools/wafsamba/wafsamba.py sed -i "s,\(XML_CATALOG_FILES=\"\),\1$XML_CATALOG_FILES ,g" buildtools/wafsamba/wafsamba.py
patchShebangs ./buildtools/bin patchShebangs ./buildtools/bin
'' + optionalString stdenv.isDarwin ''
substituteInPlace libcli/dns/wscript_build \
--replace "bld.SAMBA_BINARY('resolvconftest'" "True or bld.SAMBA_BINARY('resolvconftest'"
''; '';
configureFlags = [ configureFlags = [