Merge branch 'collectd-5.4'

diff --cc contrib/redhat/collectd.spec
Simple merge

diff --cc src/bind.c
Simple merge

diff --cc src/collectd-perl.pod
Simple merge

diff --cc src/collectd.conf.in
index 089e7818a8ec92cb705df235e16cd63d0df64f60,04d1ab3342aff70ad0baa46d8e0528b6daa7ca21..d31ef157d04d09233f6ff55c4394f19d397ba065
--- 1/src/collectd.conf.in
--- 2/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -152,12 -135,9 +152,10 @@@
  #@BUILD_PLUGIN_NUT_TRUE@LoadPlugin nut
  #@BUILD_PLUGIN_OLSRD_TRUE@LoadPlugin olsrd
  #@BUILD_PLUGIN_ONEWIRE_TRUE@LoadPlugin onewire
 +#@BUILD_PLUGIN_OPENLDAP_TRUE@LoadPlugin openldap
  #@BUILD_PLUGIN_OPENVPN_TRUE@LoadPlugin openvpn
  #@BUILD_PLUGIN_ORACLE_TRUE@LoadPlugin oracle
- #@BUILD_PLUGIN_PERL_TRUE@<LoadPlugin perl>
- #@BUILD_PLUGIN_PERL_TRUE@  Globals true
- #@BUILD_PLUGIN_PERL_TRUE@</LoadPlugin>
+ #@BUILD_PLUGIN_PERL_TRUE@LoadPlugin perl
  #@BUILD_PLUGIN_PINBA_TRUE@LoadPlugin pinba
  #@BUILD_PLUGIN_PING_TRUE@LoadPlugin ping
  #@BUILD_PLUGIN_POSTGRESQL_TRUE@LoadPlugin postgresql

diff --cc src/collectd.conf.pod
Simple merge

diff --cc src/curl.c
Simple merge

diff --cc src/powerdns.c
Simple merge