Hi Ivo, > On Sat, Jun 07, 2025 at 05:12:57PM +0200, Bernd Zeimetz wrote: > > I've attached a diff of the sources instead, as I've done a > > source > > only upload. Its a trivial diff. > > The actual upload also changes the architectures for the libxen-dev > build-dep > to add armhf. As xen isn't available on armhf, this prevents the > build.
unfortunately they were two uploads that neither were committed to git, not a pull request was made nor a bug report.... so I missed the first of both of them. I've uploaded 5.12.0-25 that fixes that, diff attached. Thanks, Bernd -- Bernd Zeimetz Debian GNU/Linux Developer http://bzed.de http://www.debian.org GPG Fingerprint: ECA1 E3F2 8E11 2432 D485 DD95 EB36 171A 6FF9 435F
diff --git a/debian/changelog b/debian/changelog index 1a86b80..d2974d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +collectd (5.12.0-25) unstable; urgency=medium + + * [fadf6af] Also integrate the changes from -22.1. + Unfortunately they never made it into salsa or into the bug tracker and + got lost on the way. + + -- Bernd Zeimetz <[email protected]> Sat, 07 Jun 2025 17:56:53 +0200 + +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 <[email protected]> Sat, 07 Jun 2025 15:22:54 +0200 + collectd (5.12.0-23) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index 1e48c2b..e6dd59a 100644 --- a/debian/control +++ b/debian/control @@ -53,7 +53,7 @@ Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13), po-debconf, dh-str libudev-dev [linux-any], libupsclient-dev | libupsclient1-dev, libvirt-dev [!kfreebsd-i386 !kfreebsd-amd64 !sh4 !ia64 !alpha], - libxen-dev [amd64 arm64 armhf], + libxen-dev [amd64 arm64], libxml2-dev, libyajl-dev, linux-libc-dev [linux-any] | linux-libc-dev (<< 2.6.25-1) [linux-any], 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
