Mon, 02 Nov 2009 20:07:19 +0100
Correct clamav-milter start block run command logic.
clamav/clamav.spec | file | annotate | diff | comparison | revisions | |
clamav/rc.clamav | file | annotate | diff | comparison | revisions |
1.1 --- a/clamav/clamav.spec Mon Nov 02 19:25:22 2009 +0100 1.2 +++ b/clamav/clamav.spec Mon Nov 02 20:07:19 2009 +0100 1.3 @@ -32,7 +32,7 @@ 1.4 Group: AntiVirus 1.5 License: GPL 1.6 Version: 0.95.3 1.7 -Release: 20091101 1.8 +Release: 20091102 1.9 1.10 # package options 1.11 %option with_milter no
2.1 --- a/clamav/rc.clamav Mon Nov 02 19:25:22 2009 +0100 2.2 +++ b/clamav/rc.clamav Mon Nov 02 20:07:19 2009 +0100 2.3 @@ -17,6 +17,7 @@ 2.4 2.5 %common 2.6 clamav_cfgfile="@l_prefix@/etc/clamav/clamd.conf" 2.7 + clamav_milter_cfgfile="@l_prefix@/etc/clamav/clamav-milter.conf" 2.8 clamav_pidfile_clamd="@l_prefix@/var/clamav/clamd.pid" 2.9 clamav_pidfile_clamav_milter="@l_prefix@/var/clamav/clamav-milter.pid" 2.10 clamav_signal () { 2.11 @@ -50,12 +51,8 @@ 2.12 elif [ ".$daemon" = ".clamav-milter" -a -x @l_prefix@/sbin/clamav-milter ]; then 2.13 ( umask 002 2.14 @l_prefix@/sbin/clamav-milter \ 2.15 - --config-file=$clamav_cfgfile \ 2.16 - --max-children=4 --outgoing --local \ 2.17 - --pidfile=$clamav_pidfile_clamav_milter \ 2.18 - --sendmail-cf=/dev/null \ 2.19 - $clamav_clamav_milter_flags \ 2.20 - local:@l_prefix@/var/milter/socket/clamav-milter 2.21 + --config-file=$clamav_milter_cfgfile \ 2.22 + $clamav_clamav_milter_flags 2.23 ) || exit $? 2.24 fi 2.25 done