wok diff clamav/receipt @ rev 19346

Up tazpkg (913)
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Jul 22 09:58:35 2016 +0300 (2016-07-22)
parents 9e01bc6321ea
children dd35682fcd62
line diff
     1.1 --- a/clamav/receipt	Sun Dec 20 15:13:45 2015 +0100
     1.2 +++ b/clamav/receipt	Fri Jul 22 09:58:35 2016 +0300
     1.3 @@ -21,7 +21,6 @@
     1.4  	# Have to create clamav user/group to be able to compile
     1.5  	adduser -s /bin/false -H -D -u 64 clamav
     1.6  
     1.7 -	cd $src
     1.8  	./configure \
     1.9  		--prefix=/usr \
    1.10  		--sysconfdir=/etc/clamav \
    1.11 @@ -47,7 +46,7 @@
    1.12  	cp -a $install/usr/lib/*.so* $fs/usr/lib
    1.13  	# Copy daemon from /$stuff
    1.14  	cp $stuff/daemon-clamd $fs/etc/init.d/clamd
    1.15 -	
    1.16 +
    1.17  	# Customize config
    1.18  	sed -i -e "s/^Example/#Example/" \
    1.19  		-e "s|^#LogFile /tmp/clamd.log|LogFile /var/log/clamav/clamav.log|" \
    1.20 @@ -59,24 +58,18 @@
    1.21  
    1.22  post_install()
    1.23  {
    1.24 -	
    1.25 -	local user
    1.26 -	local group
    1.27 -	
    1.28 -	user=clamav
    1.29 -	group=clamav
    1.30 -	
    1.31 -	echo "Processing post-install commands..."
    1.32 -	
    1.33 +	local user=clamav
    1.34 +	local group=clamav
    1.35 +
    1.36  	# Enable freshclam update
    1.37 -	echo -n "Enabling freshclam update..."
    1.38 +	echo; action 'Enabling freshclam update...'
    1.39  	cd "$1/etc/clamav"
    1.40 -	sed -i 's/^Example/#Example/' freshclam.conf 
    1.41 +	sed -i 's/^Example/#Example/' freshclam.conf
    1.42  	status
    1.43  
    1.44  	# adduser clamav if needed
    1.45  	if ! grep -q "${user}:" "$1/etc/passwd"; then
    1.46 -		echo -n "Adding user/group $user..."
    1.47 +		action 'Adding user/group $user...'
    1.48  		chroot "$1/" addgroup -S $group
    1.49  		chroot "$1/" adduser -s /bin/false -S -D -H -G $group $user
    1.50  		status
    1.51 @@ -84,15 +77,14 @@
    1.52  
    1.53  	# Enable daily.cvd updates (sometimes needed for new version)
    1.54  	#chown -R ${user}:${group} "$1/var/lib/clamav"
    1.55 -	
    1.56 +
    1.57  	# Fix perms
    1.58  	chroot "$1/" chown -R ${user}.${group} /var/log/clamav \
    1.59  		/run/clamav /var/lib/clamav
    1.60 -
    1.61  }
    1.62  
    1.63  # Del user clamav when pkg is removed.
    1.64  post_remove()
    1.65  {
    1.66 -	chroot "$1/" deluser clamav	
    1.67 +	chroot "$1/" deluser clamav
    1.68  }