Updated monit to version 5.8

Version 5.8

New: Monit no longer purge the environment for sub-processes

New: Add command line option to view Monit ID (-i/--id)

New: Add command line option to reset Monit ID (-r/--resetid)

New: Add client support for using TLS version 1.1 and 1.2. A recent
1.x version of OpenSSL is required and of course that the server
speaks this TLS version. At this time, not many does. Example:
if failed port 443 with type TCPSSL tlsv11 protocol http  then alert

New: Process UID, EUID and GID tests. Allows to test if the
process is running as a given user. Example:
    check process syslog with pidfile /var/run/rsyslogd.pid
        if failed uid  "syslog" then alert
        if failed euid "syslog" then alert
        if failed gid  "syslog" then alert

New: Add WebSocket protocol test support for port check. Example:
    check host websocket.org with address "echo.websocket.org"
        if failed
           port 80 protocol websocket
           host "echo.websocket.org"
           request "/"
           origin "http://www.websocket.com"
           version 13
        then alert

New: Simplified HTTP protocol test to allow testing content without
creating an URL object. It is now possible to say in a more natural way,
 check host mmonit.com with address mmonit.com
       if failed
          port 80 protocol http
          and request /monit/ with content = "Monit 5.7"
       then alert
meaning that if the page mmonit.com/monit does not contain the text
"Monit 5.7" then the test will fail. To reverse the test, i.e. to test
that the page should not contain a specific string simply use '!='
instead, like,
    if failed
       port 80 protocol http
       with content != "Nagios"
    then alert
Remember also that the string to test can be a regular expression

New: The HTTP protocol test now support testing the HTTP status code
returned by the server by using "status <operator> <number>".
Backward compatible defaults (return error if status >= 400):
    if failed
       port 80 protocol http
       and status < 400
    then alert
Return error if a page DOES exist (for success 404 is expected):
    if failed
       port 80 protocol http
       request "/non/existent.php"
       status = 404
    then alert

Fixed: Unix Socket test now use the communication type (TCP or UDP)
specified in port statement. Previously TCP was always used.

Fixed: Improved test to check if a socket was connected. Since we use
non-blocking connect, we now poll a few ms to avoid "connection failed,
XXX is not ready for i|o" errors which could occur, especially on high
latency networks or long distance connect.

Fixed: Simplified if-statements reported in UI

Fixed: Ignore lines starting with '#' in an 'allow htpasswd' file
statement. Thanks to Michael Bakker for reporting the issue

Fixed: Show service restart program on Monit startup in debug mode.
Thanks to Michael Bakker for reporting the issue

Version 5.7

New: Merged https://bitbucket.org/tildeslash/monit/pull-request/1/
from Philippe Kueck:
1) Handle sockets (unix domain) as regular files when checking timestamp.
2) Use mysql 4.1 protocol in MySQL check, required for checking mysql-proxy
3) Skip connection checks during startup timeout.

New: Arguments added to 'check program'. Arguments are whitespace
separated strings. For instance:

  check program list-files with path "/bin/ls -l -r -t /tmp"
        if status != 0 then alert

New: Implemented restart as an optional service action. When Monit
is called to restart a service, it previously called the stop
program registered with the service and then the start program.
Now, if a restart program is registred with the service, this
will be called instead, otherwise Monit fall back to its old
behaviour. Example:

  check process apache with pidfile /var/run/httpd.pid
        start   = "/usr/sbin/apachectl start"
        stop    = "/usr/sbin/apachectl stop"
        restart = "/usr/sbin/apachectl restart" <- New

New: Improved communication with M/Monit. Thanks to Hippo Lin. For
scalability purpose, this Monit version should only be used with
M/Monit version 3.1 or later.

BUGFIXES:

* Monit stopped if an error occurred during MTA connection close.
* Make the Memcache protocol test faster.
* Solaris zone: fix system memory usage report.
* Use chiper list with SSL server instead of relying on default

4 files changed, 14 insertions, 23 deletions

diff --git a/sysutils/monit/Makefile b/sysutils/monit/Makefile
index 22b7738c085..f215c68207d 100644
--- a/sysutils/monit/Makefile
+++ b/sysutils/monit/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.14 2014/02/12 23:18:40 tron Exp $
+# $NetBSD: Makefile,v 1.15 2014/05/12 09:00:54 imil Exp $
 #
 
