summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Orlitzky <mjo@gentoo.org>2024-06-26 07:34:20 -0400
committerMichael Orlitzky <mjo@gentoo.org>2024-06-26 07:34:20 -0400
commitbccde6103866dd95567e30b219ef006b25249d5b (patch)
treee3afb69ff02698515ab92d1fb9bf6af40297e7cc /net-analyzer
parentnet-analyzer/monitoring-plugins: add local "ipv6" desc for pkgcheck (diff)
downloadgentoo-bccde6103866dd95567e30b219ef006b25249d5b.tar.gz
gentoo-bccde6103866dd95567e30b219ef006b25249d5b.tar.bz2
gentoo-bccde6103866dd95567e30b219ef006b25249d5b.zip
net-analyzer/monitoring-plugins: remove obsolete patches
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-http-segfault.patch23
-rw-r--r--net-analyzer/monitoring-plugins/files/monitoring-plugins-gnutls.patch21
2 files changed, 0 insertions, 44 deletions
diff --git a/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-http-segfault.patch b/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-http-segfault.patch
deleted file mode 100644
index 34e539f51e2d..000000000000
--- a/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-http-segfault.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/893252
-https://github.com/monitoring-plugins/monitoring-plugins/issues/1836
-https://github.com/monitoring-plugins/monitoring-plugins/commit/6d3e44d2d8395076060e9c741e9b173dc5d57b76
-
-diff --git a/plugins/check_http.c b/plugins/check_http.c
-index 5fa310f5d..8dda046ff 100644
---- a/plugins/check_http.c
-+++ b/plugins/check_http.c
-@@ -1462,7 +1462,13 @@ char *unchunk_content(const char *content) {
- memcpy(result + (overall_size - size_of_chunk), start_of_chunk, size_of_chunk);
- }
-
-- result[overall_size] = '\0';
-+ if (overall_size == 0 && result == NULL) {
-+ // We might just have received the end chunk without previous content, so result is never allocated
-+ result = calloc(1, sizeof(char));
-+ // No error handling here, we can only return NULL anyway
-+ } else {
-+ result[overall_size] = '\0';
-+ }
- return result;
- }
-
diff --git a/net-analyzer/monitoring-plugins/files/monitoring-plugins-gnutls.patch b/net-analyzer/monitoring-plugins/files/monitoring-plugins-gnutls.patch
deleted file mode 100644
index 00415f0b7111..000000000000
--- a/net-analyzer/monitoring-plugins/files/monitoring-plugins-gnutls.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/880211
-https://github.com/monitoring-plugins/monitoring-plugins/issues/1834
-https://github.com/monitoring-plugins/monitoring-plugins/commit/31bdbfce92de2dc7717fe13a8d1ca8e7dbf850d4
-
-diff --git a/plugins/sslutils.c b/plugins/sslutils.c
-index 286273f6..c26c4fb3 100644
---- a/plugins/sslutils.c
-+++ b/plugins/sslutils.c
-@@ -134,7 +134,12 @@ int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int
- return STATE_CRITICAL;
- }
- if (cert && privkey) {
-+#ifdef USE_GNUTLS
-+ SSL_CTX_use_certificate_file(c, cert, SSL_FILETYPE_PEM);
-+#endif
-+#ifdef USE_OPENSSL
- SSL_CTX_use_certificate_chain_file(c, cert);
-+#endif
- SSL_CTX_use_PrivateKey_file(c, privkey, SSL_FILETYPE_PEM);
- #ifdef USE_OPENSSL
- if (!SSL_CTX_check_private_key(c)) {