Merge branch 'collectd-5.4' into collectd-5.5

diff --cc configure.ac
Simple merge

diff --cc contrib/redhat/collectd.spec
index 7407dc8d158756f8f518fa4c52ca106b5dd721e8,1e6cd2a7c81d1b1ea689c45e7cef609122630a26..73da03d00a66b0ee519ec58552ba898cd3314acb
--- 1/contrib/redhat/collectd.spec
--- 2/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -2054,19 -1801,11 +2054,19 @@@ f
  %{_includedir}/collectd/network_buffer.h
  %{_includedir}/collectd/lcc_features.h
  %{_libdir}/pkgconfig/libcollectdclient.pc
+ %{_libdir}/libcollectdclient.so
  
  %files -n libcollectdclient
- %{_libdir}/libcollectdclient.so
  %{_libdir}/libcollectdclient.so.*
  
 +%files -n collectd-utils
 +%{_bindir}/collectd-nagios
 +%{_bindir}/collectd-tg
 +%{_bindir}/collectdctl
 +%{_mandir}/man1/collectdctl.1*
 +%{_mandir}/man1/collectd-nagios.1*
 +%{_mandir}/man1/collectd-tg.1*
 +
  %if %{with_amqp}
  %files amqp
  %{_libdir}/%{name}/amqp.so

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

diff --cc src/processes.c
index 2d79c7f677272dc573326e0043d2f384a540fe33,faeb7c9ec0d727fe2a54f38c706d95d3259721fb..8f94fc25a102a45fc22f3f9b45f0b13631073586
--- 1/src/processes.c
--- 2/src/processes.c
+++ b/src/processes.c
@@@ -1706,9 -1701,9 +1705,9 @@@ static int ps_read (void
  
        struct dirent *ent;
        DIR           *proc;
-       int            pid;
+       long           pid;
  
 -      char cmdline[ARG_MAX];
 +      char cmdline[CMDLINE_BUFFER_SIZE];
  
        int        status;
        procstat_t ps;