control: tags -1 patch
attached the upstream fix refreshed on top of the current debian version
thanks
Gianfranco
On Fri, 17 Apr 2020 11:07:07 +0000 Matthias Klose <d...@debian.org> wrote:
> Package: src:netdata
> Version: 1.19.0-2
> Severity: normal
> Tags: sid bullseye
> User: debian-...@lists.debian.org
> Usertags: ftbfs-gcc-10
>
> Please keep this issue open in the bug tracker for the package it
> was filed for. If a fix in another package is required, please
> file a bug for the other package (or clone), and add a block in this
> package. Please keep the issue open until the package can be built in
> a follow-up test rebuild.
>
> The package fails to build in a test rebuild on at least amd64 with
> gcc-10/g++-10, but succeeds to build with gcc-9/g++-9. The
> severity of this report will be raised before the bullseye release,
> so nothing has to be done for the buster release.
>
> The full build log can be found at:
> http://people.debian.org/~doko/logs/gcc10-20200225/netdata_1.19.0-2_unstable_gcc10.log
> The last lines of the build log are at the end of this report.
>
> To build with GCC 10, either set CC=gcc-10 CXX=g++-10 explicitly,
> or install the gcc, g++, gfortran, ... packages from experimental.
>
> apt-get -t=experimental install g++
>
> Common build failures are new warnings resulting in build failures with
> -Werror turned on, or new/dropped symbols in Debian symbols files.
> For other C/C++ related build failures see the porting guide at
> http://gcc.gnu.org/gcc-10/porting_to.html
>
> [...]
> gcc -I/usr/include/uuid -lcap -g -O2
> -fdebug-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -Wformat
> -Werror=format-security -Wall -O3 -pthread -flto -I/usr/include/uuid
> -Wl,-z,relro -Wl,-z,now -Wl,--as-needed -o nfacct.plugin
> collectors/nfacct.plugin/plugin_nfacct.o
> libnetdata/adaptive_resortable_list/adaptive_resortable_list.o
> libnetdata/config/appconfig.o libnetdata/avl/avl.o libnetdata/buffer/buffer.o
> libnetdata/clocks/clocks.o libnetdata/dictionary/dictionary.o
> libnetdata/eval/eval.o libnetdata/libnetdata.o libnetdata/locks/locks.o
> libnetdata/log/log.o libnetdata/popen/popen.o libnetdata/procfile/procfile.o
> libnetdata/os.o libnetdata/simple_pattern/simple_pattern.o
> libnetdata/socket/socket.o libnetdata/socket/security.o
> libnetdata/statistical/statistical.o
> libnetdata/storage_number/storage_number.o libnetdata/threads/threads.o
> libnetdata/url/url.o libnetdata/json/json.o libnetdata/json/jsmn.o
> libnetdata/health/health.o -lm -lz -lcrypto -lssl -luuid -luv -llz4 -lJudy
> -lcrypto -lssl -ljson-c -lnetfilter_acct -lmnl
> /usr/bin/ld: libnetdata/adaptive_resortable_list/adaptive_resortable_list.o
> (symbol from plugin): in function `arl_callback_str2ull':
> (.text+0x0): multiple definition of `silencers';
> collectors/nfacct.plugin/plugin_nfacct.o (symbol from plugin):(.text+0x0):
> first defined here
> /usr/bin/ld: libnetdata/config/appconfig.o (symbol from plugin): in function
> `appconfig_section_compare':
> (.text+0x0): multiple definition of `silencers';
> collectors/nfacct.plugin/plugin_nfacct.o (symbol from plugin):(.text+0x0):
> first defined here
> /usr/bin/ld: libnetdata/avl/avl.o (symbol from plugin): in function
> `avl_search':
> (.text+0x0): multiple definition of `silencers';
> collectors/nfacct.plugin/plugin_nfacct.o (symbol from plugin):(.text+0x0):
> first defined here
> /usr/bin/ld: libnetdata/buffer/buffer.o (symbol from plugin): in function
> `buffer_reset':
> (.text+0x0): multiple definition of `silencers';
> collectors/nfacct.plugin/plugin_nfacct.o (symbol from plugin):(.text+0x0):
> first defined here
> /usr/bin/ld: libnetdata/clocks/clocks.o (symbol from plugin): in function
> `test_clock_boottime':
> (.text+0x0): multiple definition of `silencers';
> collectors/nfacct.plugin/plugin_nfacct.o (symbol from plugin):(.text+0x0):
> first defined here
> /usr/bin/ld: libnetdata/dictionary/dictionary.o (symbol from plugin): in
> function `dictionary_create':
> (.text+0x0): multiple definition of `silencers';
> collectors/nfacct.plugin/plugin_nfacct.o (symbol from plugin):(.text+0x0):
> first defined here
> /usr/bin/ld: libnetdata/eval/eval.o (symbol from plugin): in function
> `eval_and':
> (.text+0x0): multiple definition of `silencers';
> collectors/nfacct.plugin/plugin_nfacct.o (symbol from plugin):(.text+0x0):
> first defined here
> /usr/bin/ld: libnetdata/libnetdata.o (symbol from plugin): in function
> `strdupz':
> (.text+0x0): multiple definition of `silencers';
> collectors/nfacct.plugin/plugin_nfacct.o (symbol from plugin):(.text+0x0):
> first defined here
> /usr/bin/ld: libnetdata/locks/locks.o (symbol from plugin): in function
> `netdata_thread_disable_cancelability':
> (.text+0x0): multiple definition of `silencers';
> collectors/nfacct.plugin/plugin_nfacct.o (symbol from plugin):(.text+0x0):
> first defined here
> /usr/bin/ld: libnetdata/log/log.o (symbol from plugin): in function
> `facility_log':
> (.text+0x0): multiple definition of `silencers';
> collectors/nfacct.plugin/plugin_nfacct.o (symbol from plugin):(.text+0x0):
> first defined here
> /usr/bin/ld: libnetdata/popen/popen.o (symbol from plugin): in function
> `myp_init':
> (.text+0x0): multiple definition of `silencers';
> collectors/nfacct.plugin/plugin_nfacct.o (symbol from plugin):(.text+0x0):
> first defined here
> /usr/bin/ld: libnetdata/procfile/procfile.o (symbol from plugin): in function
> `procfile_adaptive_initial_allocation':
> (.text+0x0): multiple definition of `silencers';
> collectors/nfacct.plugin/plugin_nfacct.o (symbol from plugin):(.text+0x0):
> first defined here
> /usr/bin/ld: libnetdata/os.o (symbol from plugin): in function
> `get_system_cpus':
> (.text+0x0): multiple definition of `silencers';
> collectors/nfacct.plugin/plugin_nfacct.o (symbol from plugin):(.text+0x0):
> first defined here
commit 93631017d868d8d432124e18c96bbe6dcba4bce0
Author: thiagoftsm <thiagof...@gmail.com>
Date: Tue Jan 28 15:27:12 2020 +0000
Missing extern (#7877)
* missing_extern: Fix missing
Fix few externs that were missing in global variables
* missing_extern: Variables
This commit declares the variables inside .c files
diff --git a/daemon/common.c b/daemon/common.c
index e28f6cf0..67497a4e 100644
--- a/daemon/common.c
+++ b/daemon/common.c
@@ -13,4 +13,4 @@ char *netdata_configured_varlib_dir = VARLIB_DIR;
char *netdata_configured_home_dir = CACHE_DIR;
char *netdata_configured_host_prefix = NULL;
char *netdata_configured_timezone = NULL;
-
+int netdata_ready;
diff --git a/daemon/common.h b/daemon/common.h
index 6ac3cb3c..59dbc41a 100644
--- a/daemon/common.h
+++ b/daemon/common.h
@@ -81,6 +81,6 @@ extern char *netdata_configured_timezone;
extern int netdata_zero_metrics_enabled;
extern int netdata_anonymous_statistics_enabled;
-int netdata_ready;
+extern int netdata_ready;
#endif /* NETDATA_COMMON_H */
diff --git a/health/health.c b/health/health.c
index 1124cf91..4a84ef7f 100644
--- a/health/health.c
+++ b/health/health.c
@@ -9,6 +9,7 @@ struct health_cmdapi_thread_status {
};
unsigned int default_health_enabled = 1;
+char *silencers_filename;
// ----------------------------------------------------------------------------
// health initialization
diff --git a/health/health.h b/health/health.h
index 9da90d70..d77318fd 100644
--- a/health/health.h
+++ b/health/health.h
@@ -52,7 +52,7 @@ extern unsigned int default_health_enabled;
#define HEALTH_SILENCERS_MAX_FILE_LEN 10000
-char *silencers_filename;
+extern char *silencers_filename;
extern void health_init(void);
extern void *health_main(void *ptr);
diff --git a/libnetdata/health/health.c b/libnetdata/health/health.c
index e03538db..98d26d29 100644
--- a/libnetdata/health/health.c
+++ b/libnetdata/health/health.c
@@ -1,5 +1,7 @@
#include "health.h"
+SILENCERS *silencers;
+
/**
* Create Silencer
*
diff --git a/libnetdata/health/health.h b/libnetdata/health/health.h
index a3dc0775..f7580eda 100644
--- a/libnetdata/health/health.h
+++ b/libnetdata/health/health.h
@@ -44,7 +44,7 @@ typedef struct silencers {
SILENCER *silencers;
} SILENCERS;
-SILENCERS *silencers;
+extern SILENCERS *silencers;
extern SILENCER *create_silencer(void);
extern int health_silencers_json_read_callback(JSON_ENTRY *e);
diff --git a/web/api/web_api_v1.c b/web/api/web_api_v1.c
index aafcbc70..4ac50524 100644
--- a/web/api/web_api_v1.c
+++ b/web/api/web_api_v1.c
@@ -2,6 +2,8 @@
#include "web_api_v1.h"
+char *api_secret;
+
static struct {
const char *name;
uint32_t hash;
diff --git a/web/api/web_api_v1.h b/web/api/web_api_v1.h
index 4fe3c8f6..edeea98b 100644
--- a/web/api/web_api_v1.h
+++ b/web/api/web_api_v1.h
@@ -27,6 +27,6 @@ extern void host_labels2json(RRDHOST *host, BUFFER *wb, size_t indentation);
extern void web_client_api_v1_init(void);
extern void web_client_api_v1_management_init(void);
-char *api_secret;
+extern char *api_secret;
#endif //NETDATA_WEB_API_V1_H
