OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Feb-2006 18:42:16
Branch: OPENPKG_2_5_SOLID Handle: 2006022517421600
Modified files: (Branch: OPENPKG_2_5_SOLID)
openpkg-src/spamassassin
rc.spamassassin spamassassin.spec
Log:
MFC: recent fixes for spamc/spamd run-time
Summary:
Revision Changes Path
1.15.2.1 +3 -1 openpkg-src/spamassassin/rc.spamassassin
1.65.2.2 +4 -1 openpkg-src/spamassassin/spamassassin.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/spamassassin/rc.spamassassin
============================================================================
$ cvs diff -u -r1.15 -r1.15.2.1 rc.spamassassin
--- openpkg-src/spamassassin/rc.spamassassin 29 Jul 2005 15:38:11 -0000
1.15
+++ openpkg-src/spamassassin/rc.spamassassin 25 Feb 2006 17:42:16 -0000
1.15.2.1
@@ -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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/spamassassin/spamassassin.spec
============================================================================
$ cvs diff -u -r1.65.2.1 -r1.65.2.2 spamassassin.spec
--- openpkg-src/spamassassin/spamassassin.spec 11 Oct 2005 12:51:58
-0000 1.65.2.1
+++ openpkg-src/spamassassin/spamassassin.spec 25 Feb 2006 17:42:16
-0000 1.65.2.2
@@ -38,7 +38,7 @@
Group: Mail
License: ASF
Version: %{V_here}
-Release: 2.5.0
+Release: 2.5.1
# package options
%option with_fsl yes
@@ -142,6 +142,8 @@
'%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 @@
# 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
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
