Consistently switch to the l_rusr for running amavisd under. Also fix a substition bug in amavisd.conf and a packaging bug related to configure option for l_rusr. Submitted by: Bill Campbell <bill@celestial.com>

amavisd/amavisd.spec

@@ -38,7 +38,7 @@ Class:        EVAL
 Group:        Mail
 License:      GPL
 Version:      %{V_major}%{V_minor}
-Release:      20040423
+Release:      20040429
 
 #   package options
 %option       with_milter no
@@ -86,7 +86,7 @@ AutoReqProv:  no
         -e 's;/var/amavis;%{l_prefix}/var/amavisd;g' \
         -e 's;/var/virusmails;%{l_prefix}/var/amavisd/virusmails;g' \
         -e 's;/usr/bin/sendmail;%{l_prefix}/sbin/sendmail;g' \
-        -e 's; -C/etc/sendmail.orig.cf ;;g' \
+        -e 's; -C/etc/sendmail\.orig\.cf;;g' \
         -e 's;/usr/bin/exim;%{l_prefix}/bin/exim;g' \
         -e 's;/usr/local/sbin;%{l_prefix}/sbin;g' \
         -e 's;/usr/local/bin;%{l_prefix}/bin;g' \
@@ -113,7 +113,7 @@ AutoReqProv:  no
         --with-sendmail="%{l_prefix}/sbin/sendmail" \
         --with-runtime-dir="%{l_prefix}/var/amavisd" \
         --with-sockname="%{l_prefix}/var/amavisd/amavisd.sock" \
-        --with-user="@l_rusr@" \
+        --with-user="%{l_rusr}" \
         --with-milterinc="%{l_prefix}/include/libmilter" \
         --with-milterlib="%{l_prefix}/lib"
 %endif

amavisd/rc.amavisd

@@ -19,7 +19,7 @@
         [ -f $amavisd_pidfile ] && kill -$1 `cat $amavisd_pidfile`
     }
 
-%status -u @l_susr@ -o
+%status -u @l_rusr@ -o
     amavisd_usable="unknown"
     amavisd_active="no"
     rcService amavisd enable yes && \
@@ -28,30 +28,30 @@
     echo "amavisd_usable=\"$amavisd_usable\""
     echo "amavisd_active=\"$amavisd_active\""
 
-%start -u @l_susr@
+%start -u @l_rusr@
     rcService amavisd enable yes || exit 0
     rcService amavisd active yes && exit 0
     @l_prefix@/sbin/amavisd -c $amavisd_cfgfile
 
-%stop -u @l_susr@
+%stop -u @l_rusr@
     rcService amavisd enable yes || exit 0
     rcService amavisd active no && exit 0
     @l_prefix@/sbin/amavisd -c $amavisd_cfgfile stop
 
-%restart -u @l_susr@
+%restart -u @l_rusr@
     rcService amavisd enable yes || exit 0
     rcService amavisd active no && exit 0
     rc amavisd stop
     sleep 2
     rc amavisd start
 
-%daily -u @l_susr@
+%daily -u @l_rusr@
     rcService amavisd enable yes || exit 0
 
     #   rotate summary logfile
     shtool rotate -f \
         -n ${amavisd_log_numfiles} -s 0 \
-        -z ${amavisd_log_complevel} -m 640 -o @l_susr@ -g @l_rgrp@ \
+        -z ${amavisd_log_complevel} -m 640 \
         @l_prefix@/var/amavisd/amavisd.sum
 
     #   generate summary logfile
@@ -66,7 +66,7 @@
     #   rotate logfile
     shtool rotate -f \
         -n ${amavisd_log_numfiles} -s ${amavisd_log_minsize} -d \
-        -z ${amavisd_log_complevel} -m 640 -o @l_susr@ -g @l_rgrp@ \
+        -z ${amavisd_log_complevel} -m 640 \
         -P "${amavisd_log_prolog}" \
         -E "${amavisd_log_epilog} && rc amavisd restart" \
         @l_prefix@/var/amavisd/amavisd.log