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: 03-Sep-2003 17:58:35
Branch: HEAD Handle: 2003090316583302
Modified files:
openpkg-src/portfwd portfwd.spec rc.portfwd
openpkg-web news.txt
Log:
Fix logfile rotation, and implement features in ticket #202
Summary:
Revision Changes Path
1.37 +23 -1 openpkg-src/portfwd/portfwd.spec
1.15 +7 -2 openpkg-src/portfwd/rc.portfwd
1.6384 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/portfwd/portfwd.spec
============================================================================
$ cvs diff -u -r1.36 -r1.37 portfwd.spec
--- openpkg-src/portfwd/portfwd.spec 28 Jul 2003 11:07:30 -0000 1.36
+++ openpkg-src/portfwd/portfwd.spec 3 Sep 2003 15:58:35 -0000 1.37
@@ -33,7 +33,7 @@
Group: Network
License: GPL
Version: 0.26rc6
-Release: 20030728
+Release: 20030903
# package options
%option with_fsl yes
@@ -149,4 +149,26 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
+%pre
+ # before upgrade, save status and stop service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} portfwd status 2>/dev/null | tee %{l_tmpfile}`
+ %{l_rc} portfwd stop 2>/dev/null
+ exit 0
+
+%post
+ if [ $1 -eq 2 ]; then
+ # after upgrade, restore status
+ eval `cat %{l_tmpfile}`; rm -f %{l_tmpfile}
+ [ ".$portfwd_active" = .yes ] && %{l_rc} portfwd start
+ fi
+ exit 0
+
+%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} portfwd stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/portfwd/*.log* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/portfwd/rc.portfwd
============================================================================
$ cvs diff -u -r1.14 -r1.15 rc.portfwd
--- openpkg-src/portfwd/rc.portfwd 23 Jul 2003 12:25:25 -0000 1.14
+++ openpkg-src/portfwd/rc.portfwd 3 Sep 2003 15:58:35 -0000 1.15
@@ -29,24 +29,29 @@
%start -u @l_susr@
rcService portfwd enable yes || exit 0
+ rcService portfwd active yes && exit 0
@l_prefix@/sbin/portfwd -p $portfwd_pidfile $portfwd_flags
%stop -u @l_susr@
rcService portfwd enable yes || exit 0
+ rcService portfwd active no && exit 0
portfwd_signal TERM
%restart -u @l_susr@
rcService portfwd enable yes || exit 0
+ rcService portfwd active no && exit 0
rc portfwd stop
sleep 2
rc portfwd start
%daily -u @l_susr@
rcService portfwd enable yes || exit 0
+
+ # rotate logfile
shtool rotate -f \
-n ${portfwd_log_numfiles} -s ${portfwd_log_minsize} -d \
- -z ${portfwd_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+ -z ${portfwd_log_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
-P "${portfwd_log_prolog}" \
- -E "${portfwd_log_epilog}" \
+ -E "${portfwd_log_epilog} && rc portfwd restart" \
@l_prefix@/var/portfwd/portfwd.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6383 -r1.6384 news.txt
--- openpkg-web/news.txt 3 Sep 2003 14:32:23 -0000 1.6383
+++ openpkg-web/news.txt 3 Sep 2003 15:58:33 -0000 1.6384
@@ -1,3 +1,4 @@
+03-Sep-2003: Upgraded package: P<portfwd-0.26rc6-20030903>
03-Sep-2003: Upgraded package: P<mozilla-1.4-20030903>
03-Sep-2003: Upgraded package: P<openpkg-20030903-20030903>
03-Sep-2003: Upgraded package: P<subversion-0.28.2-20030903>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
