OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 16-Apr-2009 22:04:40
Branch: HEAD Handle: 2009041621044000
Modified files:
openpkg-src/monit monit.patch monit.spec
Log:
upgrading package: monit 4.10.1 -> 5.0
Summary:
Revision Changes Path
1.15 +26 -55 openpkg-src/monit/monit.patch
1.70 +5 -5 openpkg-src/monit/monit.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/monit/monit.patch
============================================================================
$ cvs diff -u -r1.14 -r1.15 monit.patch
--- openpkg-src/monit/monit.patch 6 Nov 2007 07:25:34 -0000 1.14
+++ openpkg-src/monit/monit.patch 16 Apr 2009 20:04:40 -0000 1.15
@@ -1,7 +1,7 @@
Index: configure
---- configure.orig 2007-11-05 21:23:27 +0100
-+++ configure 2007-11-06 08:16:00 +0100
-@@ -4502,6 +4502,7 @@
+--- configure.orig 2009-04-15 20:21:29 +0200
++++ configure 2009-04-16 21:42:35 +0200
+@@ -4572,6 +4572,7 @@
for ac_header in \
@@ -10,19 +10,19 @@
arpa/inet.h \
asm/page.h \
Index: file.c
---- 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 */
+--- file.c.orig 2009-02-13 14:06:31 +0100
++++ file.c 2009-04-16 21:43:43 +0200
+@@ -115,6 +115,9 @@
+
+ /* Set the location of monit's state file */
if(Run.statefile == NULL) {
+ if(!getuid())
-+ snprintf(statefile, STRLEN, "%s/%s", MYSTATEDIR, MYSTATEFILE);
++ snprintf(buf, STRLEN, "%s/%s", MYSTATEDIR, MYSTATEFILE);
+ else
- snprintf(statefile, STRLEN, "%s/.%s", Run.Env.home, MYSTATEFILE);
- Run.statefile= xstrdup(statefile);
+ snprintf(buf, STRLEN, "%s/.%s", Run.Env.home, MYSTATEFILE);
+ Run.statefile= xstrdup(buf);
}
-@@ -158,17 +161,7 @@
+@@ -186,17 +189,7 @@
return (rcfile);
}
memset(rcfile, 0, STRLEN);
@@ -41,7 +41,7 @@
if(File_exist(rcfile)) {
return (rcfile);
}
-@@ -178,8 +171,8 @@
+@@ -206,8 +199,8 @@
return (rcfile);
}
LogError("%s: Cannot find the control file at "
@@ -53,38 +53,9 @@
}
Index: monit.1
---- 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
-...@sysconfdir@/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.
-@@ -465,7 +465,7 @@
- .PP
- .Vb 2
- \& # 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
-@@ -3600,7 +3600,7 @@
- .IX Item "4. monit starts the node group"
- .PD
- .PP
--\&\fBMonit: \f(BI/etc/monitrc\fB\fR
-+\&\fBMonit: \f(b...@l_prefix@/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
-@@ -3767,9 +3767,9 @@
+--- monit.1.orig 2009-04-15 20:21:25 +0200
++++ monit.1 2009-04-16 21:42:35 +0200
+@@ -3662,9 +3662,9 @@
\&\fI~/.monitrc\fR
Default run control file
.PP
@@ -96,8 +67,8 @@
file will be used instead.
.PP
\&\fI./monitrc\fR
-@@ -3782,14 +3782,10 @@
- Lock file to help prevent concurrent runs (non\-root
+@@ -3677,14 +3677,10 @@
+ Lock file to help prevent concurrent runs (non-root
mode).
.PP
-\&\fI/var/run/monit.pid\fR
@@ -110,23 +81,23 @@
- systems without /var/run).
-.PP
\&\fI~/.monit.state\fR
- monit save its state to this file and utilize
+ Monit save its state to this file and utilize
information found in this file to recover from
Index: monitor.h
---- monitor.h.orig 2007-10-16 21:10:43 +0200
-+++ monitor.h 2007-11-06 08:16:00 +0100
-@@ -85,6 +85,7 @@
+--- monitor.h.orig 2009-04-12 10:16:37 +0200
++++ monitor.h 2009-04-16 21:42:35 +0200
+@@ -102,6 +102,7 @@
#define MYPIDMASK 0122
#define MYPIDDIR PIDDIR
#define MYPIDFILE "monit.pid"
+#define MYSTATEDIR PIDDIR
#define MYSTATEFILE "monit.state"
+ #define MYIDFILE "monit.id"
#define MYEVENTLISTBASE "/var/monit"
-
Index: process/sysdep_LINUX.c
---- 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 @@
+--- process/sysdep_LINUX.c.orig 2009-02-28 21:56:48 +0100
++++ process/sysdep_LINUX.c 2009-04-16 21:42:35 +0200
+@@ -88,6 +88,8 @@
# define HZ sysconf(_SC_CLK_TCK)
#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/monit/monit.spec
============================================================================
$ cvs diff -u -r1.69 -r1.70 monit.spec
--- openpkg-src/monit/monit.spec 1 Jan 2008 14:59:02 -0000 1.69
+++ openpkg-src/monit/monit.spec 16 Apr 2009 20:04:40 -0000 1.70
@@ -24,22 +24,22 @@
# package information
Name: monit
Summary: Service Monitoring Daemon
-URL: http://www.tildeslash.com/monit/
+URL: http://mmonit.com/monit/
Vendor: Jan-Henrik Haukeland et al.
Packager: OpenPKG Foundation e.V.
Distribution: OpenPKG Community
Class: BASE
Group: Monitoring
License: GPL
-Version: 4.10.1
-Release: 20080101
+Version: 5.0
+Release: 20090416
# package options
%option with_fsl yes
%option with_ssl no
# list of sources
-Source0: http://www.tildeslash.com/monit/dist/monit-%{version}.tar.gz
+Source0: http://mmonit.com/monit/dist/monit-%{version}.tar.gz
Source1: rc.monit
Source2: fsl.monit
Source3: monitrc
@@ -69,7 +69,7 @@
%track
prog monit = {
version = %{version}
- url = http://www.tildeslash.com/monit/dist/
+ url = http://mmonit.com/monit/dist/
regex = monit-(__VER__)\.tar\.gz
}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
