X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fshadow;h=29e66b13006bb5b8abf81b540512b169848ef855;hp=f2814314d5e105035993cd67c6129501fc9a6961;hb=77c863a2f113404a7f30b8591b9972291328980b;hpb=70df830214c97a68fcb7e89ae0d7df58c35590be

diff --git a/lfs/shadow b/lfs/shadow
index f2814314d5..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        #
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 4.0.15
+VER        = 4.2.1
 
 THISAPP    = shadow-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a0452fa989f8ba45023cc5a08136568e
+$(DL_FILE)_MD5 = 2bfafe7d4962682d31b5eba65dba4fc8
 
 install : $(TARGET)
 
@@ -69,22 +69,27 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --libdir=/lib --enable-shared --without-selinux --disable-nls
-	cd $(DIR_APP) && sed -i 's/groups$(EXEEXT) //' src/Makefile
-	cd $(DIR_APP) && find man -name Makefile -exec sed -i '/groups/d' {} \;
-	cd $(DIR_APP) && sed -i -e 's/ ko//' -e 's/ zh_CN zh_TW//' man/Makefile
+	@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) && ./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
-	mv -v /lib/libshadow.*a /usr/lib
-	rm -v /lib/libshadow.so
 	ln -sfv ../../lib/libshadow.so.0 /usr/lib/libshadow.so
-	mkdir -v /etc/default
+
+	# 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