From 7fafae5386382d793a3996591e85fd529cf57a1f Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Tue, 15 Jan 2019 14:36:21 +0100 Subject: [PATCH] Add patch to fix FTBFS with MariaDB 10.3. (closes: #919375) --- debian/changelog | 2 ++ debian/patches/mariadb-10.3.patch | 30 ++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 33 insertions(+) create mode 100644 debian/patches/mariadb-10.3.patch diff --git a/debian/changelog b/debian/changelog index a7abd61..c07e48c 100644 --- a/debian/changelog +++ b/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 diff --git a/debian/patches/mariadb-10.3.patch b/debian/patches/mariadb-10.3.patch new file mode 100644 index 0000000..66eed46 --- /dev/null +++ b/debian/patches/mariadb-10.3.patch @@ -0,0 +1,30 @@ +Description: Add support for MariaDB 10.3. +Author: Bas Couwenberg +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@monitoring-pl + #include + #include + ++#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@monitoring-pl + #include + #include + ++#ifndef MYSQL_PORT ++#define MYSQL_PORT 3306 ++#endif ++ + char *db_user = NULL; + char *db_host = NULL; + char *db_socket = NULL; diff --git a/debian/patches/series b/debian/patches/series index ac7d715..f11fc1d 100644 --- a/debian/patches/series +++ b/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