Merged branch 'master' into wheezy-backports-sloppy.

diff --combined debian/changelog
index 2c0d242d08e1899c99094f5032d8a2092cb69313,fc1d143bb58d1b01422e4e5c5e8a7fef51cdd6f1..07b01beee5a566c3de84b120fb414bcc4eb94f03
--- 1/debian/changelog
--- 2/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 <tokkee@debian.org>  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 <tokkee@debian.org>  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 <marc@bl.uem.li>  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 <marc@bl.uem.li>  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 <tokkee@debian.org>  Sat, 02 Apr 2016 11:02:49 +0200
+ 
 +collectd (5.5.1-1~bpo7+1) wheezy-backports-sloppy; urgency=medium
 +
 +  * Rebuild for wheezy-backports-sloppy.
 +
 + -- Marc Fournier <marc@bl.uem.li>  Fri, 29 Jan 2016 14:18:24 +0100
 +
  collectd (5.5.1-1) unstable; urgency=medium
  
    * New upstream release:
@@@ -31,20 -93,6 +99,20 @@@ collectd (5.5.0-4) unstable; urgency=me
  
   -- Marc Fournier <marc@bl.uem.li>  Mon, 16 Nov 2015 21:03:31 +0100
  
 +collectd (5.5.0-3~bpo7+1) wheezy-backports-sloppy; urgency=medium
 +
 +  * Rebuild for wheezy-backports-sloppy.
 +  * debian/rules, debian/control:
 +    - remove references to systemd and strip-nondeterminism, which were
 +      introduced in jessie.
 +    - disable building sigrok, turbostat and write_kafka plugins, as the
 +      required build-dependencies aren't available in wheezy.
 +    - build uuid plugin against libhal, as this lib is still available on
 +      wheezy.
 +    - adjust libprotobuf build-dependency name.
 +
 + -- Marc Fournier <marc@bl.uem.li>  Thu, 08 Oct 2015 08:26:10 +0200
 +
  collectd (5.5.0-3) unstable; urgency=medium
  
    * debian/rules, debian/control:
@@@ -149,6 -197,22 +217,22 @@@ collectd (5.5.0-1) unstable; urgency=me
  
   -- Marc Fournier <marc.fournier@camptocamp.com>  Fri, 21 Aug 2015 13:29:17 +0200
  
+ collectd (5.4.1-6+deb8u1) jessie-security; urgency=high
+ 
+   * debian/patches/CVE-2016-6254.dpatch: 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)
+   * debian/patches/bts832577-gcry-control.dpatch: 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)
+ 
+  -- Sebastian Harl <tokkee@debian.org>  Thu, 28 Jul 2016 22:25:08 +0200
+ 
  collectd (5.4.1-6) unstable; urgency=medium
  
    * debian/patches:
@@@ -435,6 -499,22 +519,22 @@@ collectd (5.1.0-3.1) unstable; urgency=
  
   -- gregor herrmann <gregoa@debian.org>  Sun, 26 May 2013 00:52:37 +0200
  
+ collectd (5.1.0-3+deb7u1) wheezy-security; urgency=high
+ 
+   * debian/patches/CVE-2016-6254.dpatch: 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)
+   * debian/patches/bts832577-gcry-control.dpatch: 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)
+ 
+  -- Sebastian Harl <tokkee@debian.org>  Thu, 28 Jul 2016 20:52:12 +0200
+ 
  collectd (5.1.0-3) unstable; urgency=low
  
    * debian/patches/migrate-4-5-df.dpatch, debian/collectd-core.postinst:
