[packages/collectd] correct types to fix build with gcc 14

atler atler at pld-linux.org
Mon Jul 28 21:15:34 CEST 2025


commit db13038034c176ff8ddfd95523fdeb9ba3118ecc
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Jul 28 21:10:39 2025 +0200

    correct types to fix build with gcc 14

 collectd.spec |  2 ++
 types.patch   | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+)
---
diff --git a/collectd.spec b/collectd.spec
index 4ff7f18..43f90da 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -205,6 +205,7 @@ Patch0:		%{name}-collection.patch
 Patch1:		glibc-2.36.patch
 Patch2:		noquote.patch
 Patch3:		libgcrypt1.11.patch
+Patch4:		types.patch
 URL:		http://collectd.org/
 %{?with_ipmi:BuildRequires:	OpenIPMI-devel >= 2.0.14-3}
 BuildRequires:	autoconf
@@ -1377,6 +1378,7 @@ Perl files from Collectd package
 %patch -P1 -p1
 %patch -P2 -p1
 %patch -P3 -p1
+%patch -P4 -p1
 
 %build
 %{__libtoolize} --ltdl
diff --git a/types.patch b/types.patch
new file mode 100644
index 0000000..968109e
--- /dev/null
+++ b/types.patch
@@ -0,0 +1,20 @@
+--- collectd-5.9.2/src/nut.c.orig	2019-10-01 14:00:47.000000000 +0200
++++ collectd-5.9.2/src/nut.c	2025-07-28 20:34:12.801738877 +0200
+@@ -46,7 +46,7 @@
+   collectd_upsconn_t *conn;
+   char *upsname;
+   char *hostname;
+-  int port;
++  uint16_t port;
+   nut_ups_t *next;
+ };
+ 
+@@ -250,7 +250,7 @@
+   const char *query[3] = {"VAR", ups->upsname, NULL};
+   unsigned int query_num = 2;
+   char **answer;
+-  unsigned int answer_num;
++  size_t answer_num;
+   int status;
+ 
+   /* (Re-)Connect if we have no connection */
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/collectd.git/commitdiff/a0e6f3280db71ed3444f83e8ed2c2e1d82c4d84b



More information about the pld-cvs-commit mailing list