[Devil-linux-commit] build/scripts clamav,1.17,1.18 unrar,1.7,1.8

[Serge L. <sma...@us...>]

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

Modified Files:
	clamav unrar 
Log Message:

- applying the version independent patch


Index: unrar
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/unrar,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- unrar	20 Oct 2005 14:51:21 -0000	1.7
+++ unrar	12 Jan 2006 17:22:44 -0000	1.8
@@ -31,7 +31,7 @@
 		if [ "$CONFIG_CLAMAV_PATCH" = "y" ]; then
 			mv unrar unrar.binary || exit 1
 			make clean -f makefile.unix || exit 1
-			bzcat $SRCDIR/unrar-3.5.2_fix.patch.bz2 | patch -p1  || exit 1
+			bzcat $SRCDIR/unrar-*_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

Index: clamav
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/clamav,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- clamav	19 Oct 2005 21:53:50 -0000	1.17
+++ clamav	12 Jan 2006 17:22:44 -0000	1.18
@@ -26,8 +26,8 @@
 	build )
 	    if [ "$CONFIG_CLAMAV" = "y" ]; then
 		if [ "$CONFIG_CLAMAV_PATCH" = "y" ]; then
-		    bzcat $SRCDIR/clamav-0.87-libunrar3.patch.bz2 | patch -p1 || exit 1
-		    bzcat $SRCDIR/clamav-0.87-un7zip.patch.bz2 | patch -p1 || exit 1
+			bzcat $SRCDIR/clamav-*-libunrar3.patch.bz2 | patch -p1 || exit 1
+			bzcat $SRCDIR/clamav-*-un7zip.patch.bz2 | patch -p1 || exit 1
 			aclocal
 			autoconf
 			automake