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: 01-Sep-2003 18:04:54
Branch: HEAD Handle: 2003090117045201
Modified files:
openpkg-src/pb4sd pb4sd pb4sd.spec rc.pb4sd
openpkg-web news.txt
Log:
Implement features in ticket #202, and fix typo in app itself
Summary:
Revision Changes Path
1.5 +1 -1 openpkg-src/pb4sd/pb4sd
1.25 +23 -1 openpkg-src/pb4sd/pb4sd.spec
1.14 +13 -2 openpkg-src/pb4sd/rc.pb4sd
1.6366 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pb4sd/pb4sd
============================================================================
$ cvs diff -u -r1.4 -r1.5 pb4sd
--- openpkg-src/pb4sd/pb4sd 20 Nov 2002 15:45:27 -0000 1.4
+++ openpkg-src/pb4sd/pb4sd 1 Sep 2003 16:04:53 -0000 1.5
@@ -16,7 +16,7 @@
use POSIX qw(getpid setsid);
use IO;
-# logfile parsing patters
+# logfile parsing patterns
my $pattern = {
# QPopper 4.0.x (OpenPKG)
'qpopper' =>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pb4sd/pb4sd.spec
============================================================================
$ cvs diff -u -r1.24 -r1.25 pb4sd.spec
--- openpkg-src/pb4sd/pb4sd.spec 23 Jul 2003 09:56:55 -0000 1.24
+++ openpkg-src/pb4sd/pb4sd.spec 1 Sep 2003 16:04:53 -0000 1.25
@@ -33,7 +33,7 @@
Group: Mail
License: PD
Version: 1.2
-Release: 20030723
+Release: 20030901
# list of sources
Source0: pb4sd
@@ -77,4 +77,26 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
+%pre
+ # before upgrade, save status and stop service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} pb4sd status 2>/dev/null | tee %{l_tmpfile}`
+ %{l_rc} pb4sd stop 2>/dev/null
+ exit 0
+
+%post
+ if [ $1 -eq 2 ]; then
+ # after upgrade, restore status
+ eval `cat %{l_tmpfile}`; rm -f %{l_tmpfile}
+ [ ".$pb4sd_active" = .yes ] && %{l_rc} pb4sd start
+ fi
+ exit 0
+
+%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} pb4sd stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/pb4sd/*.log* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pb4sd/rc.pb4sd
============================================================================
$ cvs diff -u -r1.13 -r1.14 rc.pb4sd
--- openpkg-src/pb4sd/rc.pb4sd 23 Jul 2003 09:56:55 -0000 1.13
+++ openpkg-src/pb4sd/rc.pb4sd 1 Sep 2003 16:04:53 -0000 1.14
@@ -32,6 +32,7 @@
%start -u @l_susr@
rcService pb4sd enable yes || exit 0
+ rcService pb4sd active no && exit 0
pb4sd_popserver="${POP_type:-qpopper}"
pb4sd_infile="${POP_logfile:[EMAIL PROTECTED]@/var/qpopper/qpopper.log}"
@l_prefix@/sbin/pb4sd \
@@ -46,14 +47,24 @@
%stop -u @l_susr@
rcService pb4sd enable yes || exit 0
+ rcService pb4sd active no && exit 0
pb4sd_signal TERM
+%restart -u @l_susr@
+ rcService pb4sd enable yes || exit 0
+ rcService pb4sd active no && exit 0
+ rc pb4sd stop
+ sleep 2
+ rc pb4sd start
+
%daily -u @l_susr@
rcService pb4sd enable yes || exit 0
+
+ # rotate logfile
shtool rotate -f \
-n ${pb4sd_log_numfiles} -s ${pb4sd_log_minsize} -d \
- -z ${pb4sd_log_complevel} -o @l_musr@ -g @l_mgrp@ -m 644 \
+ -z ${pb4sd_log_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
-P "${pb4sd_log_prolog}" \
- -E "${pb4sd_log_epilog}" \
+ -E "${pb4sd_log_epilog} && rc pb4sd restart" \
${pb4sd_logfile}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6365 -r1.6366 news.txt
--- openpkg-web/news.txt 1 Sep 2003 16:03:05 -0000 1.6365
+++ openpkg-web/news.txt 1 Sep 2003 16:04:52 -0000 1.6366
@@ -1,3 +1,4 @@
+01-Sep-2003: Upgraded package: P<pb4sd-1.2-20030901>
01-Sep-2003: Upgraded package: P<qt-3.2.1-20030901>
01-Sep-2003: Upgraded package: P<xine-lib-1rc0a-20030901>
01-Sep-2003: Upgraded package: P<xine-ui-0.9.22-20030901>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
