[Devil-linux-commit] build/scripts eagle-usb,1.2.2.2,1.2.2.3 frox,1.2.2.1,1.2.2.2 snort,1.15.2.1,1.15.2.2 xfsprogs,1.25,1.25.2.1

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

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

Modified Files:
      Tag: rel-1-2-patches
	eagle-usb frox snort xfsprogs 
Log Message:
use correct path names


Index: eagle-usb
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/eagle-usb,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -d -r1.2.2.2 -r1.2.2.3
--- eagle-usb	26 Nov 2004 03:27:55 -0000	1.2.2.2
+++ eagle-usb	26 Nov 2004 16:59:14 -0000	1.2.2.3
@@ -42,9 +42,11 @@
 			mkdir -p $WORKDIR/tmp || exit 1
 			mkdir -p $WORKDIR/tmp/etc/eagle-usb/scripts || exit 1
 			make install DESTDIR=$WORKDIR/tmp || exit 1
-			mkdir -p $WORKDIR/tmp/usr/share/eagle-usb
-			mv  $WORKDIR/tmp/etc/eagle-usb/dsp $WORKDIR/tmp/usr/share/eagle-usb || exit 1
-			mv  $WORKDIR/tmp/etc/eagle-usb/lang $WORKDIR/tmp/usr/share/eagle-usb || exit 1
+
+			mkdir -p $CDDIR/usr/share/eagle-usb/{dsp,lang} || exit 1
+			mv -f $WORKDIR/tmp/etc/eagle-usb/dsp/* $CDDIR/usr/share/eagle-usb/dsp/ || exit 1
+			mv -f $WORKDIR/tmp/etc/eagle-usb/lang/* $CDDIR/usr/share/eagle-usb/lang/ || exit 1
+			rm -rf $WORKDIR/tmp/etc/eagle-usb/{dsp,lang} || exit 1
 
 			copy_files $WORKDIR/tmp/usr/sbin $CDDIR/usr/ || exit 1
 			copy_files $WORKDIR/tmp/lib $CDDIR || exit 1

Index: frox
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/frox,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- frox	7 Nov 2004 21:43:29 -0000	1.2.2.1
+++ frox	26 Nov 2004 16:59:15 -0000	1.2.2.2
@@ -49,7 +49,7 @@
 		gzip -c -9 < doc/frox.man > $WORKDIR/tmp/usr/share/man/man8/frox.conf.8.gz || exit 1
 		mkdir -p $WORKDIR/tmp/usr/share/man/man5 || exit 1
 		gzip -c -9 < doc/frox.conf.man > $WORKDIR/tmp/usr/share/man/man5/frox.5.gz || exit 1
-		copy_files src/frox.conf $ETCDIR || exit 1
+		copy_files src/frox.conf $ETCDIR/etc/ || exit 1
 		copy_files $WORKDIR/tmp/usr $CDDIR || exit 1
 
 		rm -rf $WORKDIR/tmp || exit 1

Index: xfsprogs
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/xfsprogs,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -u -d -r1.25 -r1.25.2.1
--- xfsprogs	3 May 2004 14:32:44 -0000	1.25
+++ xfsprogs	26 Nov 2004 16:59:15 -0000	1.25.2.1
@@ -40,8 +40,8 @@
 		SDIR=$(pwd)
 		cd $CDDIR || exit 1
 		tar -xzf $SDIR/build/tar/xfsprogs*.tar.gz || exit 1
-		cp -dpR share/doc/ usr/share/ || exit 1
-		cp -dpR man/ usr/share/ || exit 1
+		cp -vdpR share/doc usr/share/ || exit 1
+		cp -vdpR man usr/share/ || exit 1
 		rm -fr doc man
 	fi
 	;;

Index: snort
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/snort,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -u -d -r1.15.2.1 -r1.15.2.2
--- snort	26 Nov 2004 03:54:49 -0000	1.15.2.1
+++ snort	26 Nov 2004 16:59:15 -0000	1.15.2.2
@@ -47,19 +47,19 @@
 		copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1
 		rm -rf $WORKDIR/tmp || exit 1
 
-        	mkdir -p $WORKDIR/tmp/usr/share/snort/rules
-		mkdir -p $ETCDIR/etc/snort || exit 1
-		cp -dpR ./rules/ $WORKDIR/tmp/usr/share/snort || exit 1
-		rm -rf $WORKDIR/tmp/usr/share/snort/rules/Makefile || exit 1
-		rm -rf $WORKDIR/tmp/usr/share/snort/rules/Makefile.* || exit 1
+        	mkdir -p $CDDIR/usr/share/snort/rules
+		cp -dpR ./rules/ $CDDIR/usr/share/snort || exit 1
+		rm -rf $CDDIR/usr/share/snort/rules/Makefil* || exit 1
 
-		cp ./etc/* $ETCDIR/etc/snort || exit 1
+		mkdir -p $ETCDIR/etc/snort || exit 1
+		cp ./etc/* $ETCDIR/etc/snort/ || exit 1
+		rm -rf $ETCDIR/etc/snort/Makefil* || exit 1
 		cp $MYDIR/scripts/snort $ETCDIR/etc/init.d || exit 1
 		
-		for FILE in $(ls $WORKDIR/tmp/usr/share/snort )
+		for FILE in $(ls $CDDIR/usr/share/snort/rules/* )
 		do
 		    F=${FILE##/*/}
-		    ln -sf /usr/share/snort/$F /etc/snort/$F
+		    ln -sf /usr/share/snort/rules/$F $ETCDIR/etc/snort/$F
 		done
 
 		echo "# Start Snort?" >> $CONFIGFILE