[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/files/

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/files/

[Conrad Kostecki]

commit:     2556115ab138a216c9eb021461cce9c81cb493fb
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Dec 26 08:37:02 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Dec 26 13:40:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2556115a

net-analyzer/monitoring-plugins: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28808
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/define-own-mysql-port-constant.patch     | 102 ---------------------
 1 file changed, 102 deletions(-)

diff --git a/net-analyzer/monitoring-plugins/files/define-own-mysql-port-constant.patch b/net-analyzer/monitoring-plugins/files/define-own-mysql-port-constant.patch
deleted file mode 100644
index b7406bc9af80..000000000000
--- a/net-analyzer/monitoring-plugins/files/define-own-mysql-port-constant.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From d6bd787123aa9ccd96edec8286ec22dd0442c620 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Fri, 27 Oct 2017 07:58:43 -0400
-Subject: [PATCH 1/3] plugins/check_mysql*.c: define our own default MySQL
- port.
-
-The MYSQL_PORT constant used to be defined in mysql.h, and was used as
-the default port in the two plugins check_mysql and check_mysql_query.
-Now that mysql.h no longer defines that constant, our plugins fail to
-build against newer versions of MySQL and MariaDB.
-
-Since MYSQL_PORT used the "default port" on the local system, it
-actually was not the best choice as the default for the check plugins:
-when monitoring remote MySQL servers, the usual default of 3306 is
-more likely to be correct than whatever the local server happens to be
-listening on.
-
-As a result, we fix the issue by defining our own constant, called
-CHECK_PORT_DEFAULT, as "3306" at the top of both check_mysql.c and
-check_mysql_query.c. The existing uses of MYSQL_PORT have been changed
-to use the new CHECK_PORT_DEFAULT.
-
-This change is backwards-incompatible: any users who compiled in a
-MYSQL_PORT other than 3306 and who were running their checks on the
-same server as the database will now need to specify that port
-explicitly.
-
-Closes: https://github.com/monitoring-plugins/monitoring-plugins/issues/1508
----
- plugins/check_mysql.c       | 8 ++++++--
- plugins/check_mysql_query.c | 8 ++++++--
- 2 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
-index 5773afd9..c44919d0 100644
---- a/plugins/check_mysql.c
-+++ b/plugins/check_mysql.c
-@@ -36,6 +36,10 @@ const char *email = "devel@monitoring-plugins.org";
- 
- #define SLAVERESULTSIZE 70
- 
-+/* The default port that MySQL servers listen on. */
-+#define CHECK_PORT_DEFAULT 3306
-+
-+
- #include "common.h"
- #include "utils.h"
- #include "utils_base.h"
-@@ -58,7 +62,7 @@ char *ciphers = NULL;
- bool ssl = false;
- char *opt_file = NULL;
- char *opt_group = NULL;
--unsigned int db_port = MYSQL_PORT;
-+unsigned int db_port = CHECK_PORT_DEFAULT;
- int check_slave = 0, warn_sec = 0, crit_sec = 0;
- int ignore_auth = 0;
- int verbose = 0;
-@@ -505,7 +509,7 @@ void
- print_help (void)
- {
- 	char *myport;
--	xasprintf (&myport, "%d", MYSQL_PORT);
-+	xasprintf (&myport, "%d", CHECK_PORT_DEFAULT);
- 
- 	print_revision (progname, NP_VERSION);
- 
-diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c
-index 49a14dd3..6f492442 100644
---- a/plugins/check_mysql_query.c
-+++ b/plugins/check_mysql_query.c
-@@ -33,6 +33,10 @@ const char *progname = "check_mysql_query";
- const char *copyright = "1999-2007";
- const char *email = "devel@monitoring-plugins.org";
- 
-+/* The default port that MySQL servers listen on. */
-+#define CHECK_PORT_DEFAULT 3306
-+
-+
- #include "common.h"
- #include "utils.h"
- #include "utils_base.h"
-@@ -48,7 +52,7 @@ char *db_pass = NULL;
- char *db = NULL;
- char *opt_file = NULL;
- char *opt_group = NULL;
--unsigned int db_port = MYSQL_PORT;
-+unsigned int db_port = CHECK_PORT_DEFAULT;
- 
- int process_arguments (int, char **);
- int validate_arguments (void);
-@@ -299,7 +303,7 @@ void
- print_help (void)
- {
- 	char *myport;
--	xasprintf (&myport, "%d", MYSQL_PORT);
-+	xasprintf (&myport, "%d", CHECK_PORT_DEFAULT);
- 
- 	print_revision (progname, NP_VERSION);
- 
--- 
-2.13.6
-

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/files/

[Michael Orlitzky]

commit:     f2698cdae92237d5b631877b5dba4f46cd5cdfcd
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Oct 27 05:22:58 2023 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 16:20:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2698cda

net-analyzer/monitoring-plugins: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/33534
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 .../monitoring-plugins-fix-check-disk-on-btrfs.patch | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-disk-on-btrfs.patch b/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-disk-on-btrfs.patch
deleted file mode 100644
index cbd458372133..000000000000
--- a/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-disk-on-btrfs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.gentoo.org/830249
-https://github.com/monitoring-plugins/monitoring-plugins/issues/1357
-https://github.com/monitoring-plugins/monitoring-plugins/commit/e17c1e9ed95b8b9681dccd5a909ac5a02a04416c
-
-diff --git a/plugins/check_disk.c b/plugins/check_disk.c
-index 844e625f..a2735195 100644
---- a/plugins/check_disk.c
-+++ b/plugins/check_disk.c
-@@ -1068,10 +1068,7 @@ get_stats (struct parameter_list *p, struct fs_usage *fsp) {
- 
- void
- get_path_stats (struct parameter_list *p, struct fs_usage *fsp) {
--  /* 2007-12-08 - Workaround for Gnulib reporting insanely high available
--  * space on BSD (the actual value should be negative but fsp->fsu_bavail
--  * is unsigned) */
--  p->available = fsp->fsu_bavail > fsp->fsu_bfree ? 0 : fsp->fsu_bavail;
-+  p->available = fsp->fsu_bavail;
-   p->available_to_root = fsp->fsu_bfree;
-   p->used = fsp->fsu_blocks - fsp->fsu_bfree;
-   if (freespace_ignore_reserved) {

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/files/

[Michael Orlitzky]

commit:     bccde6103866dd95567e30b219ef006b25249d5b
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 26 11:34:20 2024 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Jun 26 11:34:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bccde610

net-analyzer/monitoring-plugins: remove obsolete patches

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 ...onitoring-plugins-fix-check-http-segfault.patch | 23 ----------------------
 .../files/monitoring-plugins-gnutls.patch          | 21 --------------------
 2 files changed, 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)) {