shadow: Fix using default shell in useradd
This caused "useradd xyzzy" to produce a user with no shell: xyzzy❌1002💯:/home/xyzzy: https://github.com/shadow-maint/shadow/pull/33
This commit is contained in:
parent
a51663f9da
commit
7f6abddcd7
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, libxslt, libxml2
|
||||
{ stdenv, fetchpatch, fetchFromGitHub, autoreconfHook, libxslt, libxml2
|
||||
, docbook_xml_dtd_412, docbook_xsl, gnome_doc_utils, flex, bison
|
||||
, pam ? null, glibcCross ? null }:
|
||||
|
||||
|
@ -9,7 +9,7 @@ let
|
|||
then glibcCross
|
||||
else assert stdenv ? glibc; stdenv.glibc;
|
||||
|
||||
dots_in_usernames = fetchurl {
|
||||
dots_in_usernames = fetchpatch {
|
||||
url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch;
|
||||
sha256 = "1fj3rg6x3jppm5jvi9y7fhd2djbi4nc5pgwisw00xlh4qapgz692";
|
||||
};
|
||||
|
@ -28,21 +28,30 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam;
|
||||
nativeBuildInputs = [autoreconfHook libxslt libxml2
|
||||
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
|
||||
(fetchpatch {
|
||||
url = https://github.com/shadow-maint/shadow/commit/507f96cdeb54079fb636c7ce21e371f7a16a520e.patch;
|
||||
sha256 = "0q20s0kil0n0wlj14fg646nhym4qn9sn34g8c78nk7fpknwpjmiw";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "su" "man" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# Assume System V `setpgrp (void)', which is the default on GNU variants
|
||||
# (`AC_FUNC_SETPGRP' is not cross-compilation capable.)
|
||||
preConfigure = ''
|
||||
export ac_cv_func_setpgrp_void=yes
|
||||
export shadow_cv_logdir=/var/log
|
||||
(
|
||||
head -n -1 "${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml"
|
||||
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 ";
|
||||
|
|
Loading…
Reference in a new issue