* Sync with the trunk once more.

* Turn on everything in Hydra.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14806

pkgs/servers/ftp/vsftpd/builder.sh

@@ -1,9 +0,0 @@
-source $stdenv/setup
-
-ensureDir "$out/bin"
-ensureDir "$out/sbin"
-
-ensureDir "$out/man/man8"
-ensureDir "$out/man/man5"
-
-genericBuild

pkgs/servers/ftp/vsftpd/default.nix

@@ -15,6 +15,11 @@ stdenv.mkDerivation rec {
   '';
 
   patches = [ ./fix.patch ] ;
-  preConfigure = ''sed -i "/VSF_BUILD_SSL/s/^#undef/#define/" builddefs.h'';
-  buildInputs = [ openssl libcap pam ];
+  preConfigure = ''sed -i "/VSF_BUILD_SSL/s/^#undef/#define/" builddefs.h;
+                   sed -i "s@/etc/vsftpd.user_list@$out/vsftpd.user_list@" vsftpd.conf.5 tunables.c'';
+
+  configFile = ./vsftpd.user_list;
+  postInstall = "cp ${./vsftpd.user_list} $out/vsftpd.user_list";
+
+  buildInputs = [ openssl libcap pam configFile ];
 }

pkgs/servers/ftp/vsftpd/vsftpd.user_list

@@ -0,0 +1,3 @@
+#list users here that can (not) connect to vsftpd (only needed when userlistenable=true)
+
+raidbackup

pkgs/servers/samba/default.nix

@@ -6,8 +6,8 @@ stdenv.mkDerivation rec {
   name = "samba-3.2.7";
 
   src = fetchurl {
-    url = http://us3.samba.org/samba/ftp/stable/samba-3.2.7.tar.gz;
-    sha256 = "18q4q1ay9dsk3djl1s2ibj51n8c111y05h5dsc2ssl2wg32vhasg";
+    url = http://us3.samba.org/samba/ftp/stable/samba-3.3.2.tar.gz;
+    sha256 = "1b4fa9fbe7ccced6cca449c4b0b9fba65ffd2ad63b1f0bf2507e943281461477";
   };
 
   buildInputs = [readline pam openldap kerberos popt iniparser libunwind fam acl];