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: 24-Jun-2003 15:28:45
Branch: HEAD Handle: 2003062414284301
Modified files:
openpkg-src/sendmail rc.sendmail sendmail.spec
openpkg-web news.txt
Log:
add/unify log file trimming
Summary:
Revision Changes Path
1.8 +15 -30 openpkg-src/sendmail/rc.sendmail
1.72 +1 -1 openpkg-src/sendmail/sendmail.spec
1.4997 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sendmail/rc.sendmail
============================================================================
$ cvs diff -u -r1.7 -r1.8 rc.sendmail
--- openpkg-src/sendmail/rc.sendmail 24 Jun 2003 12:08:08 -0000 1.7
+++ openpkg-src/sendmail/rc.sendmail 24 Jun 2003 13:28:44 -0000 1.8
@@ -35,11 +35,11 @@
sendmail_pidfile_in="@l_prefix@/var/sendmail/sendmail.in.pid"
sendmail_pidfile_out="@l_prefix@/var/sendmail/sendmail.out.pid"
sendmail_pidfile_msp="@l_prefix@/var/sendmail/clientmqueue/sendmail.msp.pid"
- sendmail_rotate_prolog=""
- sendmail_rotate_epilog=""
- sendmail_rotate_numfiles="10"
- sendmail_rotate_minsize="1M"
- sendmail_rotate_complevel="9"
+ sendmail_log_prolog="true"
+ sendmail_log_epilog="true"
+ sendmail_log_numfiles="10"
+ sendmail_log_minsize="1M"
+ sendmail_log_complevel="9"
%common
sendmail_start () {
@@ -91,29 +91,14 @@
sendmail_start
%daily -u @l_susr@
- if opServiceEnabled sendmail; then
- opTmpDirGen sendmail
- opTmpDirFile sendmail hint hintfile
- prolog="true"
- if [ ".$sendmail_rotate_prolog" != . ]; then
- prolog="$prolog; $sendmail_rotate_prolog"
- fi
- epilog="echo 'epilog' >$hintfile"
- if [ ".$sendmail_rotate_epilog" != . ]; then
- epilog="$epilog; $sendmail_rotate_epilog"
- fi
- shtool rotate -f \
- -n${sendmail_rotate_numfiles} -s${sendmail_rotate_minsize} \
- -d -z${sendmail_rotate_complevel} \
- [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
- -P "$prolog" \
- -E "$epilog" \
- @l_prefix@/var/sendmail/sendmail.log
- if [ ".`cat $hintfile`" = ".epilog" ]; then
- sendmail_signal TERM KILL
- sleep 2
- sendmail_start
- fi
- opTmpDirDel sendmail
- fi
+ opServiceEnabled sendmail || exit 0
+ # rotate logfile
+ prolog="$sendmail_log_prolog"
+ epilog="$sendmail_log_epilog && @l_prefix@/etc/rc sendmail restart || true"
+ shtool rotate -f \
+ -n${sendmail_log_numfiles} -s${sendmail_log_minsize} -d \
+ -z${sendmail_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
+ -P "${prolog}" \
+ -E "${epilog}" \
+ @l_prefix@/var/sendmail/sendmail.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sendmail/sendmail.spec
============================================================================
$ cvs diff -u -r1.71 -r1.72 sendmail.spec
--- openpkg-src/sendmail/sendmail.spec 23 Jun 2003 21:01:40 -0000 1.71
+++ openpkg-src/sendmail/sendmail.spec 24 Jun 2003 13:28:44 -0000 1.72
@@ -33,7 +33,7 @@
Group: Mail
License: BSD
Version: 8.12.9
-Release: 20030623
+Release: 20030624
# package options
%option with_fsl yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4996 -r1.4997 news.txt
--- openpkg-web/news.txt 24 Jun 2003 13:28:34 -0000 1.4996
+++ openpkg-web/news.txt 24 Jun 2003 13:28:43 -0000 1.4997
@@ -1,3 +1,4 @@
+24-Jun-2003: Upgraded package: P<sendmail-8.12.9-20030624>
24-Jun-2003: Upgraded package: P<sasl-2.1.13-20030624>
24-Jun-2003: Upgraded package: P<qpopper-4.0.5-20030624>
24-Jun-2003: Upgraded package: P<powerdns-2.9.8-20030624>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
