Bladeren bron

upgrading package: monit 4.7 -> 4.8

Ralf S. Engelschall 19 jaren geleden
bovenliggende
commit
5e2cad6891
2 gewijzigde bestanden met toevoegingen van 26 en 26 verwijderingen
  1. 24 24
      monit/monit.patch
  2. 2 2
      monit/monit.spec

+ 24 - 24
monit/monit.patch

@@ -1,7 +1,7 @@
 Index: configure
---- configure.orig	2005-03-29 21:34:56 +0200
-+++ configure	2005-03-30 09:48:57 +0200
-@@ -4004,6 +4004,7 @@
+--- configure.orig	2006-05-03 23:17:39 +0200
++++ configure	2006-05-04 10:27:59 +0200
+@@ -4005,6 +4005,7 @@
  
  
  for ac_header in  \
@@ -10,9 +10,9 @@ Index: configure
  	arpa/inet.h \
  	asm/page.h \
 Index: file.c
---- file.c.orig	2005-01-28 21:19:14 +0100
-+++ file.c	2005-03-30 09:55:42 +0200
-@@ -93,6 +93,9 @@
+--- file.c.orig	2006-04-27 22:16:03 +0200
++++ file.c	2006-05-04 10:29:39 +0200
+@@ -97,6 +97,9 @@
    }
    /* Set the location of the programs state file */
    if(Run.statefile == NULL) {
@@ -22,7 +22,7 @@ Index: file.c
      snprintf(statefile, STRLEN, "%s/.%s", Run.Env.home, MYSTATEFILE);
      Run.statefile= xstrdup(statefile);
    }
-@@ -155,12 +158,7 @@
+@@ -159,12 +162,7 @@
      return (rcfile);
    }
    memset(rcfile, 0, STRLEN);
@@ -36,21 +36,21 @@ Index: file.c
    if(File_exist(rcfile)) {
      return (rcfile);
    }
-@@ -170,8 +168,8 @@
+@@ -174,8 +172,8 @@
      return (rcfile);
    }
-   log("%s: Cannot find the control file at "
+   LogError("%s: Cannot find the control file at "
 -      "~/.%s, /etc/%s, /usr/local/etc/%s or at ./%s \n",
 -      prog, MONITRC, MONITRC, MONITRC, MONITRC);
-+      "~/.%s, @l_prefix@/etc/monit/%s, or at ./%s \n",
-+      prog, MONITRC, MONITRC, MONITRC);
++       "~/.%s, @l_prefix@/etc/monit/%s, or at ./%s \n",
++       prog, MONITRC, MONITRC, MONITRC);
    exit(1);
    
  }
 Index: monit.1
---- monit.1.orig	2005-03-29 21:34:53 +0200
-+++ monit.1	2005-03-30 09:56:45 +0200
-@@ -301,8 +301,8 @@
+--- monit.1.orig	2006-05-03 23:17:35 +0200
++++ monit.1	2006-05-04 10:27:59 +0200
+@@ -307,8 +307,8 @@
  .IX Header "HOW TO MONITOR"
  monit is configured and controlled via a control file called
  \&\fBmonitrc\fR. The default location for this file is ~/.monitrc. If
@@ -61,7 +61,7 @@ Index: monit.1
  .PP
  A monit control file consists of a series of service entries and
  global option statements in a free\-format, token-oriented syntax.
-@@ -445,7 +445,7 @@
+@@ -465,7 +465,7 @@
  .PP
  .Vb 2
  \&  # Run monit in standard run\-levels
@@ -70,7 +70,7 @@ Index: monit.1
  .Ve
  .PP
  After you have modified init's configuration file, you can run
-@@ -3219,7 +3219,7 @@
+@@ -3511,7 +3511,7 @@
  .IX Item "4. monit starts the node group"
  .PD
  .PP
@@ -79,7 +79,7 @@ Index: monit.1
  .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
-@@ -3386,9 +3386,9 @@
+@@ -3678,9 +3678,9 @@
  \&\fI~/.monitrc\fR  
     Default run control file
  .PP
@@ -91,7 +91,7 @@ Index: monit.1
     file will be used instead.
  .PP
  \&\fI./monitrc\fR  
-@@ -3401,14 +3401,10 @@
+@@ -3693,14 +3693,10 @@
     Lock file to help prevent concurrent runs (non\-root
     mode).
  .PP
@@ -108,19 +108,19 @@ Index: monit.1
     monit save its state to this file and utilize 
     information found in this file to recover from 
 Index: monitor.h
---- monitor.h.orig	2005-02-24 21:44:00 +0100
-+++ monitor.h	2005-03-30 09:49:22 +0200
-@@ -76,6 +76,7 @@
+--- monitor.h.orig	2006-04-27 22:52:31 +0200
++++ monitor.h	2006-05-04 10:27:59 +0200
+@@ -82,6 +82,7 @@
  #define MYPIDMASK          0122
  #define MYPIDDIR           PIDDIR
  #define MYPIDFILE          "monit.pid"
 +#define MYSTATEDIR         PIDDIR
  #define MYSTATEFILE        "monit.state"
+ #define MYEVENTLISTBASE    "/var/monit"
  
- #define LOCALHOST          "localhost"
 Index: process/sysdep_LINUX.c
---- process/sysdep_LINUX.c.orig	2005-02-20 10:23:50 +0100
-+++ process/sysdep_LINUX.c	2005-03-30 09:49:22 +0200
+--- process/sysdep_LINUX.c.orig	2006-04-27 22:16:03 +0200
++++ process/sysdep_LINUX.c	2006-05-04 10:27:59 +0200
 @@ -74,6 +74,8 @@
  #include <glob.h>
  #endif

+ 2 - 2
monit/monit.spec

@@ -32,8 +32,8 @@ Distribution: OpenPKG
 Class:        BASE
 Group:        System
 License:      GPL
-Version:      4.7
-Release:      20060112
+Version:      4.8
+Release:      20060504
 
 #   package options
 %option       with_fsl   yes