[pkg-nagios-changes] [Git][nagios-team/pkg-monitoring-plugins][master] Add patch to fix FTBFS with MariaDB 10.3. (closes: #919375)

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian Nagios Maintainer Group / pkg-monitoring-plugins


Commits:
7fafae53 by Bas Couwenberg at 2019-01-15T13:40:15Z
Add patch to fix FTBFS with MariaDB 10.3. (closes: #919375)

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/mariadb-10.3.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -2,6 +2,8 @@ monitoring-plugins (2.2-5) UNRELEASED; urgency=medium
 
   [ Bas Couwenberg ]
   * Bump Standards-Version to 4.3.0, no changes.
+  * Add patch to fix FTBFS with MariaDB 10.3.
+    (closes: #919375)
 
   [ Andreas Henriksson ]
   * Pass PATH_TO_APTGET=/usr/bin/apt-get to configure


=====================================
debian/patches/mariadb-10.3.patch
=====================================
@@ -0,0 +1,30 @@
+Description: Add support for MariaDB 10.3.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug-Debian: https://bugs.debian.org/919395
+
+--- a/plugins/check_mysql.c
++++ b/plugins/check_mysql.c
+@@ -45,6 +45,10 @@ const char *email = "devel at monitoring-pl
+ #include <mysqld_error.h>
+ #include <errmsg.h>
+ 
++#ifndef MYSQL_PORT
++#define MYSQL_PORT 3306
++#endif
++
+ char *db_user = NULL;
+ char *db_host = NULL;
+ char *db_socket = NULL;
+--- a/plugins/check_mysql_query.c
++++ b/plugins/check_mysql_query.c
+@@ -41,6 +41,10 @@ const char *email = "devel at monitoring-pl
+ #include <mysql.h>
+ #include <errmsg.h>
+ 
++#ifndef MYSQL_PORT
++#define MYSQL_PORT 3306
++#endif
++
+ char *db_user = NULL;
+ char *db_host = NULL;
+ char *db_socket = NULL;


=====================================
debian/patches/series
=====================================
@@ -4,3 +4,4 @@
 11_check_dhcp_MSG_PEAK
 12_check_apt_only_crit
 13_check_apt_list_packages
+mariadb-10.3.patch



View it on GitLab: https://salsa.debian.org/nagios-team/pkg-monitoring-plugins/commit/7fafae5386382d793a3996591e85fd529cf57a1f

-- 
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-monitoring-plugins/commit/7fafae5386382d793a3996591e85fd529cf57a1f
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20190115/b44945c3/attachment-0001.html>