From 769811abc5e306bc03429b079ed57ad35f79ae62 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 28 Jan 2008 19:46:27 +0000
Subject: [PATCH] Samba 3.0.28

svn path=/nixpkgs/trunk/; revision=10348
---
 pkgs/servers/samba/default.nix  | 21 ++++++++++++---------
 pkgs/top-level/all-packages.nix |  3 ++-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix
index a0c16b441950..502287669779 100644
--- a/pkgs/servers/samba/default.nix
+++ b/pkgs/servers/samba/default.nix
@@ -1,19 +1,22 @@
 args: with args;
 
-stdenv.mkDerivation {
-  name = "samba-3.0.26a";
+stdenv.mkDerivation rec {
+  name = "samba-3.0.28";
 
   src = fetchurl {
-    url = http://us1.samba.org/samba/ftp/stable/samba-3.0.26a.tar.gz;
-    sha256 = "41e11f69288b2291f12f8db093e2c55dc1360555d4542c83c0758c4c7a3d4d37";
+    url = "http://us1.samba.org/samba/ftp/stable/${name}.tar.gz";
+    sha256 = "13nr4mvh6vxgl7nb94qnqx3njcyd10cf4ji18srlkizpp49r5byw";
   };
 
-  buildInputs = [readline pam openldap];
-  configureFlags = [" --with-pam " " --with-smbmount " 
-  	" --datadir=\$out/share " " --with-acl-support "
-	" --with-aio-support "];
+  buildInputs = [readline pam openldap kerberos popt iniparser libunwind fam];
+  configureFlags = ''--with-pam --with-smbmount --datadir=$out/share
+  --with-aio-support --with-libiconv=${stdenv.gcc.libc}'';
   postUnpack = "sourceRoot=\$sourceRoot/source";
   
   configFile = ./smb.conf;
-  postInstall = "rm -rf \$out/var ; ln -s /var/samba $out/var;  cp $configFile $out/lib/smb.conf";
+  postInstall = ''
+  rm -rf $out/var
+  ln -s /var/samba $out/var
+  cp ${configFile} $out/lib/smb.conf
+  '';
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 70be88a4f59f..14bcc96d857f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3134,7 +3134,8 @@ rec {
   };
 
   samba = import ../servers/samba {
-    inherit stdenv fetchurl readline openldap pam;
+    inherit stdenv fetchurl readline openldap pam kerberos popt iniparser
+	libunwind acl fam;
   };
 
   squid = import ../servers/squid {