# HG changeset patch
# User Paul Issott <paul@slitaz.org>
# Date 1396038821 0
# Node ID e4392639266935a4372f946c0227fb471817b2b1
# Parent  0c8be46b75f70398c769c0718e9446056fdaacb8
clamav (update receipt)

diff -r 0c8be46b75f7 -r e43926392669 clamav/receipt
--- a/clamav/receipt	Fri Mar 28 15:00:50 2014 +0000
+++ b/clamav/receipt	Fri Mar 28 20:33:41 2014 +0000
@@ -22,7 +22,9 @@
 
 	cd $src
 	./configure \
+		--prefix=/usr \
 		--sysconfdir=/etc/clamav \
+		--with-dbdir=/var/lib/clamav \
 		--with-iconv=no \
 		$CONFIGURE_ARGS &&
 	make &&
@@ -32,8 +34,8 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib $fs/usr/share $fs/etc/init.d \
-		$fs/var/log/clamav $fs/var/run/clamav
+	mkdir -p $fs/usr/lib $fs/etc/init.d $fs/var/lib/clamav \
+		$fs/var/log/clamav $fs/run/clamav
 	cp -a $install/usr/bin $fs/usr
 	rm -f $fs/usr/bin/clamav-config
 	cp -a $install/usr/sbin $fs/usr
@@ -48,8 +50,8 @@
 	# Customize config
 	sed -i -e "s/^Example/#Example/" \
 		-e "s|^#LogFile /tmp/clamd.log|LogFile /var/log/clamav/clamav.log|" \
-		-e "s|^#PidFile.*|PidFile /var/run/clamav/clamd.pid|" \
-		-e "s|^#LocalSocket /tmp/clamd.socket|LocalSocket /var/run/clamav/clamd.ctl|" \
+		-e "s|^#PidFile.*|PidFile /run/clamav/clamd.pid|" \
+		-e "s|^#LocalSocket /tmp/clamd.socket|LocalSocket /run/clamav/clamd-socket|" \
 		$fs/etc/clamav/clamd.conf
 		
 }
@@ -80,11 +82,11 @@
 	fi
 
 	# Enable daily.cvd updates (sometimes needed for new version)
-	chown -R ${user}:${group} $1/usr/share/clamav
+	#chown -R ${user}:${group} $1/var/lib/clamav
 	
 	# Fix perms
 	chroot $1/ chown -R ${user}.${group} /var/log/clamav \
-		/var/run/clamav
+		/run/clamav /var/lib/clamav
 
 }
 
diff -r 0c8be46b75f7 -r e43926392669 clamav/stuff/daemon-clamd
--- a/clamav/stuff/daemon-clamd	Fri Mar 28 15:00:50 2014 +0000
+++ b/clamav/stuff/daemon-clamd	Fri Mar 28 20:33:41 2014 +0000
@@ -12,7 +12,7 @@
 DESC="clamav daemon"
 DAEMON=/usr/sbin/clamd
 OPTIONS=$CLAMD_OPTIONS
-PIDFILE=/var/run/clamav/clamd.pid
+PIDFILE=/run/clamav/clamd.pid
 
 case "$1" in
   start)