OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 23-Jul-2003 12:22:43
Branch: HEAD Handle: 2003072311224102
Modified files:
openpkg-src/lmtp2nntp lmtp2nntp.spec rc.lmtp2nntp
openpkg-web news.txt
Log:
PR#202 run-time check and related issues
Summary:
Revision Changes Path
1.51 +15 -1 openpkg-src/lmtp2nntp/lmtp2nntp.spec
1.16 +17 -14 openpkg-src/lmtp2nntp/rc.lmtp2nntp
1.5745 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/lmtp2nntp/lmtp2nntp.spec
============================================================================
$ cvs diff -u -r1.50 -r1.51 lmtp2nntp.spec
--- openpkg-src/lmtp2nntp/lmtp2nntp.spec 22 Jul 2003 08:10:50 -0000 1.50
+++ openpkg-src/lmtp2nntp/lmtp2nntp.spec 23 Jul 2003 10:22:43 -0000 1.51
@@ -33,7 +33,7 @@
Group: Mail
License: GPL
Version: 1.2.0
-Release: 20030722
+Release: 20030723
# list of sources
Source0: ftp://ftp.ossp.org/pkg/tool/lmtp2nntp/lmtp2nntp-%{version}.tar.gz
@@ -91,4 +91,18 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
+%post
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} lmtp2nntp status 2>/dev/null`
+ [ ".$lmtp2nntp_active" = .yes ] && %{l_rc} lmtp2nntp restart
+ exit 0
+
+%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} lmtp2nntp stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/lmtp2nntp/lmtp2nntp.log* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/lmtp2nntp/rc.lmtp2nntp
============================================================================
$ cvs diff -u -r1.15 -r1.16 rc.lmtp2nntp
--- openpkg-src/lmtp2nntp/rc.lmtp2nntp 22 Jul 2003 08:10:50 -0000 1.15
+++ openpkg-src/lmtp2nntp/rc.lmtp2nntp 23 Jul 2003 10:22:43 -0000 1.16
@@ -31,6 +31,9 @@
cmd_stop="$cmd_stop --kill"
cmd_stop="$cmd_stop --include=$lmtp2nntp_run_cfg"
+ # determine UNIX-domain (PF_LOCAL) socket path being used, if any
+ lmtp2nntp_pflocalpath=`sed <$lmtp2nntp_run_cfg -n -e 's;^bind
[^/]*\(/.*\):.*$;\1;p'`
+
# standard daemon signal probe
lmtp2nntp_pidfile="@l_prefix@/var/lmtp2nntp/lmtp2nntp.pid"
lmtp2nntp_signal () {
@@ -48,32 +51,32 @@
%start -p 400 -u @l_susr@
rcService lmtp2nntp enable yes || exit 0
+ rcService lmtp2nntp active yes && exit 0
eval $cmd_start
+ sleep 2
%stop -p 400 -u @l_susr@
rcService lmtp2nntp enable yes || exit 0
+ rcService lmtp2nntp active no && exit 0
eval $cmd_stop
+ sleep 2
+ if [ ".$lmtp2nntp_pflocalpath" != . ]; then
+ [ -S $lmtp2nntp_pflocalpath ] && rm -f $lmtp2nntp_pflocalpath
+ fi
%restart -p 400 -u @l_susr@
rcService lmtp2nntp enable yes || exit 0
- $cmd_stop
- sleep 1
- $cmd_start
+ rcService lmtp2nntp active no && exit 0
+ rc lmtp2nntp stop start
%daily -u @l_susr@
rcService lmtp2nntp enable yes || exit 0
- rcTmp -i -p lmtp2nntp
- hintfile=`rcTmp -f -n hint`
- lmtp2nntp_log_epilog="echo 'epilog' >$hintfile; $lmtp2nntp_log_epilog"
+
+ # rotate logfile
shtool rotate -f \
-n ${lmtp2nntp_log_numfiles} -s ${lmtp2nntp_log_minsize} -d \
- -z ${lmtp2nntp_log_complevel} -o @l_musr@ -o @l_mgrp@ -m 644 \
- -P "$lmtp2nntp_log_prolog" -E "$lmtp2nntp_log_epilog" \
+ -z ${lmtp2nntp_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
+ -P "${lmtp2nntp_log_prolog}" \
+ -E "${lmtp2nntp_log_epilog} && rc lmtp2nntp restart" \
@l_prefix@/var/lmtp2nntp/lmtp2nntp.log
- if [ ".`cat $hintfile`" = ".epilog" ]; then
- $cmd_stop
- sleep 1
- $cmd_start
- fi
- rcTmp -k
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5744 -r1.5745 news.txt
--- openpkg-web/news.txt 23 Jul 2003 10:09:31 -0000 1.5744
+++ openpkg-web/news.txt 23 Jul 2003 10:22:41 -0000 1.5745
@@ -1,3 +1,4 @@
+23-Jul-2003: Upgraded package: P<lmtp2nntp-1.2.0-20030723>
23-Jul-2003: Upgraded package: P<pks-0.9.6-20030723>
23-Jul-2003: Upgraded package: P<pb4sd-1.2-20030723>
23-Jul-2003: Upgraded package: P<monit-3.2-20030723>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
