X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fshadow;h=93a7576de0f193c30af4ad7aa10c4c430407076e;hb=9217f23647243b640713e1cac421db6597d60e12;hp=ce6569a08951abfa63078520c4147313d1533741;hpb=cd1a2927226c734d96478e12bb768256fb64a06a;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/shadow b/lfs/shadow
index ce6569a089..93a7576de0 100644
--- a/lfs/shadow
+++ b/lfs/shadow
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: shadow,v 1.9.2.8 2005/03/15 18:00:09 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,12 +26,11 @@
 
 include Config
 
-VER        = 4.0.4.1
+VER        = 4.0.15
 
 THISAPP    = shadow-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = ftp://ftp.pld.org.pl/software/shadow/old
-#DL_FROM     = 	http://wiretapped.securax.org/security/host-security/shadow/old
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -49,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4e5662f360a29f174a19163c8d8a0698
+$(DL_FILE)_MD5 = a0452fa989f8ba45023cc5a08136568e
 
 install : $(TARGET)
 
@@ -78,26 +71,21 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	touch /var/run/utmp /var/log/{btmp,lastlog,wtmp}
-	chmod 644 /var/run/utmp /var/log/{btmp,lastlog,wtmp}
-	touch /usr/bin/passwd
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls --libdir=/usr/lib --enable-shared
-	cd $(DIR_APP) && make
+	@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
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	cd $(DIR_APP) && cp -f etc/{limits,login.access} /etc
-	cd $(DIR_APP) && sed -e 's%/var/spool/mail%/var/mail%' \
-	    -e 's%#MD5_CRYPT_ENAB.no%MD5_CRYPT_ENAB yes%' \
-	    etc/login.defs.linux > /etc/login.defs
-	ln -sf vipw /usr/sbin/vigr
-	mv -f /bin/sg /usr/bin
-	mv -f /usr/lib/lib{shadow,misc}.so.0* /lib
-	ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so
-	ln -sf ../../lib/libmisc.so.0 /usr/lib/libmisc.so
-	rm /bin/vigr
-	rm /bin/groups
-	/usr/sbin/pwconv
-	/usr/sbin/grpconv
-	chmod u-s /usr/bin/{chfn,chsh,chage,expiry,newgrp,passwd,gpasswd}
+	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
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)