-DISTNAME=		monit-5.6
-PKGREVISION=		1
+DISTNAME=		monit-5.8
 CATEGORIES=		sysutils
 MASTER_SITES=		http://mmonit.com/monit/dist/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://mmonit.com/monit/
-COMMENT=		Utility for monitoring processes, files, directories and devices
+COMMENT=		Monitors processes, files, directories and devices
 LICENSE=		gnu-agpl-v3
 
 # no platform specific code yet
@@ -67,10 +66,6 @@ post-install:
 .endfor
 	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/monitrc ${DESTDIR}${EGDIR}/monitrc.sample
-	${INSTALL_DATA} ${WRKSRC}/contrib/monit.service ${DESTDIR}${EGDIR}/
-	${INSTALL_DATA} ${WRKSRC}/contrib/monit.upstart ${DESTDIR}${EGDIR}/
-	${INSTALL_DATA} ${WRKSRC}/contrib/monitrc-gentoo ${DESTDIR}${EGDIR}/
-	${INSTALL_DATA} ${WRKSRC}/contrib/rc.monit ${DESTDIR}${EGDIR}/
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/sysutils/monit/PLIST b/sysutils/monit/PLIST
index c06e3dd50a3..bb19049a157 100644
--- a/sysutils/monit/PLIST
+++ b/sysutils/monit/PLIST
@@ -1,12 +1,8 @@
-@comment $NetBSD: PLIST,v 1.5 2014/03/11 14:05:15 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/05/12 09:00:54 imil Exp $
 bin/monit
 man/man1/monit.1
 share/docs/monit/CHANGES
 share/docs/monit/COPYING
 share/docs/monit/PLATFORMS
 share/docs/monit/README
-share/examples/monit/monit.service
-share/examples/monit/monit.upstart
-share/examples/monit/monitrc-gentoo
 share/examples/monit/monitrc.sample
-share/examples/monit/rc.monit
diff --git a/sysutils/monit/distinfo b/sysutils/monit/distinfo
index 9495b4f8066..872a0c889d5 100644
--- a/sysutils/monit/distinfo
+++ b/sysutils/monit/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2014/02/06 09:09:17 obache Exp $
+$NetBSD: distinfo,v 1.6 2014/05/12 09:00:54 imil Exp $
 
-SHA1 (monit-5.6.tar.gz) = cc59780deea208312690e6c05d27fb947bae3789
-RMD160 (monit-5.6.tar.gz) = b53becbc8859d97f4379d4befd070a937ea78e74
-Size (monit-5.6.tar.gz) = 1263370 bytes
-SHA1 (patch-aa) = 047783cbefb65cd89e3a398f2fb826b7ad0b3612
+SHA1 (monit-5.8.tar.gz) = b2eb92d3c76a3161ffdd3b3ec0e5960fd900fac2
+RMD160 (monit-5.8.tar.gz) = b87b68cc46aa868ad300ec05af99c664bd5058de
+Size (monit-5.8.tar.gz) = 1237958 bytes
+SHA1 (patch-aa) = bf1ef16d44d082443c34963bab1335767a4a8497
diff --git a/sysutils/monit/patches/patch-aa b/sysutils/monit/patches/patch-aa
index 34ea55cda4f..fd3c69efb31 100644
--- a/sysutils/monit/patches/patch-aa
+++ b/sysutils/monit/patches/patch-aa
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.3 2014/02/06 09:09:17 obache Exp $
+$NetBSD: patch-aa,v 1.4 2014/05/12 09:00:54 imil Exp $
 
 Fix for LP64 big-endian platforms.
 
---- src/http/engine.c.orig	2012-05-10 20:52:38.000000000 +0000
+--- src/http/engine.c.orig	2014-03-27 12:27:21.000000000 +0000
 +++ src/http/engine.c
-@@ -245,7 +245,7 @@ int add_host_allow(char *name) {
+@@ -247,7 +247,7 @@ int add_host_allow(char *name) {
         struct sockaddr_in *sin = (struct sockaddr_in *)_res->ai_addr;
  
-        NEW(h);      
+        NEW(h);
 -       memcpy(&h->network, &sin->sin_addr, 4);
 +       h->network = sin->sin_addr.s_addr;
-        h->mask=    0xffffffff;
+        h->mask =    0xffffffff;
         LOCK(hostlist_mutex)
         if(hostlist) {