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: 21-Oct-2003 18:37:22
Branch: HEAD Handle: 2003102117372002
Modified files:
openpkg-src/exim exim.spec fsl.exim rc.exim
openpkg-web news.txt
Log:
Implement features in #202, with exception to (non existent) exim
config files
Summary:
Revision Changes Path
1.59 +17 -3 openpkg-src/exim/exim.spec
1.3 +1 -1 openpkg-src/exim/fsl.exim
1.14 +4 -0 openpkg-src/exim/rc.exim
1.7099 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/exim/exim.spec
============================================================================
$ cvs diff -u -r1.58 -r1.59 exim.spec
--- openpkg-src/exim/exim.spec 23 Sep 2003 08:18:02 -0000 1.58
+++ openpkg-src/exim/exim.spec 21 Oct 2003 16:37:22 -0000 1.59
@@ -35,7 +35,7 @@
Group: Mail
License: GPL
Version: 4.24
-Release: 20030923
+Release: 20031021
# package options
%option with_fsl yes
@@ -54,8 +54,8 @@
BuildPreReq: openssl, db >= 4.1.24, libiconv
PreReq: openssl, db >= 4.1.24, libiconv
%if "%{with_fsl}" == "yes"
-BuildPreReq: fsl >= 1.2.0
-PreReq: fsl >= 1.2.0
+BuildPreReq: fsl >= 1.3.0
+PreReq: fsl >= 1.3.0
%endif
AutoReq: no
AutoReqProv: no
@@ -186,4 +186,18 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
+%post
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} exim status 2>/dev/null`
+ [ ".$exim_active" = .yes ] && %{l_rc} exim restart
+ exit 0
+
+%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} exim stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/exim/* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/exim/fsl.exim
============================================================================
$ cvs diff -u -r1.2 -r1.3 fsl.exim
--- openpkg-src/exim/fsl.exim 14 Jul 2003 18:32:20 -0000 1.2
+++ openpkg-src/exim/fsl.exim 21 Oct 2003 16:37:22 -0000 1.3
@@ -9,7 +9,7 @@
-> {
debug: file(
path="@l_prefix@/var/exim/exim.log",
- perm=0644
+ perm=0644, monitor=3600
)
}
};
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/exim/rc.exim
============================================================================
$ cvs diff -u -r1.13 -r1.14 rc.exim
--- openpkg-src/exim/rc.exim 22 Jul 2003 14:35:00 -0000 1.13
+++ openpkg-src/exim/rc.exim 21 Oct 2003 16:37:22 -0000 1.14
@@ -37,20 +37,24 @@
%start -u @l_susr@
rcService exim enable yes || exit 0
+ rcService exim active yes && exit 0
@l_prefix@/bin/exim ${exim_flags}
%stop -u @l_susr@
rcService exim enable yes || exit 0
+ rcService exim active no && exit 0
exim_signal TERM
%restart -u @l_susr@
rcService exim enable yes || exit 0
+ rcService exim active no && exit 0
exim_signal TERM
sleep 1
@l_prefix@/bin/exim ${exim_flags}
%reload -u @l_susr@
rcService exim enable yes || exit 0
+ rcService exim active no && exit 0
exim_signal HUP
%daily -u @l_susr@
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7098 -r1.7099 news.txt
--- openpkg-web/news.txt 21 Oct 2003 15:22:33 -0000 1.7098
+++ openpkg-web/news.txt 21 Oct 2003 16:37:20 -0000 1.7099
@@ -1,3 +1,4 @@
+21-Oct-2003: Upgraded package: P<exim-4.24-20031021>
21-Oct-2003: Upgraded package: P<dss-4.1.3-20031021>
21-Oct-2003: Upgraded package: P<openpkg-20031021-20031021>
21-Oct-2003: Upgraded package: P<djbdns-1.05-20031021>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]