debian/README.Debian.plugins.in

@@ -47,6 +47,7 @@ check_mailq:
     - sendmail-bin
     - exim4-daemon-heavy
     - exim4-daemon-light
+  * sudo
 
 check_oracle:
   * procps

debian/changelog

@@ -2,8 +2,6 @@ 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/control

@@ -88,6 +88,7 @@ Recommends: bind9-host | host,
             rpcbind,
             smbclient,
             snmp,
+            sudo,
             ${shlibs:Recommends}
 Suggests: fping,
           icinga | icinga2,

debian/monitoring-plugins-common.links

+usr/lib/nagios/plugins/utils.pm usr/lib/icinga/utils.pm
+usr/lib/nagios/plugins/utils.sh usr/lib/icinga/utils.sh

debian/patches/14_mariadb

+From 399cc141526ee77e1befce469f1fab40645f299d Mon Sep 17 00:00:00 2001
+From: Bernard Spil <Sp1l@users.noreply.github.com>
+Date: Mon, 6 Nov 2017 17:31:44 +0100
+Subject: [PATCH] Fix build issue with MariaDB 10.2
+Bug-Debian: https://bugs.debian.org/919395
+
+As of 10.2 MariaDB no longer defines MYSQL_PORT.
+---
+ plugins/common.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/plugins/common.h b/plugins/common.h
+index 8719b502..6bf4fca4 100644
+--- a/plugins/common.h
++++ b/plugins/common.h
+@@ -174,6 +174,11 @@
+  *
+  */
+ 
++/* MariaDB 10.2 client does not set MYSQL_PORT */
++#ifndef MYSQL_PORT
++#  define MYSQL_PORT 3306
++#endif
++
+ enum {
+ 	OK = 0,
+ 	ERROR = -1

debian/patches/15_check_smtp_initialize

+From 8520c643dd35bbeebbf36c7145d3f8c12dfaf70b Mon Sep 17 00:00:00 2001
+From: Iustin Pop <iustin@debian.org>
+Date: Fri, 18 Jan 2019 22:52:54 +0100
+Subject: [PATCH] Simply initializes n before it is used
+
+When SSL is enabled, n is assigned the size of the server's second EHLO
+response (I think in bytes), which will usually be significantly higher
+than the command passed. As such, no commands are executed and no responses
+are checked, which - silently - defeats the desired checks and results in a
+success value.
+---
+ plugins/check_smtp.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
+index 0fcf4c68..d37c57c8 100644
+--- a/plugins/check_smtp.c
++++ b/plugins/check_smtp.c
+@@ -293,6 +293,7 @@ main (int argc, char **argv)
+ 		    printf("%s", buffer);
+ 		}
+ 
++		n = 0;
+ 		while (n < ncommands) {
+ 			xasprintf (&cmd_str, "%s%s", commands[n], "\r\n");
+ 			my_send(cmd_str, strlen(cmd_str));

debian/patches/mariadb-10.3.patch

-Description: Add support for MariaDB 10.3.
-Author: Bas Couwenberg <sebastic@debian.org>
-Bug-Debian: https://bugs.debian.org/919395
-Forwarded: https://github.com/monitoring-plugins/monitoring-plugins/pull/1571
-
---- a/plugins/check_mysql.c
-+++ b/plugins/check_mysql.c
-@@ -45,6 +45,10 @@ const char *email = "devel@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@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,4 +4,5 @@
 11_check_dhcp_MSG_PEAK
 12_check_apt_only_crit
 13_check_apt_list_packages
-mariadb-10.3.patch
+14_mariadb
+15_check_smtp_initialize

debian/rules

@@ -112,6 +112,7 @@ config.status: configure
 		--with-fping-command="/usr/bin/fping" \
 		--with-fping6-command="/usr/bin/fping6" \
 		--with-ssh-command="/usr/bin/ssh" \
+		--with-sudo-command="/usr/bin/sudo" \
 		--with-mailq-command="/usr/bin/mailq" \
 		--with-proc-meminfo="/proc/meminfo" \
 		--with-dig-command="/usr/bin/dig" \