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

diff --git a/lfs/shadow b/lfs/shadow
index 93a7576de0..29e66b1300 100644
--- a/lfs/shadow
+++ b/lfs/shadow
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# 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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,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)
@@ -42,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a0452fa989f8ba45023cc5a08136568e
+$(DL_FILE)_MD5 = 2bfafe7d4962682d31b5eba65dba4fc8
 
 install : $(TARGET)
 
@@ -71,21 +69,29 @@ $(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
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)