package/collectd: remove libvirt from list of disabled plugins
PATCH 1/2 package/collectd: remove libvirt from list of disabled plugins
With collectd 5.5.0 the "libvirt plugin has been renamed to virt":
https://git.octo.it/?p=collectd.git;a=blob;f=ChangeLog;h=b0a997c53ac1a74bc39470bdd243f853fa095c9f;hb=refs/tags/collectd-5.5.0#l235
"virt" is already mentioned in COLLECTD_PLUGINS_DISABLE so we can just remove "libvirt" to fix:
configure: WARNING: unrecognized options: [...] --disable-libvirt
--- package/collectd/collectd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/collectd/collectd.mk +1 -1
@@ -15,7 +15,7 @@ COLLECTD_LICENSE_FILES = COPYING libltdl/COPYING.LIB # These require unmet dependencies, are fringe, pointless or deprecated COLLECTD_PLUGINS_DISABLE = \ apple_sensors aquaero ascent barometer dbi dpdkstat email \ - gmond grpc hddtemp intel_rdt ipmi java libvirt lpar lua lvm \ + gmond grpc hddtemp intel_rdt ipmi java lpar lua lvm \ madwifi mbmon mic multimeter netapp notify_desktop numa \ nut onewire oracle perl pf pinba powerdns python routeros \ rrdcached sigrok tape target_v5upgrade teamspeak2 ted \
Signature · 1 line
2.20.1
PATCH 2/2 package/collectd: security bump to version 5.9.0
Removed patches applied upstream.
Added upstream sha1 & sha512 hashes.
Removed libltdl/COPYING.LIB from LICENSE_FILES after upstream removal in version 5.8.0:
https://git.octo.it/?p=collectd.git;a=blob;f=ChangeLog;h=7ea5a07f10c0334f9b0f32480590b2c848577559;hb=HEAD#l90
Version 5.7.2 fixed CVE-2017-7401
https://git.octo.it/?p=collectd.git;a=blob;f=ChangeLog;h=7ea5a07f10c0334f9b0f32480590b2c848577559;hb=HEAD#l285
--- ...collectdclient-increase-error-buffer.patch | 87 ------------------ ...gps-plugin-fix-build-with-newer-gpsd.patch | 43 --------- ...checks-for-upper-limit-of-SENSORS_AP.patch | 89 ------------------- package/collectd/collectd.hash | 7 +- package/collectd/collectd.mk | 4 +- 5 files changed, 7 insertions(+), 223 deletions(-) delete mode 100644 package/collectd/0001-libcollectdclient-increase-error-buffer.patch delete mode 100644 package/collectd/0002-gps-plugin-fix-build-with-newer-gpsd.patch delete mode 100644 package/collectd/0003-sensors-Removed-checks-for-upper-limit-of-SENSORS_AP.patch
package/collectd/0001-libcollectdclient-increase-error-buffer.patch deleted +0 -87
@@ -1,87 +0,0 @@ -From e170f3559fcda6d37a012aba187a96b1f42e8f9d Mon Sep 17 00:00:00 2001 -From: Ruben Kerkhof <[email protected]> -Date: Sun, 2 Jul 2017 21:52:14 +0200 -Subject: [PATCH] libcollectdclient: increase error buffer -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -make[1]: Entering directory '/home/ruben/src/collectd' - CC src/libcollectdclient/libcollectdclient_la-client.lo -src/libcollectdclient/client.c: In function ???lcc_getval???: -src/libcollectdclient/client.c:621:23: warning: ???%s??? directive output may be truncated writing up to 1023 bytes into a region of size 1010 [-Wformat-truncation=] - LCC_SET_ERRSTR(c, "Server error: %s", res.message); - ^ ~ -src/libcollectdclient/client.c:94:48: note: in definition of macro ???LCC_SET_ERRSTR??? - snprintf((c)->errbuf, sizeof((c)->errbuf), __VA_ARGS__); \ - ^~~~~~~~~~~ -src/libcollectdclient/client.c:94:5: note: ???snprintf??? output between 15 and 1038 bytes into a destination of size 1024 - snprintf((c)->errbuf, sizeof((c)->errbuf), __VA_ARGS__); \ - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -src/libcollectdclient/client.c:621:5: note: in expansion of macro ???LCC_SET_ERRSTR??? - LCC_SET_ERRSTR(c, "Server error: %s", res.message); - ^~~~~~~~~~~~~~ -src/libcollectdclient/client.c: In function ???lcc_putval???: -src/libcollectdclient/client.c:754:23: warning: ???%s??? directive output may be truncated writing up to 1023 bytes into a region of size 1010 [-Wformat-truncation=] - LCC_SET_ERRSTR(c, "Server error: %s", res.message); - ^ ~ -src/libcollectdclient/client.c:94:48: note: in definition of macro ???LCC_SET_ERRSTR??? - snprintf((c)->errbuf, sizeof((c)->errbuf), __VA_ARGS__); \ - ^~~~~~~~~~~ -src/libcollectdclient/client.c:94:5: note: ???snprintf??? output between 15 and 1038 bytes into a destination of size 1024 - snprintf((c)->errbuf, sizeof((c)->errbuf), __VA_ARGS__); \ - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -src/libcollectdclient/client.c:754:5: note: in expansion of macro ???LCC_SET_ERRSTR??? - LCC_SET_ERRSTR(c, "Server error: %s", res.message); - ^~~~~~~~~~~~~~ -src/libcollectdclient/client.c: In function ???lcc_flush???: -src/libcollectdclient/client.c:802:23: warning: ???%s??? directive output may be truncated writing up to 1023 bytes into a region of size 1010 [-Wformat-truncation=] - LCC_SET_ERRSTR(c, "Server error: %s", res.message); - ^ ~ -src/libcollectdclient/client.c:94:48: note: in definition of macro ???LCC_SET_ERRSTR??? - snprintf((c)->errbuf, sizeof((c)->errbuf), __VA_ARGS__); \ - ^~~~~~~~~~~ -src/libcollectdclient/client.c:94:5: note: ???snprintf??? output between 15 and 1038 bytes into a destination of size 1024 - snprintf((c)->errbuf, sizeof((c)->errbuf), __VA_ARGS__); \ - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -src/libcollectdclient/client.c:802:5: note: in expansion of macro ???LCC_SET_ERRSTR??? - LCC_SET_ERRSTR(c, "Server error: %s", res.message); - ^~~~~~~~~~~~~~ -src/libcollectdclient/client.c: In function ???lcc_listval???: -src/libcollectdclient/client.c:834:23: warning: ???%s??? directive output may be truncated writing up to 1023 bytes into a region of size 1010 [-Wformat-truncation=] - LCC_SET_ERRSTR(c, "Server error: %s", res.message); - ^ ~ -src/libcollectdclient/client.c:94:48: note: in definition of macro ???LCC_SET_ERRSTR??? - snprintf((c)->errbuf, sizeof((c)->errbuf), __VA_ARGS__); \ - ^~~~~~~~~~~ -src/libcollectdclient/client.c:94:5: note: ???snprintf??? output between 15 and 1038 bytes into a destination of size 1024 - snprintf((c)->errbuf, sizeof((c)->errbuf), __VA_ARGS__); \ - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -src/libcollectdclient/client.c:834:5: note: in expansion of macro ???LCC_SET_ERRSTR??? - LCC_SET_ERRSTR(c, "Server error: %s", res.message); - ^~~~~~~~~~~~~~ - -Fixes #2200 - -[Upstream commit: https://git.octo.it/?p=collectd.git;a=commitdiff;h=e170f3559fcda6d37a012aba187a96b1f42e8f9d] -Signed-off-by: Thomas Petazzoni <[email protected]> ---- - src/libcollectdclient/client.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libcollectdclient/client.c b/src/libcollectdclient/client.c -index 51a4ab2..3ae2e71 100644 ---- a/src/libcollectdclient/client.c -+++ b/src/libcollectdclient/client.c -@@ -99,7 +99,7 @@ - */ - struct lcc_connection_s { - FILE *fh; -- char errbuf[1024]; -+ char errbuf[2048]; - }; - - struct lcc_response_s { --- -1.7.10.4 -
package/collectd/0002-gps-plugin-fix-build-with-newer-gpsd.patch deleted +0 -43
43 lines not on this page · raw message
package/collectd/0003-sensors-Removed-checks-for-upper-limit-of-SENSORS_AP.patch deleted +0 -89
89 lines not on this page · raw message
package/collectd/collectd.hash +5 -2
@@ -1,6 +1,9 @@ +# From https://collectd.org/files/SHA512SUM +sha512 f2bf9896dd8fa116834418ea46aabdb160002da7f2600b7d5120d40eb7a956ccc845299696c854c2335946903374c84bbaeb28667319bf07b7a54ea465cccd54 collectd-5.9.0.tar.bz2 # From https://collectd.org/files/SHA256SUM -sha256 7edd3643c0842215553b2421d5456f4e9a8a58b07e216b40a7e8e91026d8e501 collectd-5.7.1.tar.bz2 +sha256 7b220f8898a061f6e7f29a8c16697d1a198277f813da69474a67911097c0626b collectd-5.9.0.tar.bz2 +# From https://collectd.org/files/SHA1SUM +sha1 58cd22ef8130f17c714e9609053cf45d311ac6c7 collectd-5.9.0.tar.bz2 # Hash for license files sha256 ed0409b2b1c30566dab5fcdaf46ee70e140c99788e22f0267645a9357b476ae4 COPYING -sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa libltdl/COPYING.LIB
package/collectd/collectd.mk +2 -2
@@ -4,13 +4,13 @@ # ################################################################################ -COLLECTD_VERSION = 5.7.1 +COLLECTD_VERSION = 5.9.0 COLLECTD_SITE = http://collectd.org/files COLLECTD_SOURCE = collectd-$(COLLECTD_VERSION).tar.bz2 COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes COLLECTD_INSTALL_STAGING = YES COLLECTD_LICENSE = MIT (daemon, plugins), GPL-2.0 (plugins), LGPL-2.1 (plugins) -COLLECTD_LICENSE_FILES = COPYING libltdl/COPYING.LIB +COLLECTD_LICENSE_FILES = COPYING # These require unmet dependencies, are fringe, pointless or deprecated COLLECTD_PLUGINS_DISABLE = \
Signature · 1 line
2.20.1
PATCH 2/2 package/collectd: security bump to version 5.9.0
Hello,
package/collectd/collectd.mk line 7
Quoted 2 lines · Bernd Kuhls
package/collectd/collectd.mk +1
-1-COLLECTD_VERSION = 5.7.1 +COLLECTD_VERSION = 5.9.0
5.9.1 has been released few days ago:
https://github.com/collectd/collectd/releases
Greets
Alex
Signature · 11 lines
/"\ ASCII RIBBON | ?With the first link, the chain is forged. The first \ / CAMPAIGN | speech censured, the first thought forbidden, the X AGAINST | first freedom denied, chains us all irrevocably.? / \ HTML MAIL | (Jean-Luc Picard, quoting Judge Aaron Satie) -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190804/11d26181/attachment.asc>
PATCH 2/2 package/collectd: security bump to version 5.9.0
Am Sun, 04 Aug 2019 19:18:45 +0200 schrieb Alexander Dahl:
Quoted 3 lines
5.9.1 has been released few days ago:
Hi,
https://collectd.org/files/ only has 5.9.0.
5.9.1 does not include any security patches, shall I wait for 5.9.1 to be released on collectd.org or should we switch to the github helper? In this case we need to autoreconf the package...
Regards, Bernd
PATCH 2/2 package/collectd: security bump to version 5.9.0
Hello Bernd,
Quoted 5 lines · Bernd Kuhls
Am Sun, 04 Aug 2019 19:18:45 +0200 schrieb Alexander Dahl:
Quoted 3 lines
5.9.1 has been released few days ago:
Quoted 7 lines
Hi,
https://collectd.org/files/ only has 5.9.0.
5.9.1 does not include any security patches, shall I wait for 5.9.1 to be released on collectd.org or should we switch to the github helper? In this case we need to autoreconf the package...
I'm not familiar with how upstream collectd publishes their packages and I did not look into changes between 5.9.0 and 5.9.1 in detail.
At fli4l one developer was affected by build problems with 5.9.0 on 32bit targets, which were "solved" by introducing a snprintf wrapper, see this PR: https://github.com/collectd/collectd/pull/3153
That was cherry picked from collectd master to their 5.9.x branch, which got a tag in Git, I noticed when looking for a solution to that specific build failure.
From a quick glance on changes between 5.9.0 and 5.9.1 now, I would consider most of them build issues, and only some fixing other stuff. I can not say if anything has security impact.
HTH & Greets
Alex
Signature · 11 lines
/"\ ASCII RIBBON | ?With the first link, the chain is forged. The first \ / CAMPAIGN | speech censured, the first thought forbidden, the X AGAINST | first freedom denied, chains us all irrevocably.? / \ HTML MAIL | (Jean-Luc Picard, quoting Judge Aaron Satie) -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190805/f78c9597/attachment.asc>
PATCH 2/2 package/collectd: security bump to version 5.9.0
In reply to Bernd KuhlsQuoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Bernd" == Bernd Kuhls <[email protected]> writes:
Removed patches applied upstream.
Added upstream sha1 & sha512 hashes.Removed libltdl/COPYING.LIB from
LICENSE_FILESafter upstream removal in version 5.8.0:
https://git.octo.it/?p=collectd.git;a=blob;f=ChangeLog;h=7ea5a07f10c0334f9b0f32480590b2c848577559;hb=HEAD#l90Version 5.7.2 fixed CVE-2017-7401
https://git.octo.it/?p=collectd.git;a=blob;f=ChangeLog;h=7ea5a07f10c0334f9b0f32480590b2c848577559;hb=HEAD#l285
For 2019.02.x and 2019.05.x I have instead bumped the version to 5.7.2.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/2 package/collectd: remove libvirt from list of disabled plugins
In reply to Bernd KuhlsQuoted 6 lines · On Sun, 4 Aug 2019 17:09:56 +0200 Bernd Kuhls <[email protected]> wrote:
With collectd 5.5.0 the "libvirt plugin has been renamed to virt":
https://git.octo.it/?p=collectd.git;a=blob;f=ChangeLog;h=b0a997c53ac1a74bc39470bdd243f853fa095c9f;hb=refs/tags/collectd-5.5.0#l235"virt" is already mentioned in
COLLECTD_PLUGINS_DISABLEso we can just remove "libvirt" to fix:
Quoted 6 lines
configure: WARNING: unrecognized options: [...] --disable-libvirt
Signed-off-by Bernd Kuhls <[email protected]>--- package/collectd/collectd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Both applied. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/2 package/collectd: remove libvirt from list of disabled plugins
In reply to Bernd KuhlsQuoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Bernd" == Bernd Kuhls <[email protected]> writes:
With collectd 5.5.0 the "libvirt plugin has been renamed to virt":
https://git.octo.it/?p=collectd.git;a=blob;f=ChangeLog;h=b0a997c53ac1a74bc39470bdd243f853fa095c9f;hb=refs/tags/collectd-5.5.0#l235"virt" is already mentioned in
COLLECTD_PLUGINS_DISABLEso we can just remove "libvirt" to fix:configure: WARNING: unrecognized options: [...] --disable-libvirt
Signed-off-by Bernd Kuhls <[email protected]>
Committed to 2019.02.x and 2019.05.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard