Updated some options to shadow.

Don't link to libcrack (this is pam's job).
Do use sha-crypt.

diff --git a/lfs/shadow b/lfs/shadow
index 3493fdf5558f857d33b0e034e0083a3e2c2ff207..8a3cce5f13637cca4f1b57cd66a8d678e711b1a0 100644 (file)
--- a/lfs/shadow
+++ b/lfs/shadow
@@ -33,7 +33,7 @@ DL_FILE    = $(THISAPP).tar.bz2
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 ifneq "$(STAGE)" "base"
-        CONFIGURE_ARGS = --with-libpam
+       CONFIGURE_ARGS = --with-libpam
        EXTRA_DEPS = pam
 else
        CONFIGURE_ARGS = --without-libpam
@@ -61,7 +61,9 @@ endef
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) \
+       $(THISAPP)-ipfire.patch \
+       $(THISAPP)-goodname.patch
 
 download: $(objects)
 
@@ -84,18 +86,22 @@ $(OBJECT) :
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
 
-       #Modification of the user and shell permissions
+       # Modification of the user and shell permissions
        cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-ipfire.patch
 
-       #Username check for umlaute 
+       # Username check for umlaute
        cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-goodname.patch
 
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \
                        --sysconfdir=/etc \
+                       --with-sha-crypt \
                        --without-selinux \
-                       $(CONFIGURE_ARGS)
+                       --without-libcrack \
+                       $(CONFIGURE_ARGS) \
+                       --disable-static
+
        cd $(DIR_APP) && sed -i 's/groups$$(EXEEXT) //' src/Makefile
        cd $(DIR_APP) && find man -name Makefile -exec sed -i 's/groups\.1 / /' {} \;
        cd $(DIR_APP) && sed -i -e 's/ ko//' -e 's/ zh_CN zh_TW//' man/Makefile