gentoo resync : 05.02.2020

4 files changed, 132 insertions, 7 deletions

diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 4eaed2360faf..c13f5764012c 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,5 +1,6 @@
+AUX netdata-1.19.0-fno-common.patch 3807 BLAKE2B 42908f83322a9dab98b52fba245d31ad56b86ea8fd37ed614b3399ee07fff30fc1afbc26fda2834177869c9e8cedb4a97480a18c9c7649b9f52021a6850e391d SHA512 1e032488fb8035a87024b9085cc12a87ba87ff99cb2084db56bcdeb280ba4cfca8042647b6df1a9a06cbb9627b6c25a350782408efeb3a7d780bd1ca3a6d86a8
 AUX netdata-1.19.0-prometheus-spelling.patch 1149 BLAKE2B 567e93c8099f7edc6afd3c40a6249162f44dca30f9cccf1702df453523203ee2e79fb4d03a53f5b1c4e5dd6dfaa52961b0717546aa21bc25bb3927a9280598ad SHA512 a498b04683138fd56e71bcf1191b4f3a655be03746f850d9f407bbe24c28f16dd564967401c856ce404f58c6a947b8277e2fa0868dbe7c0aa63ff05a8b465561
 DIST netdata-1.19.0.tar.gz 3443251 BLAKE2B 8e18a661367850e712a75c1c11b661a977bf77b48369e0e36763a74f96b3726c523093a82eb6f94257c02e754d900cb675d501fda824ceb94eef31dfa30e5712 SHA512 026ae159d8ed52a30e406c110c2732e54e50f070865ba3e430df73e4df40387105053e750ca6029cfbc7f40a2c05b7fb6ba4e3e4a7070822c7eec4c1a4712aea
-EBUILD netdata-1.19.0-r2.ebuild 3301 BLAKE2B b112d96251fec1cb4492aeea5d236841b54011f70604ee425239bed81b7cc0c65c4eea9567c53535d8471a108b2390c5260cd7df300dc955b568e20263c80e3f SHA512 fc0241a4053a6804288ad791477887d165b5763ae7e2d6c7b0ed2cf30e97fc51ef511c28b7272c96a3ee30d6ce65702074e1c5d99bf38cb22b05e6c08ca12af6
-EBUILD netdata-9999.ebuild 3242 BLAKE2B 7fc66998ce13afdd645676053b71d6b857e8a6098a5b2bda72125b26b6fa55c42d58238f9306cd4930b0426de7d7a9794611098856cb452e4c64216c42c0246f SHA512 e9a16abf1c0c99fe134a60e8a088c95381c22d171652ce23b98478ccaf9d258950b842176ef72a7422609633e855aa9a501e9ec09dc61ab3e63fe895f469c936
+EBUILD netdata-1.19.0-r2.ebuild 3338 BLAKE2B 81e86da1f2cd4bb0a0e5d497c4943e70631249707fedfd1542e61e3275172d363a1c898f5ee7e44fed88f135b6c815f613530f486e755999189c48e729847037 SHA512 b92b0c0be7194af2716ed6ef4acf10aa48dd3543bee30945d145d8d4d19adaaef17fbdff6aeb14f42490296483998da2cee80ae94d3a0fb5f86a0ce8cc594bc3
+EBUILD netdata-9999.ebuild 3167 BLAKE2B cbac02716221ec467e1d994bd6b6a4f54da1691ff018ee805e4d45dda6d63d0f4e04860c97bf83d1762ec50235b7022b57d18450bdd616be8f7998442e8c1378 SHA512 966e9c1a1504482234b8785efbebc46a2c67c4c8714ca82ce866a01de9e531178eb24559d438f3703572c9c78facf7ec6192a25fae20c51338ba5bc5dbfaadb6
 MISC metadata.xml 1270 BLAKE2B e2c5bac8fd169d84daf8a6e6cfea30761490cca3d7211a29e29f6cf298a9cd728ddc56075e5a85c8f5ed5467900a2f3fb1e09c40b764c2bb0e02bf1ff8e98108 SHA512 77e4d91d31d9d48b769b13f5c9778e09fc8d64941a145ea0bc1ce3e735eb64e5c89fa36a4314753e7c0871738a7b3e94f6a998a87b9c7b9d1d7aa6e8800cdbdf
