pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/monit Initial import of monit 4.9.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8f5c693f772d
branches:  trunk
changeset: 528370:8f5c693f772d
user:      heinz <heinz%pkgsrc.org@localhost>
date:      Mon Apr 30 20:53:46 2007 +0000

description:
Initial import of monit 4.9.

Monit is a utility for managing and monitoring, processes, files,
directories and devices on a UNIX system. Monit conducts automatic
maintenance and repair and can execute meaningful causal actions in
error situations.

diffstat:

 sysutils/monit/DESCR                    |     4 +
 sysutils/monit/Makefile                 |    79 +
 sysutils/monit/PLIST                    |    27 +
 sysutils/monit/distinfo                 |    13 +
 sysutils/monit/files/monit-rc-script.sh |    36 +
 sysutils/monit/patches/patch-aa         |    20 +
 sysutils/monit/patches/patch-ab         |    15 +
 sysutils/monit/patches/patch-ac         |    15 +
 sysutils/monit/patches/patch-ad         |    39 +
 sysutils/monit/patches/patch-ae         |  3900 +++++++++++++++++++++++++++++++
 sysutils/monit/patches/patch-af         |    16 +
 sysutils/monit/patches/patch-ag         |    15 +
 sysutils/monit/patches/patch-ah         |    23 +
 13 files changed, 4202 insertions(+), 0 deletions(-)

diffs (truncated from 4254 to 300 lines):

