[pkgsrc/trunk]: pkgsrc/sysutils/monit Update to version 4.10.1.

[seb <seb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/189d3a96b36d
branches:  trunk
changeset: 536485:189d3a96b36d
user:      seb <seb%pkgsrc.org@localhost>
date:      Sat Dec 15 16:41:50 2007 +0000

description:
Update to version 4.10.1.

Placate pkglint. Most of the package's patches had been integrated.

Approved by heinz@

Changes since last packaged version (4.9):
Version 4.10.1
BUGFIXES:
* When monit sent alert, it reported that alert handler failed,
  which was not true and the message was delivered in fact. This
  bug was introduced in monit-4.10.

* Fix the memory usage report on machines with more then 4GB
  physical memory running Mac OS X.

Version 4.10
NEW FEATURES AND FUNCTIONS:
* Monit from this version on is licensed under GPL version 3

* Added support for SMTP authentication and SSL for sending alerts.
  Example syntax:
  - plain athentication:
    set mailserver
      smtp.foo.bar username "user" password "hidden"
  - plain athentication with ssl:
    set mailserver
      smtp.foo.bar username "user" password "hidden" using sslv3
  - plain athentication with tls:
    set mailserver
      smtp.foo.bar username "user" password "hidden" using tlsv1
  Thanks to Thomas Lohmueller for patch.

* Allow to set the location of monirc using 'configure --sysconfdir'
  option during monit compilation. Thanks to Klaus Heinz for patch.

* Monit now log user actions requested via monit's http interface.

* Monit http interface now use the POST method for forms
  (change is transparent from the user point of view).

* Monit ICMP echo/ping test now supports 20 echo requests per cycle at
  maximum.

* When monit identifies the process as zombie, continue the monitoring
  (formerly monit disabled monitoring of the given service and sent alert
  since it was considered unmanageable).

* Fixed #21447: Monit now adds a (dummy) Message-id header in alert
  mails to prevent any spam checkers to accidental filter out monit
  alerts based on missing message-id.

* Removed C99 particulars from monit code to support non-C99 compilers.

REMOVED FEATURE
* Removed support for local redirects in the HTTP protocol test. Users
  must provide the correct path for the resource they want to test.

BUGFIXES:
* Fixed a possible monit crash on exit if a match rule was used and
  referred a file containing multiple expressions. Thanks to Stephen
  Dowdy for report.

* Added patch from Klaus Heinz which fix a problem in the Log module
  that had monit using an uninitialized mutex after a monitrc reload.

* Fixed a possible crash on monit start when the monit control file
  contained exec action with argument longer then 256 bytes. Thanks
  to Stevan Bajic for report.

* Fixed linux 32-bit system CPU usage statistics (the fix in 4.9 was
  incomplete). If a server had a long/large uptime and high load, the
  reported CPU usage could be incorrect. Thanks to Aleksander for report.

* Fixed a problem where monit would incorrect display an error in the
  web interface status page. This could occur if a service had failed,
  monit had reload and the state of the service had passed just after the
  reload (for example due to changes of the configuration rules). Thanks to
  Claus Klein for report and help with the patch.

* Avoid filling the log with "pidfile does not contain a valid pidnumber"
  entries during debug

* Added patch from Dave Cheney, which fix and reactivate resource testing
  for Mac OS X Tiger (Darwin 10.4.x).

* Limit the number of consecutive redirects in http protocol test to 64.

* Report as error when the redirect in http protocol test points to itself.

* Fix memory leak when regular expresion is used in monit configuration
  and monit is reloaded. Thanks to Josh Kelley for patch.

* Allow the "if changed timestamp" test to refer to a non-existing file.
  This could be useful if the service is monitored in non-active mode
  and the file is expected to be created later.

* When 'if match' statement was used with the path to the regex file
  containing more then one line and the exec action was used for this
  rule, then monit failed to parse the configuration and refused to start.
  Thanks to Nathan for report.

* contrib/wap.php updated. Thanks to David Fletcher.

* Fixed #21354: Usage of the IMAP Protocol test was impossible due to a small
  typo in the control file parser and the test would fall back to DEFAULT.
  Thanks to Wolfgang Breyha for reporting the bug.

diffstat:

 sysutils/monit/Makefile         |    15 +-
 sysutils/monit/PLIST            |    12 +-
 sysutils/monit/distinfo         |    17 +-
 sysutils/monit/patches/patch-aa |    29 +-
 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 -
 11 files changed, 32 insertions(+), 4064 deletions(-)

diffs (truncated from 4181 to 300 lines):

diff -r d399e7f3c84f -r 189d3a96b36d sysutils/monit/Makefile
--- a/sysutils/monit/Makefile   Sat Dec 15 16:04:41 2007 +0000
+++ b/sysutils/monit/Makefile   Sat Dec 15 16:41:50 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/04/30 20:53:46 heinz Exp $
+# $NetBSD: Makefile,v 1.2 2007/12/15 16:41:50 seb Exp $
 #
 
-DISTNAME=              monit-4.9
+DISTNAME=              monit-4.10.1
 CATEGORIES=            sysutils
 MASTER_SITES=          http://www.tildeslash.com/monit/dist/
 
@@ -27,11 +27,11 @@
 CONFIGURE_ARGS+=       --without-ssl
 .endif
 CONFIGURE_ARGS+=       --with-ssl-dir=${SSLBASE:Q}
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 PKG_SYSCONFSUBDIR=     monit
 
 RCD_SCRIPTS=           monit
-RCD_SCRIPT_SRC.monit=   ${FILESDIR}/monit-rc-script.sh
+RCD_SCRIPT_SRC.monit=  ${FILESDIR}/monit-rc-script.sh
 
 CONF_FILES=            ${EGDIR}/monitrc.sample ${PKG_SYSCONFDIR}/monitrc
 CONF_FILES_MODE=       0600
@@ -54,8 +54,11 @@
 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
+       cd ${WRKSRC}/contrib && pax -zrf monit-OSX-startup.tar.gz
+
+# Perform configure substitutions on monit.1
+post-configure:
+       cd ${WRKSRC} && mv monit.1 monit.1.in && ./config.status --file=monit.1
 
 post-install:
        ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
diff -r d399e7f3c84f -r 189d3a96b36d sysutils/monit/PLIST
--- a/sysutils/monit/PLIST      Sat Dec 15 16:04:41 2007 +0000
+++ b/sysutils/monit/PLIST      Sat Dec 15 16:41:50 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/04/30 20:53:46 heinz Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/12/15 16:41:50 seb Exp $
 bin/monit
 man/man1/monit.1
 share/docs/monit/CHANGES.txt
@@ -12,16 +12,16 @@
 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/monit/monit.php
+share/examples/monit/monitrc-gentoo
+share/examples/monit/monitrc.sample
+share/examples/monit/wap.php
 share/examples/rc.d/monit
-@dirrm share/docs/monit
 @dirrm share/examples/monit/MacOSX
 @dirrm share/examples/monit
+@dirrm share/docs/monit
diff -r d399e7f3c84f -r 189d3a96b36d sysutils/monit/distinfo
--- a/sysutils/monit/distinfo   Sat Dec 15 16:04:41 2007 +0000
+++ b/sysutils/monit/distinfo   Sat Dec 15 16:41:50 2007 +0000
@@ -1,13 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/04/30 20:53:46 heinz Exp $
+$NetBSD: distinfo,v 1.2 2007/12/15 16:41:50 seb 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
+SHA1 (monit-4.10.1.tar.gz) = c87aa0c6e0b1d13f46b7e9d84937191e25a907a6
+RMD160 (monit-4.10.1.tar.gz) = 6c517b19bc43f4023dfca4de1df09272b41af02d
+Size (monit-4.10.1.tar.gz) = 606273 bytes
+SHA1 (patch-aa) = b51792edf22fb9867d45a4adb2aadd03dbe5467c
diff -r d399e7f3c84f -r 189d3a96b36d sysutils/monit/patches/patch-aa
--- a/sysutils/monit/patches/patch-aa   Sat Dec 15 16:04:41 2007 +0000
+++ b/sysutils/monit/patches/patch-aa   Sat Dec 15 16:41:50 2007 +0000
@@ -1,20 +1,15 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/04/30 20:53:54 heinz Exp $
+$NetBSD: patch-aa,v 1.2 2007/12/15 16:41:51 seb Exp $
 
-Shut up warnings about "subscript has type char"
+Fix for LP64 big-endian platforms.
 
---- 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) {
+--- http/engine.c.orig 2007-07-29 20:23:26.000000000 +0000
++++ http/engine.c
+@@ -246,7 +246,7 @@ int add_host_allow(char *name) {
+        struct sockaddr_in *sin = (struct sockaddr_in *)_res->ai_addr;
  
--  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;
-     
-   }
- 
+        NEW(h);      
+-       memcpy(&h->network, &sin->sin_addr, 4);
++       h->network = sin->sin_addr.s_addr;
+        h->mask=    0xffffffff;
+        LOCK(hostlist_mutex)
+        if(hostlist) {
diff -r d399e7f3c84f -r 189d3a96b36d sysutils/monit/patches/patch-ab
--- a/sysutils/monit/patches/patch-ab   Sat Dec 15 16:04:41 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$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 d399e7f3c84f -r 189d3a96b36d sysutils/monit/patches/patch-ac
--- a/sysutils/monit/patches/patch-ac   Sat Dec 15 16:04:41 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$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 d399e7f3c84f -r 189d3a96b36d sysutils/monit/patches/patch-ad
--- a/sysutils/monit/patches/patch-ad   Sat Dec 15 16:04:41 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-$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 d399e7f3c84f -r 189d3a96b36d sysutils/monit/patches/patch-ae
--- a/sysutils/monit/patches/patch-ae   Sat Dec 15 16:04:41 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3900 +0,0 @@
-$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
-+.br
-+.if t .Sp
-+.ne 5
-+.PP
-+\fB\\$1\fR
-+.PP
-+..
-+.de Sp \" Vertical space (when we can't use .PP)
-+.if t .sp .5v
-+.if n .sp
-+..
-+.de Vb \" Begin verbatim text
-+.ft CW
-+.nf
-+.ne \\$1
-+..
-+.de Ve \" End verbatim text
-+.ft R
-+.fi
-+..
-+.\" Set up some character translations and predefined strings.  \*(-- will
-+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-+.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-+.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-+.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-+.\" nothing in troff, for use with C<>.
-+.tr \(*W-
-+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-+.ie n \{\
-+.    ds -- \(*W-
-+.    ds PI pi
-+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-+.    ds L" ""
-+.    ds R" ""
-+.    ds C` ""
-+.    ds C' ""
-+'br\}
-+.el\{\
-+.    ds -- \|\(em\|
-+.    ds PI \(*p
-+.    ds L" ``
-+.    ds R" ''
-+'br\}
-+.\"
-+.\" If the F register is turned on, we'll generate index entries on stderr for
-+.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
-+.\" entries marked with X<> in POD.  Of course, you'll have to process the
-+.\" output yourself in some meaningful fashion.
-+.if \nF \{\
-+.    de IX
-+.    tm Index:\\$1\t\\n%\t"\\$2"
-+..
-+.    nr % 0
-+.    rr F
-+.\}
-+.\"
-+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-+.\" way too many mistakes in technical documents.
-+.hy 0
-+.if n .na
-+.\"
-+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-+.    \" fudge factors for nroff and troff
-+.if n \{\
-+.    ds #H 0
-+.    ds #V .8m
-+.    ds #F .3m
-+.    ds #[ \f1
-+.    ds #] \fP
-+.\}
-+.if t \{\