The attached patch to the CURRENT amavisd.spec file does two things.  It
fixes the amavisd.conf file to add a $LOGFILE line (there wasn't any in the
conf file so the old edit didn't work).  It also creates the empty
directories under the %{l_prefix/amavisd/var directory that the
amavisd.conf file says need to be created manually.

NOTE:  The line I changed in the ``%{l_shtool} subst'' invocation uses
``\n'' to append a line after the MYHOME line.  This is fine with the
OpenPKG coreutils but won't work with the standard FreeBSD sed program.

Bill
--
INTERNET:   [EMAIL PROTECTED]  Bill Campbell; Celestial Software LLC
UUCP:               camco!bill  PO Box 820; 6641 E. Mercer Way
FAX:            (206) 232-9186  Mercer Island, WA 98040-0820; (206) 236-1676
URL: http://www.celestial.com/

It is necessary for the welfare of society that genius should be
privileged to utter sedition, to blaspheme, to outrage good taste, to
corrupt the youthful mind, and generally to scandalize one's uncles.
                -- George Bernard Shaw
--- amavisd.spec.orig   2004-12-22 15:49:24.497034880 -0800
+++ amavisd.spec        2004-12-22 16:02:27.882013342 -0800
@@ -34,7 +34,7 @@
 Group:        Mail
 License:      GPL
 Version:      2.2.0
-Release:      20041103
+Release:      20041222
 
 #   package options
 %option       with_milter no
@@ -91,7 +91,7 @@
         -e 's;\(daemon_user *= \)[^;]*;\1q{%{l_rusr}};' \
         -e 's;\(daemon_group *= \)[^;]*;\1q{%{l_rgrp}};' \
         -e 's;\(\$DO_SYSLOG *= \)[^;]*;\10;' \
-        -e 's;\(\$LOGFILE *=.*\)amavis.log\([^ \t]*\) 
\(.*\);\1amavisd.log\2\3;' \
+               -e '/^\$MYHOME/s!$!\n$LOGFILE = "$MYHOME/amavisd.log";!' \
         -e 's;\(\$path 
*=.*\)/usr/local/sbin\(.*\);\1%{l_prefix}/sbin:%{l_prefix}/bin:/usr/local/sbin\2;'
 \
         amavisd.conf
     %{l_shtool} subst \
@@ -126,6 +126,8 @@
         $RPM_BUILD_ROOT%{l_prefix}/share/amavisd/tests \
         $RPM_BUILD_ROOT%{l_prefix}/var/amavisd \
         $RPM_BUILD_ROOT%{l_prefix}/var/amavisd/db \
+        $RPM_BUILD_ROOT%{l_prefix}/var/amavisd/tmp \
+        $RPM_BUILD_ROOT%{l_prefix}/var/amavisd/var \
         $RPM_BUILD_ROOT%{l_prefix}/var/amavisd/virusmails
 
     %{l_shtool} install -c -m 755 \
@@ -156,6 +158,8 @@
         '%config %{l_prefix}/etc/amavisd/amavisd.conf' \
         '%attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/amavisd' \
         '%attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/amavisd/db' \
+        '%attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/amavisd/tmp' \
+        '%attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/amavisd/var' \
         '%attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/amavisd/virusmails'
 
 %files -f files

Reply via email to