From: Erik Kapfer <ummeegge@ipfire.org>
Date: Thu, 7 Nov 2019 12:20:55 +0000 (+0100)
Subject: collectd: Update to version 5.9.2 [TESTING]
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fcollectd_update;p=people%2Fummeegge%2Fipfire-2.x.git

collectd: Update to version 5.9.2 [TESTING]

Which includes:
- lm_sensors update to version 3-6-0 as needed dependency.
- libstatgrab as needed dependency which went from packages to common and was replaced in make.sh.
- A lot of patches are not needed anymore.
- OpenVPN patchset needs to be patched new (not done until now).

Signed-off-by: Erik Kapfer <ummeegge@ipfire.org>
---

diff --git a/config/rootfiles/common/aarch64/lm_sensors b/config/rootfiles/common/aarch64/lm_sensors
index 1346047b97..4516f0d2e7 100644
--- a/config/rootfiles/common/aarch64/lm_sensors
+++ b/config/rootfiles/common/aarch64/lm_sensors
@@ -7,16 +7,21 @@ usr/bin/sensors-conf-convert
 #usr/include/sensors/sensors.h
 #usr/lib/libsensors.a
 #usr/lib/libsensors.so
-usr/lib/libsensors.so.4
-usr/lib/libsensors.so.4.4.0
+usr/lib/libsensors.so.5
+usr/lib/libsensors.so.5.0.0
 #usr/man/man1/sensors.1
 #usr/man/man3/libsensors.3
 #usr/man/man5/sensors.conf.5
 #usr/man/man5/sensors3.conf.5
 #usr/man/man8/fancontrol.8
+#usr/man/man8/isadump.8
+#usr/man/man8/isaset.8
 #usr/man/man8/pwmconfig.8
 #usr/man/man8/sensors-conf-convert.8
 #usr/man/man8/sensors-detect.8
 usr/sbin/fancontrol
+usr/sbin/isadump
+usr/sbin/isaset
 usr/sbin/pwmconfig
 usr/sbin/sensors-detect
+
diff --git a/config/rootfiles/common/armv5tel/lm_sensors b/config/rootfiles/common/armv5tel/lm_sensors
index 998b02e9f1..4516f0d2e7 100644
--- a/config/rootfiles/common/armv5tel/lm_sensors
+++ b/config/rootfiles/common/armv5tel/lm_sensors
@@ -6,9 +6,9 @@ usr/bin/sensors-conf-convert
 #usr/include/sensors/error.h
 #usr/include/sensors/sensors.h
 #usr/lib/libsensors.a
-usr/lib/libsensors.so
-usr/lib/libsensors.so.4
-usr/lib/libsensors.so.4.4.0
+#usr/lib/libsensors.so
+usr/lib/libsensors.so.5
+usr/lib/libsensors.so.5.0.0
 #usr/man/man1/sensors.1
 #usr/man/man3/libsensors.3
 #usr/man/man5/sensors.conf.5
@@ -20,5 +20,8 @@ usr/lib/libsensors.so.4.4.0
 #usr/man/man8/sensors-conf-convert.8
 #usr/man/man8/sensors-detect.8
 usr/sbin/fancontrol
+usr/sbin/isadump
+usr/sbin/isaset
 usr/sbin/pwmconfig
 usr/sbin/sensors-detect
+
diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd
index cac4c3de14..6671e09bdc 100644
--- a/config/rootfiles/common/collectd
+++ b/config/rootfiles/common/collectd
@@ -8,239 +8,237 @@ etc/rc.d/rc0.d/K50collectd
 etc/rc.d/rc3.d/S29collectd
 etc/rc.d/rc6.d/K50collectd
 #usr/bin/collectd-nagios
+#usr/bin/collectd-tg
+#usr/bin/collectdctl
 #usr/etc/collectd.conf
 #usr/include/collectd
 #usr/include/collectd/client.h
 #usr/include/collectd/lcc_features.h
+#usr/include/collectd/network.h
+#usr/include/collectd/network_buffer.h
+#usr/include/collectd/network_parse.h
+#usr/include/collectd/server.h
+#usr/include/collectd/types.h
 #usr/lib/collectd
-#usr/lib/collectd/apache.a
+#usr/lib/collectd/aggregation.la
+usr/lib/collectd/aggregation.so
 #usr/lib/collectd/apache.la
 usr/lib/collectd/apache.so
-#usr/lib/collectd/apcups.a
 #usr/lib/collectd/apcups.la
 usr/lib/collectd/apcups.so
-#usr/lib/collectd/ascent.a
 #usr/lib/collectd/ascent.la
 usr/lib/collectd/ascent.so
-#usr/lib/collectd/battery.a
 #usr/lib/collectd/battery.la
 usr/lib/collectd/battery.so
-#usr/lib/collectd/bind.a
 #usr/lib/collectd/bind.la
 usr/lib/collectd/bind.so
-#usr/lib/collectd/conntrack.a
+#usr/lib/collectd/cgroups.la
+usr/lib/collectd/cgroups.so
+#usr/lib/collectd/chrony.la
+usr/lib/collectd/chrony.so
 #usr/lib/collectd/conntrack.la
 usr/lib/collectd/conntrack.so
-#usr/lib/collectd/contextswitch.a
 #usr/lib/collectd/contextswitch.la
 usr/lib/collectd/contextswitch.so
-#usr/lib/collectd/cpu.a
 #usr/lib/collectd/cpu.la
 usr/lib/collectd/cpu.so
-#usr/lib/collectd/cpufreq.a
 #usr/lib/collectd/cpufreq.la
 usr/lib/collectd/cpufreq.so
-#usr/lib/collectd/curl.a
+#usr/lib/collectd/cpusleep.la
+usr/lib/collectd/cpusleep.so
 #usr/lib/collectd/curl.la
 usr/lib/collectd/curl.so
-#usr/lib/collectd/curl_xml.a
 #usr/lib/collectd/curl_xml.la
 usr/lib/collectd/curl_xml.so
-#usr/lib/collectd/df.a
 #usr/lib/collectd/df.la
 usr/lib/collectd/df.so
-#usr/lib/collectd/disk.a
 #usr/lib/collectd/disk.la
 usr/lib/collectd/disk.so
-#usr/lib/collectd/dns.a
 #usr/lib/collectd/dns.la
 usr/lib/collectd/dns.so
-#usr/lib/collectd/email.a
+#usr/lib/collectd/drbd.la
+usr/lib/collectd/drbd.so
 #usr/lib/collectd/email.la
 usr/lib/collectd/email.so
-#usr/lib/collectd/entropy.a
 #usr/lib/collectd/entropy.la
 usr/lib/collectd/entropy.so
-#usr/lib/collectd/exec.a
+#usr/lib/collectd/ethstat.la
+usr/lib/collectd/ethstat.so
 #usr/lib/collectd/exec.la
 usr/lib/collectd/exec.so
-#usr/lib/collectd/filecount.a
+#usr/lib/collectd/fhcount.la
+usr/lib/collectd/fhcount.so
 #usr/lib/collectd/filecount.la
 usr/lib/collectd/filecount.so
-#usr/lib/collectd/fscache.a
 #usr/lib/collectd/fscache.la
 usr/lib/collectd/fscache.so
-#usr/lib/collectd/hddtemp.a
 #usr/lib/collectd/hddtemp.la
 usr/lib/collectd/hddtemp.so
