From 6e6a59f53d987b7eac69f16b5c700ad9f1ef2a88f49f2c7eafb90f77e914bf69 Mon Sep 17 00:00:00 2001
From: Ruediger Oertel <ro@suse.de>
Date: Mon, 2 Dec 2024 17:15:18 +0000
Subject: [PATCH] =?UTF-8?q?-=20add=20patch=20monitoring-plugins-2.4.0-chec?=
 =?UTF-8?q?k=5Fdbi-type=5Fmismatch.patch=20=20=20to=20fix=20compilation=20?=
 =?UTF-8?q?with=20gcc-14=20=20=20passing=20argument=202=20of=20=E2=80=98db?=
 =?UTF-8?q?i=5Fdriver=5Fopen=5Fr=E2=80=99=20from=20incompatible=20pointer?=
 =?UTF-8?q?=20type=20-=20change=20mode=20to=20"manual"=20in=20service=20fi?=
 =?UTF-8?q?le?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

OBS-URL: https://build.opensuse.org/package/show/server:monitoring/monitoring-plugins?expand=0&rev=124
---
 _service                                           |  6 +++---
 ...ce:download_url:monitoring-plugins-2.4.0.tar.gz |  3 ---
 ...ing-plugins-2.4.0-check_dbi-type_mismatch.patch | 14 ++++++++++++++
 ...gz.sha1 => monitoring-plugins-2.4.0.tar.gz.sha1 |  0
 monitoring-plugins.changes                         |  8 ++++++++
 monitoring-plugins.spec                            |  1 +
 6 files changed, 26 insertions(+), 6 deletions(-)
 delete mode 100644 _service:download_url:monitoring-plugins-2.4.0.tar.gz
 create mode 100644 monitoring-plugins-2.4.0-check_dbi-type_mismatch.patch
 rename _service:download_url:monitoring-plugins-2.4.0.tar.gz.sha1 => monitoring-plugins-2.4.0.tar.gz.sha1 (100%)

diff --git a/_service b/_service
index 6165cf5..4632e6d 100644
--- a/_service
+++ b/_service
@@ -1,17 +1,17 @@
 <services>
-  <service name="download_url">
+  <service name="download_url" mode="manual">
     <param name="host">www.monitoring-plugins.org</param>
     <param name="protocol">https</param>
     <param name="path">/download/monitoring-plugins-2.4.0.tar.gz</param>
     <param name="filename">monitoring-plugins-2.4.0.tar.gz</param>
   </service>
-  <service name="download_url">
+  <service name="download_url" mode="manual">
     <param name="host">www.monitoring-plugins.org</param>
     <param name="protocol">https</param>
     <param name="path">/download/monitoring-plugins-2.4.0.tar.gz.sha1</param>
     <param name="filename">monitoring-plugins-2.4.0.tar.gz.sha1</param>
   </service>
-  <service name="verify_file">
+  <service name="verify_file" mode="manual">
 	<param name="verifier">sha1</param>
 	<param name="checksum">595fcfe92a5273031e8ad7f294ba683c27078a1a</param>
 <!--	<param name="file">monitoring-plugins-2.4.0.tar.gz</param> -->
diff --git a/_service:download_url:monitoring-plugins-2.4.0.tar.gz b/_service:download_url:monitoring-plugins-2.4.0.tar.gz
deleted file mode 100644
index 953d363..0000000
--- a/_service:download_url:monitoring-plugins-2.4.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e5dfd4ad8fde0a40da50aab3aff6d9a27020b8f283e332bc4da6ef9914f4028c
-size 2746382
diff --git a/monitoring-plugins-2.4.0-check_dbi-type_mismatch.patch b/monitoring-plugins-2.4.0-check_dbi-type_mismatch.patch
new file mode 100644
index 0000000..b2293f5
--- /dev/null
+++ b/monitoring-plugins-2.4.0-check_dbi-type_mismatch.patch
@@ -0,0 +1,14 @@
+--- monitoring-plugins-2.4.0/plugins/check_dbi.c	2024/12/02 16:16:03	1.1
++++ monitoring-plugins-2.4.0/plugins/check_dbi.c	2024/12/02 17:02:44
+@@ -141,9 +141,9 @@
+ 	if (verbose > 2)
+ 		printf ("Initializing DBI\n");
+ 
+-	dbi_inst *instance_p = { 0 };
++	dbi_inst instance_p = { 0 };
+ 
+-	if (dbi_initialize_r(NULL, instance_p) < 0) {
++	if (dbi_initialize_r(NULL, &instance_p) < 0) {
+ 		printf ("UNKNOWN - failed to initialize DBI; possibly you don't have any drivers installed.\n");
+ 		return STATE_UNKNOWN;
+ 	}
diff --git a/_service:download_url:monitoring-plugins-2.4.0.tar.gz.sha1 b/monitoring-plugins-2.4.0.tar.gz.sha1
similarity index 100%
rename from _service:download_url:monitoring-plugins-2.4.0.tar.gz.sha1
rename to monitoring-plugins-2.4.0.tar.gz.sha1
diff --git a/monitoring-plugins.changes b/monitoring-plugins.changes
index 71cb552..4a5cf0f 100644
--- a/monitoring-plugins.changes
+++ b/monitoring-plugins.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Dec  2 17:52:44 CET 2024 - ro@suse.de
+
+- add patch monitoring-plugins-2.4.0-check_dbi-type_mismatch.patch
+  to fix compilation with gcc-14
+  passing argument 2 of ‘dbi_driver_open_r’ from incompatible pointer type 
+- change mode to "manual" in service file
+
 -------------------------------------------------------------------
 Mon Jul 29 08:06:37 UTC 2024 - Lars Vogdt <lars@linux-schulserver.de>
 
diff --git a/monitoring-plugins.spec b/monitoring-plugins.spec
index 0c4329a..31d96ea 100644
--- a/monitoring-plugins.spec
+++ b/monitoring-plugins.spec
@@ -71,6 +71,7 @@ Patch121:       %{name}-2.4.0-check_swap_wrong_percent.patch
 # PATCH-FIX-UPSTREAM - return ntp offset absolute (as positive value) in performance data since warn and crit are also positive values 
 Patch122:       %{name}-2.4.0-check_ntp_perf_absolute.patch
 Patch130:       %{name}-2.4.0-check_http-proxy.patch
+Patch131:       %{name}-2.4.0-check_dbi-type_mismatch.patch
 BuildRequires:  automake
 BuildRequires:  bind-utils
 BuildRequires:  dhcp-devel