X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=packages%2Fbase%2Fshadow%2Fshadow;h=40cdbc7ded2b591fe78d23d64b6ec71589fc00ec;hb=e6cbadee3fa9e3e04c70d6d652a64d7025936695;hp=cd2e5fcea7b95ff021bc3b052d41a69b8dd13bed;hpb=6ae193981fcc05dcc495b4bde92cb8fd290ee4dd;p=hdw-linux%2Fhdw-linux.git

diff --git a/packages/base/shadow/shadow b/packages/base/shadow/shadow
index cd2e5fc..40cdbc7 100644
--- a/packages/base/shadow/shadow
+++ b/packages/base/shadow/shadow
@@ -2,29 +2,28 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 4.0.4.1
+# [V] 4.0.10
 # [S] 2-15
-# [D] shadow-4.0.4.1.tar.bz2 ftp://ftp.pld.org.pl/software/shadow/
+# [D] shadow-4.0.10.tar.bz2 ftp://ftp.pld.org.pl/software/shadow/
 
-confopt="$confopt --enable-shared"
+confopt="$confopt --libdir=$root/lib --enable-shared"
 
 pre_install()	{
-	echo '#define HAVE_SETLOCALE 1' >> config.h
-	cp libmisc/xmalloc.c libmisc/xmalloc.c.orig
-	sed '/extern char/d' libmisc/xmalloc.c.orig > libmisc/xmalloc.c
+	sed 's/groups$(EXEEXT) //' src/Makefile > tmp~
+	mv tmp~ src/Makefile
+	sed '/groups/d' man/Makefile > tmp~
+	mv tmp~ man/Makefile
 		}
 
 post_install()	{
-	cp etc/{limits,login.access} $root/etc &&
+	cp etc/{limits,login.access} $root/etc
 	sed -e 's%/var/spool/mail%/var/mail%' \
 		-e 's%#MD5_CRYPT_ENAB.no%MD5_CRYPT_ENAB yes%' \
-		etc/login.defs.linux > $root/etc/login.defs &&
-	rm $root/bin/groups &&
-	mv $root/bin/sg $prefix/bin &&
-	mv $root/bin/vigr $prefix/sbin &&
-	mv $prefix/passwd $root/bin &&
-	mv $prefix/lib/lib{shadow,misc}.so.0* $root/lib
+		etc/login.defs.linux > $root/etc/login.defs
+	for i in login passwd; do
+		[ -f $prefix/bin/$i ] && mv $prefix/bin/$i $root/bin
+	done
+	mv $root/lib/libshadow.*a $prefix/lib
 	ln -sf ../../lib/libshadow.so.0 $prefix/lib/libshadow.so
-	ln -sf ../../lib/libmisc.so.0 $prefix/lib/libmisc.so
 	mkdir -p $root/etc/default
 		}