Merge branch 'master' into precise-ppa

 Conflicts:
	debian/changelog
	debian/control

diff --cc debian/changelog
index c584530a72bcd2d39a66c8af4ab1ae39ecfd8a29,fc1d143bb58d1b01422e4e5c5e8a7fef51cdd6f1..01cb3601588cb922fae1c6a16b0201dbf7f2274f
--- 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-1ubuntu0~ppa12.04.1) precise; urgency=medium
 +
 +  * Rebuild for precise PPA.
 +
 + -- Marc Fournier <marc@bl.uem.li>  Fri, 29 Jan 2016 14:54:42 +0100
 +
  collectd (5.5.1-1) unstable; urgency=medium
  
    * New upstream release:

diff --cc debian/control
index bd5d0b74c3f967cf30d1f230b5d9fe8368d8b09a,90e0bbd927deea35de78f6a72e63c2d6f9d8f94e..69163dde6ebe960ff94e55539ea4ac13a7418420
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -3,7 -3,7 +3,7 @@@ 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,
@@@ -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

diff --cc debian/rules
Simple merge