wok diff clamav/receipt @ rev 17543

Up busybox (1.23.1)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Jan 27 16:55:03 2015 +0100 (2015-01-27)
parents b97997359190
children 17e313b5b9c1
line diff
     1.1 --- a/clamav/receipt	Mon Mar 10 15:33:31 2014 +0000
     1.2 +++ b/clamav/receipt	Tue Jan 27 16:55:03 2015 +0100
     1.3 @@ -22,7 +22,9 @@
     1.4  
     1.5  	cd $src
     1.6  	./configure \
     1.7 +		--prefix=/usr \
     1.8  		--sysconfdir=/etc/clamav \
     1.9 +		--with-dbdir=/var/lib/clamav \
    1.10  		--with-iconv=no \
    1.11  		$CONFIGURE_ARGS &&
    1.12  	make &&
    1.13 @@ -32,8 +34,8 @@
    1.14  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.15  genpkg_rules()
    1.16  {
    1.17 -	mkdir -p $fs/usr/lib $fs/usr/share $fs/etc/init.d \
    1.18 -		$fs/var/log/clamav $fs/var/run/clamav
    1.19 +	mkdir -p $fs/usr/lib $fs/etc/init.d $fs/var/lib/clamav \
    1.20 +		$fs/var/log/clamav $fs/run/clamav
    1.21  	cp -a $install/usr/bin $fs/usr
    1.22  	rm -f $fs/usr/bin/clamav-config
    1.23  	cp -a $install/usr/sbin $fs/usr
    1.24 @@ -48,8 +50,8 @@
    1.25  	# Customize config
    1.26  	sed -i -e "s/^Example/#Example/" \
    1.27  		-e "s|^#LogFile /tmp/clamd.log|LogFile /var/log/clamav/clamav.log|" \
    1.28 -		-e "s|^#PidFile.*|PidFile /var/run/clamav/clamd.pid|" \
    1.29 -		-e "s|^#LocalSocket /tmp/clamd.socket|LocalSocket /var/run/clamav/clamd.ctl|" \
    1.30 +		-e "s|^#PidFile.*|PidFile /run/clamav/clamd.pid|" \
    1.31 +		-e "s|^#LocalSocket /tmp/clamd.socket|LocalSocket /run/clamav/clamd-socket|" \
    1.32  		$fs/etc/clamav/clamd.conf
    1.33  		
    1.34  }
    1.35 @@ -80,11 +82,11 @@
    1.36  	fi
    1.37  
    1.38  	# Enable daily.cvd updates (sometimes needed for new version)
    1.39 -	chown -R ${user}:${group} $1/usr/share/clamav
    1.40 +	#chown -R ${user}:${group} $1/var/lib/clamav
    1.41  	
    1.42  	# Fix perms
    1.43  	chroot $1/ chown -R ${user}.${group} /var/log/clamav \
    1.44 -		/var/run/clamav
    1.45 +		/run/clamav /var/lib/clamav
    1.46  
    1.47  }
    1.48