[Devil-linux-commit] build/scripts cracklib,1.2,1.3 pam_mysql,1.2,1.3 shadow,1.24,1.25

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6423/scripts

Modified Files:
	cracklib pam_mysql shadow 
Log Message:
sync changes between 1.2 and 1.3


Index: shadow
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/shadow,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- shadow	27 Dec 2005 11:04:33 -0000	1.24
+++ shadow	16 Feb 2006 16:37:37 -0000	1.25
@@ -10,7 +10,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       shadow
-# Required-Start: $basebuildtools $libs
+# Required-Start: $basebuildtools $libs Linux-PAM
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:
@@ -25,48 +25,49 @@
 
 case $1 in
     build )
-	./configure --prefix=/usr --disable-nls --with-gnu-ld --enable-shared --enable-shadowgrp \
-		--without-selinux --with-libpam --without-libcrack || exit 1
-	make $PMAKE || exit 1
-	strip_debug
-	# we need this stuff later
-	make install || exit 1
-	;;
+		./configure --prefix=/usr --disable-nls --with-gnu-ld --enable-shared --enable-shadowgrp \
+		    --without-selinux --with-libpam --without-libcrack || exit 1
+
+		make $PMAKE || exit 1
+		strip_debug
+
+		# we need this stuff later
+		make install || exit 1
+		;;
 
     install )
-	rc=`getent group wheel`
-    	if [ -z "$rc" ]; then
-       		groupadd -g 15 wheel 
-    	fi
-	
-	rm -rf $TMPDIR || exit 1
-	mkdir -p $TMPDIR || exit 1
-	make DESTDIR=$TMPDIR install || exit 1
-	chmod 700 $TMPDIR/bin/login || exit 1
-	chmod 4550 $TMPDIR/bin/su || exit 1
-	chgrp wheel $TMPDIR/bin/su || exit 1
-	chmod -c go-rx $TMPDIR/usr/sbin/{chpasswd,group*,grp[cu]*,logoutd,newusers,pw[cu]*,user*} || exit 1
-	copy_man ./man
-	rm -rf $TMPDIR/usr/share
-	rm -rf $TMPDIR/lib/*.a
-	rm -rf $TMPDIR/lib/*.la
-	cp -dpR etc/{limits,login.access,login.def*,useradd} $ETCDIR/etc/ || exit 1
-#	sed 's%^#MD5_CRYPT_ENAB.*no%MD5_CRYPT_ENAB yes%' etc/login.defs  > $ETCDIR/etc/login.defs &&
+		rc=`getent group wheel`
+        	if [ -z "$rc" ]; then
+               		groupadd -g 15 wheel 
+        	fi
 
-	for FUNCTION in FAILLOG_ENAB LASTLOG_ENAB MAIL_CHECK_ENAB 
-			OBSCURE_CHECKS_ENAB PORTTIME_CHECKS_ENAB \
-			QUOTAS_ENAB MOTD_FILE FTMP_FILE NOLOGINS_FILE ENV_HZ PASS_MIN_LEN SU_WHEEL_ONLY \
-			CRACKLIB_DICTPATH PASS_CHANGE_TRIES PASS_ALWAYS_WARN CHFN_AUTH ENVIRON_FILE MD5_CRYPT_ENAB
-	do 
-		 sed -i -e "s/^$FUNCTION/# &/" $ETCDIR/etc/login.defs
-		 echo "sed -i -e \"s/^$FUNCTION/# &/\" $ETCDIR/etc/login.defs"
-	done || exit 1
+		rm -rf $TMPDIR || exit 1
+		mkdir -p $TMPDIR || exit 1
+		make DESTDIR=$TMPDIR install || exit 1
+		chmod 700 $TMPDIR/bin/login || exit 1
+		chmod 4550 $TMPDIR/bin/su || exit 1
+		chgrp wheel $TMPDIR/bin/su || exit 1
+		chmod -c go-rx $TMPDIR/usr/sbin/{chpasswd,group*,grp[cu]*,logoutd,newusers,pw[cu]*,user*} || exit 1
+		copy_man ./man
+		rm -rf $TMPDIR/usr/share
+		rm -rf $TMPDIR/lib/*.a
+		rm -rf $TMPDIR/lib/*.la
+		cp -dpR etc/{limits,login.access,login.def*,useradd} $ETCDIR/etc/ || exit 1
+#		sed 's%^#MD5_CRYPT_ENAB.*no%MD5_CRYPT_ENAB yes%' etc/login.defs  > $ETCDIR/etc/login.defs &&
 		
-	rm -rf $TMPDIR/usr/share || exit 1
-	rm -rf $TMPDIR/lib || exit 1
-	cp -dpR $TMPDIR/* $CDDIR/ || exit 1
-	rm -rf $TMPDIR || exit 1
-	;;
+		for FUNCTION in FAILLOG_ENAB LASTLOG_ENAB MAIL_CHECK_ENAB OBSCURE_CHECKS_ENAB PORTTIME_CHECKS_ENAB \
+				QUOTAS_ENAB MOTD_FILE FTMP_FILE NOLOGINS_FILE ENV_HZ PASS_MIN_LEN SU_WHEEL_ONLY \
+				CRACKLIB_DICTPATH PASS_CHANGE_TRIES PASS_ALWAYS_WARN CHFN_AUTH ENVIRON_FILE MD5_CRYPT_ENAB
+		do 
+			 sed -i -e "s/^$FUNCTION/# &/" $ETCDIR/etc/login.defs
+			 echo "sed -i -e \"s/^$FUNCTION/# &/\" $ETCDIR/etc/login.defs"
+		done || exit 1
+
+		rm -rf $TMPDIR/usr/share || exit 1
+		rm -rf $TMPDIR/lib || exit 1
+		cp -dpR $TMPDIR/* $CDDIR/ || exit 1
+		rm -rf $TMPDIR || exit 1
+   		;;
 
     * )
     	echo "ERROR ($0)"


Index: cracklib
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/cracklib,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cracklib	27 Dec 2005 11:04:33 -0000	1.2
+++ cracklib	16 Feb 2006 16:37:37 -0000	1.3
@@ -29,6 +29,7 @@
 		make $PMAKE || exit 1
 		make install || exit 1
 		strip_debug
+		mkdir -p /usr/share/dict/ || exit 1
 		zcat $SRCDIR/cracklib-words.gz > /usr/share/dict/words || exit 1
 		;;