diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2013-08-17 12:21:29 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2013-08-17 16:57:34 +0200 |
| commit | d6b4ed9e3cfc2d8988f1aedfb5abd9d5291b02fc (patch) | |
| tree | 09d2fb4bab3b5626cbd1224dc99179215f69dd20 /pkgs/servers/samba | |
| parent | d2194a294e201f28a58192070f2943bb672c4100 (diff) | |
| download | nixpkgs-d6b4ed9e3cfc2d8988f1aedfb5abd9d5291b02fc.tar nixpkgs-d6b4ed9e3cfc2d8988f1aedfb5abd9d5291b02fc.tar.gz nixpkgs-d6b4ed9e3cfc2d8988f1aedfb5abd9d5291b02fc.tar.bz2 nixpkgs-d6b4ed9e3cfc2d8988f1aedfb5abd9d5291b02fc.tar.lz nixpkgs-d6b4ed9e3cfc2d8988f1aedfb5abd9d5291b02fc.tar.xz nixpkgs-d6b4ed9e3cfc2d8988f1aedfb5abd9d5291b02fc.tar.zst nixpkgs-d6b4ed9e3cfc2d8988f1aedfb5abd9d5291b02fc.zip | |
samba: 3.6.8 -> 3.6.18
Release notes (left column): http://www.samba.org/samba/history/ The GNU/Hurd patch doesn't apply anymore so I dropped it.
Diffstat (limited to 'pkgs/servers/samba')
| -rw-r--r-- | pkgs/servers/samba/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/servers/samba/libnss-wins-pthread.patch | 15 |
2 files changed, 2 insertions, 22 deletions
diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index 059b1c1a217..8b58bd8d2a2 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -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; diff --git a/pkgs/servers/samba/libnss-wins-pthread.patch b/pkgs/servers/samba/libnss-wins-pthread.patch deleted file mode 100644 index 63e1485c20d..00000000000 --- a/pkgs/servers/samba/libnss-wins-pthread.patch +++ /dev/null @@ -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) |