diff -r 201dcdd94fd8 -r 8f5c693f772d sysutils/monit/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/monit/DESCR      Mon Apr 30 20:53:46 2007 +0000
@@ -0,0 +1,4 @@
+Monit is a utility for managing and monitoring, processes, files,
+directories and devices on a UNIX system. Monit conducts automatic
+maintenance and repair and can execute meaningful causal actions in
+error situations.
diff -r 201dcdd94fd8 -r 8f5c693f772d sysutils/monit/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/monit/Makefile   Mon Apr 30 20:53:46 2007 +0000
@@ -0,0 +1,79 @@
+# $NetBSD: Makefile,v 1.1.1.1 2007/04/30 20:53:46 heinz Exp $
+#
+
+DISTNAME=              monit-4.9
+CATEGORIES=            sysutils
+MASTER_SITES=          http://www.tildeslash.com/monit/dist/
+
+MAINTAINER=            heinz%NetBSD.org@localhost
+HOMEPAGE=              http://www.tildeslash.com/monit/
+COMMENT=               Utility for monitoring processes, files, directories and devices
+
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+# no platform specific code yet
+NOT_FOR_PLATFORM+=     BSDOS-*-* DragonFly-*-* Interix-*-* IRIX-*-* OSF1-*-*
+
+USE_TOOLS+=            gmake flex yacc pax
+USE_PKGLOCALEDIR=      yes
+GNU_CONFIGURE=         yes
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.monit
+PKG_SUPPORTED_OPTIONS= ssl
+PKG_SUGGESTED_OPTIONS= ssl
+
+.include "../../mk/bsd.options.mk"
+.if empty(PKG_OPTIONS:Mssl)
+CONFIGURE_ARGS+=       --without-ssl
+.endif
+CONFIGURE_ARGS+=       --with-ssl-dir=${SSLBASE:Q}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
+PKG_SYSCONFSUBDIR=     monit
+
+RCD_SCRIPTS=           monit
+RCD_SCRIPT_SRC.monit=   ${FILESDIR}/monit-rc-script.sh
+
+CONF_FILES=            ${EGDIR}/monitrc.sample ${PKG_SYSCONFDIR}/monitrc
+CONF_FILES_MODE=       0600
+
+OWN_DIRS+=             ${PKG_SYSCONFDIR}/monit.d
+
+DOC_SUBDIR=            share/docs/monit
+DOCDIR=                        ${PREFIX}/${DOC_SUBDIR}
+EG_SUBDIR=             share/examples/monit
+EGDIR=                 ${PREFIX}/${EG_SUBDIR}
+
+M_DOCFILES=            CHANGES.txt CONTRIBUTORS COPYING FAQ.txt LICENSE
+M_DOCFILES+=           PACKAGES PLATFORMS README README.SSL STATUS UPGRADE.txt
+
+SUBST_CLASSES+=                monit
+SUBST_STAGE.monit=     pre-configure
+SUBST_MESSAGE.monit=   Setting daemon interval
+SUBST_FILES.monit=     monitrc
+SUBST_SED.monit=       -e "s|^\# *set *daemon|set daemon|"
+SUBST_SED.monit+=      -e "s|include */etc/monit.d|include ${PKG_SYSCONFDIR}/monit.d|"
+
+post-extract:
+       ${MV} -f ${WRKSRC}/monit.1 ${WRKSRC}/monit.1.obsolete
+       cd ${WRKSRC}/contrib && ${PAX} -zrf monit-OSX-startup.tar.gz
+
+post-install:
+       ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+.for f in ${M_DOCFILES}
+       ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}
+.endfor
+       ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}/MacOSX
+       ${INSTALL_DATA} ${WRKSRC}/monitrc ${DESTDIR}${EGDIR}/monitrc.sample
+       ${INSTALL_DATA} ${WRKSRC}/contrib/monit.php ${DESTDIR}${EGDIR}/
+       ${INSTALL_DATA} ${WRKSRC}/contrib/monitrc-gentoo ${DESTDIR}${EGDIR}/
+       ${INSTALL_DATA} ${WRKSRC}/contrib/wap.php ${DESTDIR}${EGDIR}/
+.for f in README StartupParameters.plist monit monit.plist monitrc
+       ${INSTALL_DATA} ${WRKSRC}/contrib/monit/${f} ${DESTDIR}${EGDIR}/MacOSX
+.endfor
+
+
+
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r 201dcdd94fd8 -r 8f5c693f772d sysutils/monit/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/monit/PLIST      Mon Apr 30 20:53:46 2007 +0000
@@ -0,0 +1,27 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2007/04/30 20:53:46 heinz Exp $
+bin/monit
+man/man1/monit.1
+share/docs/monit/CHANGES.txt
+share/docs/monit/CONTRIBUTORS
+share/docs/monit/COPYING
+share/docs/monit/FAQ.txt
+share/docs/monit/LICENSE
+share/docs/monit/PACKAGES
+share/docs/monit/PLATFORMS
+share/docs/monit/README
+share/docs/monit/README.SSL
+share/docs/monit/STATUS
+share/docs/monit/UPGRADE.txt
+share/examples/monit/monitrc.sample
+share/examples/monit/monit.php
+share/examples/monit/monitrc-gentoo
+share/examples/monit/wap.php
+share/examples/monit/MacOSX/README
+share/examples/monit/MacOSX/StartupParameters.plist
+share/examples/monit/MacOSX/monit
+share/examples/monit/MacOSX/monit.plist
+share/examples/monit/MacOSX/monitrc
+share/examples/rc.d/monit
+@dirrm share/docs/monit
+@dirrm share/examples/monit/MacOSX
+@dirrm share/examples/monit
diff -r 201dcdd94fd8 -r 8f5c693f772d sysutils/monit/distinfo
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/monit/distinfo   Mon Apr 30 20:53:46 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: distinfo,v 1.1.1.1 2007/04/30 20:53:46 heinz Exp $
+
+SHA1 (monit-4.9.tar.gz) = a910b07a9ecc7d2803368d7d114df01f4e0916cd
+RMD160 (monit-4.9.tar.gz) = 5c9c9ac48d22d327818253122418e9b4c7f12587
+Size (monit-4.9.tar.gz) = 573711 bytes
+SHA1 (patch-aa) = 11d458ca0e8a4047b45651ead153d4acc167d462
+SHA1 (patch-ab) = d97d12c660d170dbd527d5055c2149faf8197838
+SHA1 (patch-ac) = 606529cf1b739591da6ed021866e5390dc9fed9e
+SHA1 (patch-ad) = a4d9464bf6c9ed6ab6f725339787fb4308735fb5
+SHA1 (patch-ae) = 0e782ca1cf00a6bdb4edd1761761833ff988b554
+SHA1 (patch-af) = dc51bf856e7a6747c51ba8385c7ccd15dc26964e
+SHA1 (patch-ag) = 8c4a29764732f4b7f1ebd05f9390448af07b1797
+SHA1 (patch-ah) = 9e9951aec935b242219164d9f7206d417a189679
diff -r 201dcdd94fd8 -r 8f5c693f772d sysutils/monit/files/monit-rc-script.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/monit/files/monit-rc-script.sh   Mon Apr 30 20:53:46 2007 +0000
@@ -0,0 +1,36 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: monit-rc-script.sh,v 1.1.1.1 2007/04/30 20:53:46 heinz Exp $
+#
+# Start script for 'monit'.
+#
+
+##
+# PROVIDE: monit
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: shutdown
+##
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/bin
+export PATH
+
+if [ -f /etc/rc.subr ]
+then
+       . /etc/rc.subr
+fi
+
+name="monit"
+rcvar=$name
+command="@PREFIX@/bin/monit"
+pidfile="@VARBASE@/run/${name}.pid"
+statefile="@VARBASE@/run/${name}.state"
+monitrc="@PKG_SYSCONFDIR@/monitrc"
+extra_commands="reload"
+sig_stop="TERM"
+sig_reload="HUP"
+
+monit_flags=${monit_flags-"-c ${monitrc} -p ${pidfile} -s ${statefile}"}
+
+load_rc_config $name
+run_rc_command "$1"
diff -r 201dcdd94fd8 -r 8f5c693f772d sysutils/monit/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/monit/patches/patch-aa   Mon Apr 30 20:53:46 2007 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-aa,v 1.1.1.1 2007/04/30 20:53:54 heinz Exp $
+
+Shut up warnings about "subscript has type char"
+
+--- util.c.orig        2007-02-03 00:00:25.000000000 +0100
++++ util.c
+@@ -367,11 +367,11 @@ int Util_countWords(char *s, const char 
+  */
+ int Util_startsWith(const char *a, const char *b) {
+ 
+-  if((!a || !b) || toupper(*a)!=toupper(*b)) return FALSE;
++  if((!a || !b) || toupper((int)*a)!=toupper((int)*b)) return FALSE;
+ 
+   while(*a && *b) {
+     
+-    if(toupper(*a++) != toupper(*b++)) return FALSE;
++    if(toupper((int)*a++) != toupper((int)*b++)) return FALSE;
+     
+   }
+ 
diff -r 201dcdd94fd8 -r 8f5c693f772d sysutils/monit/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/monit/patches/patch-ab   Mon Apr 30 20:53:46 2007 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1.1.1 2007/04/30 20:53:54 heinz Exp $
+
+Shut up warnings about "subscript has type char"
+
+--- p.y.orig   2007-01-12 22:17:12.000000000 +0100
++++ p.y
+@@ -3320,7 +3320,7 @@ static int cleanup_hash_string(char *has
+ 
+     if (isxdigit((int) hashstring[i])) {
+       
+-      hashstring[j]=tolower(hashstring[i]);
++      hashstring[j]=tolower((int)hashstring[i]);
+       j++;
+ 
+     } 
diff -r 201dcdd94fd8 -r 8f5c693f772d sysutils/monit/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/monit/patches/patch-ac   Mon Apr 30 20:53:46 2007 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1.1.1 2007/04/30 20:53:54 heinz Exp $
+
+C source files must be told where the "sysconfdir" is.
+
+--- Makefile.in.orig   2007-01-11 23:04:46.000000000 +0100
++++ Makefile.in
+@@ -61,7 +61,7 @@ PROG         = monit
+ 
+ INCDIR                = -I. -I./device -I./http -I./process -I./protocols
+ LIB           = @LEXLIB@ @LIBS@
+-DEFINES               = -D@ARCH@
++DEFINES               = -D@ARCH@ -DSYSCONFDIR="\"@sysconfdir@\""
+ 
+ # ------------------------------------------------------------------- #
+ 
diff -r 201dcdd94fd8 -r 8f5c693f772d sysutils/monit/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/monit/patches/patch-ad   Mon Apr 30 20:53:46 2007 +0000
@@ -0,0 +1,39 @@
+$NetBSD: patch-ad,v 1.1.1.1 2007/04/30 20:53:54 heinz Exp $
+
+Pre-processor macro SYSCONFDIR will be defined on the command line.
+SYSCONFDIR has to be a string enclosed by "" to enable string literal
+concatenation.
+
+--- file.c.orig        2007-01-03 22:02:06.000000000 +0100
++++ file.c
+@@ -145,9 +145,9 @@ time_t File_getTimestamp(char *object, m
+ 
+ /**
+  * Search the system for the monit control file. Try first ~/.monitrc,
+- * if that fails try /etc/monitrc, then /usr/local/etc/monitrc and
+- * finally ./monitrc.  Exit the application if the control file was
+- * not found.
++ * if that fails try /etc/monitrc, then SYSCONFDIR/monitrc (default:
++ * /usr/local/etc/monitrc) and finally ./monitrc.
++ * Exit the application if the control file was not found.
+  * @return The location of monits control file (monitrc)
+  */
+ char *File_findControlFile() {
+@@ -164,7 +164,7 @@ char *File_findControlFile() {
+     return (rcfile);
+   }
+   memset(rcfile, 0, STRLEN);
+-  snprintf(rcfile, STRLEN, "/usr/local/etc/%s", MONITRC);
++  snprintf(rcfile, STRLEN, SYSCONFDIR "/%s", MONITRC);
+   if(File_exist(rcfile)) {
+     return (rcfile);
+   }
+@@ -174,7 +174,7 @@ char *File_findControlFile() {
+     return (rcfile);
+   }
+   LogError("%s: Cannot find the control file at "
+-      "~/.%s, /etc/%s, /usr/local/etc/%s or at ./%s \n",
++      "~/.%s, /etc/%s, " SYSCONFDIR "/%s or at ./%s \n",
+       prog, MONITRC, MONITRC, MONITRC, MONITRC);
+   exit(1);
+   
diff -r 201dcdd94fd8 -r 8f5c693f772d sysutils/monit/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/monit/patches/patch-ae   Mon Apr 30 20:53:46 2007 +0000
@@ -0,0 +1,3900 @@
+$NetBSD: patch-ae,v 1.1.1.1 2007/04/30 20:53:54 heinz Exp $
+
+Create monit.1.in so we can replace @sysconfdir@ in the configure script.
+
+--- monit.1.in.orig    2007-04-16 23:45:44.000000000 +0200
++++ monit.1.in
+@@ -0,0 +1,3893 @@
++.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.32
++.\"
++.\" Standard preamble:
++.\" ========================================================================
++.de Sh \" Subsection heading



Home | Main Index | Thread Index | Old Index