[Devil-linux-commit] build/scripts eagle-usb,1.4,1.5 snort,1.15,1.16

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

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

Modified Files:
	eagle-usb snort 
Log Message:
- moved snort rule files onto CD (overwrite symlinks with your own files if
needed)
- reduced size of etc.tar.bz2 (moved some eagle-usb files)


Index: eagle-usb
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/eagle-usb,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- eagle-usb	21 Aug 2004 19:17:46 -0000	1.4
+++ eagle-usb	26 Nov 2004 03:58:07 -0000	1.5
@@ -32,7 +32,7 @@
 		if [ "$CONFIG_EAGLE_USB" = "y" ]; then
 			./autogen.sh || exit 1
 			./configure --prefix=/usr --with-kernel-src=$KERNELDIR --with-lang=en || exit 1
-			make $PMAKE || exit 1
+			make || exit 1
 		fi
 		;;
 
@@ -43,16 +43,16 @@
 			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_code_isdn.bin $WORKDIR/tmp/usr/share/eagle-usb
-			mv  $WORKDIR/tmp/etc/eagle-usb/dsp_code_pots.bin $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
 
 			copy_files $WORKDIR/tmp/usr/sbin $CDDIR/usr/ || exit 1
 			copy_files $WORKDIR/tmp/lib $CDDIR || exit 1
 			copy_files $WORKDIR/tmp/etc $ETCDIR/ || exit 1
 
 			cp $MYDIR/scripts/eagle-usb $ETCDIR/etc/init.d || exit 1
-			ln -sf /usr/share/eagle-usb/dsp_code_isdn.bin $ETCDIR/etc/eagle-usb || exit 1
-			ln -sf /usr/share/eagle-usb/dsp_code_pots.bin $ETCDIR/etc/eagle-usb || exit 1
+			ln -sf /usr/share/eagle-usb/dsp $ETCDIR/etc/eagle-usb || exit 1
+			ln -sf /usr/share/eagle-usb/lang $ETCDIR/etc/eagle-usb || exit 1
 			rm -rf $WORKDIR/tmp || exit 1
 
 			echo "# Initialize the Eagle USB modem?" >> $CONFIGFILE

Index: snort
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/snort,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- snort	11 Jan 2004 14:43:05 -0000	1.15
+++ snort	26 Nov 2004 03:58:07 -0000	1.16
@@ -46,12 +46,21 @@
 		copy_docs $WORKDIR/tmp
 		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 ./rules/*.rules $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
+
 		cp ./etc/* $ETCDIR/etc/snort || exit 1
-		rm -rf $ETCDIR/etc/snort/Makefile || exit 1
-		rm -rf $ETCDIR/etc/snort/Makefile.* || exit 1
 		cp $MYDIR/scripts/snort $ETCDIR/etc/init.d || exit 1
+		
+		for FILE in $(ls $WORKDIR/tmp/usr/share/snort )
+		do
+		    F=${FILE##/*/}
+		    ln -sf /usr/share/snort/$F /etc/snort/$F
+		done
 
 		echo "# Start Snort?" >> $CONFIGFILE
 		echo "START_$MYNAME=no" >> $CONFIGFILE