[Devil-linux-commit] build/scripts squid,1.17.2.4,1.17.2.5

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

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

Modified Files:
      Tag: rel-1-2-patches
	squid 
Log Message:
use compressed patch
make script ready for DL 1.3


Index: squid
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/squid,v
retrieving revision 1.17.2.4
retrieving revision 1.17.2.5
diff -u -d -r1.17.2.4 -r1.17.2.5
--- squid	8 Oct 2005 11:12:40 -0000	1.17.2.4
+++ squid	8 Oct 2005 14:16:53 -0000	1.17.2.5
@@ -33,7 +33,7 @@
 			pushd helpers/basic_auth/YP/ > /dev/null
 			bzcat $DL_DIR/src/yp_auth.patch.bz2 | patch || exit 1
 			popd > /dev/null
-			patch -p1 < $DL_DIR/src/squid-2.5.STABLE11-delaypools_truncated.patch || exit 1
+			bzcat $DL_DIR/src/squid-2.5.STABLE11-delaypools_truncated.patch.bz2 | patch -p1 || exit 1
 			touch .patches.done
 		fi
 		if [ "$CONFIG_LDAP" = "y" ]; then
@@ -54,15 +54,15 @@
 
     install )
 	if [ "$CONFIG_SQUID" = "y" ]; then
-		rm -rf $WORKDIR/tmp || exit 1
-		mkdir -p $WORKDIR/tmp || exit 1
-		make install DESTDIR=$WORKDIR/tmp || exit 1
-		copy_docs $WORKDIR/tmp
-		rm $WORKDIR/tmp/etc/*.default || exit 1
-		cp $WORKDIR/tmp/etc/* $ETCDIR/etc/ || exit 1
-		rm -rf $WORKDIR/tmp/etc || exit 1
-		cp -dpR $WORKDIR/tmp/* $CDDIR/ || exit 1
-		rm -rf $WORKDIR/tmp || exit 1
+		rm -rf $TMPDIR || exit 1
+		mkdir -p $TMPDIR || exit 1
+		make install DESTDIR=$TMPDIR || exit 1
+		copy_docs $TMPDIR
+		rm $TMPDIR/etc/*.default || exit 1
+		cp $TMPDIR/etc/* $ETCDIR/etc/ || exit 1
+		rm -rf $TMPDIR/etc || exit 1
+		cp -dpR $TMPDIR/* $CDDIR/ || exit 1
+		rm -rf $TMPDIR || exit 1
 		cp $MYDIR/scripts/squid $ETCDIR/etc/init.d || exit 1
 
 		useradd -u 31 -g nogroup -s /bin/false squid || exit 1