Merge branch 'collectd-4.8' into collectd-4.9

Conflicts:
	src/exec.c

diff --cc configure.in
Simple merge

diff --cc src/common.c
Simple merge

diff --cc src/common.h
Simple merge

diff --cc src/configfile.c
Simple merge

diff --cc src/exec.c
index 3bd6309fb24b5a3f68378e9e73bdc227d1cc0c10,e60065834e3ba1f0fc123cbbe1c5a89907db2d6f..681b94d67c8b28a334b74c1078389540aacdc570
--- 1/src/exec.c
--- 2/src/exec.c
+++ b/src/exec.c
@@@ -265,17 -265,7 +265,18 @@@ static int exec_config (oconfig_item_t 
    return (0);
  } /* int exec_config }}} */
  
 +static void set_environment (void) /* {{{ */
 +{
 +  char buffer[1024];
 +
 +  ssnprintf (buffer, sizeof (buffer), "%i", interval_g);
 +  setenv ("COLLECTD_INTERVAL", buffer, /* overwrite = */ 1);
 +
 +  ssnprintf (buffer, sizeof (buffer), "%s", hostname_g);
 +  setenv ("COLLECTD_HOSTNAME", buffer, /* overwrite = */ 1);
 +} /* }}} void set_environment */
 +
+ __attribute__((noreturn))
  static void exec_child (program_list_t *pl) /* {{{ */
  {
    int status;

diff --cc src/processes.c
Simple merge