From 7ce9e38ad9ac8ffc1847b86822322780b3bc69c0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 8 Dec 2006 23:53:07 +0000 Subject: [PATCH] * Latest pam. * Added pwdutils and pam_login to replace shadow. svn path=/nixpkgs/trunk/; revision=7284 --- pkgs/os-specific/linux/pam/default.nix | 12 +++---- pkgs/os-specific/linux/pam/pam-cracklib.patch | 34 ------------------- pkgs/os-specific/linux/pam/pam-modules.patch | 12 ------- pkgs/os-specific/linux/pam/pam-pwd.patch | 14 -------- pkgs/os-specific/linux/pam_login/default.nix | 12 +++++++ pkgs/os-specific/linux/pwdutils/default.nix | 14 ++++++++ pkgs/top-level/all-packages.nix | 10 +++++- 7 files changed, 41 insertions(+), 67 deletions(-) delete mode 100644 pkgs/os-specific/linux/pam/pam-cracklib.patch delete mode 100644 pkgs/os-specific/linux/pam/pam-modules.patch delete mode 100644 pkgs/os-specific/linux/pam/pam-pwd.patch create mode 100644 pkgs/os-specific/linux/pam_login/default.nix create mode 100644 pkgs/os-specific/linux/pwdutils/default.nix diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 9b81e0189d41..1cd134f33d23 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -1,12 +1,12 @@ -{stdenv, fetchurl, cracklib}: +{stdenv, fetchurl, cracklib, flex}: stdenv.mkDerivation { - name = "pam-0.80"; + name = "linux-pam-0.99.6.3"; builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/Linux-PAM-0.80.tar.bz2; - md5 = "ccff87fe639efdfc22b1ba4a0f08ec57"; + url = http://www.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-0.99.6.3.tar.bz2; + md5 = "4c2830ed55a41e795af6a482009a036c"; }; - patches = [./pam-pwd.patch ./pam-cracklib.patch ./pam-modules.patch]; - inherit cracklib; + buildInputs = [flex]; + preConfigure = "configureFlags=\"--includedir=$out/include/security\""; } diff --git a/pkgs/os-specific/linux/pam/pam-cracklib.patch b/pkgs/os-specific/linux/pam/pam-cracklib.patch deleted file mode 100644 index 9746d6a9466b..000000000000 --- a/pkgs/os-specific/linux/pam/pam-cracklib.patch +++ /dev/null @@ -1,34 +0,0 @@ -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/os-specific/linux/pam/pam-modules.patch b/pkgs/os-specific/linux/pam/pam-modules.patch deleted file mode 100644 index 0153f5572039..000000000000 --- a/pkgs/os-specific/linux/pam/pam-modules.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN Linux-PAM-0.80/modules/Makefile Linux-PAM-0.80.new/modules/Makefile ---- Linux-PAM-0.80/modules/Makefile 2004-09-28 15:49:21.000000000 +0200 -+++ Linux-PAM-0.80.new/modules/Makefile 2005-10-25 19:54:12.000000000 +0200 -@@ -8,7 +8,7 @@ - - include ../Make.Rules - --MODDIRS=$(shell /bin/ls -d pam_*/Makefile | cut -f1 -d/) -+MODDIRS=$(shell ls -d pam_*/Makefile | cut -f1 -d/) - - all: - @echo building the static modutil library diff --git a/pkgs/os-specific/linux/pam/pam-pwd.patch b/pkgs/os-specific/linux/pam/pam-pwd.patch deleted file mode 100644 index 0fa10be5c274..000000000000 --- a/pkgs/os-specific/linux/pam/pam-pwd.patch +++ /dev/null @@ -1,14 +0,0 @@ -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-24 18:33:30.000000000 +0200 -@@ -1336,8 +1336,8 @@ - - - --LOCALSRCDIR=`/bin/pwd` ; --LOCALOBJDIR=`/bin/pwd` ; -+LOCALSRCDIR=`pwd` ; -+LOCALOBJDIR=`pwd` ; - OS=`uname|sed -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` - - diff --git a/pkgs/os-specific/linux/pam_login/default.nix b/pkgs/os-specific/linux/pam_login/default.nix new file mode 100644 index 000000000000..026bbed05719 --- /dev/null +++ b/pkgs/os-specific/linux/pam_login/default.nix @@ -0,0 +1,12 @@ +{stdenv, fetchurl, pam}: + +stdenv.mkDerivation { + name = "pam_login-3.31"; + + src = fetchurl { + url = ftp://ftp.suse.com/pub/people/kukuk/pam/pam_login/pam_login-3.31.tar.bz2; + md5 = "15e34a48b0bc2ded5000e8d8780fc274"; + }; + + buildInputs = [pam]; +} diff --git a/pkgs/os-specific/linux/pwdutils/default.nix b/pkgs/os-specific/linux/pwdutils/default.nix new file mode 100644 index 000000000000..32c892cbc3a3 --- /dev/null +++ b/pkgs/os-specific/linux/pwdutils/default.nix @@ -0,0 +1,14 @@ +{stdenv, fetchurl, pam, openssl}: + +stdenv.mkDerivation { + name = "pwdutils-3.1.3"; + + src = fetchurl { + url = ftp://ftp.kernel.org/pub/linux/utils/net/NIS/pwdutils-3.1.3.tar.bz2; + md5 = "b18c601e282d8695cbb5ddd87eaa473c"; + }; + + buildInputs = [pam openssl]; + + configureFlags = "--disable-ldap"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14bf9a095366..844ca2fceae3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2181,13 +2181,21 @@ rec { }; pam = import ../os-specific/linux/pam { - inherit stdenv fetchurl cracklib; + inherit stdenv fetchurl cracklib flex; + }; + + pam_login = import ../os-specific/linux/pam_login { + inherit stdenv fetchurl pam; }; procps = import ../os-specific/linux/procps { inherit fetchurl stdenv ncurses; }; + pwdutils = import ../os-specific/linux/pwdutils { + inherit fetchurl stdenv pam openssl; + }; + shadowutils = import ../os-specific/linux/shadow { inherit fetchurl stdenv; };