[Devil-linux-commit] build/scripts bind,1.29,1.30 cyrus-sasl,1.13,1.14 jftpgw,1.15,1.16 ppp,1.14,1.15 ypserv,1.3,1.4

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

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

Modified Files:
	bind cyrus-sasl jftpgw ppp ypserv 
Log Message:
some cleanup


Index: jftpgw
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/jftpgw,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- jftpgw	11 Jan 2004 14:43:04 -0000	1.15
+++ jftpgw	27 Mar 2004 17:30:19 -0000	1.16
@@ -40,6 +40,7 @@
 		mkdir -p $WORKDIR/tmp || exit 1
 		make install DESTDIR=$WORKDIR/tmp || exit 1
 		copy_docs $WORKDIR/tmp
+		rm -rf $WORKDIR/tmp/usr/etc
 		copy_files $WORKDIR/tmp/usr $CDDIR || exit 1
 		cp ./jftpgw.conf.sample $ETCDIR/etc || exit 1
 		rm -rf $WORKDIR/tmp || exit 1

Index: ypserv
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ypserv,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ypserv	11 Jan 2004 14:43:05 -0000	1.3
+++ ypserv	27 Mar 2004 17:30:19 -0000	1.4
@@ -39,6 +39,7 @@
 		rm -rf $WORKDIR/tmp || exit 1
 		mkdir -p $WORKDIR/tmp || exit 1
 		make install DESTDIR=$WORKDIR/tmp || exit 1
+		rm -rf $WORKDIR/tmp/usr/include
 		copy_docs $WORKDIR/tmp
 		cp -dpR $WORKDIR/tmp/* $CDDIR || exit 1
 		rm -rf $WORKDIR/tmp || exit 1

Index: ppp
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ppp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ppp	23 Mar 2004 00:38:31 -0000	1.14
+++ ppp	27 Mar 2004 17:30:19 -0000	1.15
@@ -47,6 +47,7 @@
 			rm -rf $WORKDIR/tmp || exit 1
 			mkdir -p $WORKDIR/tmp || exit 1
 			make install DESTDIR=$WORKDIR/tmp || exit 1
+			rm -rf $WORKDIR/tmp/usr/include || exit 1
 			copy_docs $WORKDIR/tmp || exit 1
 			copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1
 			copy_files $WORKDIR/tmp/etc $ETCDIR/ || exit 1

Index: cyrus-sasl
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/cyrus-sasl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- cyrus-sasl	11 Jan 2004 14:43:04 -0000	1.13
+++ cyrus-sasl	27 Mar 2004 17:30:19 -0000	1.14
@@ -43,12 +43,13 @@
 			mkdir -p $CDDIR/var/state/saslauthd || exit 1
 			make install DESTDIR=$WORKDIR/tmp || exit 1
 			rm -rf $WORKDIR/tmp/usr/include || exit 1
+			rm -rf $WORKDIR/tmp/usr/lib/sasl2/*a || exit 1
 			copy_docs $WORKDIR/tmp
 
 			copy_files $WORKDIR/tmp/usr $CDDIR || exit 1
 			rm -rf $WORKDIR/tmp || exit 1
 
-			cp $MYDIR/scripts/saslauthd $ETCDIR/etc/init.d || exit 1 
+			cp $MYDIR/scripts/saslauthd $ETCDIR/etc/init.d || exit 1
 
 			echo "# start the Cyrus SASL Authentication Daemon?" >> $CONFIGFILE
 			echo "START_SASLAUTHD=no" >> $CONFIGFILE

Index: bind
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/bind,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- bind	13 Mar 2004 00:18:35 -0000	1.29
+++ bind	27 Mar 2004 17:30:19 -0000	1.30
@@ -44,6 +44,7 @@
 		mkdir -p $WORKDIR/tmp || exit 1
 		make install DESTDIR=$WORKDIR/tmp || exit 1
 		rm -rf $WORKDIR/tmp/usr/include || exit 1
+		rm -rf $WORKDIR/tmp/usr/bind
 		rm -rf $WORKDIR/tmp/usr/lib/*.a || exit 1
 		rm -rf $WORKDIR/tmp/usr/lib/*.la || exit 1
 		copy_docs $WORKDIR/tmp
@@ -61,12 +62,12 @@
 		rm -rf $WORKDIR/tmp || exit 1
 
 		getent passwd named >/dev/null
-		rc=$?	
+		rc=$?
 		if [ "$rc" == "0" ]; then
 			echo "user already exist"
 		else
 			useradd -u 44 -g nogroup -s /bin/false named || exit 1
-		fi 
+		fi
 		echo "# Start Bind Name Server?" >> $CONFIGFILE
 		echo "START_NAMED=no" >> $CONFIGFILE
 		echo >> $CONFIGFILE