Bug#1107432: unblock: collectd/5.12.0-24

[Bernd Zeimetz <bzed@debian.org>]

Package: release.debian.org
Severity: normal
X-Debbugs-Cc: collectd@packages.debian.org
Control: affects -1 + src:collectd
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package collectd

[ Reason ]
The last update of curl introduce a compiler warning on collected's
code. We treat warnings as errors, so it ftbfs.

[ Impact ]
collectd builds again.

[ Tests ]
collectd runs its test suite on build time

[ Risks ]
trivial fix

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [ ] attach debdiff against the package in testing

  I've attached a diff of the sources instead, as I've done a source
  only upload. Its a trivial diff.

[ Other info ]
(Anything else the release team should know.)

unblock collectd/5.12.0-24

diff --git a/debian/changelog b/debian/changelog
index 1a86b80..9779f4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+collectd (5.12.0-24) unstable; urgency=medium
+
+  * [a977729] curl_easy_setopt: always pass long as a parameter.
+    Thanks to Santiago Vila (Closes: #1107407)
+
+ -- Bernd Zeimetz <bzed@debian.org>  Sat, 07 Jun 2025 15:22:54 +0200
+
 collectd (5.12.0-23) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/fix_curl_long_args b/debian/patches/fix_curl_long_args
new file mode 100644
index 0000000..93e6da3
--- /dev/null
+++ b/debian/patches/fix_curl_long_args
@@ -0,0 +1,39 @@
+Index: collectd/src/curl.c
+===================================================================
+--- collectd.orig/src/curl.c
++++ collectd/src/curl.c
+@@ -346,7 +346,7 @@ static int cc_page_init_curl(web_page_t
+   curl_easy_setopt(wp->curl, CURLOPT_ERRORBUFFER, wp->curl_errbuf);
+   curl_easy_setopt(wp->curl, CURLOPT_FOLLOWLOCATION, 1L);
+   curl_easy_setopt(wp->curl, CURLOPT_MAXREDIRS, 50L);
+-  curl_easy_setopt(wp->curl, CURLOPT_IPRESOLVE, wp->address_family);
++  curl_easy_setopt(wp->curl, CURLOPT_IPRESOLVE, (long)wp->address_family);
+ 
+   if (wp->user != NULL) {
+ #ifdef HAVE_CURLOPT_USERNAME
+Index: collectd/src/curl_json.c
+===================================================================
+--- collectd.orig/src/curl_json.c
++++ collectd/src/curl_json.c
+@@ -583,7 +583,7 @@ static int cj_init_curl(cj_t *db) /* {{{
+   curl_easy_setopt(db->curl, CURLOPT_ERRORBUFFER, db->curl_errbuf);
+   curl_easy_setopt(db->curl, CURLOPT_FOLLOWLOCATION, 1L);
+   curl_easy_setopt(db->curl, CURLOPT_MAXREDIRS, 50L);
+-  curl_easy_setopt(db->curl, CURLOPT_IPRESOLVE, db->address_family);
++  curl_easy_setopt(db->curl, CURLOPT_IPRESOLVE, (long)db->address_family);
+ 
+   if (db->user != NULL) {
+ #ifdef HAVE_CURLOPT_USERNAME
+Index: collectd/src/curl_xml.c
+===================================================================
+--- collectd.orig/src/curl_xml.c
++++ collectd/src/curl_xml.c
+@@ -737,7 +737,7 @@ static int cx_init_curl(cx_t *db) /* {{{
+   curl_easy_setopt(db->curl, CURLOPT_ERRORBUFFER, db->curl_errbuf);
+   curl_easy_setopt(db->curl, CURLOPT_FOLLOWLOCATION, 1L);
+   curl_easy_setopt(db->curl, CURLOPT_MAXREDIRS, 50L);
+-  curl_easy_setopt(db->curl, CURLOPT_IPRESOLVE, db->address_family);
++  curl_easy_setopt(db->curl, CURLOPT_IPRESOLVE, (long)db->address_family);
+ 
+   if (db->user != NULL) {
+ #ifdef HAVE_CURLOPT_USERNAME
diff --git a/debian/patches/series b/debian/patches/series
index 57a7154..abc8eb0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+fix_curl_long_args
 fix-nut-integer-sizes
 fix-storing-local-variables
 rrd_filter_path.patch