[Devil-linux-commit] build/scripts p7zip,1.2,1.3 unrar,1.5,1.6

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

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

Modified Files:
	p7zip unrar 
Log Message:
bzcat needs to unpack the compressed patch


Index: unrar
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/unrar,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- unrar	17 Oct 2005 13:05:39 -0000	1.5
+++ unrar	19 Oct 2005 19:01:59 -0000	1.6
@@ -31,7 +31,7 @@
 		if [ "$CONFIG_CLAMAV_PATCH" = "y" ]; then
 			mv unrar unrar.binary || exit 1
 			make clean -f makefile.unix || exit 1
-			patch -p1 < $SRCDIR/unrar-3.5.2_fix.patch.bz2 || exit 1
+			bzcat $SRCDIR/unrar-3.5.2_fix.patch.bz2 | patch -p1  || exit 1
 			make $PMAKE -f makefile.unix lib || exit 1
 # We should install libs immediately
 			install -s -D -m 755 libunrar3.so /usr/lib/libunrar3.so || exit 1
@@ -47,7 +47,6 @@
 		    fi
 		fi
 
-		fi
 		if [ "$CONFIG_CLAMAV_PATCH" = "y" ]; then
 		    install -s -D -m 755 libunrar3.so $CDDIR/usr/lib/libunrar3.so || exit 1				
 		fi

Index: p7zip
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/p7zip,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- p7zip	17 Oct 2005 13:05:39 -0000	1.2
+++ p7zip	19 Oct 2005 19:01:59 -0000	1.3
@@ -26,7 +26,7 @@
 case $1 in
 	build )
 		if [ "$CONFIG_CLAMAV_PATCH" = "y" ]; then
-			patch -p1 < $SRCDIR/p7zip_4.27-libun7zip.patch.bz2 || exit 1
+			bzcat $SRCDIR/p7zip_4.27-libun7zip.patch.bz2 | patch -p1 || exit 1
 			pushd 7zip/Bundles/Un7Zip > /dev/null || exit 1
 			make $PMAKE || exit 1
 # We should install libs immediately