-#usr/lib/collectd/interface.a
+#usr/lib/collectd/hugepages.la
+usr/lib/collectd/hugepages.so
 #usr/lib/collectd/interface.la
 usr/lib/collectd/interface.so
-#usr/lib/collectd/iptables.a
+#usr/lib/collectd/ipc.la
+usr/lib/collectd/ipc.so
 #usr/lib/collectd/iptables.la
 usr/lib/collectd/iptables.so
-#usr/lib/collectd/irq.a
 #usr/lib/collectd/irq.la
 usr/lib/collectd/irq.so
-#usr/lib/collectd/load.a
 #usr/lib/collectd/load.la
 usr/lib/collectd/load.so
-#usr/lib/collectd/logfile.a
 #usr/lib/collectd/logfile.la
 usr/lib/collectd/logfile.so
-#usr/lib/collectd/madwifi.a
 #usr/lib/collectd/madwifi.la
 usr/lib/collectd/madwifi.so
-#usr/lib/collectd/match_empty_counter.a
 #usr/lib/collectd/match_empty_counter.la
 usr/lib/collectd/match_empty_counter.so
-#usr/lib/collectd/match_hashed.a
 #usr/lib/collectd/match_hashed.la
 usr/lib/collectd/match_hashed.so
-#usr/lib/collectd/match_regex.a
 #usr/lib/collectd/match_regex.la
 usr/lib/collectd/match_regex.so
-#usr/lib/collectd/match_timediff.a
 #usr/lib/collectd/match_timediff.la
 usr/lib/collectd/match_timediff.so
-#usr/lib/collectd/match_value.a
 #usr/lib/collectd/match_value.la
 usr/lib/collectd/match_value.so
-#usr/lib/collectd/memory.a
+#usr/lib/collectd/mcelog.la
+usr/lib/collectd/mcelog.so
+#usr/lib/collectd/md.la
+usr/lib/collectd/md.so
 #usr/lib/collectd/memory.la
 usr/lib/collectd/memory.so
-#usr/lib/collectd/multimeter.a
 #usr/lib/collectd/multimeter.la
 usr/lib/collectd/multimeter.so
-#usr/lib/collectd/network.a
 #usr/lib/collectd/network.la
 usr/lib/collectd/network.so
-#usr/lib/collectd/nfs.a
 #usr/lib/collectd/nfs.la
 usr/lib/collectd/nfs.so
-#usr/lib/collectd/ntpd.a
+#usr/lib/collectd/notify_nagios.la
+usr/lib/collectd/notify_nagios.so
 #usr/lib/collectd/ntpd.la
 usr/lib/collectd/ntpd.so
-#usr/lib/collectd/olsrd.a
+#usr/lib/collectd/numa.la
+usr/lib/collectd/numa.so
 #usr/lib/collectd/olsrd.la
 usr/lib/collectd/olsrd.so
-#usr/lib/collectd/openvpn.a
+#usr/lib/collectd/openldap.la
+usr/lib/collectd/openldap.so
 #usr/lib/collectd/openvpn.la
 usr/lib/collectd/openvpn.so
-#usr/lib/collectd/ping.a
+#usr/lib/collectd/pcie_errors.la
+usr/lib/collectd/pcie_errors.so
 #usr/lib/collectd/ping.la
 usr/lib/collectd/ping.so
-#usr/lib/collectd/powerdns.a
 #usr/lib/collectd/powerdns.la
 usr/lib/collectd/powerdns.so
-#usr/lib/collectd/processes.a
 #usr/lib/collectd/processes.la
 usr/lib/collectd/processes.so
-#usr/lib/collectd/protocols.a
 #usr/lib/collectd/protocols.la
 usr/lib/collectd/protocols.so
-#usr/lib/collectd/python.a
 #usr/lib/collectd/python.la
 usr/lib/collectd/python.so
-#usr/lib/collectd/rrdcached.a
 #usr/lib/collectd/rrdcached.la
 usr/lib/collectd/rrdcached.so
-#usr/lib/collectd/rrdtool.a
 #usr/lib/collectd/rrdtool.la
 usr/lib/collectd/rrdtool.so
-#usr/lib/collectd/sensors.a
 #usr/lib/collectd/sensors.la
 usr/lib/collectd/sensors.so
-#usr/lib/collectd/swap.a
+#usr/lib/collectd/statsd.la
+usr/lib/collectd/statsd.so
 #usr/lib/collectd/swap.la
 usr/lib/collectd/swap.so
-#usr/lib/collectd/syslog.a
+#usr/lib/collectd/synproxy.la
+usr/lib/collectd/synproxy.so
 #usr/lib/collectd/syslog.la
 usr/lib/collectd/syslog.so
-#usr/lib/collectd/table.a
 #usr/lib/collectd/table.la
 usr/lib/collectd/table.so
-#usr/lib/collectd/tail.a
 #usr/lib/collectd/tail.la
 usr/lib/collectd/tail.so
-#usr/lib/collectd/target_notification.a
+#usr/lib/collectd/tail_csv.la
+usr/lib/collectd/tail_csv.so
 #usr/lib/collectd/target_notification.la
 usr/lib/collectd/target_notification.so
-#usr/lib/collectd/target_replace.a
 #usr/lib/collectd/target_replace.la
 usr/lib/collectd/target_replace.so
-#usr/lib/collectd/target_scale.a
 #usr/lib/collectd/target_scale.la
 usr/lib/collectd/target_scale.so
-#usr/lib/collectd/target_set.a
 #usr/lib/collectd/target_set.la
 usr/lib/collectd/target_set.so
-#usr/lib/collectd/tcpconns.a
+#usr/lib/collectd/target_v5upgrade.la
+usr/lib/collectd/target_v5upgrade.so
 #usr/lib/collectd/tcpconns.la
 usr/lib/collectd/tcpconns.so
-#usr/lib/collectd/teamspeak2.a
 #usr/lib/collectd/teamspeak2.la
 usr/lib/collectd/teamspeak2.so
-#usr/lib/collectd/ted.a
 #usr/lib/collectd/ted.la
 usr/lib/collectd/ted.so
-#usr/lib/collectd/thermal.a
 #usr/lib/collectd/thermal.la
 usr/lib/collectd/thermal.so
-#usr/lib/collectd/unixsock.a
+#usr/lib/collectd/threshold.la
+usr/lib/collectd/threshold.so
+#usr/lib/collectd/turbostat.la
+usr/lib/collectd/turbostat.so
 #usr/lib/collectd/unixsock.la
 usr/lib/collectd/unixsock.so
-#usr/lib/collectd/uptime.a
 #usr/lib/collectd/uptime.la
 usr/lib/collectd/uptime.so
-#usr/lib/collectd/users.a
 #usr/lib/collectd/users.la
 usr/lib/collectd/users.so
-#usr/lib/collectd/uuid.a
 #usr/lib/collectd/uuid.la
 usr/lib/collectd/uuid.so
-#usr/lib/collectd/vmem.a
 #usr/lib/collectd/vmem.la
 usr/lib/collectd/vmem.so
-#usr/lib/collectd/wireless.a
 #usr/lib/collectd/wireless.la
 usr/lib/collectd/wireless.so
-#usr/lib/collectd/write_http.a
+#usr/lib/collectd/write_graphite.la
+usr/lib/collectd/write_graphite.so
 #usr/lib/collectd/write_http.la
 usr/lib/collectd/write_http.so
