OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Nov-2007 08:25:36
Branch: HEAD Handle: 2007110607253401
Modified files:
openpkg-src/monit monit.patch monit.spec
Log:
upgrading package: monit 4.9 -> 4.10
Summary:
Revision Changes Path
1.14 +30 -25 openpkg-src/monit/monit.patch
1.67 +2 -2 openpkg-src/monit/monit.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/monit/monit.patch
============================================================================
$ cvs diff -u -r1.13 -r1.14 monit.patch
--- openpkg-src/monit/monit.patch 4 May 2006 08:32:06 -0000 1.13
+++ openpkg-src/monit/monit.patch 6 Nov 2007 07:25:34 -0000 1.14
@@ -1,7 +1,7 @@
Index: configure
---- configure.orig 2006-05-03 23:17:39 +0200
-+++ configure 2006-05-04 10:27:59 +0200
-@@ -4005,6 +4005,7 @@
+--- configure.orig 2007-11-05 21:23:27 +0100
++++ configure 2007-11-06 08:16:00 +0100
+@@ -4502,6 +4502,7 @@
for ac_header in \
@@ -10,9 +10,9 @@
arpa/inet.h \
asm/page.h \
Index: file.c
---- file.c.orig 2006-04-27 22:16:03 +0200
-+++ file.c 2006-05-04 10:29:39 +0200
-@@ -97,6 +97,9 @@
+--- file.c.orig 2007-08-12 20:02:48 +0200
++++ file.c 2007-11-06 08:23:25 +0100
+@@ -96,6 +96,9 @@
}
/* Set the location of the programs state file */
if(Run.statefile == NULL) {
@@ -22,7 +22,7 @@
snprintf(statefile, STRLEN, "%s/.%s", Run.Env.home, MYSTATEFILE);
Run.statefile= xstrdup(statefile);
}
-@@ -159,12 +162,7 @@
+@@ -158,17 +161,7 @@
return (rcfile);
}
memset(rcfile, 0, STRLEN);
@@ -31,31 +31,36 @@
- return (rcfile);
- }
- memset(rcfile, 0, STRLEN);
+- snprintf(rcfile, STRLEN, "%s/%s", SYSCONFDIR, MONITRC);
+- if(File_exist(rcfile)) {
+- return (rcfile);
+- }
+- memset(rcfile, 0, STRLEN);
- snprintf(rcfile, STRLEN, "/usr/local/etc/%s", MONITRC);
+ snprintf(rcfile, STRLEN, "@l_prefix@/etc/monit/%s", MONITRC);
if(File_exist(rcfile)) {
return (rcfile);
}
-@@ -174,8 +172,8 @@
+@@ -178,8 +171,8 @@
return (rcfile);
}
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, /etc/%s, %s/%s, /usr/local/etc/%s or at ./%s \n",
+- prog, MONITRC, MONITRC, SYSCONFDIR, 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 2006-05-03 23:17:35 +0200
-+++ monit.1 2006-05-04 10:27:59 +0200
+--- monit.1.orig 2007-11-05 21:23:23 +0100
++++ monit.1 2007-11-06 08:24:04 +0100
@@ -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
-this file does not exist, monit will try /etc/monitrc, then
--/usr/local/etc/monitrc and finally ./monitrc.
[EMAIL PROTECTED]@/monitrc and finally ./monitrc.
+this file does not exist, monit will try @l_prefix@/etc/monit/monitrc, then
+finally ./monitrc.
.PP
@@ -70,7 +75,7 @@
.Ve
.PP
After you have modified init's configuration file, you can run
-@@ -3511,7 +3511,7 @@
+@@ -3600,7 +3600,7 @@
.IX Item "4. monit starts the node group"
.PD
.PP
@@ -79,7 +84,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
-@@ -3678,9 +3678,9 @@
+@@ -3767,9 +3767,9 @@
\&\fI~/.monitrc\fR
Default run control file
.PP
@@ -91,7 +96,7 @@
file will be used instead.
.PP
\&\fI./monitrc\fR
-@@ -3693,14 +3693,10 @@
+@@ -3782,14 +3782,10 @@
Lock file to help prevent concurrent runs (non\-root
mode).
.PP
@@ -108,9 +113,9 @@
monit save its state to this file and utilize
information found in this file to recover from
Index: monitor.h
---- monitor.h.orig 2006-04-27 22:52:31 +0200
-+++ monitor.h 2006-05-04 10:27:59 +0200
-@@ -82,6 +82,7 @@
+--- monitor.h.orig 2007-10-16 21:10:43 +0200
++++ monitor.h 2007-11-06 08:16:00 +0100
+@@ -85,6 +85,7 @@
#define MYPIDMASK 0122
#define MYPIDDIR PIDDIR
#define MYPIDFILE "monit.pid"
@@ -119,10 +124,10 @@
#define MYEVENTLISTBASE "/var/monit"
Index: process/sysdep_LINUX.c
---- 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>
+--- process/sysdep_LINUX.c.orig 2007-07-29 22:23:26 +0200
++++ process/sysdep_LINUX.c 2007-11-06 08:16:00 +0100
+@@ -77,6 +77,8 @@
+ # define HZ sysconf(_SC_CLK_TCK)
#endif
+#include <errno.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/monit/monit.spec
============================================================================
$ cvs diff -u -r1.66 -r1.67 monit.spec
--- openpkg-src/monit/monit.spec 27 Oct 2007 11:59:37 -0000 1.66
+++ openpkg-src/monit/monit.spec 6 Nov 2007 07:25:35 -0000 1.67
@@ -32,8 +32,8 @@
Class: BASE
Group: Monitoring
License: GPL
-Version: 4.9
-Release: 20071027
+Version: 4.10
+Release: 20071106
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
