From 6f2b3f46cc55ebd3e6dc5da1688fa15ac6472f89 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Jun 2010 17:31:20 +0000
Subject: [PATCH] * PAM updated to 1.1.1.  Also build with libxcrypt support. *
 Cracklib updated.  Removed the dictionary as it should be moved into   a
 separate package.

svn path=/nixpkgs/trunk/; revision=22105
---
 pkgs/development/libraries/cracklib/default.nix | 16 ++++++++--------
 pkgs/os-specific/linux/pam/default.nix          | 12 +++++-------
 pkgs/top-level/all-packages.nix                 |  2 +-
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix
index 33961f760dad..9833d79a726c 100644
--- a/pkgs/development/libraries/cracklib/default.nix
+++ b/pkgs/development/libraries/cracklib/default.nix
@@ -1,19 +1,19 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "cracklib-2.8.13";
+  name = "cracklib-2.8.16";
 
-  builder = ./builder.sh;
+  #builder = ./builder.sh;
 
   src = fetchurl {
     url = "mirror://sourceforge/cracklib/${name}.tar.gz";
-    sha256 = "06h4b3hifsh1azpjvfn5qa052agavzz9xhgh4g89ghr66vzwl1ha";
+    sha256 = "1g3mchdvra9nihxlkl3rdz96as3xnfw5m59hmr5k17l7qa9a8fpw";
   };
 
-  dicts = fetchurl {
-    url = http://nixos.org/tarballs/cracklib-words.gz;
-    md5 = "d18e670e5df560a8745e1b4dede8f84f";
-  };
+  #dicts = fetchurl {
+  #  url = http://nixos.org/tarballs/cracklib-words.gz;
+  #  md5 = "d18e670e5df560a8745e1b4dede8f84f";
+  #};
 
   meta = {
     homepage = http://sourceforge.net/projects/cracklib;
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 345211f5226d..a06f3975b27d 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -1,16 +1,14 @@
-{stdenv, fetchurl, cracklib, flex}:
+{ stdenv, fetchurl, flex, cracklib, libxcrypt }:
 
 stdenv.mkDerivation {
-  name = "linux-pam-1.0.3";
+  name = "linux-pam-1.1.1";
 
   src = fetchurl {
-    url = mirror://kernel/linux/libs/pam/library/Linux-PAM-1.0.3.tar.bz2;
-    sha256 = "1xqj4ibnid5w3pi629vj7jiddf192kzm8rbm3vy90diqpl1k5h6n";
+    url = mirror://kernel/linux/libs/pam/library/Linux-PAM-1.1.1.tar.bz2;
+    sha256 = "015r3xdkjpqwcv4lvxavq0nybdpxhfjycqpzbx8agqd5sywkx3b0";
   };
 
-  buildInputs = [flex cracklib];
-
-  CRACKLIB_DICTPATH = "${cracklib}/lib";
+  buildInputs = [ flex cracklib libxcrypt ];
 
   preConfigure = ''
     configureFlags="$configureFlags --includedir=$out/include/security"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 443f20d489fc..080e290a302a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6669,7 +6669,7 @@ let
   };
 
   pam = import ../os-specific/linux/pam {
-    inherit stdenv fetchurl cracklib flex;
+    inherit stdenv fetchurl flex cracklib libxcrypt;
   };
 
   # pam_bioapi ( see http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader )