OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web openpkg$ Date:   27-Oct-2003 15:26:56
  Branch: HEAD                             Handle: 2003102714265402

  Modified files:
    openpkg-re/vcheck       vc.monit
    openpkg-src/monit       monit.patch monit.spec
    openpkg-web             news.txt

  Log:
    upgrading package: monit 4.0 -> 4.1

  Summary:
    Revision    Changes     Path
    1.3         +1  -1      openpkg-re/vcheck/vc.monit
    1.5         +14 -14     openpkg-src/monit/monit.patch
    1.25        +3  -3      openpkg-src/monit/monit.spec
    1.7180      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-re/vcheck/vc.monit
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 vc.monit
  --- openpkg-re/vcheck/vc.monit        23 Sep 2003 10:13:44 -0000      1.2
  +++ openpkg-re/vcheck/vc.monit        27 Oct 2003 14:26:54 -0000      1.3
  @@ -2,7 +2,7 @@
   }
   
   prog monit = {
  -  version   = 4.0
  +  version   = 4.1
     url       = http://www.tildeslash.com/monit/dist/
     regex     = monit-(__VER__)\.tar\.gz
   }
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/monit/monit.patch
  ============================================================================
  $ cvs diff -u -r1.4 -r1.5 monit.patch
  --- openpkg-src/monit/monit.patch     23 Sep 2003 10:13:46 -0000      1.4
  +++ openpkg-src/monit/monit.patch     27 Oct 2003 14:26:56 -0000      1.5
  @@ -1,6 +1,6 @@
  -diff -Naur monit-4.0.orig/files.c monit-4.0/files.c
  ---- monit-4.0.orig/files.c   2003-09-03 02:41:57.000000000 +0200
  -+++ monit-4.0/files.c        2003-09-23 10:24:20.000000000 +0200
  +Index: files.c
  +--- files.c.orig     2003-10-25 21:17:10.000000000 +0200
  ++++ files.c  2003-10-27 15:23:38.000000000 +0100
   @@ -160,8 +160,8 @@
    
    /**
  @@ -30,9 +30,9 @@
          prog, MONITRC, MONITRC, MONITRC);
      
      exit(1);
  -diff -Naur monit-4.0.orig/monit.1 monit-4.0/monit.1
  ---- monit-4.0.orig/monit.1   2003-09-22 15:36:43.000000000 +0200
  -+++ monit-4.0/monit.1        2003-09-23 11:47:18.000000000 +0200
  +Index: monit.1
  +--- monit.1.orig     2003-10-27 13:31:11.000000000 +0100
  ++++ monit.1  2003-10-27 15:24:32.000000000 +0100
   @@ -309,7 +309,7 @@
    .IX Header "HOW TO MONITOR"
    monit is configured and controlled via a control file called
  @@ -51,7 +51,7 @@
    .Ve
    After you have modified init's configuration file, you can run
    the following command to re-examine /etc/inittab and start monit:
  -@@ -2436,7 +2436,7 @@
  +@@ -2682,7 +2682,7 @@
    .IX Item "4. monit starts the node group"
    .PD
    .PP
  @@ -60,7 +60,7 @@
    .PP
    This example describes a cluster with 2 nodes. Services running
    on Node 1 are in the group \fInode1\fR and Node 2 services are in
  -@@ -2518,7 +2518,7 @@
  +@@ -2764,7 +2764,7 @@
    .PP
    .Vb 2
    \& #/etc/inittab
  @@ -69,19 +69,19 @@
    .Ve
    \&\fBheartbeat:  \f(BI/etc/ha.d/haresources\fB\fR
    .PP
  -@@ -2572,9 +2572,9 @@
  +@@ -2836,9 +2836,9 @@
    \&\fI~/.monitrc\fR  
       Default run control file
    .PP
   -\&\fI/etc/monitrc\fR
   +\&[EMAIL PROTECTED]@/etc/monit/monitrc\fR
  -    If the control file is not found in the default location and
  --   /etc contains a \fImonitrc\fR file, this file will be used
  -+   @l_prefix@/etc/monit contains a \fImonitrc\fR file, this file will be used
  -    instead.
  +    If the control file is not found in the default 
  +-   location and /etc contains a \fImonitrc\fR file, this
  ++   location and @l_prefix@/etc/monit contains a \fImonitrc\fR file, this
  +    file will be used instead.
    .PP
    \&\fI./monitrc\fR  
  -@@ -2586,14 +2586,10 @@
  +@@ -2851,14 +2851,10 @@
       Lock file to help prevent concurrent runs (non-root
       mode).
    .PP
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/monit/monit.spec
  ============================================================================
  $ cvs diff -u -r1.24 -r1.25 monit.spec
  --- openpkg-src/monit/monit.spec      23 Sep 2003 16:24:36 -0000      1.24
  +++ openpkg-src/monit/monit.spec      27 Oct 2003 14:26:56 -0000      1.25
  @@ -32,8 +32,8 @@
   Distribution: OpenPKG [EVAL]
   Group:        System
   License:      GPL
  -Version:      4.0
  -Release:      20030923
  +Version:      4.1
  +Release:      20031027
   
   #   package options
   %option       with_fsl   yes
  @@ -69,7 +69,7 @@
   
   %prep
       %setup -q
  -    %patch -p1
  +    %patch -p0
       %{l_shtool} subst %{l_value -s -a} \
           files.c monit.1
       %{l_shtool} subst \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.7179 -r1.7180 news.txt
  --- openpkg-web/news.txt      27 Oct 2003 14:25:09 -0000      1.7179
  +++ openpkg-web/news.txt      27 Oct 2003 14:26:54 -0000      1.7180
  @@ -1,3 +1,4 @@
  +27-Oct-2003: Upgraded package: P<monit-4.1-20031027>
   27-Oct-2003: Upgraded package: P<zoem-03.300-20031027>
   27-Oct-2003: Upgraded package: P<openpkg-import-20031027-20031027>
   26-Oct-2003: Upgraded package: P<dia-0.92.1-20031026>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to