Merged branch 'wheezy' into jessie.

diff --cc debian/changelog
index ecdc1e81c4118caf6e2af228e75383b56e1bf0a9,6f83f95bb297b9d3a8d74079bbcc348d232765fd..031793ad0e4d5c2cfb8e1603bbfac3811eae1e0e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,289 -1,19 +1,305 @@@
 +collectd (5.4.1-6) unstable; urgency=medium
 +
 +  * debian/patches:
 +    - Added bts770681_riemann_ack: upstream fix for the write_riemann plugin
 +      to avoid locking up a remote Riemann instance; thanks to Marc Fournier
 +      for reporting this (Closes: #770681).
 +    - Added bts747093_lvm_segfault: upstream fix for a segfault in the LVM
 +      plugin; thanks to Bernd Zeimetz and Marc Fournier for reporting this
 +      (Closes: #747093).
 +    - Added bts770683_curl_init: upstream fix for a segfault in plugins using
 +      libcurl caused by concurrent memory access; thanks to Marc Fournier for
 +      reporting this (Closes: #770683, cf. #735173).
 +    - Added bts750440_config_segfault: upstream fix for a segfault when
 +      including empty config files; thanks to Bernd Zeimetz and Marc Fournier
 +      for reporting this (Closes: #750440, #770685).
 +    - Added bts770688_snmp_memleak: upstream fix for a memory leak in the
 +      SNMP plugin; thanks to Marc Fournier for reporting this
 +      (Closes: #770688).
 +    - Added bts770690_java_jni_thread_detach: upstream fix for locking up the
 +      Java plugin by not properly detaching from the JVM in error conditions;
 +      thanks to Marc Fournier for reporting this (Closes: #770690).
 +    - Added bts770693_timestamps: upstream fix for handling internal
 +      timestamps; thanks to Marc Fournier for reporting this (Closes: #770693)
 +    - Added bts770694_loglevel: upstream fix to correct logging behavior when
 +      using an invalid log level; thanks to Marc Fournier for reporting this
 +      (Closes: #770694, #687067).
 +
 + -- Sebastian Harl <tokkee@debian.org>  Sun, 23 Nov 2014 15:27:15 +0100
 +
 +collectd (5.4.1-5) unstable; urgency=medium
 +
 +  * debian/rules:
 +    - Fixed a typo preventing the fix for #760719 to be active
 +      (Closes: #760719).
 +
 + -- Sebastian Harl <tokkee@debian.org>  Sun, 28 Sep 2014 17:13:07 +0000
 +
 +collectd (5.4.1-4) unstable; urgency=medium
 +
 +  * debian/rules:
 +    - Disable preprocessor warnings on kfreebsd to work around an error
 +      resulting from a redefined macro in PostgreSQL's pg_config_manual.h;
 +      thanks to Ivo De Decker for reporting this (Closes: #760719).
 +  * debian/control, debian/rules:
 +    - Disable the 'java' plugin on sparc for now. It fails to build.
 +
 + -- Sebastian Harl <tokkee@debian.org>  Sun, 28 Sep 2014 01:59:14 +0200
 +
 +collectd (5.4.1-3.1) unstable; urgency=medium
 +
 +  * Non-maintainer upload.
 +  * debian/control:
 +    - Build-Depend on libprotobuf-c-dev instead of libprotobuf-c0-dev due to
 +      the protobuf-c transition (Closes: #756422).
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Tue, 12 Aug 2014 15:36:27 -0400
 +
 +collectd (5.4.1-3) unstable; urgency=medium
 +
 +  * debian/control:
 +    - Added libupsclient-dev as primary alternate build-dep to
 +      libupsclient1-dev; thanks to Laurent Bigonville for reporting this and
 +      Marc Fournier for sending a patch (Closes: #730397).
 +
 + -- Sebastian Harl <tokkee@debian.org>  Mon, 28 Apr 2014 23:29:53 +0200
 +
 +collectd (5.4.1-2) unstable; urgency=medium
 +
 +  * debian/rules, debian/control:
 +    - Disable varnish for now; it does not work with varnish 4;
 +      c.f. https://bugs.debian.org/745902 (Closes: #745894).
 +    - Drop build dependency on libvarnishapi-dev.
 +    - Build-depend on libow-dev and re-enable the onewire plugin; thanks to
 +      Adam Smutnicki for pointing this out (Closes: #744956).
 +  * debian/rules:
 +    - Added INSTALL_BASE= to perl options; else, modules are installed
 +      into $HOME.
 +    - Prepend collectd/core to collectd's header files; thanks to Sergio
 +      Jimenez for reporting this (Closes: #739516).
 +  * debian/patches:
 +    - Added collection.cgi.dpatch fixing apache data-sources; thanks to
 +      Fabiano Pires for reporting this and providing a patch
 +      (Closes: #743881).
 +    - Added myplugin_api.dpatch updating myplugin.c to the latest API.
 +
 + -- Sebastian Harl <tokkee@debian.org>  Sat, 26 Apr 2014 16:54:19 +0200
 +
 +collectd (5.4.1-1) unstable; urgency=medium
 +
 +  * New upstream release:
 +    - Fixed a segfault when using <Match> without an Instance; thanks to
 +      Alexander Golovko for reporting this (Closes: #732701).
 +    - Fixed gcrypt initialization issues (partly fixed in 5.1.1 already);
 +      thanks to Pieter Lexis for reporting this (Closes: #735173).
 +  * debian/patches:
 +    - Removed amqp_0_4.dpatch; merged upstream.
 +  * debian/control:
 +    - Updated standards-version to 3.9.5; no changes.
 +  * debian/rules:
 +    - Use -Wno-error=deprecated-declarations to suppress libdbi deprecation
 +      warnings for now; they would else cause build failures due to -Werror.
 +
 + -- Sebastian Harl <tokkee@debian.org>  Tue, 28 Jan 2014 21:47:00 +0100
 +
 +collectd (5.4.0-3) unstable; urgency=low
 +
 +  * debian/control:
 +    - Removed build-dep on iproute-dev which is about to be removed and has
 +      been superseded by libmnl-dev in collectd. Thanks to Laurent Bigonville
 +      and Andreas Henriksson for reporting this (Closes: #726921).
 +  * debian/collectd.conf:
 +    - Removed sample configuration for the write_mongodb plugin; the plugin is
 +      not available on Debian; thanks to Bryan Fullerton for reporting this
 +      (cf. LP:#1206813, Closes: #724699).
 +  * debian/patches:
 +    - Added amqp_0_4.dpatch: Added support for rabbitmq-c 0.4.x.
 +
 + -- Sebastian Harl <tokkee@debian.org>  Sat, 23 Nov 2013 16:08:05 +0100
 +
 +collectd (5.4.0-2) unstable; urgency=low
 +
 +  * debian/control:
 +    - Limit build-dependency on libmnl-dev to linux-any. debian/rules already
 +      did the right thing and excluded the 'netlink' plugin on kfreebsd.
 +      Thanks to Ivo De Decker for reporting this (Closes: #724911).
 +
 + -- Sebastian Harl <tokkee@debian.org>  Thu, 03 Oct 2013 12:23:18 +0200
 +
 +collectd (5.4.0-1) unstable; urgency=low
 +
 +  * New upstream release (Closes: #723187):
 +    - MySQL plugin now uses the name of the <Database> block rather than the
 +      database name to identify the read callback; thanks to Mathieu Parent
 +      for reporting this (Closes: #703446).
 +    - Fixed a segfault in the ethstat plugin; thanks to Maximilian Engelhardt
 +      for reporting this (Closes: #698584).
 +    - The swap plugin now reports NaN rather than failing if no swap space is
 +      available; thanks to Simon Richter for reporting this (Closes: #679163).
 +    New plugins:
 +    - read statistics from Aquaero 5 watercooling boards: aquaero (disabled in
 +      Debian because of missing dependencies)
 +    - CPU accounting information for Linux process groups: cgroups (disabled
 +      on non-Linux systems)
 +    - Logical Volume Manager usage: lvm (disabled on non-Linux systems)
 +    - Intel Many-Integrated-Core (MIC) statistics: mic (disabled in Debian
 +      because of missing dependencies)
 +    - statistics of sigrok-supported devices: sigrok (disabled in Debian
 +      because of missing dependencies)
 +    - aggregate values received with the StatsD protocol: statsd
 +    - incremental parsing of CSV files: tail_csv
 +    - send collected values to Riemann: write_riemann
 +  * Uploading to unstable; Wheezy has long been released.
 +  * debian/patches:
 +    - Removed pod-perl-5.18.dpatch; applied upstream.
 +  * debian/control, debian/rules:
 +    - Depend on libmnl-dev and enable the netlink plugin on all architectures
 +      (upstream removed the dependency on the netlink library which is only
 +      available as a static non-PIC library on Debian) (Closes: #531352).
 +    - Depend on liblvm2-dev and enable the LVM plugin on Linux.
 +  * debian/rules:
 +    - Disable the aquaero plugin which requires libaquaero5.
 +    - Disable the cgroups plugin on non-Linux.
 +    - Disable the MIC plugin which requires libmic.
 +    - Disable the sigrok plugin which requires libsigrok >= 0.2.0.
 +    - Removed the Perl INSTALL_BASE workaround introduced in 5.2.0-1.
 +  * debian/control:
 +    - Removed build-dependency on libhal-dev; HAL is deprecated and will be
 +      removed from Debian. It was optionally used by the uuid plugin.
 +      (Closes: #615203)
 +    - Build-conflict with libhal-dev to ensure consistent builds (cf. #615203).
 +    - Let libcollectdclient-dev replace/break collectd-dev (<< 5.2.0-1)
 +      because it ships files previously shipped by that package; thanks to
 +      Andreas Beckmann for reporting this (Closes: #717973).
 +    - Let collectd-core / collectd suggest / recommend default-jre-headless
 +      (cf. #683525).
 +  * debian/collectd-core.collectd.init.d:
 +    - Do not use different PID files for collectd and collectdmon. Else, a
 +      process might be left-over after changing USE_COLLECTDMON and restarting
 +      collectd. Thanks to Dennis Hoppe for reporting this (Closes: #704048).
 +  * debian/collectd-core.templates, debian/po/:
 +    - Fixed path-names of NEWS.Debian.gz and the migrate scripts; thanks to
 +      Uli Martens for reporting this (Closes: #719292).
 +  * debian/po/:
 +    - Updated Italian debconf template translation; thanks to Beatrice
 +      Torracca (Closes: #705869).
 +    - Updated Japanese debconf template translation; thanks to 'victory'
 +      (Closes: #715283).
 +  * debian/collectd.conf:
 +    - Recursively include all '*.conf' files in /etc/collectd/collectd.conf.d/
 +      using the new 'Include' option's 'Filter' feature; thanks to Laurent
 +      Bigonville for suggesting this change (Closes: #690668).
 +
 + -- Sebastian Harl <tokkee@debian.org>  Wed, 18 Sep 2013 13:26:58 +0200
 +
 +collectd (5.2.1-1) experimental; urgency=low
 +
 +  * New upstream release.
 +  * debian/patches:
 +    - Removed postgresql_writer_memleak.dpatch -- applied upstream.
 +  * debian/collectd-utils.install:
 +    - Install collectd-tg manpage.
 +  * debian/control:
 +    - Updated standards-version to 3.9.4 -- no changes.
 +
 + -- Sebastian Harl <tokkee@debian.org>  Wed, 30 Jan 2013 21:35:30 +0100
 +
 +collectd (5.2.0-2) experimental; urgency=low
 +
 +  * debian/patches:
 +    - Added postgresql_writer_memleak.dpatch fixing a memory leak in the
 +      PostgreSQL writer implementation.
 +
 + -- Sebastian Harl <tokkee@debian.org>  Thu, 29 Nov 2012 09:09:51 +0100
 +
 +collectd (5.2.0-1) experimental; urgency=low
 +
 +  * New upstream release:
 +    - ping plugin: Don't abort if ping_send fails but report an error only;
 +      thanks to Bernd Zeimetz for reporting this (Closes: #630683).
 +    - df plugin: Ignore "rootfs" file-system type to make sure that root
 +      file-system statistics are only collected once; thanks to Florian La
 +      Roche for reporting this (Closes: #657122).
 +    - Fixed parse errors when using (including) empty config files; thanks to
 +      Reinhard Tartler for reporting this (Closes: #592881).
 +    New plugins:
 +    - Aggregate multiple values lists into one: aggregation
 +    - Query statistics from BSD's packet filter: pf (FreeBSD only)
 +  * Uploading to experimental because of the Wheezy freeze.
 +  * debian/control, debian/rules:
 +    - Build-depend on kfreebsd-kernel-headers (kfreebsd-any only) and disable
 +      the 'pf' plugin on non-kfreebsd systems.
 +  * debian/patches:
 +    - Removed migrate-4-5-df.dpatch; merged upstream.
 +    - Removed rtnl_dump_filter.dpatch; merged upstream.
 +    - Added myplugin_includes.dpatch -- change the example plugin include path
 +      to /usr/include/collectd/core/ (see below).
 +    - rrd_filter_path.dpatch: Also patch the migrate-4-5 script; while this is
 +      not required for the (optional) auto-migration when updating the package
 +      (the full path is passed as an argument) it helps the user to just use
 +      the script without the need to add further arguments; thanks to Joey
 +      Hess for reporting this (Closes: #689001).
 +  * debian/rules:
 +    - Fix installation paths used for Perl bindings. Upstream now passes
 +      INSTALL_BASE rather than PREFIX to Makefile.PL which resulted in the
 +      bindings being installed to different locations than before.
 +  * debian/collectd-utils.install:
 +    - Install collectd-tg(1).
 +  * debian/libcollectdclient-dev.install:
 +    - Install the libcollectdclient network*.h header files.
 +  * Renamed libcollectclient0 to libcollectdclient1 due to the SONAME version
 +    bump.
 +  * debian/libcollectdclient1.symbols:
 +    - Updated for 5.2.
 +  * debian/collectd-dev.install:
 +    - Install the collectd (daemon) headers to /usr/include/collectd/core/
 +      rather than /usr/include/collectd/. The latter is used by
 +      libcollectdclient which causes file conflicts.
 +  * debian/collectd.conf:
 +    - Let the 'df' plugin ignore 'rootfs' (else, the root file-system would
 +      appear twice, causing one of the updates to fail and spam the log) and
 +      the usual virtual / temporary file-systems (cf. #657122).
 +  * debian/collectd-core.postrm:
 +    - Source the debconf confmodule to make the db_* functions available;
 +      thanks to Joey Hess and YunQiang Su for reporting this
 +      (Closes: #680172, #688285).
 +  * debian/po:
 +    - Updated Brazilian Portuguese debconf templates; thanks to Adriano Rafael
 +      Gomes (Closes: #685760).
 +
 + -- Sebastian Harl <tokkee@debian.org>  Tue, 20 Nov 2012 15:40:12 +0100
 +
 +collectd (5.1.0-3.1) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * Fix "FTBFS with perl 5.18: POD errors":
 +    add patch pod-perl-5.18 that adds =encoding to some POD files.
 +    (Closes: #708718)
 +  * Fix "Transition package to use default java implementation":
 +    apply modified patch from Ubuntu / James Page:
 +    - switch build dependency from openjdk-6-jdk to default-jdk
 +    - set JAVA_HOME to /usr/lib/jvm/default-java
 +    - update lintian override accordingly
 +    (Closes: #683525)
 +
 + -- 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:

diff --cc debian/patches/00list
index f9939c617a79aa0a71b119a0b7e39be8dee43f9e,1e263d1ac3b03213cf0da32b07c28d8edd27d48a..6a4b44179a27b0a0f010445fb8cc961c5fcf03d0
--- 1/debian/patches/00list
--- 2/debian/patches/00list
+++ b/debian/patches/00list
@@@ -1,14 -1,7 +1,16 @@@
+ CVE-2016-6254.dpatch
+ bts832577-gcry-control.dpatch
  rrd_filter_path.dpatch
  collection_conf_path.dpatch
 +collection.cgi.dpatch
 +myplugin_includes.dpatch
 +myplugin_api.dpatch
  bts559801_plugin_find_fix.dpatch
 -rtnl_dump_filter.dpatch
 -migrate-4-5-df.dpatch
 +bts770681_riemann_ack.dpatch
 +bts747093_lvm_segfault.dpatch
 +bts770683_curl_init.dpatch
 +bts750440_config_segfault.dpatch
 +bts770688_snmp_memleak.dpatch
 +bts770690_java_jni_thread_detach.dpatch
 +bts770693_timestamps.dpatch
 +bts770694_loglevel.dpatch