Attachment #118474 for bug #160715

View | Details | Raw Unified | Return to bug 160715
Collapse All | Expand All




#

PORTNAME=	monit
PORTVERSION=	5.3
PORTREVISION=	1
CATEGORIES=	sysutils
MASTER_SITES=	http://www.mmonit.com/monit/dist/

MAINTAINER=	martinp@tildeslash.com
COMMENT=	Unix system management and proactive monitoring

MAN1=		monit.1


PKGMESSAGE=	${WRKDIR}/pkg-message
SUB_FILES=	pkg-message

DOCS=		CHANGES COPYING README
		doc/examples.html doc/monit.html
PORTDOCS=	${DOCS:T}

.include <bsd.port.options.mk>

Lines 1-2 Link Here

(-)monit-new/distinfo (-2 / +2 lines)
1	SHA256 (monit-5.2.5.tar.gz) = 3c2496e9f653ff8a46b75b61126a86cb3861ad35e4eeb7379d64a0fc55c1fd8d	1	SHA256 (monit-5.3.tar.gz) = a336d275ac8176c6cdf50f971d2e42325e74af713ae77afa9f005a29db06981e
2	SIZE (monit-5.2.5.tar.gz) = 608861	2	SIZE (monit-5.3.tar.gz) = 1193660




--- 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;
   }
 

Lines 4-13 Link Here

(-)monit-new/files/pkg-message.in (-3 / +1 lines)
4		4
5	To enable monit you need to add monit_enable="YES" to rc.conf file.	5	To enable monit you need to add monit_enable="YES" to rc.conf file.
6	Before running monit you have to configure monitrc file. There is	6	Before running monit you have to configure monitrc file. There is
7	example configuration file monitrc.sample, you can find many	7	example configuration file monitrc.sample.
8	samples for particular services in examples.html:
9		8
10	%%PREFIX%%/etc/monitrc.sample	9	%%PREFIX%%/etc/monitrc.sample
11	%%PREFIX%%/share/doc/monit/examples.html
12		10
13	**************************************************************************	11	**************************************************************************

Return to bug 160715

Lines 6-18 Link Here

(-)monit-new/Makefile (-4 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= monit	8	PORTNAME= monit
9	PORTVERSION= 5.2.5	9	PORTVERSION= 5.3
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= sysutils	11	CATEGORIES= sysutils
12	MASTER_SITES= http://www.mmonit.com/monit/dist/	12	MASTER_SITES= http://www.mmonit.com/monit/dist/
13		13
14	MAINTAINER= martinp@tildeslash.com	14	MAINTAINER= martinp@tildeslash.com
15	COMMENT= Unix system management and monitoring	15	COMMENT= Unix system management and proactive monitoring
16		16
17	MAN1= monit.1	17	MAN1= monit.1
18		18
Lines 32-39 Link Here
32	PKGMESSAGE= ${WRKDIR}/pkg-message	32	PKGMESSAGE= ${WRKDIR}/pkg-message
33	SUB_FILES= pkg-message	33	SUB_FILES= pkg-message
34		34
35	DOCS= CHANGES.txt LICENSE README README.SSL \	35	DOCS= CHANGES COPYING README
36	doc/examples.html doc/monit.html
37	PORTDOCS= ${DOCS:T}	36	PORTDOCS= ${DOCS:T}
38		37
39	.include <bsd.port.options.mk>	38	.include <bsd.port.options.mk>

Lines 1-13 Link Here

(-)monit-new/files/patch-protocols-mysql_c (-13 lines)
1	--- protocols/mysql.c.orig 2011-02-07 20:04:08.000000000 +0000
2	+++ protocols/mysql.c 2011-05-23 12:35:35.000000000 +0100
3	@@ -160,8 +160,8 @@
4	}
5
6	return TRUE;
7	- } else if((buf[4] == 0xFF) && ((buf[5] == 0x15 && buf[6] == 0x04) \|\| (buf[5] == 0xE3 && buf[6] == 0x04))) {
8	- /* If access denied (1045) or server requires newer authentication protocol (1251), return success immediately */
9	+ } else if((buf[4] == 0xFF) && ((buf[5] == 0x15 && buf[6] == 0x04) \|\| (buf[5] == 0xE3 && buf[6] == 0x04) \|\| (buf[5] == 0x13 && buf[6] == 0x04))) {
10	+ /* If access denied (1045) or server requires newer authentication protocol (1251) or bad handshake (1043) return success immediately */
11	return TRUE;
12	}
13