shadow: 4.2.1 -> 4.4
This commit is contained in:
parent
4101f1fd18
commit
d6710e3d66
@ -1,4 +1,6 @@
|
|||||||
{ stdenv, fetchurl, pam ? null, glibcCross ? null }:
|
{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, libxslt, libxml2
|
||||||
|
, docbook_xml_dtd_412, docbook_xsl, gnome_doc_utils, flex, bison
|
||||||
|
, pam ? null, glibcCross ? null }:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
@ -15,14 +17,20 @@ let
|
|||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "shadow-4.2.1";
|
name = "shadow-${version}";
|
||||||
|
version = "4.4";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchFromGitHub {
|
||||||
url = "http://pkg-shadow.alioth.debian.org/releases/${name}.tar.xz";
|
owner = "shadow-maint";
|
||||||
sha256 = "0h9x1zdbq0pqmygmc1x459jraiqw4gqz8849v268crk78z8r621v";
|
repo = "shadow";
|
||||||
|
rev = "${version}";
|
||||||
|
sha256 = "005qk3n86chc8mlg86qhrns2kpl52n5f3las3m5s6266xij3qwka";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam;
|
buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam;
|
||||||
|
nativeBuildInputs = [autoreconfHook libxslt libxml2
|
||||||
|
docbook_xml_dtd_412 docbook_xsl gnome_doc_utils flex bison
|
||||||
|
];
|
||||||
|
|
||||||
patches = [ ./keep-path.patch dots_in_usernames ];
|
patches = [ ./keep-path.patch dots_in_usernames ];
|
||||||
|
|
||||||
@ -33,8 +41,15 @@ stdenv.mkDerivation rec {
|
|||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
export ac_cv_func_setpgrp_void=yes
|
export ac_cv_func_setpgrp_void=yes
|
||||||
export shadow_cv_logdir=/var/log
|
export shadow_cv_logdir=/var/log
|
||||||
|
(
|
||||||
|
head -n -1 "${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml"
|
||||||
|
tail -n +3 "${docbook_xsl}/share/xml/docbook-xsl/catalog.xml"
|
||||||
|
) > xmlcatalog
|
||||||
|
configureFlags="$configureFlags --with-xml-catalog=$PWD/xmlcatalog ";
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
configureFlags = " --enable-man ";
|
||||||
|
|
||||||
preBuild = assert glibc != null;
|
preBuild = assert glibc != null;
|
||||||
''
|
''
|
||||||
substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc.bin}/bin/nscd
|
substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc.bin}/bin/nscd
|
||||||
|
Loading…
x
Reference in New Issue
Block a user