-#usr/lib/libcollectdclient.a
+#usr/lib/collectd/write_log.la
+usr/lib/collectd/write_log.so
+#usr/lib/collectd/write_sensu.la
+usr/lib/collectd/write_sensu.so
+#usr/lib/collectd/write_syslog.la
+usr/lib/collectd/write_syslog.so
+#usr/lib/collectd/write_tsdb.la
+usr/lib/collectd/write_tsdb.so
+#usr/lib/collectd/zfs_arc.la
+usr/lib/collectd/zfs_arc.so
+#usr/lib/collectd/zookeeper.la
+usr/lib/collectd/zookeeper.so
 #usr/lib/libcollectdclient.la
 usr/lib/libcollectdclient.so
-usr/lib/libcollectdclient.so.0
-usr/lib/libcollectdclient.so.0.0.0
-#usr/lib/perl5/Collectd
-#usr/lib/perl5/Collectd.pm
-#usr/lib/perl5/Collectd/Plugins
-#usr/lib/perl5/Collectd/Plugins/OpenVZ.pm
-#usr/lib/perl5/Collectd/Unixsock.pm
-#usr/lib/perl5/MACHINE-linux-thread-multi
-#usr/lib/perl5/MACHINE-linux-thread-multi/auto
-#usr/lib/perl5/MACHINE-linux-thread-multi/auto/Collectd
-#usr/lib/perl5/MACHINE-linux-thread-multi/auto/Collectd/.packlist
-#usr/lib/perl5/MACHINE-linux-thread-multi/perllocal.pod
+usr/lib/libcollectdclient.so.1
+usr/lib/libcollectdclient.so.1.1.0
+#usr/lib/perl5/site_perl/5.30.0/Collectd
+#usr/lib/perl5/site_perl/5.30.0/Collectd.pm
+#usr/lib/perl5/site_perl/5.30.0/Collectd/Plugins
+#usr/lib/perl5/site_perl/5.30.0/Collectd/Plugins/OpenVZ.pm
+#usr/lib/perl5/site_perl/5.30.0/Collectd/Unixsock.pm
+#usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/Collectd
+#usr/lib/perl5/site_perl/5.30.0/x86_64-linux-thread-multi/auto/Collectd/.packlist
 #usr/lib/pkgconfig/libcollectdclient.pc
-#usr/man/man3/Collectd::Unixsock.3
 usr/sbin/collectd
 usr/sbin/collectdmon
 #usr/share/collectd
 #usr/share/collectd/postgresql_default.conf
 usr/share/collectd/types.db
 #usr/share/man/man1/collectd-nagios.1
+#usr/share/man/man1/collectd-tg.1
 #usr/share/man/man1/collectd.1
+#usr/share/man/man1/collectdctl.1
 #usr/share/man/man1/collectdmon.1
+#usr/share/man/man3/Collectd::Unixsock.3
 #usr/share/man/man5/collectd-email.5
 #usr/share/man/man5/collectd-exec.5
 #usr/share/man/man5/collectd-java.5
+#usr/share/man/man5/collectd-lua.5
 #usr/share/man/man5/collectd-perl.5
 #usr/share/man/man5/collectd-python.5
 #usr/share/man/man5/collectd-snmp.5
+#usr/share/man/man5/collectd-threshold.5
 #usr/share/man/man5/collectd-unixsock.5
 #usr/share/man/man5/collectd.conf.5
 #usr/share/man/man5/types.db.5
-#var/lib/collectd
 var/ipfire/ovpn/collectd.vpn
+#var/lib/collectd
\ No newline at end of file
diff --git a/config/rootfiles/common/i586/lm_sensors b/config/rootfiles/common/i586/lm_sensors
index 9936e0466a..4516f0d2e7 100644
--- a/config/rootfiles/common/i586/lm_sensors
+++ b/config/rootfiles/common/i586/lm_sensors
@@ -6,9 +6,9 @@ usr/bin/sensors-conf-convert
 #usr/include/sensors/error.h
 #usr/include/sensors/sensors.h
 #usr/lib/libsensors.a
-usr/lib/libsensors.so
-usr/lib/libsensors.so.4
-usr/lib/libsensors.so.4.4.0
+#usr/lib/libsensors.so
+usr/lib/libsensors.so.5
+usr/lib/libsensors.so.5.0.0
 #usr/man/man1/sensors.1
 #usr/man/man3/libsensors.3
 #usr/man/man5/sensors.conf.5
@@ -24,3 +24,4 @@ usr/sbin/isadump
 usr/sbin/isaset
 usr/sbin/pwmconfig
 usr/sbin/sensors-detect
+
diff --git a/config/rootfiles/packages/libstatgrab b/config/rootfiles/common/libstatgrab
similarity index 100%
rename from config/rootfiles/packages/libstatgrab
rename to config/rootfiles/common/libstatgrab
diff --git a/config/rootfiles/common/x86_64/lm_sensors b/config/rootfiles/common/x86_64/lm_sensors
index 9936e0466a..4516f0d2e7 100644
--- a/config/rootfiles/common/x86_64/lm_sensors
+++ b/config/rootfiles/common/x86_64/lm_sensors
@@ -6,9 +6,9 @@ usr/bin/sensors-conf-convert
 #usr/include/sensors/error.h
 #usr/include/sensors/sensors.h
 #usr/lib/libsensors.a
-usr/lib/libsensors.so
-usr/lib/libsensors.so.4
-usr/lib/libsensors.so.4.4.0
+#usr/lib/libsensors.so
+usr/lib/libsensors.so.5
+usr/lib/libsensors.so.5.0.0
 #usr/man/man1/sensors.1
 #usr/man/man3/libsensors.3
 #usr/man/man5/sensors.conf.5
@@ -24,3 +24,4 @@ usr/sbin/isadump
 usr/sbin/isaset
 usr/sbin/pwmconfig
 usr/sbin/sensors-detect
+
diff --git a/lfs/collectd b/lfs/collectd
index e31324817f..62cd3d886a 100644
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = collectd
-VER        = 4.10.9
+VER        = 5.9.2
 
 THISAPP    = collectd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 980dd3387508f9ad209df04a6f7a126c
+$(DL_FILE)_MD5 = 764c62767a85885f4856224a30ee1a31
 
 install : $(TARGET)
 