@@@ -1581,7 -1661,7 +1681,7 @@@ collectd (3.9.4+debian-1) unstable; urg
    * Initial release (Closes: #373008).
    * Removed upstream's debian/ directory from .orig.tar.gz.
    * getifaddrs.dpatch: Patching src/traffic.c to read data from /proc instead
-     of using getifaddrs(). getifaddrs() does not seem to work correctly on 
+     of using getifaddrs(). getifaddrs() does not seem to work correctly on
      AMD64.
  
   -- Sebastian Harl <sh@tokkee.org>  Fri,  7 Jul 2006 15:49:42 +0200

diff --combined debian/control
index fc94c72520b7a19b8ea89e2995e49d1b6ac251a2,90e0bbd927deea35de78f6a72e63c2d6f9d8f94e..f89f5bbd4192a8d9e6527ecdfcd301d94c8d584b
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -3,20 -3,19 +3,20 @@@ Section: util
  Priority: optional
  Maintainer: Sebastian Harl <tokkee@debian.org>
  Uploaders: Marc Fournier <marc@bl.uem.li>
- 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,
   kfreebsd-kernel-headers [kfreebsd-any],
   libatasmart-dev [linux-any],
 - libcap-dev [linux-any],
 +# libcap-dev [linux-any],
   libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev,
   libdbi0-dev,
   libesmtp-dev,
   libganglia1-dev (>= 3) [linux-any],
   libgcrypt11-dev,
   libglib2.0-dev,
 + libhal-dev,
   libhiredis-dev,
   libi2c-dev,
   libkvm-dev [kfreebsd-any],
@@@ -33,12 -32,12 +33,12 @@@
   libpcap0.8-dev | libpcap-dev,
   libperl-dev,
   libpq-dev,
 - libprotobuf-c-dev,
 - librdkafka-dev,
 + libprotobuf-c0-dev,
 +# librdkafka-dev,
   librabbitmq-dev,
   librrd-dev (>= 1.4~),
   libsensors4-dev [linux-any],
 - libsigrok-dev (>= 0.2~) [linux-any],
 +# libsigrok-dev (>= 0.2~),
  # libsnmp-dev (>= 5.4.2.1~dfsg-4~) | (libsnmp-dev & perl (<< 5.10.1~rc2-1~))
   libsnmp-dev (>= 5.4.2.1~dfsg-4~) | libsnmp-dev | libsnmp9-dev,
   libsnmp-dev (>= 5.4.2.1~dfsg-4~) | perl (<< 5.10.1~rc2-1~),
@@@ -54,8 -53,8 +54,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

diff --combined debian/rules
index 17983fd7eff59ea3df7ca353865ce7bd09306fdf,fca492c9b3d482e6613583f5a2e8bb38db04eb44..1029f44b9c9317435aabe2f260aca76b1fdbfd4a
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -79,18 -79,9 +79,18 @@@ confflags += --disable-oracl
  # librouteros is required for the routeros plugin.
  confflags += --disable-routeros
  
 +# libsigrok >= 0.2.0 is required for the sigrok plugin
 +confflags += --disable-sigrok
 +
 +# linux-libc-dev >= 3.13 is required for the turbostat plugin.
 +confflags += --disable-turbostat
 +
  # libmongoc is required for the write_mongodb plugin.
  confflags += --disable-write_mongodb
  
 +# librdkafka is required for the write_kafka plugin.
 +confflags += --disable-write_kafka
 +
  # xmms1 is required for the xmms plugin.
  confflags += --disable-xmms
  
@@@ -108,6 -99,10 +108,10 @@@ ifneq (,$(filter kfreebsd-i386 kfreebsd
                --disable-numa \
                --disable-sensors \
                --disable-vserver
+       # libsigrok >= 0.2.0 is required for the sigrok plugin,
+       # only available on Linux.
+       confflags += \
+               --disable-sigrok
  endif
  
  # This plugin is FreeBSD-specific.
@@@ -166,9 -161,15 +170,15 @@@ ifneq (,$(filter hppa sparc, $(DEB_BUIL
        confflags += --disable-java
  endif
  
- config.status: configure
+ build: build-arch build-indep
+ build-arch: build-stamp
+ build-indep: build-stamp
+ 
+ build-stamp:
        dh_testdir
        
+       dh_autoreconf
+       
        # This is a work-around for #474087 (broken openipmi .pc files).
        mkdir debian/pkgconfig
        sed -re 's/^(Requires:.*) pthread(.*)$$/\1\2/' \
@@@ -181,13 -182,6 +191,6 @@@
                JAVA_LDFLAGS="$(JAVA_LDFLAGS)" \
                || ( status=$$?; cat config.log; exit $$status )
  
- build: build-arch build-indep
- build-arch: build-stamp
- build-indep: build-stamp
- 
- build-stamp: config.status
-       dh_testdir
-       
        $(MAKE)
        perl ./debian/bin/check_plugins.pl
        
@@@ -205,6 -199,7 +208,7 @@@ clean
        
        rm -rf debian/pkgconfig
        
+       dh_autoreconf_clean
        dh_clean
        debconf-updatepo
  
@@@ -284,9 -279,12 +288,9 @@@ binary-arch: build install-arc
                && rm -f lib/Collectd/Graph/File.pm lib/Collectd/Graph/Filter.pm \
                && rm -f lib/Collectd/Graph/MetaData.pm )
        dh_installdebconf -a
 -      dh_systemd_enable -pcollectd-core --name=collectd
        dh_installinit -pcollectd-core --name=collectd -- defaults 95
 -      dh_systemd_start -pcollectd-core
        dh_link -a
        dh_strip -a --dbg-package=collectd-dbg
 -      dh_strip_nondeterminism -pcollectd-core
        dh_compress -a -Xexamples/
        dh_fixperms -a
        dh_makeshlibs -a