Attachment 187724 Details for Bug 223387 – Fixes compile issues with mariadb 10.2

[patch] Fixes compile issues with mariadb 10.2

patch-net-mgmt_nagios-plugins-mysql-compile-fail.patch (text/plain), 1.80 KB, created by Matthias Fechner on 2017-11-04 13:38:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Fechner

Created: 2017-11-04 13:38:08 UTC

Size: 1.80 KB

patch

obsolete

>diff --git a/Makefile b/Makefile
>index 6fe2e24..55185ee 100644
>--- a/Makefile
>+++ b/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	nagios-plugins
> PORTVERSION=	2.2.1
>-PORTREVISION=	5
>+PORTREVISION=	6
> PORTEPOCH=	1
> CATEGORIES=	net-mgmt
> MASTER_SITES=	https://www.nagios-plugins.org/download/ \
>diff --git a/files/patch-plugins_check__mysql.c b/files/patch-plugins_check__mysql.c
>new file mode 100644
>index 0000000..bbc2431
>--- /dev/null
>+++ b/files/patch-plugins_check__mysql.c
>@@ -0,0 +1,20 @@
>+--- plugins/check_mysql.c.orig	2017-11-04 14:13:56.502985000 +0100
>++++ plugins/check_mysql.c	2017-11-04 14:14:18.879426000 +0100
>+@@ -58,7 +58,7 @@
>+ bool ssl = false;
>+ char *opt_file = NULL;
>+ char *opt_group = NULL;
>+-unsigned int db_port = MYSQL_PORT;
>++unsigned int db_port = 3306;
>+ int check_slave = 0, warn_sec = 0, crit_sec = 0;
>+ int ignore_auth = 0;
>+ int verbose = 0;
>+@@ -505,7 +505,7 @@
>+ print_help (void)
>+ {
>+ 	char *myport;
>+-	xasprintf (&myport, "%d", MYSQL_PORT);
>++	xasprintf (&myport, "%d", 3306);
>+ 
>+ 	print_revision (progname, NP_VERSION);
>+ 
>diff --git a/files/patch-plugins_check__mysql__query.c b/files/patch-plugins_check__mysql__query.c
>new file mode 100644
>index 0000000..029fedb
>--- /dev/null
>+++ b/files/patch-plugins_check__mysql__query.c
>@@ -0,0 +1,20 @@
>+--- plugins/check_mysql_query.c.orig	2017-11-04 14:20:36.002844000 +0100
>++++ plugins/check_mysql_query.c	2017-11-04 14:20:51.210213000 +0100
>+@@ -48,7 +48,7 @@
>+ char *db = NULL;
>+ char *opt_file = NULL;
>+ char *opt_group = NULL;
>+-unsigned int db_port = MYSQL_PORT;
>++unsigned int db_port = 3306;
>+ 
>+ int process_arguments (int, char **);
>+ int validate_arguments (void);
>+@@ -300,7 +300,7 @@
>+ print_help (void)
>+ {
>+ 	char *myport;
>+-	xasprintf (&myport, "%d", MYSQL_PORT);
>++	xasprintf (&myport, "%d", 3306);
>+ 
>+ 	print_revision (progname, NP_VERSION);
>+

Actions: View | Diff

Attachments on bug 223387: 187724 | 187750