nagios-plugins: update to 2.4.7
| | |
| | | include ../../../make-rules/shared-macros.mk |
| | | |
| | | COMPONENT_NAME = nagios-plugins |
| | | COMPONENT_VERSION = 2.4.6 |
| | | COMPONENT_VERSION = 2.4.7 |
| | | COMPONENT_SUMMARY = Nagios Plugins |
| | | COMPONENT_PROJECT_URL = https://github.com/nagios-plugins/nagios-plugins |
| | | COMPONENT_FMRI = system/management/nagios/plugins |
| | |
| | | COMPONENT_ARCHIVE_URL = \ |
| | | $(COMPONENT_PROJECT_URL)/releases/download/release-$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE) |
| | | COMPONENT_ARCHIVE_HASH = \ |
| | | sha256:47af67196507b2ae2ab03a802b0709bcd5e453ec5bdd419333233b5a8485bcd0 |
| | | sha256:63833d03cd62ea5da85763c241c276c468e8b92730fd6f1701cc9828d73c7f69 |
| | | COMPONENT_LICENSE = GPL-3.0-only |
| | | COMPONENT_LICENSE_FILE = COPYING |
| | | |
| | |
| | | LDAP_OPT_X_TLS_SSL_CTX is OpenLDAP specific. |
| | | See https://github.com/nagios-plugins/nagios-plugins/issues/516 |
| | | |
| | | --- nagios-plugins-2.4.0/plugins/check_ldap.c.orig |
| | | +++ nagios-plugins-2.4.0/plugins/check_ldap.c |
| | | --- nagios-plugins-2.4.7/plugins/check_ldap.c.orig |
| | | +++ nagios-plugins-2.4.7/plugins/check_ldap.c |
| | | @@ -576,24 +576,6 @@ |
| | | ); |
| | | } |
| | |
| | | --- nagios-plugins-2.4.0/lib/tests/Makefile.in.orig |
| | | +++ nagios-plugins-2.4.0/lib/tests/Makefile.in |
| | | @@ -206,8 +206,8 @@ |
| | | --- nagios-plugins-2.4.7/lib/tests/Makefile.in.orig |
| | | +++ nagios-plugins-2.4.7/lib/tests/Makefile.in |
| | | @@ -213,8 +213,8 @@ |
| | | test_base64_OBJECTS = test_base64.$(OBJEXT) |
| | | test_base64_LDADD = $(LDADD) |
| | | am__DEPENDENCIES_1 = |
| | |
| | | AM_V_lt = $(am__v_lt_@AM_V@) |
| | | am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) |
| | | am__v_lt_0 = --silent |
| | | @@ -215,48 +215,48 @@ |
| | | @@ -222,48 +222,48 @@ |
| | | test_cmd_SOURCES = test_cmd.c |
| | | test_cmd_OBJECTS = test_cmd.$(OBJEXT) |
| | | test_cmd_LDADD = $(LDADD) |
| | |
| | | AM_V_P = $(am__v_P_@AM_V@) |
| | | am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) |
| | | am__v_P_0 = false |
| | | @@ -1696,18 +1696,18 @@ |
| | | @@ -1713,18 +1713,18 @@ |
| | | TESTS = @EXTRA_TEST@ |
| | | check_PROGRAMS = @EXTRA_TEST@ |
| | | AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" \ |
| | |
| | | SOURCES = test_utils.c test_disk.c test_tcp.c test_cmd.c test_base64.c test_ini1.c test_ini3.c test_opts1.c test_opts2.c test_opts3.c |
| | | all: all-am |
| | | |
| | | @@ -2213,10 +2213,10 @@ |
| | | @@ -2258,10 +2258,10 @@ |
| | | |
| | | |
| | | test: ${noinst_PROGRAMS} |
| | |
| | | https://github.com/nagios-plugins/nagios-plugins/pull/707 |
| | | |
| | | --- nagios-plugins-2.4.4/plugins/check_dns.c.orig |
| | | +++ nagios-plugins-2.4.4/plugins/check_dns.c |
| | | @@ -263,7 +263,7 @@ main (int argc, char **argv) |
| | | --- nagios-plugins-2.4.7/plugins/check_dns.c.orig |
| | | +++ nagios-plugins-2.4.7/plugins/check_dns.c |
| | | @@ -263,7 +263,7 @@ |
| | | /* needed for non-query ptr\reverse lookup checks */ |
| | | else if (strstr(chld_out.line[i], ".in-addr.arpa") && !query_set) { |
| | | if ((temp_buffer = strstr(chld_out.line[i], "name = "))) { |
| | |
| | | } |
| | | else { |
| | | xasprintf(&msg, "%s %s %s %s", _("Warning plugin error")); |
| | | @@ -358,7 +358,7 @@ main (int argc, char **argv) |
| | | @@ -358,7 +358,7 @@ |
| | | } |
| | | |
| | | /* compare query type to query found, if query type is ANY we can skip as any record is accepted*/ |
| | |
| | | if (strncmp(query_type, query_found, 16) != 0) { |
| | | if (verbose) { |
| | | printf( "%s %s %s %s %s\n", _("Failed query for"), query_type, _("only found"), query_found, _(", or nothing")); |
| | | @@ -634,7 +634,6 @@ validate_arguments () |
| | | @@ -634,7 +634,6 @@ |
| | | /*query_type = "-querytype=A";*/ |
| | | strcpy(query_type, "-querytype="); |
| | | strcat(query_type, "A"); |