From 5e2bfd848a11c6360d4a106f8e7d70c58bbddf70 Mon Sep 17 00:00:00 2001
From: Marcel Telka <marcel@telka.sk>
Date: Fri, 22 Dec 2023 07:01:37 +0100
Subject: [PATCH] nagios-plugins: update to 2.4.8
---
components/sysutils/nagios-plugins/patches/02-tests-VPATH-build.patch | 12 ++++++------
components/sysutils/nagios-plugins/Makefile | 6 +++---
components/sysutils/nagios-plugins/patches/04-check_dns-fix-reverse-mapping.patch | 4 ++--
components/sysutils/nagios-plugins/patches/01-LDAP_OPT_X_TLS_SSL_CTX.patch | 4 ++--
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/components/sysutils/nagios-plugins/Makefile b/components/sysutils/nagios-plugins/Makefile
index 994367b..5d1567d 100644
--- a/components/sysutils/nagios-plugins/Makefile
+++ b/components/sysutils/nagios-plugins/Makefile
@@ -16,7 +16,7 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME = nagios-plugins
-COMPONENT_VERSION = 2.4.7
+COMPONENT_VERSION = 2.4.8
COMPONENT_SUMMARY = Nagios Plugins
COMPONENT_PROJECT_URL = https://github.com/nagios-plugins/nagios-plugins
COMPONENT_FMRI = system/management/nagios/plugins
@@ -24,9 +24,9 @@
COMPONENT_SRC = $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE = $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_URL = \
- $(COMPONENT_PROJECT_URL)/releases/download/release-$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
+ $(COMPONENT_PROJECT_URL)/releases/download/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_ARCHIVE_HASH = \
- sha256:63833d03cd62ea5da85763c241c276c468e8b92730fd6f1701cc9828d73c7f69
+ sha256:8e09e9ec1676ecead7e7c7d41d5ea48d5c4bfdfaddfc756d0dd732df7c8f85e4
COMPONENT_LICENSE = GPL-3.0-only
COMPONENT_LICENSE_FILE = COPYING
diff --git a/components/sysutils/nagios-plugins/patches/01-LDAP_OPT_X_TLS_SSL_CTX.patch b/components/sysutils/nagios-plugins/patches/01-LDAP_OPT_X_TLS_SSL_CTX.patch
index 6e7fc4a..f0d0133 100644
--- a/components/sysutils/nagios-plugins/patches/01-LDAP_OPT_X_TLS_SSL_CTX.patch
+++ b/components/sysutils/nagios-plugins/patches/01-LDAP_OPT_X_TLS_SSL_CTX.patch
@@ -1,8 +1,8 @@
LDAP_OPT_X_TLS_SSL_CTX is OpenLDAP specific.
See https://github.com/nagios-plugins/nagios-plugins/issues/516
---- nagios-plugins-2.4.7/plugins/check_ldap.c.orig
-+++ nagios-plugins-2.4.7/plugins/check_ldap.c
+--- nagios-plugins-2.4.8/plugins/check_ldap.c.orig
++++ nagios-plugins-2.4.8/plugins/check_ldap.c
@@ -576,24 +576,6 @@
);
}
diff --git a/components/sysutils/nagios-plugins/patches/02-tests-VPATH-build.patch b/components/sysutils/nagios-plugins/patches/02-tests-VPATH-build.patch
index 27938a3..727e415 100644
--- a/components/sysutils/nagios-plugins/patches/02-tests-VPATH-build.patch
+++ b/components/sysutils/nagios-plugins/patches/02-tests-VPATH-build.patch
@@ -1,6 +1,6 @@
---- nagios-plugins-2.4.7/lib/tests/Makefile.in.orig
-+++ nagios-plugins-2.4.7/lib/tests/Makefile.in
-@@ -213,8 +213,8 @@
+--- nagios-plugins-2.4.8/lib/tests/Makefile.in.orig
++++ nagios-plugins-2.4.8/lib/tests/Makefile.in
+@@ -206,8 +206,8 @@
test_base64_OBJECTS = test_base64.$(OBJEXT)
test_base64_LDADD = $(LDADD)
am__DEPENDENCIES_1 =
@@ -11,7 +11,7 @@
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
-@@ -222,48 +222,48 @@
+@@ -215,48 +215,48 @@
test_cmd_SOURCES = test_cmd.c
test_cmd_OBJECTS = test_cmd.$(OBJEXT)
test_cmd_LDADD = $(LDADD)
@@ -78,7 +78,7 @@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
-@@ -1713,18 +1713,18 @@
+@@ -1696,18 +1696,18 @@
TESTS = @EXTRA_TEST@
check_PROGRAMS = @EXTRA_TEST@
AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" \
@@ -101,7 +101,7 @@
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
-@@ -2258,10 +2258,10 @@
+@@ -2213,10 +2213,10 @@
test: ${noinst_PROGRAMS}
diff --git a/components/sysutils/nagios-plugins/patches/04-check_dns-fix-reverse-mapping.patch b/components/sysutils/nagios-plugins/patches/04-check_dns-fix-reverse-mapping.patch
index 5fe0600..3dab775 100644
--- a/components/sysutils/nagios-plugins/patches/04-check_dns-fix-reverse-mapping.patch
+++ b/components/sysutils/nagios-plugins/patches/04-check_dns-fix-reverse-mapping.patch
@@ -1,7 +1,7 @@
https://github.com/nagios-plugins/nagios-plugins/pull/707
---- nagios-plugins-2.4.7/plugins/check_dns.c.orig
-+++ nagios-plugins-2.4.7/plugins/check_dns.c
+--- nagios-plugins-2.4.8/plugins/check_dns.c.orig
++++ nagios-plugins-2.4.8/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) {
--
Gitblit v1.9.3