Index: BOOK/boot/common/shadow.xml
===================================================================
--- BOOK/boot/common/shadow.xml (revision b46be7dc5ead8b7cc25b9dbf8b8fbb9a7a611505)
+++ BOOK/boot/common/shadow.xml (revision 09202dee9781147363d1f380d9342afef8ea8c51)
@@ -23,35 +23,36 @@
Installation of Shadow
- Disable the installation of the groups and
+ Disable the installation of the groups and
nologin programs, as better versions
of these programs are provided by Coreutils and Util-linux:
-cp -v src/Makefile.in{,.orig}
+cp -v src/Makefile.in{,.orig}
sed -e 's/groups$(EXEEXT) //' -e 's/= nologin$(EXEEXT)/= /' \
src/Makefile.in.orig > src/Makefile.in
- Prepare Shadow for compilation:
+ Prevent Shadow from setting installed programs suid:
-./configure --prefix=/tools \
- --build=${CLFS_HOST} --host=${CLFS_TARGET}
+cp -v src/Makefile.in{,.orig}
+sed 's/\(^suidu*bins = \).*/\1/' src/Makefile.in.orig > src/Makefile.in
- Tell Shadow to use passwd in
+ Tell Shadow to use passwd in
/tools/bin:
-cp -v config.h{,.orig}
-sed '/PASSWD_PROGRAM/s@/bin/passwd@/tools&@' config.h.orig > config.h
+cat > config.cache << "EOF"
+shadow_cv_passwd_dir=/tools/bin
+EOF
- Prevent Shadow from setting installed programs suid:
+ Prepare Shadow for compilation:
-cp -v src/Makefile{,.orig}
-sed 's/\(^suidu*bins = \).*/\1/' src/Makefile.orig > src/Makefile
+./configure --prefix=/tools \
+ --build=${CLFS_HOST} --host=${CLFS_TARGET} --cache-file=config.cache
- Compile the package:
+ Compile the package:
-make
+make
- Install the package:
+ Install the package:
-make install
+make install