pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #34085 from ikervagyok/samba

samba: 4.6.11 -> 4.7.4

authored by Graham Christensen and committed by GitHub 2a2793f6 9f16756f

+25 -4
unified split
+2 -2
pkgs/development/libraries/ldb/default.nix
··· 3 }: 4 5 stdenv.mkDerivation rec { 6 - name = "ldb-1.1.27"; 7 8 src = fetchurl { 9 url = "mirror://samba/ldb/${name}.tar.gz"; 10 - sha256 = "1b1mkl5p8swb67s9aswavhzswlib34hpgsv66zgns009paf2df6d"; 11 }; 12 13 outputs = [ "out" "dev" ];
··· 3 }: 4 5 stdenv.mkDerivation rec { 6 + name = "ldb-1.3.1"; 7 8 src = fetchurl { 9 url = "mirror://samba/ldb/${name}.tar.gz"; 10 + sha256 = "1b1mkggp8swb67s9aswavhzswlib34hpgsv66zgns009paf2df6d"; 11 }; 12 13 outputs = [ "out" "dev" ];
+3 -2
pkgs/servers/samba/4.x.nix
··· 19 20 stdenv.mkDerivation rec { 21 name = "samba-${version}"; 22 - version = "4.6.11"; 23 24 src = fetchurl { 25 url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; 26 - sha256 = "07gd41y4ajdiansfqa8c5wvrincgddfzyfgh1pf7g388zaq7l6q5"; 27 }; 28 29 outputs = [ "out" "dev" "man" ]; 30 31 patches = 32 [ ./4.x-no-persistent-install.patch 33 ]; 34 35 buildInputs =
··· 19 20 stdenv.mkDerivation rec { 21 name = "samba-${version}"; 22 + version = "4.7.4"; 23 24 src = fetchurl { 25 url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; 26 + sha256 = "0iw290n0q4l5s92d0f9yz27yp3rdfr6bvsmvg1xvd19g8p2d04pv"; 27 }; 28 29 outputs = [ "out" "dev" "man" ]; 30 31 patches = 32 [ ./4.x-no-persistent-install.patch 33 + ./patch-source3__libads__kerberos_keytab.c.patch 34 ]; 35 36 buildInputs =
+20
pkgs/servers/samba/patch-source3__libads__kerberos_keytab.c.patch
···
··· 1 + --- old/source3/libads/kerberos_keytab.c 2017-12-23 14:23:53.247467000 +0100 2 + +++ new/source3/libads/kerberos_keytab.c 2017-12-23 18:57:07.135340000 +0100 3 + @@ -32,8 +32,6 @@ 4 + 5 + #ifdef HAVE_KRB5 6 + 7 + -#ifdef HAVE_ADS 8 + - 9 + /* This MAX_NAME_LEN is a constant defined in krb5.h */ 10 + #ifndef MAX_KEYTAB_NAME_LEN 11 + #define MAX_KEYTAB_NAME_LEN 1100 12 + @@ -85,6 +83,8 @@ 13 + return ret; 14 + } 15 + 16 + +#ifdef HAVE_ADS 17 + + 18 + /********************************************************************** 19 + Adds a single service principal, i.e. 'host' to the system keytab 20 + ***********************************************************************/