Attachment 116274 Details for Bug 158198 – monit-5.2.5_1.patch

[patch] monit-5.2.5_1.patch

monit-5.2.5_1.patch (text/plain), 2.18 KB, created by Jase Thew on 2011-06-23 10:50:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jase Thew

Created: 2011-06-23 10:50:15 UTC

Size: 2.18 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/sysutils/monit.orig/Makefile /usr/ports/sysutils/monit/Makefile
>--- /usr/ports/sysutils/monit.orig/Makefile	2011-03-29 18:56:15.000000000 +0100
>+++ /usr/ports/sysutils/monit/Makefile	2011-06-23 10:15:45.761198685 +0100
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	monit
> PORTVERSION=	5.2.5
>+PORTREVISION=	1
> CATEGORIES=	sysutils
> MASTER_SITES=	http://www.mmonit.com/monit/dist/
> 
>@@ -20,8 +21,8 @@
> USE_GMAKE=	yes
> USE_RC_SUBR=	${PORTNAME}.sh
> 
>-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
>-		CONFIG_SHELL="${SH}" LOCALBASE="${LOCALBASE}"
>+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}" \
>+		LOCALBASE="${LOCALBASE}"
> 
> OPTIONS=	SSL "Enable SSL support" on
> 
>@@ -35,12 +36,9 @@
> 		doc/examples.html doc/monit.html
> PORTDOCS=	${DOCS:T}
> 
>-.include <bsd.port.pre.mk>
>+.include <bsd.port.options.mk>
> 
>-.if defined(WITH_SSL)
>-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
>-CONFIGURE_ARGS+=	--enable-ssl --with-openssl="${OPENSSLBASE}"
>-.else
>+.if defined(WITHOUT_SSL)
> CONFIGURE_ARGS+=	--without-ssl
> .endif
> 
>@@ -52,4 +50,4 @@
> .endif
> 	@${CAT} ${PKGMESSAGE}
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -ruN --exclude=CVS /usr/ports/sysutils/monit.orig/files/patch-protocols-mysql_c /usr/ports/sysutils/monit/files/patch-protocols-mysql_c
>--- /usr/ports/sysutils/monit.orig/files/patch-protocols-mysql_c	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/sysutils/monit/files/patch-protocols-mysql_c	2011-06-23 10:15:45.759170219 +0100
>@@ -0,0 +1,13 @@
>+--- 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;
>+   }
>+

Actions: View | Diff

Attachments on bug 158198: 116274