Bug#1119741: kcollectd: diff for NMU version 0.12.2-1.1
Control: tags 1119741 + patch
Control: tags 1119741 + pending
Dear maintainer,
I've prepared an NMU for kcollectd (versioned as 0.12.2-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I should
cancel it.
cu
Adrian
diffstat for kcollectd-0.12.2 kcollectd-0.12.2
changelog | 7 +++++++
patches/rrd-1.9.0.patch | 15 +++++++++++++++
patches/series | 1 +
3 files changed, 23 insertions(+)
diff -Nru kcollectd-0.12.2/debian/changelog kcollectd-0.12.2/debian/changelog
--- kcollectd-0.12.2/debian/changelog 2024-12-13 16:57:14.000000000 +0200
+++ kcollectd-0.12.2/debian/changelog 2025-12-03 12:12:52.000000000 +0200
@@ -1,3 +1,10 @@
+kcollectd (0.12.2-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS with RRDtool 1.9.0. (Closes: #1119741)
+
+ -- Adrian Bunk <bunk@debian.org> Wed, 03 Dec 2025 12:12:52 +0200
+
kcollectd (0.12.2-1) unstable; urgency=medium
* New upstream release 0.12.2.
diff -Nru kcollectd-0.12.2/debian/patches/rrd-1.9.0.patch kcollectd-0.12.2/debian/patches/rrd-1.9.0.patch
--- kcollectd-0.12.2/debian/patches/rrd-1.9.0.patch 1970-01-01 02:00:00.000000000 +0200
+++ kcollectd-0.12.2/debian/patches/rrd-1.9.0.patch 2025-12-03 12:12:52.000000000 +0200
@@ -0,0 +1,15 @@
+Description: Fix FTBFS with RRDtool 1.9.0
+Author: Adrian Bunk <bunk@debian.org>
+Bug-Debian: https://bugs.debian.org/1119741
+
+--- kcollectd-0.12.2.orig/kcollectd/rrd_interface.cc
++++ kcollectd-0.12.2/kcollectd/rrd_interface.cc
+@@ -47,7 +47,7 @@ static inline rrd_info_t *rrd_info(int,
+ return NULL;
+ filename.copy(c_file, std::string::npos);
+ c_file[filename.length()] = 0;
+- char *arg[] = {0, c_file, 0};
++ const char *arg[] = {0, c_file, 0};
+ rrd_info_t *result = rrd_info(2, arg);
+ free(c_file);
+ return result;
diff -Nru kcollectd-0.12.2/debian/patches/series kcollectd-0.12.2/debian/patches/series
--- kcollectd-0.12.2/debian/patches/series 1970-01-01 02:00:00.000000000 +0200
+++ kcollectd-0.12.2/debian/patches/series 2025-12-03 12:12:52.000000000 +0200
@@ -0,0 +1 @@
+rrd-1.9.0.patch
Reply to: