[pkg-nagios-changes] [Git][nagios-team/monitoring-plugins][experimental] 3 commits: Adding d/p/17_fix_exit_codes from upstream
Jan Wagner (@waja)
gitlab at salsa.debian.org
Fri May 5 19:59:20 BST 2023
Jan Wagner pushed to branch experimental at Debian Nagios Maintainer Group / monitoring-plugins
Commits:
9225592b by Jan Wagner at 2023-05-05T18:53:57+00:00
Adding d/p/17_fix_exit_codes from upstream
- - - - -
3a0d875c by Jan Wagner at 2023-05-05T18:56:38+00:00
Adding d/p/18_check_mysql_fix_typo from upstream
- - - - -
17688c79 by Jan Wagner at 2023-05-05T18:58:42+00:00
Adding d/p/19_check_nwstat_fix_typo from upstream
- - - - -
4 changed files:
- + debian/patches/17_fix_exit_codes
- + debian/patches/18_check_mysql_fix_typo
- + debian/patches/19_check_nwstat_fix_typo
- debian/patches/series
Changes:
=====================================
debian/patches/17_fix_exit_codes
=====================================
@@ -0,0 +1,166 @@
+From 5af4db7b4169acee20bfa2d637ce3f3eb5bdef47 Mon Sep 17 00:00:00 2001
+From: MisterMountain <bjoern.berg at netways.de>
+Date: Tue, 11 Apr 2023 16:26:12 +0200
+Subject: [PATCH 1/3] fixed the outputs of the --versions options on 3 scripts
+
+---
+ plugins-scripts/check_log.sh | 2 +-
+ plugins-scripts/check_oracle.sh | 2 +-
+ plugins-scripts/check_sensors.sh | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/plugins-scripts/check_log.sh b/plugins-scripts/check_log.sh
+index c623a8d6b..10c56f14b 100755
+--- a/plugins-scripts/check_log.sh
++++ b/plugins-scripts/check_log.sh
+@@ -109,7 +109,7 @@ while test -n "$1"; do
+ ;;
+ -V | --version)
+ print_revision "$PROGNAME" "$REVISION"
+- exit "$STATE_OK"
++ exit "$STATE_UNKNOWN"
+ ;;
+ -F | --filename)
+ logfile=$2
+diff --git a/plugins-scripts/check_oracle.sh b/plugins-scripts/check_oracle.sh
+index b14ec50ed..f340b97c4 100755
+--- a/plugins-scripts/check_oracle.sh
++++ b/plugins-scripts/check_oracle.sh
+@@ -95,7 +95,7 @@ case "$cmd" in
+ ;;
+ --version)
+ print_revision "$PROGNAME" "$REVISION"
+- exit "$STATE_OK"
++ exit "$STATE_UNKNOWN"
+ ;;
+ -V)
+ print_revision "$PROGNAME" "$REVISION"
+diff --git a/plugins-scripts/check_sensors.sh b/plugins-scripts/check_sensors.sh
+index 921e7b365..3c4cf01bf 100755
+--- a/plugins-scripts/check_sensors.sh
++++ b/plugins-scripts/check_sensors.sh
+@@ -34,7 +34,7 @@ case "$1" in
+ ;;
+ --version)
+ print_revision "$PROGNAME" "$REVISION"
+- exit "$STATE_OK"
++ exit "$STATE_UNKNOWN"
+ ;;
+ -V)
+ print_revision "$PROGNAME" "$REVISION"
+
+From 3dc677e4f1f990e7b26bc714a02608070379cf85 Mon Sep 17 00:00:00 2001
+From: MisterMountain <bjoern.berg at netways.de>
+Date: Tue, 11 Apr 2023 17:11:06 +0200
+Subject: [PATCH 2/3] fixed the identation (and also patched -V on check_oracle
+ to behave exactly like --version again)
+
+---
+ plugins-scripts/check_oracle.sh | 10 +++++-----
+ plugins-scripts/check_sensors.sh | 2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/plugins-scripts/check_oracle.sh b/plugins-scripts/check_oracle.sh
+index f340b97c4..d58cfbea3 100755
+--- a/plugins-scripts/check_oracle.sh
++++ b/plugins-scripts/check_oracle.sh
+@@ -86,20 +86,20 @@ esac
+ # Information options
+ case "$cmd" in
+ --help)
+- print_help
++ print_help
+ exit "$STATE_OK"
+ ;;
+ -h)
+- print_help
++ print_help
+ exit "$STATE_OK"
+ ;;
+ --version)
+- print_revision "$PROGNAME" "$REVISION"
++ print_revision "$PROGNAME" "$REVISION"
+ exit "$STATE_UNKNOWN"
+ ;;
+ -V)
+- print_revision "$PROGNAME" "$REVISION"
+- exit "$STATE_OK"
++ print_revision "$PROGNAME" "$REVISION"
++ exit "$STATE_UNKNOWN"
+ ;;
+ esac
+
+diff --git a/plugins-scripts/check_sensors.sh b/plugins-scripts/check_sensors.sh
+index 3c4cf01bf..adbfc533f 100755
+--- a/plugins-scripts/check_sensors.sh
++++ b/plugins-scripts/check_sensors.sh
+@@ -38,7 +38,7 @@ case "$1" in
+ ;;
+ -V)
+ print_revision "$PROGNAME" "$REVISION"
+- exit "$STATE_OK"
++ exit "$STATE_UNKNOWN"
+ ;;
+ *)
+ sensordata=$(sensors 2>&1)
+
+From 21885d85d54ce2afe7b9bf962348dc60e31442e0 Mon Sep 17 00:00:00 2001
+From: MisterMountain <bjoern.berg at netways.de>
+Date: Tue, 2 May 2023 09:40:35 +0200
+Subject: [PATCH 3/3] also fixed the --help returns
+
+---
+ plugins-scripts/check_log.sh | 2 +-
+ plugins-scripts/check_oracle.sh | 4 ++--
+ plugins-scripts/check_sensors.sh | 4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/plugins-scripts/check_log.sh b/plugins-scripts/check_log.sh
+index 10c56f14b..8ecdd3164 100755
+--- a/plugins-scripts/check_log.sh
++++ b/plugins-scripts/check_log.sh
+@@ -105,7 +105,7 @@ while test -n "$1"; do
+ case "$1" in
+ -h | --help)
+ print_help
+- exit "$STATE_OK"
++ exit "$STATE_UNKNOWN"
+ ;;
+ -V | --version)
+ print_revision "$PROGNAME" "$REVISION"
+diff --git a/plugins-scripts/check_oracle.sh b/plugins-scripts/check_oracle.sh
+index d58cfbea3..599813865 100755
+--- a/plugins-scripts/check_oracle.sh
++++ b/plugins-scripts/check_oracle.sh
+@@ -87,11 +87,11 @@ esac
+ case "$cmd" in
+ --help)
+ print_help
+- exit "$STATE_OK"
++ exit "$STATE_UNKNOWN"
+ ;;
+ -h)
+ print_help
+- exit "$STATE_OK"
++ exit "$STATE_UNKNOWN"
+ ;;
+ --version)
+ print_revision "$PROGNAME" "$REVISION"
+diff --git a/plugins-scripts/check_sensors.sh b/plugins-scripts/check_sensors.sh
+index adbfc533f..866e0e0f0 100755
+--- a/plugins-scripts/check_sensors.sh
++++ b/plugins-scripts/check_sensors.sh
+@@ -26,11 +26,11 @@ print_help() {
+ case "$1" in
+ --help)
+ print_help
+- exit "$STATE_OK"
++ exit "$STATE_UNKNOWN"
+ ;;
+ -h)
+ print_help
+- exit "$STATE_OK"
++ exit "$STATE_UNKNOWN"
+ ;;
+ --version)
+ print_revision "$PROGNAME" "$REVISION"
=====================================
debian/patches/18_check_mysql_fix_typo
=====================================
@@ -0,0 +1,22 @@
+From d10ee31d89c2c599ee4c502e82d632aef8554020 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lorenz=20K=C3=A4stle?= <lorenz.kaestle at netways.de>
+Date: Fri, 28 Apr 2023 16:51:39 +0200
+Subject: [PATCH] Typo in check_mysql
+
+---
+ plugins/check_mysql.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
+index 0cba50e6d..6cfa70edb 100644
+--- a/plugins/check_mysql.c
++++ b/plugins/check_mysql.c
+@@ -551,7 +551,7 @@ print_help (void)
+ printf (" %s\n", _("Exit with CRITICAL status if slave server is more then INTEGER seconds"));
+ printf (" %s\n", _("behind master"));
+ printf (" %s\n", "-l, --ssl");
+- printf (" %s\n", _("Use ssl encryptation"));
++ printf (" %s\n", _("Use ssl encryption"));
+ printf (" %s\n", "-C, --ca-cert=STRING");
+ printf (" %s\n", _("Path to CA signing the cert"));
+ printf (" %s\n", "-a, --cert=STRING");
=====================================
debian/patches/19_check_nwstat_fix_typo
=====================================
@@ -0,0 +1,64 @@
+From cc69e8f76bcde8f75b5828b920bb937682673f49 Mon Sep 17 00:00:00 2001
+From: donien <matthias.doehler at netways.de>
+Date: Thu, 13 Apr 2023 17:15:16 +0200
+Subject: [PATCH] Fix 'requres' typo
+
+---
+ plugins/check_nwstat.c | 2 +-
+ po/de.po | 2 +-
+ po/fr.po | 2 +-
+ po/monitoring-plugins.pot | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
+index e7e8de05b..3c9d23e2e 100644
+--- a/plugins/check_nwstat.c
++++ b/plugins/check_nwstat.c
+@@ -1668,7 +1668,7 @@ void print_help(void)
+
+ printf ("\n");
+ printf ("%s\n", _("Notes:"));
+- printf (" %s\n", _("- This plugin requres that the MRTGEXT.NLM file from James Drews' MRTG"));
++ printf (" %s\n", _("- This plugin requires that the MRTGEXT.NLM file from James Drews' MRTG"));
+ printf (" %s\n", _(" extension for NetWare be loaded on the Novell servers you wish to check."));
+ printf (" %s\n", _(" (available from http://www.engr.wisc.edu/~drews/mrtg/)"));
+ printf (" %s\n", _("- Values for critical thresholds should be lower than warning thresholds"));
+diff --git a/po/de.po b/po/de.po
+index 919fae32b..c29cbbbac 100644
+--- a/po/de.po
++++ b/po/de.po
+@@ -3315,7 +3315,7 @@ msgid "Include server version string in results"
+ msgstr ""
+
+ #: plugins/check_nwstat.c:1671
+-msgid "- This plugin requres that the MRTGEXT.NLM file from James Drews' MRTG"
++msgid "- This plugin requires that the MRTGEXT.NLM file from James Drews' MRTG"
+ msgstr ""
+
+ #: plugins/check_nwstat.c:1672
+diff --git a/po/fr.po b/po/fr.po
+index e44cf88cb..b4de17ed6 100644
+--- a/po/fr.po
++++ b/po/fr.po
+@@ -3372,7 +3372,7 @@ msgid "Include server version string in results"
+ msgstr ""
+
+ #: plugins/check_nwstat.c:1671
+-msgid "- This plugin requres that the MRTGEXT.NLM file from James Drews' MRTG"
++msgid "- This plugin requires that the MRTGEXT.NLM file from James Drews' MRTG"
+ msgstr ""
+
+ #: plugins/check_nwstat.c:1672
+diff --git a/po/monitoring-plugins.pot b/po/monitoring-plugins.pot
+index 5bc236373..45f46a899 100644
+--- a/po/monitoring-plugins.pot
++++ b/po/monitoring-plugins.pot
+@@ -3225,7 +3225,7 @@ msgid "Include server version string in results"
+ msgstr ""
+
+ #: plugins/check_nwstat.c:1671
+-msgid "- This plugin requres that the MRTGEXT.NLM file from James Drews' MRTG"
++msgid "- This plugin requires that the MRTGEXT.NLM file from James Drews' MRTG"
+ msgstr ""
+
+ #: plugins/check_nwstat.c:1672
=====================================
debian/patches/series
=====================================
@@ -8,6 +8,9 @@
14_check_curl_fix_SSL_with_multiple_IPs
15_check_swap_remove_includes
16_check_snmp_disable_multiplier_when_unused
+17_fix_exit_codes
+18_check_mysql_fix_typo
+19_check_nwstat_fix_typ
# feature patches
30_check_radius_radcli_1.3.1_support
31_checl_mailq_separate_submission_queue
View it on GitLab: https://salsa.debian.org/nagios-team/monitoring-plugins/-/compare/49df534b72e6727b82d431cbdd0371572afb6ce0...17688c79c249154e46d9f66d82807e78950a4d26
--
View it on GitLab: https://salsa.debian.org/nagios-team/monitoring-plugins/-/compare/49df534b72e6727b82d431cbdd0371572afb6ce0...17688c79c249154e46d9f66d82807e78950a4d26
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/20230505/59b771b3/attachment-0001.htm>
More information about the pkg-nagios-changes
mailing list