[pkg-nagios-changes] [Git][nagios-team/monitoring-plugins][master] 2 commits: Adding d/p/13_check_mysql_fix_variables from upstream

[Jan Wagner (@waja)]

Jan Wagner pushed to branch master at Debian Nagios Maintainer Group / monitoring-plugins


Commits:
8b17915e by Jan Wagner at 2024-09-08T20:34:16+02:00
Adding d/p/13_check_mysql_fix_variables from upstream

https://patch-diff.githubusercontent.com/raw/monitoring-plugins/monitoring-plugins/pull/2015.diff

- - - - -
01e11f95 by Jan Wagner at 2024-09-08T20:36:05+02:00
Adding d/p/14_check_curl_remove_experimental_state from upstream

https://patch-diff.githubusercontent.com/raw/monitoring-plugins/monitoring-plugins/pull/2017.diff

- - - - -


3 changed files:

- + debian/patches/13_check_mysql_fix_variables
- + debian/patches/14_check_curl_remove_experimental_state
- debian/patches/series


Changes:

=====================================
debian/patches/13_check_mysql_fix_variables
=====================================
@@ -0,0 +1,28 @@
+diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
+index 6a7daf11a..15ec04c04 100644
+--- a/plugins/check_mysql.c
++++ b/plugins/check_mysql.c
+@@ -59,8 +59,8 @@ bool ssl = false;
+ char *opt_file = NULL;
+ char *opt_group = NULL;
+ unsigned int db_port = MYSQL_PORT;
+-int check_slave = 0, warn_sec = 0, crit_sec = 0;
+-int ignore_auth = 0;
++bool check_slave = false;
++bool ignore_auth = false;
+ int verbose = 0;
+ 
+ static double warning_time = 0;
+@@ -456,10 +456,10 @@ process_arguments (int argc, char **argv)
+ 			db_port = atoi (optarg);
+ 			break;
+ 		case 'S':
+-			check_slave = 1;							/* check-slave */
++			check_slave = true;							/* check-slave */
+ 			break;
+ 		case 'n':
+-			ignore_auth = 1;							/* ignore-auth */
++			ignore_auth = true;							/* ignore-auth */
+ 			break;
+ 		case 'w':
+ 			warning = optarg;


=====================================
debian/patches/14_check_curl_remove_experimental_state
=====================================
@@ -0,0 +1,13 @@
+diff --git a/plugins/check_curl.c b/plugins/check_curl.c
+index e9c15e648..e25d7a79a 100644
+--- a/plugins/check_curl.c
++++ b/plugins/check_curl.c
+@@ -2190,8 +2190,6 @@ print_usage (void)
+   printf ("%s\n", _("In the first form, make an HTTP request."));
+   printf ("%s\n\n", _("In the second form, connect to the server and check the TLS certificate."));
+ #endif
+-  printf ("%s\n", _("WARNING: check_curl is experimental. Please use"));
+-  printf ("%s\n\n", _("check_http if you need a stable version."));
+ }
+ 
+ void


=====================================
debian/patches/series
=====================================
@@ -4,4 +4,6 @@
 10_check_curl_fix_redirects
 11_check_curl_raise_ssl_issue
 12_check_curl_add_docu
+13_check_mysql_fix_variables
+14_check_curl_remove_experimental_state
 # feature patches



View it on GitLab: https://salsa.debian.org/nagios-team/monitoring-plugins/-/compare/a6b1db0c7c7d8878f555d539f15a6fa55eca002b...01e11f95824091e481dcee2321a761e716fc38a2

-- 
View it on GitLab: https://salsa.debian.org/nagios-team/monitoring-plugins/-/compare/a6b1db0c7c7d8878f555d539f15a6fa55eca002b...01e11f95824091e481dcee2321a761e716fc38a2
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/20241119/63f89def/attachment-0001.htm>