OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 08-Jan-2004 15:11:32
Branch: HEAD Handle: 2004010814113002
Modified files:
openpkg-src/spamassassin
fsl.spamassassin rc.spamassassin spamassassin.spec
openpkg-web news.txt
Log:
modifying package: spamassassin-2.61 20031210 -> 20040108
Summary:
Revision Changes Path
1.3 +1 -1 openpkg-src/spamassassin/fsl.spamassassin
1.12 +3 -0 openpkg-src/spamassassin/rc.spamassassin
1.26 +15 -1 openpkg-src/spamassassin/spamassassin.spec
1.8012 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/spamassassin/fsl.spamassassin
============================================================================
$ cvs diff -u -r1.2 -r1.3 fsl.spamassassin
--- openpkg-src/spamassassin/fsl.spamassassin 14 Jul 2003 18:32:50 -0000 1.2
+++ openpkg-src/spamassassin/fsl.spamassassin 8 Jan 2004 14:11:32 -0000 1.3
@@ -9,7 +9,7 @@
-> {
debug: file(
path="@l_prefix@/var/spamassassin/spamassassin.log",
- perm=0644
+ perm=0644, jitter=1, monitor=3600
)
}
};
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/spamassassin/rc.spamassassin
============================================================================
$ cvs diff -u -r1.11 -r1.12 rc.spamassassin
--- openpkg-src/spamassassin/rc.spamassassin 25 Sep 2003 08:05:07 -0000 1.11
+++ openpkg-src/spamassassin/rc.spamassassin 8 Jan 2004 14:11:32 -0000 1.12
@@ -30,6 +30,7 @@
%start -p 400 -u @l_susr@
rcService spamassassin enable yes || exit 0
+ rcService spamassassin active yes && exit 0
@l_prefix@/bin/spamd \
--daemonize \
--pidfile="${spamassassin_pidfile}" \
@@ -39,10 +40,12 @@
%stop -p 400 -u @l_susr@
rcService spamassassin enable yes || exit 0
+ rcService spamassassin active no && exit 0
spamassassin_signal TERM
%restart -p 400 -u @l_susr@
rcService spamassassin enable yes || exit 0
+ rcService spamassassin active no && exit 0
rc spamassassin stop
sleep 2
rc spamassassin start
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/spamassassin/spamassassin.spec
============================================================================
$ cvs diff -u -r1.25 -r1.26 spamassassin.spec
--- openpkg-src/spamassassin/spamassassin.spec 10 Dec 2003 19:30:53 -0000
1.25
+++ openpkg-src/spamassassin/spamassassin.spec 8 Jan 2004 14:11:32 -0000
1.26
@@ -33,7 +33,7 @@
Group: Mail
License: GPL/Artistic
Version: 2.61
-Release: 20031210
+Release: 20040108
# package options
%option with_fsl yes
@@ -141,4 +141,18 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
+%post
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} spamassassin status 2>/dev/null`
+ [ ".$spamassassin_active" = .yes ] && %{l_rc} spamassassin restart
+ exit 0
+
+%preun
+ # before erase, stop service
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} spamassassin stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/spamassassin/*.log* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.8011 -r1.8012 news.txt
--- openpkg-web/news.txt 8 Jan 2004 13:21:46 -0000 1.8011
+++ openpkg-web/news.txt 8 Jan 2004 14:11:30 -0000 1.8012
@@ -1,3 +1,4 @@
+08-Jan-2004: Upgraded package: P<spamassassin-2.61-20040108>
08-Jan-2004: Upgraded package: P<cvs-1.11.5-1.2.4>
08-Jan-2004: New package: P<pdnsd-1.1.8b1par8-20040108>
08-Jan-2004: Upgraded package: P<cvs-1.12.1-1.3.3>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
