[pkg-nagios-changes] [Git][nagios-team/pkg-monitoring-plugins][master] 7 commits: Revert "Mark mariadb-10.3.patch as Forwarded."
Jan Wagner
gitlab at salsa.debian.org
Sun Jan 20 18:43:29 GMT 2019
Jan Wagner pushed to branch master at Debian Nagios Maintainer Group / pkg-monitoring-plugins
Commits:
3fa4c45d by Jan Wagner at 2019-01-18T20:17:30Z
Revert "Mark mariadb-10.3.patch as Forwarded."
This reverts commit 44a6583f23e81adf36a840a64ed4b80c1d19aa71.
- - - - -
15f2a2be by Jan Wagner at 2019-01-18T20:17:36Z
Revert "Add patch to fix FTBFS with MariaDB 10.3. (closes: #919375)"
This reverts commit 7fafae5386382d793a3996591e85fd529cf57a1f.
- - - - -
73f22736 by Jan Wagner at 2019-01-18T20:32:02Z
Add d/p/14_mariad to fix FTBFS with MariaDB 10.3. (Closes: #919375)
Taken from upstream
- - - - -
4f75b284 by Jan Wagner at 2019-01-20T14:17:59Z
Add d/p/15_check_smtp_initialize to fix check_smtp with custom commands and SSL
Thanks to Iustin Pop <iustin at debian.org>! (Closes: #886888)
- - - - -
61315eef by Jan Wagner at 2019-01-20T14:37:02Z
d/rules: Configure with sudo (Closes: 905318)
- - - - -
d8a134e6 by Jan Wagner at 2019-01-20T14:37:52Z
d/control: Add sudo to Recommends
- - - - -
1fe1cd2a by Jan Wagner at 2019-01-20T18:34:23Z
Symlink /usr/lib/nagios/plugins/utils.* to /usr/lib/icinga/
(Closes: #879084, #907484)
- - - - -
9 changed files:
- debian/README.Debian.plugins.in
- debian/changelog
- debian/control
- + debian/monitoring-plugins-common.links
- + debian/patches/14_mariadb
- + debian/patches/15_check_smtp_initialize
- − debian/patches/mariadb-10.3.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
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
=====================================
@@ -0,0 +1,2 @@
+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
=====================================
@@ -0,0 +1,27 @@
+From 399cc141526ee77e1befce469f1fab40645f299d Mon Sep 17 00:00:00 2001
+From: Bernard Spil <Sp1l at 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
=====================================
@@ -0,0 +1,26 @@
+From 8520c643dd35bbeebbf36c7145d3f8c12dfaf70b Mon Sep 17 00:00:00 2001
+From: Iustin Pop <iustin at 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 deleted
=====================================
@@ -1,31 +0,0 @@
-Description: Add support for MariaDB 10.3.
-Author: Bas Couwenberg <sebastic at 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 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,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" \
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-monitoring-plugins/compare/44a6583f23e81adf36a840a64ed4b80c1d19aa71...1fe1cd2ace418d8e906565e488daf9a8a7a91520
--
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-monitoring-plugins/compare/44a6583f23e81adf36a840a64ed4b80c1d19aa71...1fe1cd2ace418d8e906565e488daf9a8a7a91520
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/20190120/351ac9e5/attachment-0001.html>
More information about the pkg-nagios-changes
mailing list