@@ -79,44 +79,28 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && find . -name "Makefile.*" | xargs sed -e "s/-Werror//g" -i
-	cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0001-src-utils_mount.h-Add-stdio.h.patch
-	cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0002-Don-t-notify-continuously-when-MySQL-slave-SQL-threa.patch
-	cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0003-curl_xml.c-avoid-using-uninitalized-variable-in-erro.patch
-	cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0004-interface.c-FreeBSD-10-support.patch
-	cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0005-Revert-curl_xml.c-avoid-using-uninitalized-variable-.patch
-	cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0006-network-set_thread_cbs-so-we-initialize-the-right-th.patch
-	cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0007-apache-plugin-Call-curl_global_init-from-the-init-fu.patch
-	cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0008-network-comment-libgcrypt-initalization-process.patch
-	cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0009-Call-curl_global_init-in-_init-of-plugins-using-curl.patch
-	cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0010-indent-wh_init-to-be-consistent-with-the-rest-of-the.patch
-	cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0011-Configparser-when-we-alocate-an-empty-list-we-also-n.patch
-	cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0012-don-t-assume-pkg-config-is-in-PATH.patch
-	cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0013-add-missing-backticks-which-broke-the-build.patch
-	cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0014-snmp-free-snmp_pdu-struct-allocated-by-snmp_pdu_crea.patch
-	cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0015-curl_xml-plugin-Fixed-tautological-pointer-compariso.patch
-	cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0016-Add-support-for-OpenVPN-2.3.0-status-files.patch
-	cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0017-openvpn-plugin-Don-t-signal-an-error-when-no-clients.patch
-	cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0018-openvpn-Remove-boguous-file-handler-check.patch
-	cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0019-openvpn-Ignore-not-fully-established-connections.patch
-	cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0020-openvpn-Make-read-functions-robust-like-in-8516f9abb.patch
-	cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0021-openvpn-Fix-copy-and-paste-error.patch
-	cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0022-openvpn-Change-data-type-from-COUNTER-to-DERIVE.patch
-	cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/silence-openvpn-errors.patch
-	cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10.9-xfs-compile-fix.patch
-	cd $(DIR_APP) && autoreconf -vfi
-	cd $(DIR_APP)/libltdl && autoreconf -vfi
+	#$(UPDATE_AUTOMAKE)
+	#cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0016-Add-support-for-OpenVPN-2.3.0-status-files.patch
+	#cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0017-openvpn-plugin-Don-t-signal-an-error-when-no-clients.patch
+	#cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0018-openvpn-Remove-boguous-file-handler-check.patch
+	#cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0019-openvpn-Ignore-not-fully-established-connections.patch
+	#cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0020-openvpn-Make-read-functions-robust-like-in-8516f9abb.patch
+	#cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0021-openvpn-Fix-copy-and-paste-error.patch
+	#cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0022-openvpn-Change-data-type-from-COUNTER-to-DERIVE.patch
+	#cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/silence-openvpn-errors.patch
+	#cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10.9-xfs-compile-fix.patch
 	cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var \
-		--disable-{apple_sensors,csv,ipvs,mbmon,memcached,mysql} \
+		--disable-{apple_sensors,csv,ipvs,mbmon,memcached} \
 		--disable-{netlink,nginx,nut,perl,serial,snmp,tape,vserver,xmms} \
 		--disable-{perl,serial,snmp,tape,vserver,xmms} \
 		--enable-{apcups,battery,cpu{,freq},df,disk,dns,email,entropy,exec,hddtemp} \
 		--enable-{interface,iptables,irq,load,logfile,memory,multimeter} \
 		--enable-{network,nfs,ntpd,ping,processes,rrdtool,sensors,swap,syslog} \
-		--enable-{tcpconns,unixsock,users,wireless} \
+		--enable-{tcpconns,unixsock,users,wireless,openvpn} \
 		--with-librrd=/usr/share/rrdtool-1.2.30
-	cd $(DIR_APP) && make install #collectd-4 does not support parallel build
+
+	cd $(DIR_APP) && make all install #collectd-4 does not support parallel build
+
 	cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/
 	mv /etc/collectd.vpn /var/ipfire/ovpn/collectd.vpn
 	chown nobody.nobody /var/ipfire/ovpn/collectd.vpn
diff --git a/lfs/libstatgrab b/lfs/libstatgrab
index 471ba3ab6b..9c960b5b50 100644
--- a/lfs/libstatgrab
+++ b/lfs/libstatgrab
@@ -32,9 +32,6 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libstatgrab
-PAK_VER    = 2
-
-DEPS       = ""
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/lm_sensors b/lfs/lm_sensors
index 8403be6e0e..2a4756440e 100644
--- a/lfs/lm_sensors
+++ b/lfs/lm_sensors
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 3.4.0
+VER        = 3-6-0
 
-THISAPP    = lm_sensors-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+THISAPP    = lm-sensors-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c03675ae9d43d60322110c679416901a
+$(DL_FILE)_MD5 = f60e47b5eb50bbeed48a9f43bb08dd5e
 
 install : $(TARGET)
 
@@ -72,7 +72,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && make PREFIX=/usr $(MAKETUNING)
 	cd $(DIR_APP) && make PREFIX=/usr install
 	@rm -rf $(DIR_APP)
