X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fshadow;h=29e66b13006bb5b8abf81b540512b169848ef855;hp=b4777b9b5cc2d0774547b5e05300d5928ba8da54;hb=15b1a3e360a277dc7481103f8ddcbf189033e3a6;hpb=59232d72251e46011b92501b7538bfe24e869ffa

diff --git a/lfs/shadow b/lfs/shadow
index b4777b9b5c..29e66b1300 100644
--- a/lfs/shadow
+++ b/lfs/shadow
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -71,21 +71,25 @@ $(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		\
-				--without-selinux	\
-				--disable-nls		\
-				--with-group-name-max-length=32
+	cd $(DIR_APP) && ./configure \
+		--libdir=/lib \
+		--sysconfdir=/etc \
+		--enable-shared \
+		--without-selinux \
+		--disable-nls \
+		--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