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: 30-Mar-2005 09:58:17
Branch: HEAD Handle: 2005033008581600
Modified files:
openpkg-src/monit monit.patch monit.spec
Log:
upgrading package: monit 4.4 -> 4.5
Summary:
Revision Changes Path
1.11 +73 -93 openpkg-src/monit/monit.patch
1.47 +3 -3 openpkg-src/monit/monit.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/monit/monit.patch
============================================================================
$ cvs diff -u -r1.10 -r1.11 monit.patch
--- openpkg-src/monit/monit.patch 7 Dec 2004 17:59:16 -0000 1.10
+++ openpkg-src/monit/monit.patch 30 Mar 2005 07:58:16 -0000 1.11
@@ -1,6 +1,6 @@
Index: configure
---- configure.orig 2004-09-23 21:00:29 +0200
-+++ configure 2004-09-24 10:48:14 +0200
+--- configure.orig 2005-03-29 21:34:56 +0200
++++ configure 2005-03-30 09:48:57 +0200
@@ -4004,6 +4004,7 @@
@@ -9,60 +9,68 @@
alloca.h \
arpa/inet.h \
asm/page.h \
-Index: files.c
---- files.c.orig 2004-06-11 20:37:25 +0200
-+++ files.c 2004-09-24 10:48:14 +0200
-@@ -160,8 +160,8 @@
-
- /**
- * Search the system for the monit control file. Try first ~/.monitrc,
-- * if that fails try /etc/monitrc and finally ./monitrc. Exit the
-- * application if the control file is not found.
-+ * if that fails try @l_prefix@/etc/monit/monitrc and finally ./monitrc.
-+ * Exit the application if the control file is not found.
- * @return The location * of monits control file (monitrc)
- */
- char *find_rcfile() {
-@@ -177,7 +177,7 @@
+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 @@
+ }
+ /* Set the location of the programs state file */
+ if(Run.statefile == NULL) {
++ if(!getuid())
++ snprintf(statefile, STRLEN, "%s/%s", MYSTATEDIR, MYSTATEFILE);
++ else
+ snprintf(statefile, STRLEN, "%s/.%s", Run.Env.home, MYSTATEFILE);
+ Run.statefile= xstrdup(statefile);
+ }
+@@ -155,12 +158,7 @@
+ return (rcfile);
}
-
memset(rcfile, 0, STRLEN);
- snprintf(rcfile, STRLEN, "/etc/%s", 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(exist_file(rcfile)) {
-
-@@ -194,7 +194,7 @@
-
+ if(File_exist(rcfile)) {
+ return (rcfile);
}
-
-- log("%s: Cannot find the control file at ~/.%s, /etc/%s or at ./%s \n",
-+ log("%s: Cannot find the control file at ~/.%s, @l_prefix@/etc/monit/%s
or at ./%s \n",
- prog, MONITRC, MONITRC, MONITRC);
-
+@@ -170,8 +168,8 @@
+ return (rcfile);
+ }
+ log("%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);
exit(1);
+
+ }
Index: monit.1
---- monit.1.orig 2004-09-23 21:00:25 +0200
-+++ monit.1 2004-09-24 10:48:14 +0200
-@@ -301,7 +301,7 @@
+--- monit.1.orig 2005-03-29 21:34:53 +0200
++++ monit.1 2005-03-30 09:56:45 +0200
+@@ -301,8 +301,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 and finally
-+this file does not exist, monit will try @l_prefix@/etc/monit/monitrc and
finally
- \&./monitrc.
+-this file does not exist, monit will try /etc/monitrc, then
+-/usr/local/etc/monitrc and finally ./monitrc.
++this file does not exist, monit will try @l_prefix@/etc/monit/monitrc, then
++finally ./monitrc.
.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 @@
.PP
.Vb 2
- \& # Run monit in standard run-levels
--\& mo:2345:respawn:/usr/local/bin/monit -Ic /etc/monitrc
-+\& mo:2345:respawn:/usr/local/bin/monit -Ic @l_prefix@/etc/monit/monitrc
+ \& # Run monit in standard run\-levels
+-\& mo:2345:respawn:/usr/local/bin/monit \-Ic /etc/monitrc
++\& mo:2345:respawn:@l_prefix@/bin/monit \-Ic @l_prefix@/etc/monit/monitrc
.Ve
.PP
After you have modified init's configuration file, you can run
-@@ -3000,7 +3000,7 @@
+@@ -3219,7 +3219,7 @@
.IX Item "4. monit starts the node group"
.PD
.PP
@@ -71,16 +79,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
-@@ -3091,7 +3091,7 @@
- .PP
- .Vb 2
- \& #/etc/inittab
--\& mo:2345:respawn:/usr/local/bin/monit -d 10 -c /etc/monitrc -g local
-+\& mo:2345:respawn:/usr/local/bin/monit -d 10 -c
@l_prefix@/etc/monit/monitrc -g local
- .Ve
- .PP
- \&\fBheartbeat: \f(BI/etc/ha.d/haresources\fB\fR
-@@ -3167,9 +3167,9 @@
+@@ -3386,9 +3386,9 @@
\&\fI~/.monitrc\fR
Default run control file
.PP
@@ -92,7 +91,7 @@
file will be used instead.
.PP
\&\fI./monitrc\fR
-@@ -3182,14 +3182,10 @@
+@@ -3401,14 +3401,10 @@
Lock file to help prevent concurrent runs (non\-root
mode).
.PP
@@ -108,34 +107,10 @@
\&\fI~/.monit.state\fR
monit save its state to this file and utilize
information found in this file to recover from
-Index: sendmail.c
---- sendmail.c.orig 2004-07-15 21:08:09 +0200
-+++ sendmail.c 2004-09-24 10:48:14 +0200
-@@ -144,7 +144,7 @@
- do_send(&S, "\r\n");
- do_send(&S, "%s\r\n", m->message);
- if(m->opt_message) {
-- do_send(&S, "%s\r\n", m->opt_message);
-+ do_send(&S, "\r\n%s\r\n", m->opt_message);
- }
- do_send(&S, ".\r\n");
- do_status(&S);
-Index: process/sysdep_LINUX.c
---- process/sysdep_LINUX.c.orig 2004-09-11 21:07:35 +0200
-+++ process/sysdep_LINUX.c 2004-10-11 17:17:45 +0200
-@@ -70,6 +70,8 @@
- #include <glob.h>
- #endif
-
-+#include <errno.h>
-+
- #include "monitor.h"
- #include "process.h"
- #include "process_sysdep.h"
Index: monitor.h
---- monitor.h.orig 2004-09-10 21:13:58 +0200
-+++ monitor.h 2004-12-07 18:54:11 +0100
-@@ -71,6 +71,7 @@
+--- monitor.h.orig 2005-02-24 21:44:00 +0100
++++ monitor.h 2005-03-30 09:49:22 +0200
+@@ -76,6 +76,7 @@
#define MYPIDMASK 0122
#define MYPIDDIR PIDDIR
#define MYPIDFILE "monit.pid"
@@ -143,22 +118,27 @@
#define MYSTATEFILE "monit.state"
#define LOCALHOST "localhost"
-Index: files.c
---- files.c.orig 2004-12-07 18:51:17 +0100
-+++ files.c 2004-12-07 18:55:04 +0100
-@@ -102,7 +102,15 @@
- /* Set the location of the programs state file */
- if(Run.statefile == NULL) {
+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
+@@ -74,6 +74,8 @@
+ #include <glob.h>
+ #endif
-+ if(! getuid()) {
-+
-+ snprintf(statefile, STRLEN, "%s/%s", MYSTATEDIR, MYSTATEFILE);
-+
-+ } else {
-+
- snprintf(statefile, STRLEN, "%s/.%s", Run.Env.home, MYSTATEFILE);
++#include <errno.h>
+
-+ }
-
- Run.statefile= xstrdup(statefile);
-
+ #include "monitor.h"
+ #include "process.h"
+ #include "process_sysdep.h"
+Index: sendmail.c
+--- sendmail.c.orig 2005-02-20 00:52:19 +0100
++++ sendmail.c 2005-03-30 09:49:22 +0200
+@@ -140,7 +140,7 @@
+ do_send(&S, "\r\n");
+ do_send(&S, "%s\r\n", m->message);
+ if(m->opt_message) {
+- do_send(&S, "%s\r\n", m->opt_message);
++ do_send(&S, "\r\n%s\r\n", m->opt_message);
+ }
+ do_send(&S, ".\r\n");
+ do_status(&S);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/monit/monit.spec
============================================================================
$ cvs diff -u -r1.46 -r1.47 monit.spec
--- openpkg-src/monit/monit.spec 24 Mar 2005 11:19:30 -0000 1.46
+++ openpkg-src/monit/monit.spec 30 Mar 2005 07:58:16 -0000 1.47
@@ -32,8 +32,8 @@
Class: PLUS
Group: System
License: GPL
-Version: 4.4
-Release: 20041207
+Version: 4.5
+Release: 20050330
# package options
%option with_fsl yes
@@ -79,7 +79,7 @@
%setup -q
%patch -p0
%{l_shtool} subst %{l_value -s -a} \
- files.c monit.1
+ file.c monit.1
%{l_shtool} subst \
-e 's;piddir=;dummy=;g' \
configure
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
