[Devil-linux-commit] build/scripts ntop,1.2,1.3 squid,1.16,1.17

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

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

Modified Files:
	ntop squid 
Log Message:
some more cleanup and moved stuff from /etc to /usr/shared


Index: squid
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/squid,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- squid	13 Mar 2004 00:18:35 -0000	1.16
+++ squid	27 Mar 2004 17:42:20 -0000	1.17
@@ -57,7 +57,7 @@
 		mkdir -p $WORKDIR/tmp || exit 1
 		make install DESTDIR=$WORKDIR/tmp || exit 1
 		copy_docs $WORKDIR/tmp
-		cp $WORKDIR/tmp/etc/* $ETCDIR/etc/ || exit 1
+		cp $WORKDIR/tmp/etc/squid.conf $ETCDIR/etc/ || exit 1
 		rm -rf $WORKDIR/tmp/etc || exit 1
 		cp -dpR $WORKDIR/tmp/* $CDDIR/ || exit 1
 		rm -rf $WORKDIR/tmp || exit 1

Index: ntop
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ntop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ntop	23 Mar 2004 22:45:39 -0000	1.2
+++ ntop	27 Mar 2004 17:42:20 -0000	1.3
@@ -46,7 +46,17 @@
 			rm -rf $WORKDIR/tmp/usr/lib/*a || exit 1
 
 			copy_docs $WORKDIR/tmp
+
+			mkdir -p $WORKDIR/tmp/usr/share/ntop || exit 1
+			chmod -x $WORKDIR/tmp/etc/ntop/*.gz 
+			mv -f $WORKDIR/tmp/etc/ntop/*.gz $WORKDIR/tmp/usr/share/ntop/ || exit 1
+			ln -sf /usr/share/ntop/etter.passive.os.fp.gz $WORKDIR/tmp/etc/ntop/etter.passive.os.fp.gz || exit 1
+			ln -sf /usr/share/ntop/oui.txt.gz $WORKDIR/tmp/etc/ntop/oui.txt.gz || exit 1
+			ln -sf /usr/share/ntop/p2c.opt.table.gz $WORKDIR/tmp/etc/ntop/p2c.opt.table.gz || exit 1
+			ln -sf /usr/share/ntop/specialMAC.txt.gz $WORKDIR/tmp/etc/ntop/specialMAC.txt.gz || exit 1
+
 			cp -dpfR $WORKDIR/tmp/etc/* $ETCDIR/etc/ || exit 1
+
 			copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1
 			rm -rf $WORKDIR/tmp || exit 1
 		fi