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: 18-Sep-2003 15:47:41
Branch: HEAD Handle: 2003091814474001
Modified files:
openpkg-src/amavisd amavisd.spec rc.amavisd
openpkg-web news.txt
Log:
Implemented features in ticket #202, though this package logs to
syslog and thus OpenPKG has no control over its logging (no daily
rotation). See OSSP ticket #173.
Summary:
Revision Changes Path
1.22 +24 -3 openpkg-src/amavisd/amavisd.spec
1.9 +3 -0 openpkg-src/amavisd/rc.amavisd
1.6614 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/amavisd/amavisd.spec
============================================================================
$ cvs diff -u -r1.21 -r1.22 amavisd.spec
--- openpkg-src/amavisd/amavisd.spec 29 Aug 2003 11:32:24 -0000 1.21
+++ openpkg-src/amavisd/amavisd.spec 18 Sep 2003 13:47:41 -0000 1.22
@@ -37,7 +37,7 @@
Group: Mail
License: GPL
Version: %{V_major}%{V_minor}
-Release: 20030829
+Release: 20030918
# package options
%option with_milter no
@@ -50,8 +50,8 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20030718
-PreReq: OpenPKG, openpkg >= 20030718, perl
-PreReq: perl-net, perl-util, perl-mail, perl-time
+PreReq: OpenPKG, openpkg >= 20030718, spamassassin
+PreReq: perl, perl-net, perl-util, perl-mail, perl-time
PreReq: perl-sys, perl-comp, perl-conv
%if "%{with_milter}" == "yes"
BuildPreReq: sendmail, sendmail::with_milter = yes
@@ -145,4 +145,25 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
+%pre
+ # before upgrade, save status and stop service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} amavisd status 2>/dev/null | tee %{l_tmpfile}`
+ %{l_rc} amavisd stop 2>/dev/null
+ exit 0
+
+%post
+ if [ $1 -eq 2 ]; then
+ # after upgrade, restore status
+ eval `cat %{l_tmpfile}`; rm -f %{l_tmpfile}
+ [ ".$amavisd_active" = .yes ] && %{l_rc} amavisd start
+ fi
+ exit 0
+
+%preun
+ # before erase, stop service
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} amavisd stop 2>/dev/null
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/amavisd/rc.amavisd
============================================================================
$ cvs diff -u -r1.8 -r1.9 rc.amavisd
--- openpkg-src/amavisd/rc.amavisd 29 Aug 2003 11:32:24 -0000 1.8
+++ openpkg-src/amavisd/rc.amavisd 18 Sep 2003 13:47:41 -0000 1.9
@@ -24,14 +24,17 @@
%start -u @l_rusr@
rcService amavisd enable yes || exit 0
+ rcService amavisd active yes && exit 0
@l_prefix@/sbin/amavisd -c $amavisd_config
%stop -u @l_rusr@
rcService amavisd enable yes || exit 0
+ rcService amavisd active no && exit 0
@l_prefix@/sbin/amavisd -c $amavisd_config stop
%restart -u @l_rusr@
rcService amavisd enable yes || exit 0
+ rcService amavisd active no && exit 0
@l_prefix@/sbin/amavisd -c $amavisd_config stop
@l_prefix@/sbin/amavisd -c $amavisd_config
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6613 -r1.6614 news.txt
--- openpkg-web/news.txt 18 Sep 2003 13:36:37 -0000 1.6613
+++ openpkg-web/news.txt 18 Sep 2003 13:47:40 -0000 1.6614
@@ -1,3 +1,4 @@
+18-Sep-2003: Upgraded package: P<amavisd-20030616p5-20030918>
18-Sep-2003: Upgraded package: P<bind-9.2.2-20030918>
18-Sep-2003: Upgraded package: P<sendmail-8.12.10-20030918>
18-Sep-2003: Upgraded package: P<openpkg-20030918-20030918>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
