浏览代码

fix run-time of spamc(1) and spamd(8)

Ralf S. Engelschall 20 年之前
父节点
当前提交
dc43f70391
共有 2 个文件被更改,包括 7 次插入2 次删除
  1. 3 1
      spamassassin/rc.spamassassin
  2. 4 1
      spamassassin/spamassassin.spec

+ 3 - 1
spamassassin/rc.spamassassin

@@ -16,6 +16,7 @@
 
 %common
     spamassassin_pidfile="@l_prefix@/var/spamassassin/spamassassin.pid"
+    spamassassin_logfile="@l_prefix@/var/spamassassin/spamassassin.log"
     spamassassin_signal () {
         [ -f $spamassassin_pidfile ] && kill -$1 `cat $spamassassin_pidfile`
     }
@@ -35,6 +36,7 @@
     @l_prefix@/bin/spamd \
         --daemonize \
         --pidfile="${spamassassin_pidfile}" \
+        --syslog="${spamassassin_logfile}" \
         --listen-ip="${spamassassin_bind}" \
         --port="${spamassassin_port}" \
         ${spamassassin_flags}
@@ -58,5 +60,5 @@
         -z ${spamassassin_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
         -P "${spamassassin_log_prolog}" \
         -E "${spamassassin_log_epilog}" \
-        @l_prefix@/var/spamassassin/spamassassin.log
+        $spamassassin_logfile
 

+ 4 - 1
spamassassin/spamassassin.spec

@@ -38,7 +38,7 @@ Class:        BASE
 Group:        Mail
 License:      ASF
 Version:      %{V_here}
-Release:      20050916
+Release:      20060220
 
 #   package options
 %option       with_fsl  yes
@@ -142,6 +142,8 @@ AutoReqProv:  no
         '%not %dir %{l_prefix}/etc/fsl' \
         '%config %{l_prefix}/etc/fsl/fsl.spamassassin' \
         '%config %{l_prefix}/etc/spamassassin/*' \
+        '%attr(775,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/spamassassin' \
+        '%attr(4755,%{l_rusr},%{l_mgrp}) %{l_prefix}/bin/spamc' \
         `cat perl-openpkg-files`
 
 %files -f files
@@ -160,6 +162,7 @@ AutoReqProv:  no
     #   before erase, stop service
     [ $1 -eq 0 ] || exit 0
     %{l_rc} spamassassin stop 2>/dev/null
+    rm -f $RPM_INSTALL_PREFIX/var/spamassassin/*.pid >/dev/null 2>&1 || true
     rm -f $RPM_INSTALL_PREFIX/var/spamassassin/*.log* >/dev/null 2>&1 || true
     exit 0