Merge branch 'collectd-5.0'

diff --cc ChangeLog
Simple merge

diff --cc configure.in
Simple merge

diff --cc src/Makefile.am
Simple merge

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

diff --cc src/libcollectdclient/client.c
Simple merge

diff --cc src/processes.c
Simple merge

diff --cc src/snmp.c
Simple merge

diff --cc src/tcpconns.c
index 6a7e32d72007e216ff739bd491e6e34a6abefe11,78c337b7687ee3e7fcc3af4ee06e437513444b04..3c8fc7285e2621c57fa5f3779d08df70e8ed7179
--- 1/src/tcpconns.c
--- 2/src/tcpconns.c
+++ b/src/tcpconns.c
@@@ -116,14 -116,13 +116,18 @@@
  # include <netinet/tcp_var.h>
  # include <netdb.h>
  # include <arpa/inet.h>
- # include <nlist.h>
+ # if !defined(HAVE_BSD_NLIST_H) || !HAVE_BSD_NLIST_H
+ #  include <nlist.h>
+ # else /* HAVE_BSD_NLIST_H */
+ #  include <bsd/nlist.h>
+ # endif
  # include <kvm.h>
 -#endif /* HAVE_LIBKVM_NLIST */
 +/* #endif HAVE_LIBKVM_NLIST */
 +
 +#elif KERNEL_AIX
 +# include <arpa/inet.h>
 +# include <sys/socketvar.h>
 +#endif /* KERNEL_AIX */
  
  #if KERNEL_LINUX
  static const char *tcp_state[] =

diff --cc version-gen.sh
Simple merge