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

samba: 3.6.8 -> 3.6.18

Browse Source 
Release notes (left column): http://www.samba.org/samba/history/

The GNU/Hurd patch doesn't apply anymore so I dropped it.
This commit is contained in:
Bjørn Forsman 2013-08-17 12:21:29 +02:00
parent d2194a294e
commit d6b4ed9e3c
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/servers/samba/default.nix
View File

@ -18,18 +18,13 @@
assert useKerberos -> kerberos != null;
stdenv.mkDerivation rec {
name = "samba-3.6.8";
name = "samba-3.6.18";
src = fetchurl {
url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz";
sha256 = "1phl6mmrc72jyvbyrw6cv6b92cxq3v2pbn1fh97nnb4hild1fnjg";
sha256 = "14lrb7724952wyc1sah4nsngd6cv8x8y96cm7f3awzjnfyxajwbd";
};
patches =
[ # Allow cross-builds for GNU/Hurd.
./libnss-wins-pthread.patch
];
buildInputs = [ readline pam openldap popt iniparser libunwind fam acl cups ]
++ stdenv.lib.optional useKerberos kerberos;

15
pkgs/servers/samba/libnss-wins-pthread.patch
View File

@ -1,15 +0,0 @@
`libnss_wins' uses pthreads but is built without `-pthread'. This is
not a problem when building natively on GNU/Linux, but causes troubles
when cross-building for GNU/Hurd (undefined references to libpthread
functions.)
--- samba-3.6.1/source3/Makefile.in 2012-02-22 15:25:15.000000000 +0100
+++ samba-3.6.1/source3/Makefile.in 2012-02-22 15:25:47.000000000 +0100
@@ -2760,6 +2760,7 @@ bin/vlp@EXEEXT@: $(BINARY_PREREQS) $(VLP
@echo "Linking $@"
@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \
$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS) \
+ $(PTHREAD_LDFLAGS) \
@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
bin/winbind_krb5_locator.@SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT)