diff options
| author | wxs <wxs@FreeBSD.org> | 2011-06-25 20:37:57 +0800 |
|---|---|---|
| committer | wxs <wxs@FreeBSD.org> | 2011-06-25 20:37:57 +0800 |
| commit | 7d4139a6702ea287cf0622e54440ea978cdbf37b (patch) | |
| tree | 6e678d653c03db5802e060a3b1a27360fb68446b | |
| parent | 48d74df5282fef7b3fc32fcb41ca81b25f177ad1 (diff) | |
| download | freebsd-ports-gnome-7d4139a6702ea287cf0622e54440ea978cdbf37b.tar.gz freebsd-ports-gnome-7d4139a6702ea287cf0622e54440ea978cdbf37b.tar.zst freebsd-ports-gnome-7d4139a6702ea287cf0622e54440ea978cdbf37b.zip | |
- 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.
- Fix WWW in pkg-descr.
PR: ports/158198
Submitted by: Jase Thew <freebsd@beardz.net>
Approved by: Martin Pala <martinp@tildeslash.com> (maintainer)
| -rw-r--r-- | sysutils/monit/Makefile | 14 | ||||
| -rw-r--r-- | sysutils/monit/files/patch-protocols-mysql_c | 13 | ||||
| -rw-r--r-- | sysutils/monit/pkg-descr | 2 |
3 files changed, 20 insertions, 9 deletions
diff --git a/sysutils/monit/Makefile b/sysutils/monit/Makefile index 556a78bd92f6..843c1e05a11d 100644 --- a/sysutils/monit/Makefile +++ b/sysutils/monit/Makefile @@ -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_BISON= build 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 @@ DOCS= CHANGES.txt LICENSE README README.SSL \ 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 @@ post-install: .endif @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/monit/files/patch-protocols-mysql_c b/sysutils/monit/files/patch-protocols-mysql_c new file mode 100644 index 000000000000..1cac6a39f49d --- /dev/null +++ b/sysutils/monit/files/patch-protocols-mysql_c @@ -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; + } + diff --git a/sysutils/monit/pkg-descr b/sysutils/monit/pkg-descr index 64fe43f27181..ac3aa3cbf0b7 100644 --- a/sysutils/monit/pkg-descr +++ b/sysutils/monit/pkg-descr @@ -21,4 +21,4 @@ monit supports: * A HTTP interface with XML output option and many more features :) -WWW: http://www.tildeslash.com/monit/ +WWW: http://mmonit.com/monit/ |