[exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim…

Góra strony
Delete this message
Reply to this message
Autor: Nigel Metheringham
Data:  
Dla: exim-cvs
Temat: [exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim/exim-src/src exicyclog.src
nm4 2008/01/30 20:09:24 GMT

  Modified files:
    exim-doc/doc-txt     ChangeLog 
    exim-src/src         exicyclog.src 
  Log:
  exicyclog additions.  Fixes: #602


  Revision  Changes    Path
  1.541     +3 -0      exim/exim-doc/doc-txt/ChangeLog
  1.6       +33 -0     exim/exim-src/src/exicyclog.src


  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
  retrieving revision 1.540
  retrieving revision 1.541
  diff -u -r1.540 -r1.541
  --- ChangeLog    28 Jan 2008 18:24:07 -0000    1.540
  +++ ChangeLog    30 Jan 2008 20:09:23 -0000    1.541
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.540 2008/01/28 18:24:07 fanf2 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.541 2008/01/30 20:09:23 nm4 Exp $


Change log file for Exim from version 4.21
-------------------------------------------
@@ -19,6 +19,9 @@

TF/02 Bugzilla 662: Fix stack corruption before exec() in daemon.c.

  +NM/03 Bugzilla 602: exicyclog now handles panic log, and creates empty
  +      log files in place.  Contributed by Roberto Lima
  +


Exim version 4.69
-----------------

  Index: exicyclog.src
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/exicyclog.src,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- exicyclog.src    16 Mar 2006 11:51:10 -0000    1.5
  +++ exicyclog.src    30 Jan 2008 20:09:24 -0000    1.6
  @@ -1,5 +1,5 @@
   #! /bin/sh
  -# $Cambridge: exim/exim-src/src/exicyclog.src,v 1.5 2006/03/16 11:51:10 ph10 Exp $
  +# $Cambridge: exim/exim-src/src/exicyclog.src,v 1.6 2008/01/30 20:09:24 nm4 Exp $


# Copyright (c) 2006 University of Cambridge.
# See the file NOTICE for conditions of use and distribution.
@@ -20,6 +20,8 @@
# COMPRESS_SUFFIX
# CHOWN_COMMAND
# CHGRP_COMMAND
+# CHMOD_COMMAND
+# TOUCH_COMMAND
# MV_COMMAND
# RM_COMMAND

@@ -53,6 +55,8 @@

chown=CHOWN_COMMAND
chgrp=CHGRP_COMMAND
+chmod=CHMOD_COMMAND
+touch=TOUCH_COMMAND
mv=MV_COMMAND
rm=RM_COMMAND

  @@ -183,11 +187,13 @@
     logdir=$spool_directory/log
     mainlog=mainlog
     rejectlog=rejectlog
  +  paniclog=paniclog
   else
     logdir=`echo $log_file_path | sed 's?/[^/]*$??'`
     logbase=`echo $log_file_path | sed 's?^.*/??'`
     mainlog=`echo $logbase | sed 's/%s/main/'`
     rejectlog=`echo $logbase | sed 's/%s/reject/'`
  +  paniclog=`echo $logbase | sed 's/%s/panic/'`
   fi


# Get into the log directory to do the business.
@@ -235,6 +241,9 @@
if [ -f $rejectlog.$keept ]; then $rm $rejectlog.$keept; fi;
if [ -f $rejectlog.$keept.$suffix ]; then $rm $rejectlog.$keept.$suffix; fi;

+if [ -f $paniclog.$keept ]; then $rm $rejectlog.$keept; fi;
+if [ -f $paniclog.$keept.$suffix ]; then $rm $rejectlog.$keept.$suffix; fi;
+
# Now rename all the previous old files by increasing their numbers by 1.
# When the number is less than 10, insert a leading zero.

  @@ -261,6 +270,11 @@
     elif [ -f $rejectlog.$oldt.$suffix ]; then
       $mv $rejectlog.$oldt.$suffix $rejectlog.$countt.$suffix
     fi
  +  if [ -f $paniclog.$oldt ]; then
  +    $mv $paniclog.$oldt $paniclog.$countt
  +  elif [ -f $paniclog.$oldt.$suffix ]; then
  +    $mv $paniclog.$oldt.$suffix $paniclog.$countt.$suffix
  +  fi
     count=$old
     countt=$oldt
   done
  @@ -272,11 +286,25 @@
   if [ -f $mainlog ]; then
     $mv $mainlog $mainlog.$first
     $chown $user:$group $mainlog.$first
  +  $touch $mainlog
  +  $chown $user:$group $mainlog
  +  $chmod 640 $mainlog
   fi


   if [ -f $rejectlog ]; then
     $mv $rejectlog $rejectlog.$first
     $chown $user:$group $rejectlog.$first
  +  $touch $rejectlog
  +  $chown $user:$group $rejectlog
  +  $chmod 640 $rejectlog
  +fi
  +
  +if [ -f $paniclog ]; then
  +  $mv $paniclog $paniclog.$first
  +  $chown $user:$group $rejectlog.$first
  +  $touch $paniclog
  +  $chown $user:$group $paniclog
  +  $chmod 640 $paniclog
   fi


   # Now scan the (0)02 and later files, compressing where necessary, and
  @@ -301,6 +329,11 @@
     if [ -f $rejectlog.$countt.$suffix ]; then
       $chown $user:$group $rejectlog.$countt.$suffix
     fi
  +  if [ -f $paniclog.$countt ]; then $compress $paniclog.$countt; fi
  +  if [ -f $paniclog.$countt.$suffix ]; then
  +    $chown $user:$group $paniclog.$countt.$suffix
  +  fi
  +
     count=`expr $count + 1`
   done