Date: Thu, 23 Jun 2011 10:30:08 +0100 (BST) From: Jase Thew <freebsd@beardz.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: martinp@tildeslash.com Subject: ports/158198: [PATCH] sysutils/monit: Fix MySQL protocol testing and misc port cleanups Message-ID: <201106230930.p5N9U8FD088373@beardz.net> Resent-Message-ID: <201106230950.p5N9oFS4047090@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 158198 >Category: ports >Synopsis: [PATCH] sysutils/monit: Fix MySQL protocol testing and misc port cleanups >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Jun 23 09:50:15 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Jase Thew >Release: FreeBSD 8.2-STABLE amd64 >Organization: >Environment: System: FreeBSD jail-ports.localdomain 8.2-STABLE FreeBSD 8.2-STABLE #0: Sat Apr 2 19:17:15 BST >Description: - Add patch to fix MySQL protocol testing with MySQL 5.1.57+ and 5.5.12+. Taken from vendor repo (r372). - Remove CPPFLAGS from CONFIGURE_ARGS as it is inherently passed via use of GNU_CONFIGURE. (quiets lint warning) - Remove WITH_SSL option conditional and replace it with a WITHOUT_SSL conditional. SSL support is enabled by default in configure and the --enable-SSL and --with-openssl knobs have been removed. (quiets configure warning) - Change Mk includes to use new options style. - Update to 5.2.5_1. Added file(s): - files/patch-protocols-mysql_c Port maintainer (martinp@tildeslash.com) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- monit-5.2.5_1.patch begins here --- 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; + } + --- monit-5.2.5_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106230930.p5N9U8FD088373>