OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 23-Sep-2003 12:13:46
Branch: HEAD Handle: 2003092311134402
Modified files:
openpkg-re/vcheck vc.monit
openpkg-src/monit monit.patch monit.spec
openpkg-web news.txt
Log:
Rewrite patch for new sources, and remove C++ namespace hack due to
vendor improvements in the logging logic
Summary:
Revision Changes Path
1.2 +1 -1 openpkg-re/vcheck/vc.monit
1.4 +73 -38 openpkg-src/monit/monit.patch
1.23 +4 -7 openpkg-src/monit/monit.spec
1.6695 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.monit
============================================================================
$ cvs diff -u -r1.1 -r1.2 vc.monit
--- openpkg-re/vcheck/vc.monit 7 May 2003 11:19:34 -0000 1.1
+++ openpkg-re/vcheck/vc.monit 23 Sep 2003 10:13:44 -0000 1.2
@@ -2,7 +2,7 @@
}
prog monit = {
- version = 3.2
+ version = 4.0
url = http://www.tildeslash.com/monit/dist/
regex = monit-(__VER__)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/monit/monit.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 monit.patch
--- openpkg-src/monit/monit.patch 11 Aug 2003 09:30:46 -0000 1.3
+++ openpkg-src/monit/monit.patch 23 Sep 2003 10:13:46 -0000 1.4
@@ -1,42 +1,87 @@
---- files.c.orig 2003-02-17 12:42:27.000000000 +0100
-+++ files.c 2003-05-07 10:23:58.000000000 +0200
-@@ -143,7 +143,8 @@
+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
+@@ -160,8 +160,8 @@
/**
- * Search the system for the monit control file. Try first
-- * ~/.monitrc, if that fails try ./monitrc and finally /etc/monitrc.
-+ * ~/.monitrc, if that fails try ./monitrc and finally
-+ * @l_prefix@/etc/monit/monitrc.
- * Exit the application if the control file is not found.
- * @return The location of monits control file (monitrc)
+ * 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)
*/
-@@ -169,12 +170,12 @@
+ char *find_rcfile() {
+@@ -177,7 +177,7 @@
}
memset(rcfile, 0, STRLEN);
- snprintf(rcfile, STRLEN, "/etc/%s", MONITRC);
+ snprintf(rcfile, STRLEN, "@l_prefix@/etc/monit/%s", MONITRC);
- if(exist_file(rcfile))
- return (rcfile);
+ if(exist_file(rcfile)) {
+
+@@ -194,7 +194,7 @@
+
+ }
-- log("%s: Cannot find the control file at ~/.%s, ./%s or at /etc/%s\n",
-+ log("%s: Cannot find the control file at ~/.%s, ./%s or at
@l_prefix@/etc/monit/%s\n",
+- 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);
exit(1);
---- monit.1.orig 2003-02-18 15:26:01.000000000 +0100
-+++ monit.1 2003-05-07 10:52:41.000000000 +0200
-@@ -1803,7 +1803,7 @@
- contains a \fImonitrc\fR file, this file is used
- instead.
+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
+@@ -309,7 +309,7 @@
+ .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.
+ .PP
+ A monit control file consists of a series of service entries and
+@@ -435,7 +435,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
+ .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 @@
+ .IX Item "4. monit starts the node group"
+ .PD
+ .PP
+-\&\fBMonit: \f(BI/etc/monitrc\fB\fR
++\&\fBMonit: \f([EMAIL PROTECTED]@/etc/monit/monitrc\fB\fR
+ .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 @@
+ .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
+ \&\fBheartbeat: \f(BI/etc/ha.d/haresources\fB\fR
+ .PP
+@@ -2572,9 +2572,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 either of the
- previous two locations, and /etc contains a
- \fImonitrc\fR file, this file will be used instead.
-@@ -1812,13 +1812,9 @@
+ 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.
+ .PP
+ \&\fI./monitrc\fR
+@@ -2586,14 +2586,10 @@
Lock file to help prevent concurrent runs (non-root
mode).
.PP
@@ -44,21 +89,11 @@
+\&[EMAIL PROTECTED]@/var/monit/monit.pid\fR
Lock file to help prevent concurrent runs (root mode,
Linux systems).
--.PP
+ .PP
-\&\fI/etc/monit.pid\fR
- Lock file to help prevent concurrent runs (root mode,
- systems without /var/run).
- .SH "SIGNALS"
- .IX Header "SIGNALS"
- If a monit daemon is running, \s-1SIGUSR1\s0 wakes it up from its sleep
---- monitor.h.orig Mon Aug 11 11:25:52 2003
-+++ monitor.h Mon Aug 11 11:28:51 2003
-@@ -336,7 +336,7 @@
- int exist_file(char *);
- char *get_ctime();
- char *get_RFC1123date(long *);
--char *get_uptime(long delta);
-+char *get_uptime(time_t delta);
- char *get_process_uptime(char *);
- char *get_md5sum(char *);
- int check_md5(char *, char *);
+-.PP
+ \&\fI~/.monit.state\fR
+ monit save its state to this file and utilize
+ information found in this file to recover from
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/monit/monit.spec
============================================================================
$ cvs diff -u -r1.22 -r1.23 monit.spec
--- openpkg-src/monit/monit.spec 11 Aug 2003 09:30:46 -0000 1.22
+++ openpkg-src/monit/monit.spec 23 Sep 2003 10:13:46 -0000 1.23
@@ -32,8 +32,8 @@
Distribution: OpenPKG [EVAL]
Group: System
License: GPL
-Version: 3.2
-Release: 20030811
+Version: 4.0
+Release: 20030923
# package options
%option with_fsl yes
@@ -69,15 +69,12 @@
%prep
%setup -q
- %patch -p0
+ %patch -p1
%{l_shtool} subst %{l_value -s -a} \
files.c monit.1
%{l_shtool} subst \
- -e 's;piddir=;dummy=;' \
+ -e 's;piddir=;dummy=;g' \
configure
- %{l_shtool} subst \
- -e 's;\([^a-z]\)log(;\1monit_log(;g' \
- `find . -type f -name "*.[chyl]" -print`
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6694 -r1.6695 news.txt
--- openpkg-web/news.txt 23 Sep 2003 08:18:00 -0000 1.6694
+++ openpkg-web/news.txt 23 Sep 2003 10:13:44 -0000 1.6695
@@ -1,3 +1,4 @@
+23-Sep-2003: Upgraded package: P<monit-4.0-20030923>
23-Sep-2003: Upgraded package: P<exim-4.24-20030923>
23-Sep-2003: Upgraded package: P<w3m-0.4.2-20030923>
23-Sep-2003: Upgraded package: P<pgadmin-0.9.3.20030923-20030923>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
