[Lunar-commits] r15786 - moonbase/trunk/security/shadow

[Auke Kok]

Author: sofar
Date: 2005-07-19 12:26:45 +0000 (Tue, 19 Jul 2005)
New Revision: 15786

Modified:
   moonbase/trunk/security/shadow/BUILD
Log:
totally unbelievably simplify and cleanup and make this BUILD braindead instead of something incomprehensibly complex and mind-boggling. thanks.


Modified: moonbase/trunk/security/shadow/BUILD
===================================================================
--- moonbase/trunk/security/shadow/BUILD	2005-07-19 08:09:11 UTC (rev 15785)
+++ moonbase/trunk/security/shadow/BUILD	2005-07-19 12:26:45 UTC (rev 15786)
@@ -1,36 +1,24 @@
 (
 
+  touch *
   patch_it $SOURCE_CACHE/$SOURCE2 1 &&
 
   if  module_installed  Linux-PAM;  then
-    WITH_LIBPAM="--with-libpam"
+    OPTS="$OPTS --with-libpam"
   fi
+  OPTS="$OPTS --with-libcrack"
 
-  sedit "s/CRACKLIB_DICTPATH    \/var\/cache\/cracklib\/cracklib_dict/CRACKLIB_DICTPATH \/usr\/share\/dict\/pw_dict/" etc/login.defs.linux
-  sedit "s/#MD5_CRYPT_ENAB      no/MD5_CRYPT_ENAB       yes/" etc/login.defs.linux
+  default_build || return 1
 
-  touch *
+  sedit 's|#CRACKLIB_DICTPATH.*$|CRACKLIB_DICTPATH /usr/share/dict/pw_dict|g' etc/login.defs*
+  sedit 's/#MD5_CRYPT_ENAB.*$/MD5_CRYPT_ENAB yes/' etc/login.defs*
 
-  ./configure  --build=$BUILD        \
-               --prefix=/usr         \
-               --sysconfdir=/etc     \
-               --localstatedir=/var  \
-               --with-libcrack       \
-               $WITH_LIBPAM          \
-               $OPTS                &&
-
-  default_make || return 1
-
-  for FILE in limits login.access login.defs.linux defaults ; do
+  for FILE in limits login.access login.defs defaults ; do
     [ -e /etc/$FILE ] || install etc/$FILE /etc/
   done
-  [ -e /etc/login.defs ] || install etc/login.defs.linux /etc/login.defs
   [ -e /etc/securetty  ] || install $SCRIPT_DIRECTORY/securetty /etc/
   ln -sf /usr/sbin/vipw /usr/sbin/vigr &&
   install $SCRIPT_DIRECTORY/adduser /usr/sbin/ &&
-  install $SCRIPT_DIRECTORY/deluser /usr/sbin/ &&
+  install $SCRIPT_DIRECTORY/deluser /usr/sbin/
 
-  sedit "s/CRACKLIB_DICTPATH    \/var\/cache\/cracklib\/cracklib_dict/CRACKLIB_DICTPATH \/usr\/share\/dict\/pw_dict/" /etc/login.defs
-  sedit "s/#MD5_CRYPT_ENAB      no/MD5_CRYPT_ENAB       yes/" /etc/login.defs
-
 ) > $C_FIFO 2>&1