swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

add a patch to use the cracklib dictionairy we built (cracklib package)

Browse source 
svn path=/nixpkgs/trunk/; revision=4130
This commit is contained in:
Armijn Hemel 2005-10-25 17:39:55 +00:00
parent 3c079ce798
commit c82afd131d
4 changed files with 44 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/os-specific/linux/pam/builder.sh Normal file
View file

@ -0,0 +1,5 @@
source $stdenv/setup
export CRACKLIB_DICTPATH=$cracklib/lib
genericBuild

6
pkgs/os-specific/linux/pam/default.nix
View file

@ -1,10 +1,12 @@
{stdenv, fetchurl}: {stdenv, fetchurl, cracklib}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "pam-0.80"; name = "pam-0.80";
builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://www.nl.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-0.80.tar.bz2; url = http://www.nl.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-0.80.tar.bz2;
md5 = "ccff87fe639efdfc22b1ba4a0f08ec57"; md5 = "ccff87fe639efdfc22b1ba4a0f08ec57";
}; };
patches = [./pam-pwd.patch]; patches = [./pam-pwd.patch ./pam-cracklib.patch];
inherit cracklib;
} }

34
pkgs/os-specific/linux/pam/pam-cracklib.patch Normal file
View file

@ -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;}

2
pkgs/system/all-packages-generic.nix
View file

@ -1288,7 +1288,7 @@ rec {
}; };
pam = (import ../os-specific/linux/pam) { pam = (import ../os-specific/linux/pam) {
inherit stdenv fetchurl; inherit stdenv fetchurl cracklib;
}; };
#nfsUtils = (import ../os-specific/linux/nfs-utils) { #nfsUtils = (import ../os-specific/linux/nfs-utils) {