OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 23-Jul-2003 14:31:42
Branch: HEAD Handle: 2003072313314001
Modified files:
openpkg-src/spamassassin
rc.spamassassin spamassassin.spec
openpkg-web news.txt
Log:
%status and pidfile handling
Summary:
Revision Changes Path
1.10 +19 -3 openpkg-src/spamassassin/rc.spamassassin
1.20 +1 -1 openpkg-src/spamassassin/spamassassin.spec
1.5747 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/spamassassin/rc.spamassassin
============================================================================
$ cvs diff -u -r1.9 -r1.10 rc.spamassassin
--- openpkg-src/spamassassin/rc.spamassassin 22 Jul 2003 08:11:12 -0000 1.9
+++ openpkg-src/spamassassin/rc.spamassassin 23 Jul 2003 12:31:41 -0000 1.10
@@ -16,6 +16,18 @@
%common
spamassassin_pidfile="@l_prefix@/var/spamassassin/spamassassin.pid"
+ spamassassin_signal () {
+ [ -f $spamassassin_pidfile ] && kill -$1 `cat $spamassassin_pidfile`
+ }
+
+%status -u @l_susr@ -o
+ spamassassin_usable="unknown"
+ spamassassin_active="no"
+ rcService spamassassin enable yes && \
+ spamassassin_signal 0 && spamassassin_active="yes"
+ echo "spamassassin_enable=\"$spamassassin_enable\""
+ echo "spamassassin_usable=\"$spamassassin_usable\""
+ echo "spamassassin_active=\"$spamassassin_active\""
%start -p 400 -u @l_susr@
rcService spamassassin enable yes || exit 0
@@ -28,9 +40,13 @@
%stop -p 400 -u @l_susr@
rcService spamassassin enable yes || exit 0
- if [ -f "${spamassassin_pidfile}" ] ;then
- kill -TERM `cat "${spamassassin_pidfile}"`
- fi
+ spamassassin_signal TERM
+
+%restart -p 400 -u @l_susr@
+ rcService spamassassin enable yes || exit 0
+ rc spamassassin stop
+ sleep 2
+ rc spamassassin start
%daily -u @l_susr@
rcService spamassassin enable yes || exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/spamassassin/spamassassin.spec
============================================================================
$ cvs diff -u -r1.19 -r1.20 spamassassin.spec
--- openpkg-src/spamassassin/spamassassin.spec 22 Jul 2003 08:11:12 -0000
1.19
+++ openpkg-src/spamassassin/spamassassin.spec 23 Jul 2003 12:31:41 -0000
1.20
@@ -33,7 +33,7 @@
Group: Mail
License: GPL/Artistic
Version: 2.55
-Release: 20030722
+Release: 20030723
# package options
%option with_fsl yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5746 -r1.5747 news.txt
--- openpkg-web/news.txt 23 Jul 2003 12:25:24 -0000 1.5746
+++ openpkg-web/news.txt 23 Jul 2003 12:31:40 -0000 1.5747
@@ -1,3 +1,4 @@
+23-Jul-2003: Upgraded package: P<spamassassin-2.55-20030723>
23-Jul-2003: Upgraded package: P<portfwd-0.26rc6-20030723>
23-Jul-2003: Upgraded package: P<lmtp2nntp-1.2.0-20030723>
23-Jul-2003: Upgraded package: P<pks-0.9.6-20030723>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
