shadow-utils: Create standard set of configuration files

[ipfire-2.x.git] / lfs / shadow

diff --git a/lfs/shadow b/lfs/shadow
index b4777b9b5cc2d0774547b5e05300d5928ba8da54..c445dd362f5794f4e1f16cd6230ef8aaee7be29c 100644 (file)
--- a/lfs/shadow
+++ b/lfs/shadow
@@ -71,7 +71,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/shadow-4.2.1-suppress_installation_of_groups.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/shadow-4.2.1-SHA512_password_hashing.patch
        cd $(DIR_APP) && ./configure --libdir=/lib      \
                                --sysconfdir=/etc       \
                                --enable-shared         \
@@ -80,12 +79,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                                --with-group-name-max-length=32
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
-       cd $(DIR_APP) && cp -v etc/{limits,login.access} /etc
-       cd $(DIR_APP) && sed -e's@#MD5_CRYPT_ENAB.no@MD5_CRYPT_ENAB yes@' \
-                               -e 's@/var/spool/mail@/var/mail@' \
-                               etc/login.defs > /etc/login.defs
+
        mv -v /usr/bin/passwd /bin
        ln -sfv ../../lib/libshadow.so.0 /usr/lib/libshadow.so
+
+       # Install configuration
+       install -m 644 $(DIR_SRC)/config/shadow/limits /etc/limits
+       install -m 644 $(DIR_SRC)/config/shadow/login.access /etc/login.access
+       install -m 644 $(DIR_SRC)/config/shadow/login.defs /etc/login.defs
+
        touch /etc/shadow
        chmod 600 /etc/shadow
        pwconv