OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 06-Aug-2003 16:57:09
Branch: HEAD Handle: 2003080615570801
Modified files:
openpkg-src/proftpd proftpd.spec rc.proftpd
openpkg-web news.txt
Log:
avoid multiple restarts on logfile rotation
Summary:
Revision Changes Path
1.70 +1 -1 openpkg-src/proftpd/proftpd.spec
1.15 +10 -4 openpkg-src/proftpd/rc.proftpd
1.6056 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.spec
============================================================================
$ cvs diff -u -r1.69 -r1.70 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 29 Jul 2003 09:58:52 -0000 1.69
+++ openpkg-src/proftpd/proftpd.spec 6 Aug 2003 14:57:09 -0000 1.70
@@ -33,7 +33,7 @@
Group: FTP
License: GPL
Version: 1.2.9rc1
-Release: 20030729
+Release: 20030806
# package options
%option with_ifsession no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/rc.proftpd
============================================================================
$ cvs diff -u -r1.14 -r1.15 rc.proftpd
--- openpkg-src/proftpd/rc.proftpd 22 Jul 2003 14:22:25 -0000 1.14
+++ openpkg-src/proftpd/rc.proftpd 6 Aug 2003 14:57:09 -0000 1.15
@@ -69,28 +69,34 @@
rcService proftpd enable yes || exit 0
# rotate logfile
+ rcTmp -i
+ hintfile=`rcTmp -f -n hint`
shtool rotate -f \
-n ${proftpd_acc_numfiles} -s ${proftpd_acc_minsize} -d \
-z ${proftpd_acc_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
-P "${proftpd_acc_prolog}" \
- -E "${proftpd_acc_epilog} && rc proftpd restart" \
+ -E "${proftpd_acc_epilog} && echo 1 >$hintfile" \
${proftpd_acc_file}
shtool rotate -f \
-n ${proftpd_auth_numfiles} -s ${proftpd_auth_minsize} -d \
-z ${proftpd_auth_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
-P "${proftpd_auth_prolog}" \
- -E "${proftpd_auth_epilog} && rc proftpd restart" \
+ -E "${proftpd_auth_epilog} && echo 1 >$hintfile" \
${proftpd_auth_file}
shtool rotate -f \
-n ${proftpd_sys_numfiles} -s ${proftpd_sys_minsize} -d \
-z ${proftpd_sys_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
-P "${proftpd_sys_prolog}" \
- -E "${proftpd_sys_epilog} && rc proftpd restart" \
+ -E "${proftpd_sys_epilog} && echo 1 >$hintfile" \
${proftpd_sys_file}
shtool rotate -f \
-n ${proftpd_xfer_numfiles} -s ${proftpd_xfer_minsize} -d \
-z ${proftpd_xfer_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
-P "${proftpd_xfer_prolog}" \
- -E "${proftpd_xfer_epilog} && rc proftpd restart" \
+ -E "${proftpd_xfer_epilog} && echo 1 >$hintfile" \
${proftpd_xfer_file}
+ if [ -s $hintfile ]; then
+ rc proftpd restart
+ fi
+ rcTmp -k
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6055 -r1.6056 news.txt
--- openpkg-web/news.txt 6 Aug 2003 14:46:15 -0000 1.6055
+++ openpkg-web/news.txt 6 Aug 2003 14:57:08 -0000 1.6056
@@ -1,3 +1,4 @@
+06-Aug-2003: Upgraded package: P<proftpd-1.2.9rc1-20030806>
06-Aug-2003: Upgraded package: P<xaw3d-1.5-20030806>
06-Aug-2003: Upgraded package: P<openssh-3.5p1-1.2.2>
06-Aug-2003: Upgraded package: P<rt-3.0.4-20030806>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
