[Devil-linux-commit] build/scripts ebtables,1.7,1.7.2.1

[Bruce S. <bl...@us...>]

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

Modified Files:
      Tag: rel-1-2-patches
	ebtables 
Log Message:
Fix compiler abort.


Index: ebtables
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ebtables,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- ebtables	17 Jan 2004 13:42:11 -0000	1.7
+++ ebtables	12 Jun 2006 20:06:58 -0000	1.7.2.1
@@ -28,7 +28,8 @@
 case $1 in
 	build )
 		if [ "$CONFIG_EBTABLES" = "y" ]; then
-			if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
+			if [ "$CONFIG_LINUX_VERSION" = "2.4" -a ! -f .ebtables.patch.done ]; then
+				touch .ebtables.patch.done
 				zcat $DL_DIR/src/ebtables-brnf-*.diff.gz | patch -p 1 -d $KERNELDIR || exit 1
 
 				# update kernel 
@@ -41,7 +42,7 @@
 
 				set_kernel_option CONFIG_IP_NF_MATCH_PHYSDEV m
 			fi	
-			make MANDIR=/usr/share/man $PMAKE all|| exit 1
+			make MANDIR=/usr/share/man $PMAKE CC="gcc -fno-stack-protector" all || exit 1
 			strip_debug
 		fi
 		;;