diff --git a/net-analyzer/netdata/files/netdata-1.19.0-fno-common.patch b/net-analyzer/netdata/files/netdata-1.19.0-fno-common.patch
new file mode 100644
index 000000000000..1b6d5b75020d
--- /dev/null
+++ b/net-analyzer/netdata/files/netdata-1.19.0-fno-common.patch
@@ -0,0 +1,126 @@
+https://github.com/netdata/netdata/pull/7877
+
+From c65f57af0714558294c1ad1b9568077720fb282b Mon Sep 17 00:00:00 2001
+From: Thiago Marques <thiagoftsm@gmail.com>
+Date: Tue, 28 Jan 2020 13:59:20 +0000
+Subject: [PATCH 1/2] missing_extern: Fix missing
+
+Fix few externs that were missing in global variables
+---
+ daemon/common.h            | 2 +-
+ health/health.h            | 2 +-
+ libnetdata/health/health.h | 2 +-
+ web/api/web_api_v1.h       | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/daemon/common.h b/daemon/common.h
+index 6ac3cb3c87..59dbc41a8d 100644
+--- a/daemon/common.h
++++ b/daemon/common.h
+@@ -84,6 +84,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.h b/health/health.h
+index 9da90d70c9..d77318fd78 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.h b/libnetdata/health/health.h
+index a3dc0775fc..f7580edab2 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.h b/web/api/web_api_v1.h
+index 4fe3c8f6be..edeea98bed 100644
+--- a/web/api/web_api_v1.h
++++ b/web/api/web_api_v1.h
+@@ -29,6 +29,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
+
+From c0275ddaad62459a6da1eee0a0c76282a1391590 Mon Sep 17 00:00:00 2001
+From: Thiago Marques <thiagoftsm@gmail.com>
+Date: Tue, 28 Jan 2020 14:06:56 +0000
+Subject: [PATCH 2/2] missing_extern: Variables
+
+This commit declares the variables inside .c files
+---
+ daemon/common.c            | 2 +-
+ health/health.c            | 1 +
+ libnetdata/health/health.c | 2 ++
+ web/api/web_api_v1.c       | 2 ++
+ 4 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/daemon/common.c b/daemon/common.c
+index e28f6cf000..67497a4e93 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/health/health.c b/health/health.c
+index 1124cf9107..4a84ef7fca 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/libnetdata/health/health.c b/libnetdata/health/health.c
+index e03538db3f..98d26d295f 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/web/api/web_api_v1.c b/web/api/web_api_v1.c
+index aafcbc70be..4ac50524ad 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/net-analyzer/netdata/netdata-1.19.0-r2.ebuild b/net-analyzer/netdata/netdata-1.19.0-r2.ebuild
index 2c99a7a4fe82..322bebf5a280 100644
--- a/net-analyzer/netdata/netdata-1.19.0-r2.ebuild
+++ b/net-analyzer/netdata/netdata-1.19.0-r2.ebuild
@@ -86,6 +86,7 @@ FILECAPS=(
 
 PATCHES=(
 	"${FILESDIR}/${P}-prometheus-spelling.patch"
+	"${FILESDIR}/${P}-fno-common.patch"
 )
 
 pkg_setup() {
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index 6e2a420b82c9..ba797abab3c0 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -115,13 +115,10 @@ src_install() {
 
 	rm -rf "${D}/var/cache" || die
 
-	# Remove unneeded .keep files
-	find "${ED}" -name ".keep" -delete || die
-
-	fowners -Rc netdata:netdata /var/log/netdata
 	keepdir /var/log/netdata
-	fowners -Rc netdata:netdata /var/lib/netdata
+	fowners -Rc netdata:netdata /var/log/netdata
 	keepdir /var/lib/netdata
+	fowners -Rc netdata:netdata /var/lib/netdata
 	keepdir /var/lib/netdata/registry
 
 	fowners -Rc root:netdata /usr/share/${PN}