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

Merge pull request #34085 from ikervagyok/samba

Browse Source 
samba: 4.6.11 -> 4.7.4
This commit is contained in:
Graham Christensen 2018-01-23 20:55:15 -05:00 committed by GitHub
commit 2a2793f618
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/ldb/default.nix
View File

@ -3,11 +3,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ldb-1.1.27"; name = "ldb-1.3.1";
src = fetchurl { src = fetchurl {
url = "mirror://samba/ldb/${name}.tar.gz"; url = "mirror://samba/ldb/${name}.tar.gz";
sha256 = "1b1mkl5p8swb67s9aswavhzswlib34hpgsv66zgns009paf2df6d"; sha256 = "1b1mkggp8swb67s9aswavhzswlib34hpgsv66zgns009paf2df6d";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

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

@ -19,17 +19,18 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "samba-${version}"; name = "samba-${version}";
version = "4.6.11"; version = "4.7.4";
src = fetchurl { src = fetchurl {
url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
sha256 = "07gd41y4ajdiansfqa8c5wvrincgddfzyfgh1pf7g388zaq7l6q5"; sha256 = "0iw290n0q4l5s92d0f9yz27yp3rdfr6bvsmvg1xvd19g8p2d04pv";
}; };
outputs = [ "out" "dev" "man" ]; outputs = [ "out" "dev" "man" ];
patches = patches =
[ ./4.x-no-persistent-install.patch [ ./4.x-no-persistent-install.patch
./patch-source3__libads__kerberos_keytab.c.patch
]; ];
buildInputs = buildInputs =

20
pkgs/servers/samba/patch-source3__libads__kerberos_keytab.c.patch Normal file
View File

@ -0,0 +1,20 @@
--- old/source3/libads/kerberos_keytab.c 2017-12-23 14:23:53.247467000 +0100
+++ new/source3/libads/kerberos_keytab.c 2017-12-23 18:57:07.135340000 +0100
@@ -32,8 +32,6 @@
#ifdef HAVE_KRB5
-#ifdef HAVE_ADS
-
/* This MAX_NAME_LEN is a constant defined in krb5.h */
#ifndef MAX_KEYTAB_NAME_LEN
#define MAX_KEYTAB_NAME_LEN 1100
@@ -85,6 +83,8 @@
return ret;
}
+#ifdef HAVE_ADS
+
/**********************************************************************
Adds a single service principal, i.e. 'host' to the system keytab
***********************************************************************/