diff --git a/make.sh b/make.sh
index da674fcb67..d7c21fcde8 100755
--- a/make.sh
+++ b/make.sh
@@ -1433,6 +1433,7 @@ buildipfire() {
   lfsmake2 pcmciautils
   lfsmake2 lm_sensors
   lfsmake2 liboping
+  lfsmake2 libstatgrab
   lfsmake2 collectd
   lfsmake2 elinks
   lfsmake2 igmpproxy
@@ -1563,7 +1564,6 @@ buildipfire() {
   lfsmake2 pygpgme
   lfsmake2 pakfire3
   lfsmake2 stress
-  lfsmake2 libstatgrab
   lfsmake2 sarg
   lfsmake2 check_mk_agent
   lfsmake2 nginx
diff --git a/src/patches/collectd/0001-src-utils_mount.h-Add-stdio.h.patch b/src/patches/collectd/0001-src-utils_mount.h-Add-stdio.h.patch
deleted file mode 100644
index 7391fbfcb7..0000000000
--- a/src/patches/collectd/0001-src-utils_mount.h-Add-stdio.h.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4bbfb2b9f391f273744163cfda7bec96671e9d9c Mon Sep 17 00:00:00 2001
-From: Florian Forster <octo@collectd.org>
-Date: Thu, 18 Apr 2013 06:25:58 +0200
-Subject: [PATCH 01/22] src/utils_mount.h: Add <stdio.h>.
-
-This is required on Solaris 10. Thanks to dannypoo@ for reporting this
-problem.
-
-Github: #306
----
- src/utils_mount.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/utils_mount.h b/src/utils_mount.h
-index 1f2403c..83f789b 100644
---- a/src/utils_mount.h
-+++ b/src/utils_mount.h
-@@ -26,6 +26,7 @@
- #ifndef COLLECTD_UTILS_MOUNT_H
- #define COLLECTD_UTILS_MOUNT_H 1
- 
-+#include <stdio.h>
- #if HAVE_FS_INFO_H
- # include <fs_info.h>
- #endif
--- 
-1.9.3
-
diff --git a/src/patches/collectd/0002-Don-t-notify-continuously-when-MySQL-slave-SQL-threa.patch b/src/patches/collectd/0002-Don-t-notify-continuously-when-MySQL-slave-SQL-threa.patch
deleted file mode 100644
index f0beb39a2d..0000000000
--- a/src/patches/collectd/0002-Don-t-notify-continuously-when-MySQL-slave-SQL-threa.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f2391b9da6127e4acd5b54b7ae6c2d585df0e2a0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Joaqu=C3=ADn=20Cuenca=20Abela?= <e98cuenc@gmail.com>
-Date: Wed, 29 May 2013 16:22:09 +0200
-Subject: [PATCH 02/22] Don't notify continuously when MySQL slave SQL thread
- is running
-
-Signed-off-by: Florian Forster <octo@collectd.org>
----
- src/mysql.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/mysql.c b/src/mysql.c
-index 8b3cd21..f93a442 100644
---- a/src/mysql.c
-+++ b/src/mysql.c
-@@ -689,7 +689,7 @@ static int mysql_read_slave_stats (mysql_database_t *db, MYSQL *con)
- 			ssnprintf (n.message, sizeof (n.message),
- 					"slave SQL thread started");
- 			plugin_dispatch_notification (&n);
--			db->slave_sql_running = 0;
-+			db->slave_sql_running = 1;
- 		}
- 	}
- 
--- 
-1.9.3
-
diff --git a/src/patches/collectd/0003-curl_xml.c-avoid-using-uninitalized-variable-in-erro.patch b/src/patches/collectd/0003-curl_xml.c-avoid-using-uninitalized-variable-in-erro.patch
deleted file mode 100644
index 4011dd8121..0000000000
--- a/src/patches/collectd/0003-curl_xml.c-avoid-using-uninitalized-variable-in-erro.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From bbbf37d55a3959951604c4be482e9a705a0f86d9 Mon Sep 17 00:00:00 2001
-From: Marc Fournier <marc.fournier@camptocamp.com>
-Date: Tue, 7 Jan 2014 11:30:59 +0100
-Subject: [PATCH 03/22] curl_xml.c: avoid using uninitalized variable in error
- message
-
-Thanks to @trtrmitya for reporting this. Fixes GH#507
----
- src/curl_xml.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/curl_xml.c b/src/curl_xml.c
-index 75f5cc3..77aee60 100644
---- a/src/curl_xml.c
-+++ b/src/curl_xml.c
-@@ -551,12 +551,12 @@ static int cx_curl_perform (cx_t *db, CURL *curl) /* {{{ */
-   char *ptr;
-   char *url;
- 
--  db->buffer_fill = 0; 
-+  db->buffer_fill = 0;
-   status = curl_easy_perform (curl);
-   if (status != CURLE_OK)
-   {
--    ERROR ("curl_xml plugin: curl_easy_perform failed with status %i: %s (%s)",
--           status, db->curl_errbuf, url);
-+    ERROR ("curl_xml plugin: curl_easy_perform failed with status %i: %s",
-+           status, db->curl_errbuf);
-     return (-1);
-   }
- 
--- 
-1.9.3
-
diff --git a/src/patches/collectd/0004-interface.c-FreeBSD-10-support.patch b/src/patches/collectd/0004-interface.c-FreeBSD-10-support.patch
deleted file mode 100644
index cc7067dfd7..0000000000
--- a/src/patches/collectd/0004-interface.c-FreeBSD-10-support.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 645dadb3fcc466e8880fda4eb23b21ad433631fc Mon Sep 17 00:00:00 2001
-From: Marc Fournier <marc.fournier@camptocamp.com>
-Date: Tue, 7 Jan 2014 16:06:10 +0100
-Subject: [PATCH 04/22] interface.c: FreeBSD-10 support
-
-Quoting @trtrmitya in github issue #506 : "[...] it is broken on
-FreeBSD-10, in which getifaddrs() returns not only link level stats for
-a particular interface, but also entries for each IP configured on that
-interface. As a result if_submit() is called several times for each
-interface, which results in incorrect data being logged.
-
-I am attaching a patch which fixes a problem on FreeBSD (9/10), but it
-should work for every *BSD because [...] the getifaddrs implementation
-first appeared in BSDi BSD/OS."
-
-Many thanks to @trtrmitya for providing the patch !
----
- src/interface.c | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/src/interface.c b/src/interface.c
-index db998a3..9b566ea 100644
---- a/src/interface.c
-+++ b/src/interface.c
-@@ -213,18 +213,19 @@ static int interface_read (void)
- 
- 	for (if_ptr = if_list; if_ptr != NULL; if_ptr = if_ptr->ifa_next)
- 	{
--		if ((if_data = (struct IFA_DATA *) if_ptr->ifa_data) == NULL)
--			continue;
-+		if (if_ptr->ifa_addr != NULL && if_ptr->ifa_addr->sa_family == AF_LINK) {
-+			if_data = (struct IFA_DATA *) if_ptr->ifa_data;
- 
--		if_submit (if_ptr->ifa_name, "if_octets",
-+			if_submit (if_ptr->ifa_name, "if_octets",
- 				if_data->IFA_RX_BYTES,
- 				if_data->IFA_TX_BYTES);
--		if_submit (if_ptr->ifa_name, "if_packets",
-+			if_submit (if_ptr->ifa_name, "if_packets",
- 				if_data->IFA_RX_PACKT,
- 				if_data->IFA_TX_PACKT);
--		if_submit (if_ptr->ifa_name, "if_errors",
-+			if_submit (if_ptr->ifa_name, "if_errors",
- 				if_data->IFA_RX_ERROR,
- 				if_data->IFA_TX_ERROR);
-+		}
- 	}
- 
- 	freeifaddrs (if_list);
--- 
-1.9.3
-
diff --git a/src/patches/collectd/0005-Revert-curl_xml.c-avoid-using-uninitalized-variable-.patch b/src/patches/collectd/0005-Revert-curl_xml.c-avoid-using-uninitalized-variable-.patch
deleted file mode 100644
index 3534cded38..0000000000
--- a/src/patches/collectd/0005-Revert-curl_xml.c-avoid-using-uninitalized-variable-.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From cde09b547abbeb7595d91259fcc628504d0f55a9 Mon Sep 17 00:00:00 2001
-From: Marc Fournier <marc.fournier@camptocamp.com>
-Date: Wed, 8 Jan 2014 18:05:40 +0100
-Subject: [PATCH 05/22] Revert "curl_xml.c: avoid using uninitalized variable
- in error message"
-
-This reverts commit bbbf37d55a3959951604c4be482e9a705a0f86d9.
-
-A different fix for this problem was commited to the collectd-5.4 branch
-(8327ee64) and conflicts with this patch. Also, initializing url the
-same way as 8327ee64 does it, to avoid a merge conflict.
----
- src/curl_xml.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/curl_xml.c b/src/curl_xml.c
-index 77aee60..b941f02 100644
---- a/src/curl_xml.c
-+++ b/src/curl_xml.c
-@@ -550,13 +550,14 @@ static int cx_curl_perform (cx_t *db, CURL *curl) /* {{{ */
-   long rc;
-   char *ptr;
-   char *url;
-+  url = db->url;
- 
--  db->buffer_fill = 0;
-+  db->buffer_fill = 0; 
-   status = curl_easy_perform (curl);
-   if (status != CURLE_OK)
-   {
--    ERROR ("curl_xml plugin: curl_easy_perform failed with status %i: %s",
--           status, db->curl_errbuf);
-+    ERROR ("curl_xml plugin: curl_easy_perform failed with status %i: %s (%s)",
-+           status, db->curl_errbuf, url);
-     return (-1);
-   }
- 
--- 
-1.9.3
-
diff --git a/src/patches/collectd/0006-network-set_thread_cbs-so-we-initialize-the-right-th.patch b/src/patches/collectd/0006-network-set_thread_cbs-so-we-initialize-the-right-th.patch
deleted file mode 100644
index 460f4b542f..0000000000
--- a/src/patches/collectd/0006-network-set_thread_cbs-so-we-initialize-the-right-th.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From ddffda7a150cd3abdb6ec392b514a250e91e0c19 Mon Sep 17 00:00:00 2001
-From: Chris Lundquist <chris.lundquist@github.com>
-Date: Tue, 14 Jan 2014 18:33:13 -0800
-Subject: [PATCH 06/22] [network] set_thread_cbs so we initialize the right
- threading mode in gcry_check_version
-
-Signed-off-by: Florian Forster <octo@collectd.org>
----
- src/network.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/network.c b/src/network.c
-index d0ff6bc..be82c6f 100644
---- a/src/network.c
-+++ b/src/network.c
-@@ -500,8 +500,8 @@ static void network_init_gcrypt (void) /* {{{ */
-   if (gcry_control (GCRYCTL_ANY_INITIALIZATION_P))
-     return;
- 
--  gcry_check_version (NULL); /* before calling any other functions */
-   gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
-+  gcry_check_version (NULL); /* before calling *almost* any other functions */
-   gcry_control (GCRYCTL_INIT_SECMEM, 32768);
-   gcry_control (GCRYCTL_INITIALIZATION_FINISHED);
- } /* }}} void network_init_gcrypt */
--- 
-1.9.3
-
diff --git a/src/patches/collectd/0007-apache-plugin-Call-curl_global_init-from-the-init-fu.patch b/src/patches/collectd/0007-apache-plugin-Call-curl_global_init-from-the-init-fu.patch
deleted file mode 100644
index 8408337e73..0000000000
--- a/src/patches/collectd/0007-apache-plugin-Call-curl_global_init-from-the-init-fu.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 5f2f969335757f31f42cd8bb7e38eb8c5fe5e56e Mon Sep 17 00:00:00 2001
-From: Florian Forster <octo@collectd.org>
-Date: Wed, 15 Jan 2014 23:47:33 +0100
-Subject: [PATCH 07/22] apache plugin: Call curl_global_init() from the init
- function.
-
-This is a shot in the dark in trying to address #513. By calling this
-from an init() callback, I hope to be initializing the curl and gcrypt
-libraries before collectd becomes multi-threaded, avoiding the problems
-described in the issue.
----
- src/apache.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/apache.c b/src/apache.c
-index 899c21e..23bba3e 100644
---- a/src/apache.c
-+++ b/src/apache.c
-@@ -702,9 +702,18 @@ static int apache_read_host (user_data_t *user_data) /* {{{ */
- 	return (0);
- } /* }}} int apache_read_host */
- 
-+static int apache_init (void) /* {{{ */
-+{
-+	/* Call this while collectd is still single-threaded to avoid
-+	 * initialization issues in libgcrypt. */
-+	curl_global_init (CURL_GLOBAL_SSL);
-+	return (0);
-+} /* }}} int apache_init */
-+
- void module_register (void)
- {
- 	plugin_register_complex_config ("apache", config);
-+	plugin_register_init ("apache", apache_init);
- } /* void module_register */
- 
- /* vim: set sw=8 noet fdm=marker : */
--- 
-1.9.3
-
diff --git a/src/patches/collectd/0008-network-comment-libgcrypt-initalization-process.patch b/src/patches/collectd/0008-network-comment-libgcrypt-initalization-process.patch
deleted file mode 100644
index 9499328a56..0000000000
--- a/src/patches/collectd/0008-network-comment-libgcrypt-initalization-process.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 793c2046de1ac04689d541a5e83513fe8e62578c Mon Sep 17 00:00:00 2001
-From: Marc Fournier <marc.fournier@camptocamp.com>
-Date: Thu, 16 Jan 2014 00:30:42 +0100
-Subject: [PATCH 08/22] network: comment libgcrypt initalization process
-
----
- src/network.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/src/network.c b/src/network.c
-index be82c6f..f379a5c 100644
---- a/src/network.c
-+++ b/src/network.c
-@@ -500,8 +500,15 @@ static void network_init_gcrypt (void) /* {{{ */
-   if (gcry_control (GCRYCTL_ANY_INITIALIZATION_P))
-     return;
- 
-+ /* http://www.gnupg.org/documentation/manuals/gcrypt/Multi_002dThreading.html
-+  * To ensure thread-safety, it's important to set GCRYCTL_SET_THREAD_CBS
-+  * *before* initalizing Libgcrypt with gcry_check_version(), which itself must
-+  * be called before any other gcry_* function. GCRYCTL_ANY_INITIALIZATION_P
-+  * above doesn't count, as it doesn't implicitly initalize Libgcrypt.
-+  *
-+  * tl;dr: keep all these gry_* statements in this exact order please. */
-   gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
--  gcry_check_version (NULL); /* before calling *almost* any other functions */
-+  gcry_check_version (NULL);
-   gcry_control (GCRYCTL_INIT_SECMEM, 32768);
-   gcry_control (GCRYCTL_INITIALIZATION_FINISHED);
- } /* }}} void network_init_gcrypt */
--- 
-1.9.3
-
diff --git a/src/patches/collectd/0009-Call-curl_global_init-in-_init-of-plugins-using-curl.patch b/src/patches/collectd/0009-Call-curl_global_init-in-_init-of-plugins-using-curl.patch
deleted file mode 100644
index a2c3ef5227..0000000000
--- a/src/patches/collectd/0009-Call-curl_global_init-in-_init-of-plugins-using-curl.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 66b400ab01b8133e450bb002e175117a1ab6f9ae Mon Sep 17 00:00:00 2001
-From: Jeremy Katz <jeremy@katzbox.net>
-Date: Sun, 26 Jan 2014 20:43:19 -0500
-Subject: [PATCH 09/22] Call curl_global_init() in _init of plugins using curl
-
-Need to call curl_global_init() or curl_easy_init() during init
-for plugins when we're still running single threaded.  This
-updates the remaining ones
----
- src/curl.c       | 1 +
- src/curl_json.c  | 9 +++++++++
- src/curl_xml.c   | 9 +++++++++
- src/write_http.c | 9 +++++++++
- 4 files changed, 28 insertions(+)
-
-diff --git a/src/curl.c b/src/curl.c
-index 3899aaa..8d2893f 100644
---- a/src/curl.c
-+++ b/src/curl.c
-@@ -566,6 +566,7 @@ static int cc_init (void) /* {{{ */
-     INFO ("curl plugin: No pages have been defined.");
-     return (-1);
-   }
-+  curl_global_init (CURL_GLOBAL_SSL);
-   return (0);
- } /* }}} int cc_init */
- 
-diff --git a/src/curl_json.c b/src/curl_json.c
-index 24e1df1..0948962 100644
---- a/src/curl_json.c
-+++ b/src/curl_json.c
-@@ -882,9 +882,18 @@ static int cj_read (user_data_t *ud) /* {{{ */
-   return cj_curl_perform (db, db->curl);
- } /* }}} int cj_read */
- 
-+static int cj_init (void) /* {{{ */
-+{
-+  /* Call this while collectd is still single-threaded to avoid
-+   * initialization issues in libgcrypt. */
-+  curl_global_init (CURL_GLOBAL_SSL);
-+  return (0);
-+} /* }}} int cj_init */
-+
- void module_register (void)
- {
-   plugin_register_complex_config ("curl_json", cj_config);
-+  plugin_register_init ("curl_json", cj_init);
- } /* void module_register */
- 
- /* vim: set sw=2 sts=2 et fdm=marker : */
-diff --git a/src/curl_xml.c b/src/curl_xml.c
-index b941f02..e31e73d 100644
---- a/src/curl_xml.c
-+++ b/src/curl_xml.c
-@@ -926,9 +926,18 @@ static int cx_config (oconfig_item_t *ci) /* {{{ */
-   return (0);
- } /* }}} int cx_config */
- 
-+static int cx_init (void) /* {{{ */
-+{
-+  /* Call this while collectd is still single-threaded to avoid
-+   * initialization issues in libgcrypt. */
-+  curl_global_init (CURL_GLOBAL_SSL);
-+  return (0);
-+} /* }}} int cx_init */
-+
- void module_register (void)
- {
-   plugin_register_complex_config ("curl_xml", cx_config);
-+  plugin_register_init ("curl_xml", cx_init);
- } /* void module_register */
- 
- /* vim: set sw=2 sts=2 et fdm=marker : */
-diff --git a/src/write_http.c b/src/write_http.c
-index 62c73b0..04c637b 100644
---- a/src/write_http.c
-+++ b/src/write_http.c
-@@ -656,9 +656,18 @@ static int wh_config (oconfig_item_t *ci) /* {{{ */
-         return (0);
- } /* }}} int wh_config */
- 
-+static int wh_init (void) /* {{{ */
-+{
-+  /* Call this while collectd is still single-threaded to avoid
-+   * initialization issues in libgcrypt. */
-+  curl_global_init (CURL_GLOBAL_SSL);
-+  return (0);
-+} /* }}} int wh_init */
-+
- void module_register (void) /* {{{ */
- {
-         plugin_register_complex_config ("write_http", wh_config);
-+        plugin_register_init ("write_http", wh_init);
- } /* }}} void module_register */
- 
- /* vim: set fdm=marker sw=8 ts=8 tw=78 et : */
--- 
-1.9.3
-
diff --git a/src/patches/collectd/0010-indent-wh_init-to-be-consistent-with-the-rest-of-the.patch b/src/patches/collectd/0010-indent-wh_init-to-be-consistent-with-the-rest-of-the.patch
deleted file mode 100644
index 81f2d84025..0000000000
--- a/src/patches/collectd/0010-indent-wh_init-to-be-consistent-with-the-rest-of-the.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 6bd48f2346c5072dc22da58c7b7cd8e8ceb83fc5 Mon Sep 17 00:00:00 2001
-From: Marc Fournier <marc.fournier@camptocamp.com>
-Date: Sat, 29 Mar 2014 13:37:36 +0100
-Subject: [PATCH 10/22] indent wh_init() to be consistent with the rest of the
- file
-
----
- src/write_http.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/write_http.c b/src/write_http.c
-index 04c637b..0a13444 100644
---- a/src/write_http.c
-+++ b/src/write_http.c
-@@ -658,10 +658,10 @@ static int wh_config (oconfig_item_t *ci) /* {{{ */
- 
- static int wh_init (void) /* {{{ */
- {
--  /* Call this while collectd is still single-threaded to avoid
--   * initialization issues in libgcrypt. */
--  curl_global_init (CURL_GLOBAL_SSL);
--  return (0);
-+        /* Call this while collectd is still single-threaded to avoid
-+         * initialization issues in libgcrypt. */
-+        curl_global_init (CURL_GLOBAL_SSL);
-+        return (0);
- } /* }}} int wh_init */
- 
- void module_register (void) /* {{{ */
--- 
-1.9.3
-
diff --git a/src/patches/collectd/0011-Configparser-when-we-alocate-an-empty-list-we-also-n.patch b/src/patches/collectd/0011-Configparser-when-we-alocate-an-empty-list-we-also-n.patch
deleted file mode 100644
index b3e6f786e5..0000000000
--- a/src/patches/collectd/0011-Configparser-when-we-alocate-an-empty-list-we-also-n.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 6207fce91a0933e852ec76fc31ca81ec00ffa04b Mon Sep 17 00:00:00 2001
-From: Wilfried Goesgens <dothebart@citadel.org>
-Date: Thu, 5 Jun 2014 20:04:13 +0200
-Subject: [PATCH 11/22] Configparser: when we alocate an empty list, we also
- need to reset the counter; else we will trip over this later. This fixes
- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750440
-
----
- src/configfile.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/src/configfile.c b/src/configfile.c
-index 0b7786f..983d995 100644
---- a/src/configfile.c
-+++ b/src/configfile.c
-@@ -414,6 +414,12 @@ static int cf_ci_replace_child (oconfig_item_t *dst, oconfig_item_t *src,
- 
- 	/* Resize the memory containing the children to be big enough to hold
- 	 * all children. */
-+	if (dst->children_num + src->children_num - 1 == 0)
-+	{
-+		dst->children_num = 0;
-+		return (0);
-+	}
-+
- 	temp = (oconfig_item_t *) realloc (dst->children,
- 			sizeof (oconfig_item_t)
- 			* (dst->children_num + src->children_num - 1));
-@@ -514,7 +520,8 @@ static int cf_include_all (oconfig_item_t *root, int depth)
- 			continue;
- 
- 		/* Now replace the i'th child in `root' with `new'. */
--		cf_ci_replace_child (root, new, i);
-+		if (cf_ci_replace_child (root, new, i) < 0)
-+			return (-1);
- 
- 		/* ... and go back to the new i'th child. */
- 		--i;
--- 
-1.9.3
-
diff --git a/src/patches/collectd/0012-don-t-assume-pkg-config-is-in-PATH.patch b/src/patches/collectd/0012-don-t-assume-pkg-config-is-in-PATH.patch
deleted file mode 100644
index 5bb5c853fe..0000000000
--- a/src/patches/collectd/0012-don-t-assume-pkg-config-is-in-PATH.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From c2ca2a46e617878dcff69de0b8940ea91d3401cc Mon Sep 17 00:00:00 2001
-From: Lauri Tirkkonen <lotheac@iki.fi>
-Date: Thu, 22 May 2014 14:05:40 +0300
-Subject: [PATCH 12/22] don't assume pkg-config is in PATH
-
----
- configure.in | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 0b12630..7086800 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1136,8 +1136,8 @@ AC_CHECK_LIB(hal,libhal_device_property_exists,
- 	     [with_libhal="no"])
- if test "x$with_libhal" = "xyes"; then
- 	if test "x$PKG_CONFIG" != "x"; then
--		BUILD_WITH_LIBHAL_CFLAGS="`pkg-config --cflags hal`"
--		BUILD_WITH_LIBHAL_LIBS="`pkg-config --libs hal`"
-+		BUILD_WITH_LIBHAL_CFLAGS="`$PKG_CONFIG --cflags hal`"
-+		BUILD_WITH_LIBHAL_LIBS="`$PKG_CONFIG --libs hal`"
- 		AC_SUBST(BUILD_WITH_LIBHAL_CFLAGS)
- 		AC_SUBST(BUILD_WITH_LIBHAL_LIBS)
- 	fi
-@@ -3434,8 +3434,8 @@ then
-   if $PKG_CONFIG --exists tokyotyrant
-   then
-     with_libtokyotyrant_cppflags="$with_libtokyotyrant_cppflags `$PKG_CONFIG --cflags tokyotyrant`"
--    with_libtokyotyrant_ldflags="$with_libtokyotyrant_ldflags `pkg-config --libs-only-L tokyotyrant`"
--    with_libtokyotyrant_libs="$with_libtokyotyrant_libs `pkg-config --libs-only-l tokyotyrant`"
-+    with_libtokyotyrant_ldflags="$with_libtokyotyrant_ldflags `$PKG_CONFIG --libs-only-L tokyotyrant`"
-+    with_libtokyotyrant_libs="$with_libtokyotyrant_libs `$PKG_CONFIG --libs-only-l tokyotyrant`"
-   fi
- fi
- 
-@@ -3743,7 +3743,7 @@ with_libvirt_cflags=""
- with_libvirt_ldflags=""
- if test "x$PKG_CONFIG" != "x"
- then
--	pkg-config --exists 'libxml-2.0' 2>/dev/null
-+	$PKG_CONFIG --exists 'libxml-2.0' 2>/dev/null
- 	if test "$?" = "0"
- 	then
- 		with_libxml2="yes"
-@@ -3751,7 +3751,7 @@ then
- 		with_libxml2="no (pkg-config doesn't know library)"
- 	fi
- 
--	pkg-config --exists libvirt 2>/dev/null
-+	$PKG_CONFIG --exists libvirt 2>/dev/null
- 	if test "$?" = "0"
- 	then
- 		with_libvirt="yes"
-@@ -3761,12 +3761,12 @@ then
- fi
- if test "x$with_libxml2" = "xyes"
- then
--	with_libxml2_cflags="`pkg-config --cflags libxml-2.0`"
-+	with_libxml2_cflags="`$PKG_CONFIG --cflags libxml-2.0`"
- 	if test $? -ne 0
- 	then
- 		with_libxml2="no"
- 	fi
--	with_libxml2_ldflags="`pkg-config --libs libxml-2.0`"
-+	with_libxml2_ldflags="$PKG_CONFIG --libs libxml-2.0`"
- 	if test $? -ne 0
- 	then
- 		with_libxml2="no"
-@@ -3806,12 +3806,12 @@ if test "x$with_libxml2" = "xyes"; then
- fi
- if test "x$with_libvirt" = "xyes"
- then
--	with_libvirt_cflags="`pkg-config --cflags libvirt`"
-+	with_libvirt_cflags="$PKG_CONFIG --cflags libvirt`"
- 	if test $? -ne 0
- 	then
- 		with_libvirt="no"
- 	fi
--	with_libvirt_ldflags="`pkg-config --libs libvirt`"
-+	with_libvirt_ldflags="$PKG_CONFIG --libs libvirt`"
- 	if test $? -ne 0
- 	then
- 		with_libvirt="no"
--- 
-1.9.3
-
diff --git a/src/patches/collectd/0013-add-missing-backticks-which-broke-the-build.patch b/src/patches/collectd/0013-add-missing-backticks-which-broke-the-build.patch
deleted file mode 100644
index d7f2264cbc..0000000000
--- a/src/patches/collectd/0013-add-missing-backticks-which-broke-the-build.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 497f5785e8b385f03b5fb5b15bdff8ba39e4699e Mon Sep 17 00:00:00 2001
-From: Marc Fournier <marc.fournier@camptocamp.com>
-Date: Mon, 23 Jun 2014 18:00:01 +0200
-Subject: [PATCH 13/22] add missing backticks which broke the build
-
----
- configure.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 7086800..5dac543 100644
---- a/configure.in
-+++ b/configure.in
-@@ -3766,7 +3766,7 @@ then
- 	then
- 		with_libxml2="no"
- 	fi
--	with_libxml2_ldflags="$PKG_CONFIG --libs libxml-2.0`"
-+	with_libxml2_ldflags="`$PKG_CONFIG --libs libxml-2.0`"
- 	if test $? -ne 0
- 	then
- 		with_libxml2="no"
-@@ -3806,12 +3806,12 @@ if test "x$with_libxml2" = "xyes"; then
- fi
- if test "x$with_libvirt" = "xyes"
- then
--	with_libvirt_cflags="$PKG_CONFIG --cflags libvirt`"
-+	with_libvirt_cflags="`$PKG_CONFIG --cflags libvirt`"
- 	if test $? -ne 0
- 	then
- 		with_libvirt="no"
- 	fi
--	with_libvirt_ldflags="$PKG_CONFIG --libs libvirt`"
-+	with_libvirt_ldflags="`$PKG_CONFIG --libs libvirt`"
- 	if test $? -ne 0
- 	then
- 		with_libvirt="no"
--- 
-1.9.3
-
diff --git a/src/patches/collectd/0014-snmp-free-snmp_pdu-struct-allocated-by-snmp_pdu_crea.patch b/src/patches/collectd/0014-snmp-free-snmp_pdu-struct-allocated-by-snmp_pdu_crea.patch
deleted file mode 100644
index 945c28bbb4..0000000000
--- a/src/patches/collectd/0014-snmp-free-snmp_pdu-struct-allocated-by-snmp_pdu_crea.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0da910fb1bf2bd4982ca6541458c795ec296f398 Mon Sep 17 00:00:00 2001
-From: Marc Fournier <marc.fournier@camptocamp.com>
-Date: Fri, 8 Aug 2014 15:55:10 +0200
-Subject: [PATCH 14/22] snmp: free snmp_pdu struct allocated by
- snmp_pdu_create()
-
-This should fix the leak reported in issue #610.
----
- src/snmp.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/snmp.c b/src/snmp.c
-index d440f7f..dacdede 100644
---- a/src/snmp.c
-+++ b/src/snmp.c
-@@ -1503,6 +1503,10 @@ static int csnmp_read_table (host_definition_t *host, data_definition_t *data)
-     snmp_free_pdu (res);
-   res = NULL;
- 
-+  if (req != NULL)
-+    snmp_free_pdu (req);
-+  req = NULL;
-+
-   if (status == 0)
-     csnmp_dispatch_table (host, data, instance_list_head, value_list_head);
- 
--- 
-1.9.3
-
diff --git a/src/patches/collectd/0015-curl_xml-plugin-Fixed-tautological-pointer-compariso.patch b/src/patches/collectd/0015-curl_xml-plugin-Fixed-tautological-pointer-compariso.patch
deleted file mode 100644
index 30e1a08bea..0000000000
--- a/src/patches/collectd/0015-curl_xml-plugin-Fixed-tautological-pointer-compariso.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0afea60611f115a28b8ec331aba610e3038c1ef2 Mon Sep 17 00:00:00 2001
-From: Arthur Marble <arthur@info9.net>
-Date: Sun, 17 Aug 2014 17:34:04 -0500
-Subject: [PATCH 15/22] curl_xml plugin: Fixed tautological pointer comparison
- error.
-
-Fixes: http://bugs.debian.org/758481
-Signed-off-by: Florian Forster <octo@collectd.org>
----
- src/curl_xml.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/curl_xml.c b/src/curl_xml.c
-index e31e73d..28b2ded 100644
---- a/src/curl_xml.c
-+++ b/src/curl_xml.c
-@@ -344,7 +344,7 @@ static int cx_handle_instance_xpath (xmlXPathContextPtr xpath_ctx, /* {{{ */
-   /* If the base xpath returns more than one block, the result is assumed to be
-    * a table. The `Instnce' option is not optional in this case. Check for the
-    * condition and inform the user. */
--  if (is_table && (vl->type_instance == NULL))
-+  if (is_table)
-   {
-     WARNING ("curl_xml plugin: "
-         "Base-XPath %s is a table (more than one result was returned), "
--- 
-1.9.3
-