devil-linux-commit

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

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

Modified Files:
	clamav unrar 
Added Files:
	p7zip 
Log Message:

- added rar3 & 7-zip support for clamav


Index: unrar
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/unrar,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- unrar	11 Jan 2004 14:43:05 -0000	1.4
+++ unrar	17 Oct 2005 13:05:39 -0000	1.5
@@ -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.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- clamav	1 Feb 2005 01:20:16 -0000	1.14
+++ clamav	17 Oct 2005 13:05:39 -0000	1.15
@@ -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
@@ -36,23 +44,23 @@
 
 	install )
 	    if [ "$CONFIG_CLAMAV" = "y" ]; then
-		rm -rf $TMPDIR || exit 1
-		mkdir -p $TMPDIR/usr/sbin || exit 1
-		make install DESTDIR=$TMPDIR || exit 1
+		rm -rf $WORKDIR/tmp || exit 1
+		mkdir -p $WORKDIR/tmp/usr/sbin || exit 1
+		make install DESTDIR=$WORKDIR/tmp || exit 1
 
-		copy_docs $TMPDIR
+		copy_docs $WORKDIR/tmp
 
 		cp etc/*conf $ETCDIR/etc/ || exit 1
 
 		useradd -u 45 -s /bin/false -g vscan clamav || exit 1
 
-		rm -rf $TMPDIR/usr/include || exit 1
-		rm -rf $TMPDIR/usr/lib/*a || exit 1
-		copy_files $TMPDIR/usr $CDDIR/ || exit 1
+		rm -rf $WORKDIR/tmp/usr/include || exit 1
+		rm -rf $WORKDIR/tmp/usr/lib/*a || exit 1
+		copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1
 		mkdir -p $CDDIR/var/lib/clamav || exit 1
 		chmod -R 700 $CDDIR/var/lib/clamav || exit 1
 		chown -R clamav $CDDIR/var/lib/clamav || exit 1
-		rm -rf $TMPDIR || exit 1
+		rm -rf $WORKDIR/tmp || exit 1
 
 		cp -dp $MYDIR/scripts/clamav $ETCDIR/etc/init.d/ || exit 1
 		echo "# Start ClamAV daemon?" >> $CONFIGFILE

--- NEW FILE: p7zip ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/p7zip,v $
# $Revision: 1.2 $
# $Date: 2005/10/17 13:05:39 $
# http://www.devil-linux.org

# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3

### BEGIN INIT INFO
# Provides:       p7zip
# Required-Start: $basebuildtools $libs
# Required-Stop:
# Default-Start:  1 2
# Default-Stop:
# Description:    description
### END INIT INFO

# get the directoryname of the script
MYDIR=${0%/*}
#MYNAME=p7zip

# source functions and config
source $MYDIR/settings

case $1 in
	build )
		if [ "$CONFIG_CLAMAV_PATCH" = "y" ]; then
			patch -p1 < $SRCDIR/p7zip_4.27-libun7zip.patch.bz2 || exit 1
			pushd 7zip/Bundles/Un7Zip > /dev/null || exit 1
			make $PMAKE || exit 1
# We should install libs immediately
			install -s -D -m 755 libun7zip.so /usr/lib/libun7zip.so || exit 1
			install -D -m 644 u7zip.h /usr/include/u7zip.h || exit 1
			popd > /dev/null || exit 1
		fi
		;;

	install )
		if [ "$CONFIG_CLAMAV_PATCH" = "y" ]; then
			install -s -D -m 755 libun7zip.so $CDDIR/usr/lib/libun7zip.so || exit 1
		fi
		;;

	* )
		echo "ERROR ($0)"
		echo "please add parameter so I know what to do"
		exit 1
		;;
esac