[Devil-linux-commit] build/scripts squidguard,1.1,1.2

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

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

Modified Files:
	squidguard 
Log Message:
some program updates
moved squidguard db dir to /var/lib/squidguard


Index: squidguard
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/squidguard,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- squidguard	16 Feb 2004 23:28:24 -0000	1.1
+++ squidguard	30 Mar 2004 00:31:57 -0000	1.2
@@ -32,8 +32,7 @@
 				zcat $DL_DIR/src/squidguard_1*diff.gz | patch -p1 || exit 1
 				touch .done_devil_patch
 			fi
-			#./configure --verbose --prefix=/usr --with-db=/usr/BerkeleyDB.3.2.9 --with-sg-config=/etc/squidguard.conf --with-sg-logdir=/var/log --with-sg-dbhome=/var/data/squidguard || exit 1
-			./configure --verbose --prefix=/usr --with-sg-config=/etc/squidguard.conf --with-sg-logdir=/var/log --with-sg-dbhome=/var/data/squidguard || exit 1
+			./configure --verbose --prefix=/usr --with-sg-config=/etc/squidguard.conf --with-sg-logdir=/var/log --with-sg-dbhome=/var/lib/squidguard || exit 1
 			make $PMAKE all || exit 1
 			strip_debug
 		fi
@@ -45,14 +44,14 @@
 			mkdir -p $WORKDIR/tmp/usr/bin || exit 1
 			mkdir -p $WORKDIR/tmp/usr/share/doc/squidguard || exit 1
 			# Create the db directory
-			mkdir -p $WORKDIR/tmp/var/data/squidguard/demo || exit 1
-			cp -r ../squidguard-blacklist/* $WORKDIR/tmp/var/data/squidguard/demo
+			mkdir -p $WORKDIR/tmp/var/lib/squidguard/demo || exit 1
+			cp -r ../squidguard-blacklist/* $WORKDIR/tmp/var/lib/squidguard/demo
 			cp src/squidGuard $WORKDIR/tmp/usr/bin/
 			cp doc/* $WORKDIR/tmp/usr/share/doc/squidguard
 			cp -r samples $WORKDIR/tmp/usr/share/doc/squidguard
 			cp -r test $WORKDIR/tmp/usr/share/doc/squidguard
 			echo "logdir /var/log" > $ETCDIR/etc/squidguard.conf
-			echo "dbhome /var/data/squidguard" >> $ETCDIR/etc/squidguard.conf
+			echo "dbhome /var/lib/squidguard" >> $ETCDIR/etc/squidguard.conf
 			echo "" >> $ETCDIR/etc/squidguard.conf
 			echo "acl {" >> $ETCDIR/etc/squidguard.conf
 			echo "  default {" >> $ETCDIR/etc/squidguard.conf