[Devil-linux-commit] build/scripts iptraf,1.19,1.20

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

Update of /cvsroot/devil-linux/build/scripts
In directory vz-cvs-3.sog:/tmp/cvs-serv17490/scripts

Modified Files:
	iptraf 
Log Message:
added iptraf patch to support openvpn tun interfaces ( Andrzej Odyniec )


Index: iptraf
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/iptraf,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- iptraf	12 Jul 2010 19:21:55 -0000	1.19
+++ iptraf	18 Nov 2011 15:31:22 -0000	1.20
@@ -19,16 +19,13 @@
 case $1 in
 	build )
 		if [ "$CONFIG_IPTRAF" = "y" ]; then
-		   if [ ! -e .done_dl_patches ]; then
-			   bzcat $DL_DIR/src/iptraf-include-fix.diff.bz2 | patch -p1 || exit 1
-			   bzcat $DL_DIR/src/iptraf-add-devnames.diff.bz2 | patch -p1 || exit 1
-			   bzcat $DL_DIR/src/iptraf-3.0.0-vlan.diff.bz2 | patch -p1 || exit 1
-			   touch .done_dl_patches
-		   fi
-		   if [ ! -e /usr/include/linux/.done_dl_patch_iptraf-netdevice-fix ]; then
-			   bzcat $DL_DIR/src/iptraf-netdevice-fix.diff.bz2 | patch -p0 || exit 1
-			   touch /usr/include/linux/.done_dl_patch_iptraf-netdevice-fix
-		   fi
+			patch_from_file 1 $DL_DIR/src/iptraf-include-fix.diff.bz2 || exit 1
+			patch_from_file 1 $DL_DIR/src/iptraf-add-devnames.diff.bz2 || exit 1
+			patch_from_file 1 $DL_DIR/src/iptraf-3.0.0-vlan.diff.bz2 || exit 1
+			patch_from_file 1 $DL_DIR/src/iptraf-tun-65534_diff.bz2 || exit 1
+			pushd /usr/include/linux || exit 1
+			patch_from_file 0 $DL_DIR/src/iptraf-netdevice-fix.diff.bz2 || exit 1
+			popd > /dev/null
 
 			replace_str ./src/Makefile /usr/local/bin /usr/bin
 			replace_str ./src/Makefile /var/local/iptraf /var/iptraf