[Devil-linux-commit] build/scripts unrar,1.4,1.4.2.1 clamav,1.9.2.4,1.9.2.5

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

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

Modified Files:
      Tag: rel-1-2-patches
	unrar clamav 
Log Message:

- clamap patch for rar3 & 7-zip support


Index: unrar
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/unrar,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- unrar	11 Jan 2004 14:43:05 -0000	1.4
+++ unrar	17 Oct 2005 05:26:58 -0000	1.4.2.1
@@ -28,12 +28,30 @@
 			make $PMAKE -f makefile.unix || exit 1
 			strip_debug
 		fi
+		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
+			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
+			install -D -m 644 dll.hpp /usr/include/libunrar3/dll.hpp || exit 1
+		fi
 		;;
 
 	install )
 		if [ "$CONFIG_UNRAR" = "y" ]; then
-			cp unrar $CDDIR/usr/bin || exit 1
+		    cp unrar $CDDIR/usr/bin || exit 1
+		    if [ "$CONFIG_CLAMAV_PATCH" = "y" ]; then
+			cp unrar.binary $CDDIR/usr/bin/unrar || exit 1
+		    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: clamav
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/clamav,v
retrieving revision 1.9.2.4
retrieving revision 1.9.2.5
diff -u -d -r1.9.2.4 -r1.9.2.5
--- clamav	1 Feb 2005 01:13:27 -0000	1.9.2.4
+++ clamav	17 Oct 2005 05:26:58 -0000	1.9.2.5
@@ -9,7 +9,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       clamav
-# Required-Start: $basebuildtools $libs
+# Required-Start: $basebuildtools $libs unrar p7zip
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:
@@ -25,6 +25,14 @@
 case $1 in
 	build )
 	    if [ "$CONFIG_CLAMAV" = "y" ]; then
+		if [ "$CONFIG_CLAMAV_PATCH" = "y" ]; then
+		    patch -p1 < $SRCDIR/clamav-0.87-libunrar3.patch.bz2 || exit 1
+		    patch -p1 < $SRCDIR/clamav-0.87-un7zip.patch.bz2 || exit 1
+			aclocal
+			autoconf
+			automake
+		fi
+
 		./configure --prefix=/usr --sysconfdir=/etc --disable-clamav --with-dbdir=/var/lib/clamav || exit 1
 		make $PMAKE all || exit 1
 		strip_debug