OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-Jul-2003 16:26:27
Branch: HEAD Handle: 2003072315262700
Modified files:
openpkg-src/qpopper qpopper.spec rc.qpopper
Log:
PR#202 run-time check and related issues
Summary:
Revision Changes Path
1.61 +12 -3 openpkg-src/qpopper/qpopper.spec
1.23 +9 -6 openpkg-src/qpopper/rc.qpopper
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/qpopper/qpopper.spec
============================================================================
$ cvs diff -u -r1.60 -r1.61 qpopper.spec
--- openpkg-src/qpopper/qpopper.spec 23 Jul 2003 12:57:48 -0000 1.60
+++ openpkg-src/qpopper/qpopper.spec 23 Jul 2003 14:26:27 -0000 1.61
@@ -159,11 +159,20 @@
fi
%endif
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} qpopper status 2>/dev/null`
+ [ ".$qpopper_active" = .yes ] && %{l_rc} qpopper restart
+ exit 0
+
%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} qpopper stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/qpopper/qpopper.log* >/dev/null 2>&1 || true
%if "%{with_pam}" == "yes"
# remove PAM configuration entry
- if [ $1 -eq 0 ]; then
- $RPM_INSTALL_PREFIX/sbin/pamtool --remove --smart --name=qpopper
- fi
+ $RPM_INSTALL_PREFIX/sbin/pamtool --remove --smart --name=qpopper
%endif
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/qpopper/rc.qpopper
============================================================================
$ cvs diff -u -r1.22 -r1.23 rc.qpopper
--- openpkg-src/qpopper/rc.qpopper 22 Jul 2003 08:11:06 -0000 1.22
+++ openpkg-src/qpopper/rc.qpopper 23 Jul 2003 14:26:27 -0000 1.23
@@ -31,26 +31,29 @@
%start -u @l_susr@
rcService qpopper enable yes || exit 0
+ rcService qpopper active yes && exit 0
@l_prefix@/sbin/qpopper ${qpopper_bind} -S -f
@l_prefix@/etc/qpopper/qpopper.config
%stop -u @l_susr@
rcService qpopper enable yes || exit 0
+ rcService qpopper active no && exit 0
qpopper_signal TERM
+ sleep 2
rm -f $qpopper_pidfile >/dev/null 2>&1 || true
%restart -u @l_susr@
rcService qpopper enable yes || exit 0
- qopper_signal TERM
- rm -f $qpopper_pidfile >/dev/null 2>&1 || true
- sleep 2
- @l_prefix@/sbin/qpopper ${qpopper_bind} -S -f
@l_prefix@/etc/qpopper/qpopper.config
+ rcService qpopper active no && exit 0
+ rc qpopper stop start
%daily -u @l_susr@
rcService qpopper enable yes || exit 0
+
+ # rotate logfile
shtool rotate -f \
-n ${qpopper_log_numfiles} -s ${qpopper_log_minsize} -d \
- -z ${qpopper_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+ -z ${qpopper_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
-P "${qpopper_log_prolog}" \
- -E "${qpopper_log_epilog}" \
+ -E "${qpopper_log_epilog} && rc qpopper restart" \
$POP_logfile
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
