Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:
	configure.in
	src/iptables.c

diff --cc configure.in
index 3033d4e276e8b95850b4eaca169550fc40463823,533e398bae19bc33536b8ad0f607ccff412f5403..3f3012bdad37b26d5d8fa7f5e451f770fe9a6490
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -3772,7 -3250,7 +3772,7 @@@ AC_SUBST(LCC_VERSION_STRING
  
  AC_CONFIG_FILES(src/libcollectdclient/lcc_features.h)
  
- AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/libiptc/Makefile src/libcollectdclient/Makefile src/libcollectdclient/libcollectdclient.pc src/liboconfig/Makefile bindings/Makefile bindings/java/Makefile)
 -AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/owniptc/Makefile src/libcollectdclient/Makefile src/libcollectdclient/libcollectdclient.pc src/liboconfig/Makefile src/liboping/Makefile bindings/Makefile)
++AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/owniptc/Makefile src/libcollectdclient/Makefile src/libcollectdclient/libcollectdclient.pc src/liboconfig/Makefile bindings/Makefile bindings/java/Makefile)
  
  if test "x$with_librrd" = "xyes" \
        && test "x$librrd_threadsafe" != "xyes"

diff --cc contrib/collection.cgi
Simple merge

diff --cc contrib/collection3/etc/collection.conf
Simple merge

diff --cc src/Makefile.am
index aca1af7105226efaa8fe672127dc9b72e6e0f405,c01998e8bab9610bd3b2af6c575a99b1efab01c6..42b97f8d48b94cabefe334b87e8a37293e09edf7
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -358,10 -341,10 +358,10 @@@ pkglib_LTLIBRARIES += iptables.l
  iptables_la_SOURCES = iptables.c
  iptables_la_LDFLAGS = -module -avoid-version
  if BUILD_WITH_OWN_LIBIPTC
- iptables_la_LIBADD  = libiptc/libiptc.la
- iptables_la_DEPENDENCIES = libiptc/libiptc.la
+ iptables_la_LIBADD  = owniptc/libiptc.la
+ iptables_la_DEPENDENCIES = owniptc/libiptc.la
  else
 -iptables_la_LDFLAGS += -liptc
 +iptables_la_LIBADD = -liptc
  endif
  collectd_LDADD += "-dlopen" iptables.la
  collectd_DEPENDENCIES += iptables.la

diff --cc src/iptables.c
index 6f1030fb374549c04983ced5a65aae51db2aa9e5,9f56d590fcb1616411d0ba553b4e745919f1a660..534a8c2ab278ce73377d872e3d56055797b0e5cc
--- 1/src/iptables.c
--- 2/src/iptables.c
+++ b/src/iptables.c
@@@ -29,14 -27,10 +29,14 @@@
  #include "plugin.h"
  #include "configfile.h"
  
 +#include <sys/socket.h>
 +
  #if OWN_LIBIPTC
- # include "libiptc/libiptc.h"
- # include "libiptc/libip6tc.h"
+ # include "owniptc/libiptc.h"
++# include "owniptc/libip6tc.h"
  #else
  # include <libiptc/libiptc.h>
 +# include <libiptc/libip6tc.h>
  #endif
  
  /*

diff --cc src/powerdns.c
Simple merge