7 files changed, 34 insertions, 27 deletions
diff --git a/pkgs/development/libraries/cracklib/builder.sh b/pkgs/development/libraries/cracklib/builder.sh
index 35f682398be..0f7473a81b2 100644
--- a/pkgs/development/libraries/cracklib/builder.sh
+++ b/pkgs/development/libraries/cracklib/builder.sh
@@ -8,7 +8,7 @@ preConfigure() {
 preConfigure=preConfigure
 
 postInstall() {
-  ./util/cracklib-format cracklib-dicts/* | ./util/cracklib-packer cracklib_dict
+  $out/sbin/cracklib-format cracklib-dicts/* | $out/sbin/cracklib-packer cracklib_dict
   cp cracklib_dict.* $out/lib
 }
 
diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix
index ecfa41e2305..33961f760da 100644
--- a/pkgs/development/libraries/cracklib/default.nix
+++ b/pkgs/development/libraries/cracklib/default.nix
@@ -1,14 +1,22 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "cracklib-2.8.12";
+stdenv.mkDerivation rec {
+  name = "cracklib-2.8.13";
+
   builder = ./builder.sh;
+
   src = fetchurl {
-    url = mirror://sourceforge/cracklib/cracklib-2.8.12.tar.gz;
-    sha256 = "0l9kar7h80kkvs394dyzbn02jkd8hzynh9kxyqrlacj1wp35rmah";
+    url = "mirror://sourceforge/cracklib/${name}.tar.gz";
+    sha256 = "06h4b3hifsh1azpjvfn5qa052agavzz9xhgh4g89ghr66vzwl1ha";
   };
+
   dicts = fetchurl {
     url = http://nixos.org/tarballs/cracklib-words.gz;
     md5 = "d18e670e5df560a8745e1b4dede8f84f";
   };
+
+  meta = {
+    homepage = http://sourceforge.net/projects/cracklib;
+    description = "A library for checking the strength of passwords";
+  };
 }
diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix
index 37a032fdefa..7124fc72eee 100644
--- a/pkgs/development/libraries/libxcrypt/default.nix
+++ b/pkgs/development/libraries/libxcrypt/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:
    
 stdenv.mkDerivation {
-  name = "libxcrypt-2.4";
+  name = "libxcrypt-3.0.2";
    
   src = fetchurl {
-    url = ftp://ftp.suse.com/pub/people/kukuk/libxcrypt/libxcrypt-2.4.tar.bz2;
-    md5 = "b5ae266550af2d04423da7d3af08a82a";
+    url = ftp://ftp.suse.com/pub/people/kukuk/libxcrypt/libxcrypt-3.0.2.tar.bz2;
+    sha256 = "15l2xvhi3r3b40x4665c101ikylh5xsbpw03gnszypfjgn1jkcii";
   };
 }
diff --git a/pkgs/os-specific/linux/pam/builder.sh b/pkgs/os-specific/linux/pam/builder.sh
deleted file mode 100644
index 531ae2c0b90..00000000000
--- a/pkgs/os-specific/linux/pam/builder.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-source $stdenv/setup
-
-export CRACKLIB_DICTPATH=$cracklib/lib
-
-configureFlags="--enable-includedir=$out/include"
-
-genericBuild
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 9120a121732..345211f5226 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -1,12 +1,18 @@
 {stdenv, fetchurl, cracklib, flex}:
 
 stdenv.mkDerivation {
-  name = "linux-pam-0.99.6.3";
-  builder = ./builder.sh;
+  name = "linux-pam-1.0.3";
+
   src = fetchurl {
-    url = mirror://kernel/linux/libs/pam/pre/library/Linux-PAM-0.99.6.3.tar.bz2;
-    md5 = "4c2830ed55a41e795af6a482009a036c";
+    url = mirror://kernel/linux/libs/pam/library/Linux-PAM-1.0.3.tar.bz2;
+    sha256 = "1xqj4ibnid5w3pi629vj7jiddf192kzm8rbm3vy90diqpl1k5h6n";
   };
-  buildInputs = [flex];
-  preConfigure = "configureFlags=\"--includedir=$out/include/security\"";
+
+  buildInputs = [flex cracklib];
+
+  CRACKLIB_DICTPATH = "${cracklib}/lib";
+
+  preConfigure = ''
+    configureFlags="$configureFlags --includedir=$out/include/security"
+  '';
 }
diff --git a/pkgs/os-specific/linux/pam_login/default.nix b/pkgs/os-specific/linux/pam_login/default.nix
index 026bbed0571..954606eef6c 100644
--- a/pkgs/os-specific/linux/pam_login/default.nix
+++ b/pkgs/os-specific/linux/pam_login/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, pam}:
    
 stdenv.mkDerivation {
-  name = "pam_login-3.31";
+  name = "pam_login-3.35";
    
   src = fetchurl {
-    url = ftp://ftp.suse.com/pub/people/kukuk/pam/pam_login/pam_login-3.31.tar.bz2;
-    md5 = "15e34a48b0bc2ded5000e8d8780fc274";
+    url = ftp://ftp.suse.com/pub/people/kukuk/pam/pam_login/pam_login-3.35.tar.bz2;
+    sha256 = "1w2hpwjhmwjhf8rg789xpl0hibahqlr3ccivfy3m4kgrm5gf04kv";
   };
 
   buildInputs = [pam];
diff --git a/pkgs/os-specific/linux/pam_unix2/default.nix b/pkgs/os-specific/linux/pam_unix2/default.nix
index b89f6ba4f3f..f215d69ea8a 100644
--- a/pkgs/os-specific/linux/pam_unix2/default.nix
+++ b/pkgs/os-specific/linux/pam_unix2/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, pam, libxcrypt}:
    
 stdenv.mkDerivation {
-  name = "pam_unix2-2.1";
+  name = "pam_unix2-2.6";
    
   src = fetchurl {
-    url = ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.1.tar.bz2;
-    md5 = "08d3bc1940897b5dfcbe2f51dd979ad0";
+    url = ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.6.tar.bz2;
+    sha256 = "067xnyd3q8ik73glxwyx1lydk4bgl78lzq44mnqqp4jrpnpd04ml";
   };
 
   buildInputs = [pam libxcrypt];