ports/160715: [maintainer update] sysutils/monit 5.3

[Martin Pala]

>Number:         160715
>Category:       ports
>Synopsis:       [maintainer update] sysutils/monit 5.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 13 20:00:16 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Martin Pala
>Release:        
>Organization:
>Environment:
>Description:
The attached patch  updates Monit to version 5.3.

The MySQL patch (files/patch-protocols-mysql_c) is part of Monit 5.3, the file can be removed from FreeBSD cvs:

    cvs rm files/patch-protocols-mysql_c


Thanks,
Martin
>How-To-Repeat:

>Fix:
diff -ruN monit/Makefile monit-new/Makefile
--- monit/Makefile	2011-06-25 14:37:57.000000000 +0200
+++ monit-new/Makefile	2011-09-13 21:27:12.000000000 +0200
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	monit
-PORTVERSION=	5.2.5
+PORTVERSION=	5.3
 PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.mmonit.com/monit/dist/
 
 MAINTAINER=	martinp at tildeslash.com
-COMMENT=	Unix system management and monitoring
+COMMENT=	Unix system management and proactive monitoring
 
 MAN1=		monit.1
 
@@ -32,8 +32,7 @@
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
 
-DOCS=		CHANGES.txt LICENSE README README.SSL \
-		doc/examples.html doc/monit.html
+DOCS=		CHANGES COPYING README
 PORTDOCS=	${DOCS:T}
 
 .include <bsd.port.options.mk>
diff -ruN monit/distinfo monit-new/distinfo
--- monit/distinfo	2011-03-29 19:56:15.000000000 +0200
+++ monit-new/distinfo	2011-09-13 21:33:13.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (monit-5.2.5.tar.gz) = 3c2496e9f653ff8a46b75b61126a86cb3861ad35e4eeb7379d64a0fc55c1fd8d
-SIZE (monit-5.2.5.tar.gz) = 608861
+SHA256 (monit-5.3.tar.gz) = a336d275ac8176c6cdf50f971d2e42325e74af713ae77afa9f005a29db06981e
+SIZE (monit-5.3.tar.gz) = 1193660
diff -ruN monit/files/patch-protocols-mysql_c monit-new/files/patch-protocols-mysql_c
--- monit/files/patch-protocols-mysql_c	2011-06-25 14:37:57.000000000 +0200
+++ monit-new/files/patch-protocols-mysql_c	1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
---- protocols/mysql.c.orig	2011-02-07 20:04:08.000000000 +0000
-+++ protocols/mysql.c	2011-05-23 12:35:35.000000000 +0100
-@@ -160,8 +160,8 @@
-     }
- 
-     return TRUE;
--  } else if((buf[4] == 0xFF) && ((buf[5] == 0x15 && buf[6] == 0x04) || (buf[5] == 0xE3 && buf[6] == 0x04))) {
--    /* If access denied (1045) or server requires newer authentication protocol (1251), return success immediately */
-+  } else if((buf[4] == 0xFF) && ((buf[5] == 0x15 && buf[6] == 0x04) || (buf[5] == 0xE3 && buf[6] == 0x04) || (buf[5] == 0x13 && buf[6] == 0x04))) {
-+    /* If access denied (1045) or server requires newer authentication protocol (1251) or bad handshake (1043) return success immediately */
-     return TRUE;
-   }
- 
diff -ruN monit/files/pkg-message.in monit-new/files/pkg-message.in
--- monit/files/pkg-message.in	2005-10-11 04:50:45.000000000 +0200
+++ monit-new/files/pkg-message.in	2011-09-13 21:36:03.000000000 +0200
@@ -4,10 +4,8 @@
 
 To enable monit you need to add monit_enable="YES" to rc.conf file.
 Before running monit you have to configure monitrc file. There is
-example configuration file monitrc.sample, you can find many
-samples for particular services in examples.html:
+example configuration file monitrc.sample.
 
 %%PREFIX%%/etc/monitrc.sample
-%%PREFIX%%/share/doc/monit/examples.html
 
 **************************************************************************

>Release-Note:
>Audit-Trail:
>Unformatted: