From: Marc Fournier Date: Tue, 9 Aug 2016 20:53:13 +0000 (+0200) Subject: Merge branch 'master' into precise-ppa X-Git-Tag: collectd-5.5.2-1ubuntu0_ppa12.04.1~1 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c72261dcf93829bd66b03527f3a620f3109562c3;p=pkg-collectd.git Merge branch 'master' into precise-ppa Conflicts: debian/changelog debian/control --- c72261dcf93829bd66b03527f3a620f3109562c3 diff --cc debian/changelog index c584530,fc1d143..01cb360 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,71 +1,77 @@@ + collectd (5.5.2-1) unstable; urgency=high + + * New upstream release. + - Fix heap overflow in the network plugin. Emilien Gaspar has identified a + heap overflow in parse_packet(), the function used by the network plugin + to parse incoming network packets. Thanks to Florian Forster for + reporting the bug in Debian. (Closes: #832507, CVE-2016-6254) + - Fix improper usage of gcry_control. A team of security researchers at + Columbia University and the University of Virginia discovered that + GCrypt's gcry_control is sometimes called without checking its return + value for an error. This may cause the program to be initialized without + the desired, secure settings. (Closes: #832577) + * debian/patches: + - bts832577-gcry-control.patch: Update for 5.5.2. Mostly part of the new + upstream release, except for: Don't abort() if gcrypt initialization + failed. + - Drop bts823012_librrd8.patch; merged upstream. + * Rebuild with linux-libc-dev >= 4.6 (now in testing and unstable) to + accommodate a change to rtnl_link_stats64. Thanks to Gábor Gombás for + reporting this (Closes: #829634). + + -- Sebastian Harl Fri, 29 Jul 2016 00:02:11 +0200 + + collectd (5.5.1-5) unstable; urgency=low + + * debian/control, debian/rules: + - Disable the sigrok plugin on non-Linux; restrict build dependency to + linux-any; thanks to Andreas Beckmann for reporting this + (Closes: #825606). + * debian/rules: + - Fix failure to build twice in a row introduced by dh_autoreconf_clean; + drop the separate config.status target and, hence, a dependency on the + configure script. + * debian/patches/: + - Added gcc6.patch: Fix FTBFS with GCC 6; thanks to Lucas Nussbaum for + reporting this (Closes: #831194). + + -- Sebastian Harl Sun, 17 Jul 2016 23:30:33 +0200 + + collectd (5.5.1-4) unstable; urgency=medium + + * debian/control: + - Add dh-autoreconf to Build-Depends. + - Update standards-version to 3.9.8 (no changes). + + -- Marc Fournier Tue, 31 May 2016 18:16:43 +0200 + + collectd (5.5.1-3) unstable; urgency=medium + + * Re-enable gmond plugin. Thanks to Michael Tautschnig and Jean-Michel + Vourgère for fixing #812462. + * debian/patches: + - Add bts823012_librrd8.patch. Properly detect thread safety with librrd8. + Thanks to Jean-Michel Vourgère for the patch (Closes: #823012). + * debian/collectd.conf: + - Add missing example blocks in main configuration file (Closes: #806196). + + -- Marc Fournier Wed, 25 May 2016 23:14:14 +0200 + + collectd (5.5.1-2) unstable; urgency=medium + + * Disable the gmond plugin for now. Ganglia is not available in testing + (cf. #812462). Thanks to Santiago Vila for reporting this + (Closes: #819241). + * Update standards-version to 3.9.7 (no changes). + + -- Sebastian Harl Sat, 02 Apr 2016 11:02:49 +0200 + +collectd (5.5.1-1ubuntu0~ppa12.04.1) precise; urgency=medium + + * Rebuild for precise PPA. + + -- Marc Fournier Fri, 29 Jan 2016 14:54:42 +0100 + collectd (5.5.1-1) unstable; urgency=medium * New upstream release: diff --cc debian/control index bd5d0b7,90e0bbd..69163dd --- a/debian/control +++ b/debian/control @@@ -3,7 -3,7 +3,7 @@@ Section: util Priority: optional Maintainer: Sebastian Harl Uploaders: Marc Fournier - Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf, -Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf, dh-systemd (>= 1.5), dh-strip-nondeterminism, dh-autoreconf, ++Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf, dh-autoreconf, bison, flex, autotools-dev, libltdl-dev, pkg-config, iptables-dev (>= 1.4.3.2-2) [linux-any], javahelper, @@@ -51,8 -53,8 +51,8 @@@ default-jdk [!hppa !sparc !kfreebsd-i386 !kfreebsd-amd64], protobuf-c-compiler, python-dev -Build-Conflicts: libpthread-dev, libhal-dev +Build-Conflicts: libpthread-dev - Standards-Version: 3.9.6 + Standards-Version: 3.9.8 Homepage: http://collectd.org/ Vcs-Git: git://git.tokkee.org/pkg-collectd.git Vcs-Browser: http://git.tokkee.org/?p=pkg-collectd.git