* 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
This commit is contained in:
Eelco Dolstra 2010-06-02 17:31:20 +00:00
parent e0adbee395
commit 6f2b3f46cc
3 changed files with 14 additions and 16 deletions

View File

@ -1,19 +1,19 @@
{stdenv, fetchurl}: { stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cracklib-2.8.13"; name = "cracklib-2.8.16";
builder = ./builder.sh; #builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/cracklib/${name}.tar.gz"; url = "mirror://sourceforge/cracklib/${name}.tar.gz";
sha256 = "06h4b3hifsh1azpjvfn5qa052agavzz9xhgh4g89ghr66vzwl1ha"; sha256 = "1g3mchdvra9nihxlkl3rdz96as3xnfw5m59hmr5k17l7qa9a8fpw";
}; };
dicts = fetchurl { #dicts = fetchurl {
url = http://nixos.org/tarballs/cracklib-words.gz; # url = http://nixos.org/tarballs/cracklib-words.gz;
md5 = "d18e670e5df560a8745e1b4dede8f84f"; # md5 = "d18e670e5df560a8745e1b4dede8f84f";
}; #};
meta = { meta = {
homepage = http://sourceforge.net/projects/cracklib; homepage = http://sourceforge.net/projects/cracklib;

View File

@ -1,16 +1,14 @@
{stdenv, fetchurl, cracklib, flex}: { stdenv, fetchurl, flex, cracklib, libxcrypt }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "linux-pam-1.0.3"; name = "linux-pam-1.1.1";
src = fetchurl { src = fetchurl {
url = mirror://kernel/linux/libs/pam/library/Linux-PAM-1.0.3.tar.bz2; url = mirror://kernel/linux/libs/pam/library/Linux-PAM-1.1.1.tar.bz2;
sha256 = "1xqj4ibnid5w3pi629vj7jiddf192kzm8rbm3vy90diqpl1k5h6n"; sha256 = "015r3xdkjpqwcv4lvxavq0nybdpxhfjycqpzbx8agqd5sywkx3b0";
}; };
buildInputs = [flex cracklib]; buildInputs = [ flex cracklib libxcrypt ];
CRACKLIB_DICTPATH = "${cracklib}/lib";
preConfigure = '' preConfigure = ''
configureFlags="$configureFlags --includedir=$out/include/security" configureFlags="$configureFlags --includedir=$out/include/security"

View File

@ -6669,7 +6669,7 @@ let
}; };
pam = import ../os-specific/linux/pam { 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 ) # pam_bioapi ( see http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader )