From c82afd131d1bb1f4ca6a95162897a8ddf0579291 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 25 Oct 2005 17:39:55 +0000
Subject: [PATCH] add a patch to use the cracklib dictionairy we built
 (cracklib package)

svn path=/nixpkgs/trunk/; revision=4130
---
 pkgs/os-specific/linux/pam/builder.sh         |  5 +++
 pkgs/os-specific/linux/pam/default.nix        |  6 ++--
 pkgs/os-specific/linux/pam/pam-cracklib.patch | 34 +++++++++++++++++++
 pkgs/system/all-packages-generic.nix          |  2 +-
 4 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/os-specific/linux/pam/builder.sh
 create mode 100644 pkgs/os-specific/linux/pam/pam-cracklib.patch

diff --git a/pkgs/os-specific/linux/pam/builder.sh b/pkgs/os-specific/linux/pam/builder.sh
new file mode 100644
index 00000000000..0ccc40c7c0e
--- /dev/null
+++ b/pkgs/os-specific/linux/pam/builder.sh
@@ -0,0 +1,5 @@
+source $stdenv/setup
+
+export CRACKLIB_DICTPATH=$cracklib/lib
+
+genericBuild
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 00a5a403e46..fde4eaa7f25 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -1,10 +1,12 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, cracklib}:
 
 stdenv.mkDerivation {
   name = "pam-0.80";
+  builder = ./builder.sh;
   src = fetchurl {
     url = http://www.nl.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-0.80.tar.bz2;
     md5 = "ccff87fe639efdfc22b1ba4a0f08ec57";
   };
-  patches = [./pam-pwd.patch];
+  patches = [./pam-pwd.patch ./pam-cracklib.patch];
+  inherit cracklib;
 }
diff --git a/pkgs/os-specific/linux/pam/pam-cracklib.patch b/pkgs/os-specific/linux/pam/pam-cracklib.patch
new file mode 100644
index 00000000000..9746d6a9466
--- /dev/null
+++ b/pkgs/os-specific/linux/pam/pam-cracklib.patch
@@ -0,0 +1,34 @@
+diff -ruN Linux-PAM-0.80/configure Linux-PAM-0.80.new/configure
+--- Linux-PAM-0.80/configure	2005-07-04 14:09:55.000000000 +0200
++++ Linux-PAM-0.80.new/configure	2005-10-25 19:30:29.000000000 +0200
+@@ -6090,18 +6090,18 @@
+ DICT_DIR_CANDIDATES="/usr/lib /usr/share/dict /usr/share/lib \
+   /usr/local/lib /usr/local/share/lib /usr/share/cracklib"
+ DICT_FILE_CANDIDATES="pw_dict cracklib_dict"
+-CRACKLIB_DICTPATH=""
+-for d in $DICT_DIR_CANDIDATES ; do
+-      for f in $DICT_FILE_CANDIDATES ; do
+-              if test -r $d/$f.hwm ; then
+-                      CRACKLIB_DICTPATH=$d/$f
+-                      break 2
+-              elif test -r $d/dict/$f.hwm ; then
+-                      CRACKLIB_DICTPATH=$d/dict/$f
+-                      break 2
+-              fi
+-      done
+-done
++#CRACKLIB_DICTPATH=""
++#for d in $DICT_DIR_CANDIDATES ; do
++#      for f in $DICT_FILE_CANDIDATES ; do
++#              if test -r $d/$f.hwm ; then
++#                      CRACKLIB_DICTPATH=$d/$f
++#                      break 2
++#              elif test -r $d/dict/$f.hwm ; then
++#                      CRACKLIB_DICTPATH=$d/dict/$f
++#                      break 2
++#              fi
++#      done
++#done
+ if test -z "$CRACKLIB_DICTPATH" ; then
+       { echo "$as_me:$LINENO: WARNING: none found - pam_cracklib will not be built" >&5
+ echo "$as_me: WARNING: none found - pam_cracklib will not be built" >&2;}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index f535fef6469..56185a45dc1 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -1288,7 +1288,7 @@ rec {
   };
 
   pam = (import ../os-specific/linux/pam) {
-    inherit stdenv fetchurl;
+    inherit stdenv fetchurl cracklib;
   };
 
   #nfsUtils = (import ../os-specific/linux/nfs-utils) {