Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d23f5fd1214cafd9a6da092149e4b90cc4b16988
commit d23f5fd1214cafd9a6da092149e4b90cc4b16988 Author: CSÉCSY László <[EMAIL PROTECTED]> Date: Sun Jan 20 18:14:18 2008 +0100 monit-4.10.1-1-i686 version bump new m8r, ok by alex@ diff --git a/source/apps-extra/monit/FrugalBuild b/source/apps-extra/monit/FrugalBuild index 090868a..c08dbca 100644 --- a/source/apps-extra/monit/FrugalBuild +++ b/source/apps-extra/monit/FrugalBuild @@ -1,8 +1,9 @@ # Compiling Time: 0.17 SBU -# Maintainer: AlexExtreme <[EMAIL PROTECTED]> +# Maintainer: CSÉCSY László <[EMAIL PROTECTED]> +# Contributor: AlexExtreme <[EMAIL PROTECTED]> pkgname=monit -pkgver=4.9 +pkgver=4.10.1 pkgrel=1 pkgdesc="monit is a utility for managing and monitoring, processes, files, directories and devices on a UNIX system" url="http://www.tildeslash.com/monit"; @@ -11,11 +12,11 @@ groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump 'http://www.tildeslash.com/monit/dist/?C=M;O=A' | Flasttar" source=(http://www.tildeslash.com/monit/dist/$pkgname-$pkgver.tar.gz \ - monit-4.8.1-change-conf-file-path.patch monit-4.8.1-fix-man-page-paths.patch \ + monit-4.10.1-change-conf-file-path.patch monit-4.10.1-fix-man-page-paths.patch \ README.Frugalware) -sha1sums=('a910b07a9ecc7d2803368d7d114df01f4e0916cd' \ - '84361e2f83c1e1d2b931f3e2093ce30af216ab6e' \ - '238ab46b032b9dd4060f11ca719885ff053542c4' \ +sha1sums=('c87aa0c6e0b1d13f46b7e9d84937191e25a907a6' \ + 'b0e0461b3cf128a036d35021c8a4aaa24254a60e' \ + '3abdc3b12942e29fe88d1f8c74ec0105e05d161b' \ '933901884a93535baf97c1a629dca9acec2fc82f') Fconfopts="$Fconfopts --bindir=/usr/sbin" diff --git a/source/apps-extra/monit/monit-4.10.1-change-conf-file-path.patch b/source/apps-extra/monit/monit-4.10.1-change-conf-file-path.patch new file mode 100644 index 0000000..b467553 --- /dev/null +++ b/source/apps-extra/monit/monit-4.10.1-change-conf-file-path.patch @@ -0,0 +1,26 @@ +diff -Naur monit-4.10.1-orig/file.c monit-4.10.1/file.c +--- monit-4.10.1-orig/file.c 2007-08-12 20:02:48.000000000 +0200 ++++ monit-4.10.1/file.c 2007-11-26 12:08:21.000000000 +0100 +@@ -158,6 +158,11 @@ + return (rcfile); + } + memset(rcfile, 0, STRLEN); ++ snprintf(rcfile, STRLEN, "/etc/monit/%s", MONITRC); ++ if(File_exist(rcfile)) { ++ return (rcfile); ++ } ++ memset(rcfile, 0, STRLEN); + snprintf(rcfile, STRLEN, "/etc/%s", MONITRC); + if(File_exist(rcfile)) { + return (rcfile); +@@ -178,8 +183,8 @@ + return (rcfile); + } + LogError("%s: Cannot find the control file at " +- "~/.%s, /etc/%s, %s/%s, /usr/local/etc/%s or at ./%s \n", +- prog, MONITRC, MONITRC, SYSCONFDIR, MONITRC, MONITRC, MONITRC); ++ "~/.%s, /etc/monit/%s, /etc/%s, %s/%s, /usr/local/etc/%s or at ./%s \n", ++ prog, MONITRC, MONITRC, MONITRC, MONITRC, MONITRC, MONITRC); + exit(1); + + } diff --git a/source/apps-extra/monit/monit-4.10.1-fix-man-page-paths.patch b/source/apps-extra/monit/monit-4.10.1-fix-man-page-paths.patch new file mode 100644 index 0000000..47a8f0e --- /dev/null +++ b/source/apps-extra/monit/monit-4.10.1-fix-man-page-paths.patch @@ -0,0 +1,69 @@ +diff -Naur monit-4.10.1-orig/monit.1 monit-4.10.1/monit.1 +--- monit-4.10.1-orig/monit.1 2007-11-06 21:34:52.000000000 +0100 ++++ monit-4.10.1/monit.1 2008-01-20 17:54:37.000000000 +0100 +@@ -307,7 +307,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, then ++this file does not exist, monit will try /etc/monit/monitrc, then + @sysconfdir@/monitrc and finally ./monitrc. + .PP + A monit control file consists of a series of service entries and +@@ -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:/usr/sbin/monit \-Ic /etc/monit/monitrc + .Ve + .PP + After you have modified init's configuration file, you can run +@@ -1749,7 +1749,7 @@ + script. Example: + .PP + .Vb 3 +-\& check file monit.bin with path "/usr/local/bin/monit" ++\& check file monit.bin with path "/usr/sbin/monit" + \& if failed permission 0555 then unmonitor + \& alert [EMAIL PROTECTED] + .Ve +@@ -3600,7 +3600,7 @@ + .IX Item "4. monit starts the node group" + .PD + .PP +-\&\fBMonit: \f(BI/etc/monitrc\fB\fR ++\&\fBMonit: \f(BI/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 +@@ -3691,7 +3691,7 @@ + .PP + .Vb 2 + \& #/etc/inittab +-\& mo:2345:respawn:/usr/local/bin/monit \-d 10 \-c /etc/monitrc \-g local ++\& mo:2345:respawn:/usr/sbin/monit \-d 10 \-c /etc/monit/monitrc \-g local + .Ve + .PP + \&\fBheartbeat: \f(BI/etc/ha.d/haresources\fB\fR +@@ -3714,7 +3714,7 @@ + \& # + \& # sample script for starting/stopping all services on node1 + \& # +-\& prog="/usr/local/bin/monit \-g node1" ++\& prog="/usr/sbin/monit \-g node1" + \& start() + \& { + \& echo \-n $"Starting $prog:" +@@ -3767,9 +3767,9 @@ + \&\fI~/.monitrc\fR + Default run control file + .PP +-\&\fI/etc/monitrc\fR ++\&\fI/etc/monit/monitrc\fR + If the control file is not found in the default +- location and /etc contains a \fImonitrc\fR file, this ++ location and /etc/monit contains a \fImonitrc\fR file, this + file will be used instead. + .PP + \&\fI./monitrc\fR diff --git a/source/apps-extra/monit/monit-4.8.1-change-conf-file-path.patch b/source/apps-extra/monit/monit-4.8.1-change-conf-file-path.patch deleted file mode 100644 index dccb1e8..0000000 --- a/source/apps-extra/monit/monit-4.8.1-change-conf-file-path.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- file-orig.c Tue Apr 5 16:56:26 2005 -+++ file.c Tue Apr 5 16:58:55 2005 -@@ -155,6 +155,11 @@ - return (rcfile); - } - memset(rcfile, 0, STRLEN); -+ snprintf(rcfile, STRLEN, "/etc/monit/%s", MONITRC); -+ if(File_exist(rcfile)) { -+ return (rcfile); -+ } -+ memset(rcfile, 0, STRLEN); - snprintf(rcfile, STRLEN, "/etc/%s", MONITRC); - if(File_exist(rcfile)) { - return (rcfile); -@@ -170,8 +175,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, /etc/monit/%s, /etc/%s, /usr/local/etc/%s or at ./%s \n", -+ prog, MONITRC, MONITRC, MONITRC, MONITRC, MONITRC); - exit(1); - - } diff --git a/source/apps-extra/monit/monit-4.8.1-fix-man-page-paths.patch b/source/apps-extra/monit/monit-4.8.1-fix-man-page-paths.patch deleted file mode 100644 index f6d6152..0000000 --- a/source/apps-extra/monit/monit-4.8.1-fix-man-page-paths.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- monit-orig.1 Tue Apr 5 17:01:31 2005 -+++ monit.1 Tue Apr 5 17:06:07 2005 -@@ -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, then --/usr/local/etc/monitrc and finally ./monitrc. -+this file does not exist, monit will try /etc/monit/monitrc, then -+/etc/monitrc, then /usr/local/etc/monitrc and 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/sbin/monit \-Ic /etc/monit/monitrc - .Ve - .PP - After you have modified init's configuration file, you can run -@@ -1414,7 +1414,7 @@ - script. Example: - .PP - .Vb 3 --\& check file monit.bin with path "/usr/local/bin/monit" -+\& check file monit.bin with path "/usr/sbin/monit" - \& if failed permission 0555 then unmonitor - \& alert [EMAIL PROTECTED] - .Ve -@@ -3219,7 +3219,7 @@ - .IX Item "4. monit starts the node group" - .PD - .PP --\&\fBMonit: \f(BI/etc/monitrc\fB\fR -+\&\fBMonit: \f(BI/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 -@@ -3310,7 +3310,7 @@ - .PP - .Vb 2 - \& #/etc/inittab --\& mo:2345:respawn:/usr/local/bin/monit \-d 10 \-c /etc/monitrc \-g local -+\& mo:2345:respawn:/usr/sbin/monit \-d 10 \-c /etc/monit/monitrc \-g local - .Ve - .PP - \&\fBheartbeat: \f(BI/etc/ha.d/haresources\fB\fR -@@ -3333,7 +3333,7 @@ - \& # - \& # sample script for starting/stopping all services on node1 - \& # --\& prog="/usr/local/bin/monit \-g node1" -+\& prog="/usr/sbin/monit \-g node1" - \& start() - \& { - \& echo \-n $"Starting $prog:" -@@ -3386,9 +3386,9 @@ - \&\fI~/.monitrc\fR - Default run control file - .PP --\&\fI/etc/monitrc\fR -+\&\fI/etc/monit/monitrc\fR - If the control file is not found in the default -- location and /etc contains a \fImonitrc\fR file, this -+ location and /etc/monit contains a \fImonitrc\fR file, this - file will be used instead. - .PP - \&\fI./monitrc\fR -@@ -3493,6 +3493,8 @@ - Rory Toma <[EMAIL PROTECTED]> - .PP - See also http://www.tildeslash.com/monit/who.html -++.PP -++Edited by Stefan Alfredsson <[EMAIL PROTECTED]> for the Debian project. - .SH "COPYRIGHT" - .IX Header "COPYRIGHT" - Copyright (C) 2000\-2005 by the monit project group. All Rights _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
