[gentoo-commits] repo/gentoo:master commit in: net-analyzer/netdata/files/, net-analyzer/netdata/
commit: 1b09f7bebb386f46a7d47e0d263f0154f5855e81 Author: Craig Andrews gentoo org> AuthorDate: Fri May 10 15:31:20 2024 + Commit: Craig Andrews gentoo org> CommitDate: Fri May 10 15:32:24 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b09f7be net-analyzer/netdata: Remove patch which was included in 1.45.4 See: https://github.com/netdata/netdata/commit/a5a96b4a9ee03e4494cc76f5fa541404c4eb4f2b Closes: https://bugs.gentoo.org/931679 Signed-off-by: Craig Andrews gentoo.org> net-analyzer/netdata/files/netdata-1.45.3-dbengine.patch | 13 - net-analyzer/netdata/netdata-1.45.4.ebuild | 2 -- 2 files changed, 15 deletions(-) diff --git a/net-analyzer/netdata/files/netdata-1.45.3-dbengine.patch b/net-analyzer/netdata/files/netdata-1.45.3-dbengine.patch deleted file mode 100644 index 66392c9b7203.. --- a/net-analyzer/netdata/files/netdata-1.45.3-dbengine.patch +++ /dev/null @@ -1,13 +0,0 @@ a/src/daemon/main.c -+++ b/src/daemon/main.c -@@ -1520,8 +1520,9 @@ - - // set defaults for dbegnine unittest - config_set(CONFIG_SECTION_DB, "dbengine page type", "gorilla"); -+#ifdef ENABLE_DBENGINE - default_rrdeng_disk_quota_mb = default_multidb_disk_quota_mb = 256; -- -+#endif - if (sqlite_library_init()) - return 1; - diff --git a/net-analyzer/netdata/netdata-1.45.4.ebuild b/net-analyzer/netdata/netdata-1.45.4.ebuild index e7d91907df53..0d57f53917bc 100644 --- a/net-analyzer/netdata/netdata-1.45.4.ebuild +++ b/net-analyzer/netdata/netdata-1.45.4.ebuild @@ -83,8 +83,6 @@ RDEPEND=" DEPEND="${RDEPEND} virtual/pkgconfig" -PATCHES=( "${FILESDIR}/${P}-dbengine.patch" ) - FILECAPS=( 'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/netdata/files/, net-analyzer/netdata/
commit: 952d6f852c860f4cc37b98ca10a509e78bc78d60 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Tue May 7 18:04:53 2024 + Commit: Craig Andrews gentoo org> CommitDate: Tue May 7 18:35:25 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=952d6f85 net-analyzer/netdata: fix bug #928164 Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://bugs.gentoo.org/928164 Signed-off-by: Craig Andrews gentoo.org> net-analyzer/netdata/files/netdata-1.45.3-dbengine.patch | 13 + net-analyzer/netdata/netdata-1.45.3.ebuild | 2 ++ 2 files changed, 15 insertions(+) diff --git a/net-analyzer/netdata/files/netdata-1.45.3-dbengine.patch b/net-analyzer/netdata/files/netdata-1.45.3-dbengine.patch new file mode 100644 index ..66392c9b7203 --- /dev/null +++ b/net-analyzer/netdata/files/netdata-1.45.3-dbengine.patch @@ -0,0 +1,13 @@ +--- a/src/daemon/main.c b/src/daemon/main.c +@@ -1520,8 +1520,9 @@ + + // set defaults for dbegnine unittest + config_set(CONFIG_SECTION_DB, "dbengine page type", "gorilla"); ++#ifdef ENABLE_DBENGINE + default_rrdeng_disk_quota_mb = default_multidb_disk_quota_mb = 256; +- ++#endif + if (sqlite_library_init()) + return 1; + diff --git a/net-analyzer/netdata/netdata-1.45.3.ebuild b/net-analyzer/netdata/netdata-1.45.3.ebuild index 0d57f53917bc..e7d91907df53 100644 --- a/net-analyzer/netdata/netdata-1.45.3.ebuild +++ b/net-analyzer/netdata/netdata-1.45.3.ebuild @@ -83,6 +83,8 @@ RDEPEND=" DEPEND="${RDEPEND} virtual/pkgconfig" +PATCHES=( "${FILESDIR}/${P}-dbengine.patch" ) + FILECAPS=( 'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/netdata/files/, net-analyzer/netdata/
commit: a9e7c16c506d4d2f59ffc6a82fc5f0b279bf5619 Author: Craig Andrews gentoo org> AuthorDate: Tue Jan 2 15:00:37 2024 + Commit: Craig Andrews gentoo org> CommitDate: Tue Jan 2 15:00:37 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9e7c16c net-analyzer/netdata: fix build failure when USE="-dbengine" Closes: https://bugs.gentoo.org/919712 Signed-off-by: Craig Andrews gentoo.org> .../netdata/files/netdata-1.44.0-dbengine.patch| 47 ++ net-analyzer/netdata/netdata-1.44.0.ebuild | 6 ++- 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/net-analyzer/netdata/files/netdata-1.44.0-dbengine.patch b/net-analyzer/netdata/files/netdata-1.44.0-dbengine.patch new file mode 100644 index ..3119094f64bc --- /dev/null +++ b/net-analyzer/netdata/files/netdata-1.44.0-dbengine.patch @@ -0,0 +1,47 @@ +From ee6c0bcb7f0bfe6440dd7c4c52dca87486abc181 Mon Sep 17 00:00:00 2001 +From: Stelios Fragkakis <52996999+stelf...@users.noreply.github.com> +Date: Wed, 20 Dec 2023 21:54:17 +0200 +Subject: [PATCH] Fix compilation error when using --disable-dbengine + +--- + daemon/global_statistics.c | 2 ++ + daemon/main.c | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/daemon/global_statistics.c b/daemon/global_statistics.c +index 8392a3c88e08d..6e286b18a7220 100644 +--- a/daemon/global_statistics.c b/daemon/global_statistics.c +@@ -857,6 +857,7 @@ static void global_statistics_charts(void) { + + // + ++#ifdef ENABLE_DBENGINE + if (tier_page_type[0] == PAGE_GORILLA_METRICS) + { + static RRDSET *st_tier0_gorilla_pages = NULL; +@@ -918,6 +919,7 @@ static void global_statistics_charts(void) { + + rrdset_done(st_tier0_compression_info); + } ++#endif + } + + // +diff --git a/daemon/main.c b/daemon/main.c +index fc15f0c9dfc52..7c7452c4aa055 100644 +--- a/daemon/main.c b/daemon/main.c +@@ -1502,11 +1502,11 @@ int main(int argc, char **argv) { + #ifdef ENABLE_DBENGINE + char* createdataset_string = "createdataset="; + char* stresstest_string = "stresstest="; +-#endif + + if(strcmp(optarg, "pgd-tests") == 0) { + return pgd_test(argc, argv); + } ++#endif + + if(strcmp(optarg, "sqlite-meta-recover") == 0) { + sql_init_database(DB_CHECK_RECOVER, 0); diff --git a/net-analyzer/netdata/netdata-1.44.0.ebuild b/net-analyzer/netdata/netdata-1.44.0.ebuild index 120388949957..6149a81fb3ac 100644 --- a/net-analyzer/netdata/netdata-1.44.0.ebuild +++ b/net-analyzer/netdata/netdata-1.44.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -84,6 +84,10 @@ FILECAPS=( 'usr/libexec/netdata/plugins.d/debugfs.plugin' ) +PATCHES=( + "${FILESDIR}/${P}-dbengine.patch" +) + pkg_setup() { use python && python-single-r1_pkg_setup linux-info_pkg_setup
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/netdata/files/, net-analyzer/netdata/
commit: 0cd7399f84f76e46cbbe514b12d584221e8725e1 Author: Craig Andrews gentoo org> AuthorDate: Wed Aug 1 16:30:55 2018 + Commit: Craig Andrews gentoo org> CommitDate: Wed Aug 1 16:37:54 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cd7399f net-analyzer/netdata: Drop old versions Package-Manager: Portage-2.3.44, Repoman-2.3.10 net-analyzer/netdata/Manifest | 2 - .../netdata/files/netdata-1.8.0-openrc-fixes.patch | 105 net-analyzer/netdata/netdata-1.8.0-r1.ebuild | 108 - net-analyzer/netdata/netdata-1.9.0.ebuild | 107 4 files changed, 322 deletions(-) diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest index 63eefb3104e..8705cb492bd 100644 --- a/net-analyzer/netdata/Manifest +++ b/net-analyzer/netdata/Manifest @@ -1,3 +1 @@ DIST netdata-1.10.0.tar.gz 2611773 BLAKE2B ffc4bfa593e4a36785c7e09709f1063598bd337016ad858e435049c5821f44fd5f048e4e7874e06d67c7e59234f6ec67a8a50fc7573f6b2f0cd768770ee2a612 SHA512 2358db818ad7d1ef6298c25d3f9d6c5a5a850f5bbe033b82cca1f3bc154055523637691417b6f2c2d4b7273b575afa0ec13e203ea7c2dd6321088a078ef05017 -DIST netdata-1.8.0.tar.gz 2779648 BLAKE2B 537d39c3f24ec53fbc7156663cf842143c560b8f8b40647d68e3ad0772bea441a70c7550da213bb0c5d75e0a0d685f32388f95f36e1e1101a0d619f44523c9f4 SHA512 8bb21f49ce1fcf3d199eabd18f65d5005ef784b227f08cd8efe91e5cab2ae980cf0aea4bcaa3aca1dc666c10845684deca48257510ad574bd948ecd019afcdaf -DIST netdata-1.9.0.tar.gz 2483847 BLAKE2B 7f1bcc9cc5768a91b39c39cac04f877472d008630dfa3da97c0893c3cceeed721fb2982fce1f377267cf76e2a9ea70cca650d53bdd442e944820b0356f2700ea SHA512 d17112ee48a7d06704d03598e6020b6172f93a6f19e5577657fc5ffe902b8a0472f53b880552eb653e855da3e743a863db446520af008d3b75fb1b438e90 diff --git a/net-analyzer/netdata/files/netdata-1.8.0-openrc-fixes.patch b/net-analyzer/netdata/files/netdata-1.8.0-openrc-fixes.patch deleted file mode 100644 index 517eaec51fa..000 --- a/net-analyzer/netdata/files/netdata-1.8.0-openrc-fixes.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 3f4db620484e777265a7e5f0cfe10ba840f7eefd Mon Sep 17 00:00:00 2001 -From: Craig Andrews -Date: Tue, 3 Oct 2017 10:52:02 -0400 -Subject: [PATCH 1/3] Eliminate bashisms in openrc script - - system/netdata-openrc.in | 14 +++--- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/system/netdata-openrc.in b/system/netdata-openrc.in -index 465e1232c..5c4eafa57 100644 a/system/netdata-openrc.in -+++ b/system/netdata-openrc.in -@@ -38,13 +38,13 @@ depend() { - } - - start_post() { -- if [[ ! -f @sysconfdir_POST@/netdata/netdata.conf ]]; then -+ if [ ! -f @sysconfdir_POST@/netdata/netdata.conf ]; then - ebegin "Downloading default configuration to @sysconfdir_POST@/netdata/netdata.conf" - sleep 2 - curl -s -o @sysconfdir_POST@/netdata/netdata.conf.new "${NETDATA_CONFIG_URL}" - ret=$? -- if [[ $ret -eq 0 && -s @sysconfdir_POST@/netdata/netdata.conf.new ]]; then -- mv @sysconfdir_POST@/netdata/netdata.conf{.new,} -+ if [ $ret -eq 0 && -s @sysconfdir_POST@/netdata/netdata.conf.new ]; then -+ mv @sysconfdir_POST@/netdata/netdata.conf.new @sysconfdir_POST@/netdata/netdata.conf - else - ret=1 - rm @sysconfdir_POST@/netdata/netdata.conf.new 2>/dev/null -@@ -57,20 +57,20 @@ stop_post() { - local result ret=0 count=0 sigkill=0 - - ebegin "Waiting for netdata to save its database" -- while [[ -f "${pidfile}" ]]; do -- if [[ $count -gt ${NETDATA_WAIT_EXIT_TIMEOUT} ]]; then -+ while [ -f "${pidfile}" ]; do -+ if [ $count -gt ${NETDATA_WAIT_EXIT_TIMEOUT} ]; then - sigkill=1 - break - fi - -- count=$[count + 1] -+ count=$((count + 1)) - kill -0 $(cat ${pidfile}) 2>/dev/null - ret=$? - test $ret -eq 0 && sleep 1 - done - eend $sigkill - -- if [[ $sigkill -eq 1 && -f "${pidfile}" ]]; then -+ if [ $sigkill -eq 1 && -f "${pidfile}" ]; then - ebegin "Netdata is taking too long to exit, forcing it to quit" - kill -SIGKILL $(cat ${pidfile}) 2>/dev/null - eend $? - -From b6d80fb3a3ae60077cbbc1e8dd0d01e1eb3ff67d Mon Sep 17 00:00:00 2001 -From: Craig Andrews -Date: Tue, 3 Oct 2017 14:56:53 -0400 -Subject: [PATCH 2/3] Fix the path to the netdata executable in the openrc - script - -Fixes #2826 - system/netdata-openrc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/system/netdata-openrc.in b/system/netdata-openrc.in -index 5c4eafa57..512d48278 100644 a/system/netdata-openrc.in -+++ b/system/netdata-openrc.in -@@ -23,7 +23,7 @@ - -
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/netdata/files/, net-analyzer/netdata/
commit: e530c96b2f07ed9eddfadd1ac638a12b90452313 Author: Craig Andrews gentoo org> AuthorDate: Tue Dec 19 01:47:08 2017 + Commit: Craig Andrews gentoo org> CommitDate: Tue Dec 19 01:47:21 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e530c96b net-analyzer/netdata: Cleanup old versions Package-Manager: Portage-2.3.19, Repoman-2.3.6 net-analyzer/netdata/Manifest | 6 -- .../files/netdata-1.4.0-glibc-sysmacros.patch | 21 - net-analyzer/netdata/netdata-1.2.0-r1.ebuild | 80 net-analyzer/netdata/netdata-1.3.0.ebuild | 94 --- net-analyzer/netdata/netdata-1.4.0-r1.ebuild | 102 net-analyzer/netdata/netdata-1.5.0.ebuild | 101 net-analyzer/netdata/netdata-1.6.0.ebuild | 103 - net-analyzer/netdata/netdata-1.7.0.ebuild | 103 - net-analyzer/netdata/netdata-1.8.0.ebuild | 103 - 9 files changed, 713 deletions(-) diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest index 43dae45a350..e3fc1c50317 100644 --- a/net-analyzer/netdata/Manifest +++ b/net-analyzer/netdata/Manifest @@ -1,8 +1,2 @@ -DIST netdata-1.2.0.tar.xz 1254000 BLAKE2B 1da38cfe5316c3d0036a7bea0f0abd1d8305d1a77204701ed7c57091259c958fb40b16e61ccde4091c6c7ddc63ca0c16c3fda39bdd87b09958a8411fe7b0fb3d SHA512 0c43e89c7cb52a5dde2aec13b06496ffb70fcb1952cf74156bd4400f3520b4136a94b5390077a4e5e3278a8e175dcc14505a456efafec5fdf0759af4846e03f4 -DIST netdata-1.3.0.tar.xz 1647708 BLAKE2B 637f1259ac5dad11f7987c085828cea46a907c1a78735ec5b00a449e6d17423f8b35b02b072ece2adf7cdb8d2c25d3fd48e1c8cd416c1418e5b9761f55abe2fc SHA512 0e96f12cbeb7aeecb07b885a0f10940022741633e5cfd76d9f79c9efe3bce2583d96ae18995831fc48d6724f65357929dc5a4220521230ecfb8517f15e779217 -DIST netdata-1.4.0.tar.xz 1801440 BLAKE2B 2d0b3feb4d1e66ca160f4bdb5b3e28edd99727148d7e0d9c2b3ced323a6c6514cd0f80767b49016dff7cdf912de0807dea3fd5bd11cbc7f8287cf85e780dfe20 SHA512 b5f60931372f0c6a437d1340bd9bb07557d8a9ffb478381715495c09c9b9bcf71f287c2e47be40945149a268e0f666289c75cc4eb1d1ab6fc73988f6b71daaf3 -DIST netdata-1.5.0.tar.gz 2257299 BLAKE2B bbfcd418329db1268173c9ff3f89632ebebb59f61200ef63fbc3055459c744417baaf0a747eb49de35f65742e006ad1165b1c3e691cb82e7f60aa00ab78c79f9 SHA512 54477c0f9fe2c920580e2e6c3f6c12828f3be2c3dfc1fee47ad98cab51ae3652cb3f223413e9de9399487a35ce844d502ce12fbf615102c0e1962b7dc96a9d95 -DIST netdata-1.6.0.tar.gz 2526589 BLAKE2B 209913f3ffc3afee30c24bf95eba8d1ff3f12154e9b5b8af3f311de2386d8aa1cde08ecf40464cdc5b0321511f0ec61fe9192b54aa15bb4291e8c99bea5b634b SHA512 9514fd320fc944897961f9581c123f37fb956dc3ae324a879744fabb0d853e8c6a1d62faf7a486f89a0507b2179f746e8dd0943443eb4744311e905a8c06aed6 -DIST netdata-1.7.0.tar.gz 2646936 BLAKE2B fbd0dd17e26e79f993e5daad5dfe55c84ba58e0f4a2f67015ab53729234b2a814bcd8132210819a7c39864d80f34ef505c6c5e5f2b21013d4ed580bbe414e08e SHA512 f7204d77963c06c010b91fb9df47b79cc03070a730f0c09d599a0ec606510f449bab3c8429db2df1494e4cee330c2229300de010c3ec705fe91376d92adf48fd DIST netdata-1.8.0.tar.gz 2779648 BLAKE2B 537d39c3f24ec53fbc7156663cf842143c560b8f8b40647d68e3ad0772bea441a70c7550da213bb0c5d75e0a0d685f32388f95f36e1e1101a0d619f44523c9f4 SHA512 8bb21f49ce1fcf3d199eabd18f65d5005ef784b227f08cd8efe91e5cab2ae980cf0aea4bcaa3aca1dc666c10845684deca48257510ad574bd948ecd019afcdaf DIST netdata-1.9.0.tar.gz 2483847 BLAKE2B 7f1bcc9cc5768a91b39c39cac04f877472d008630dfa3da97c0893c3cceeed721fb2982fce1f377267cf76e2a9ea70cca650d53bdd442e944820b0356f2700ea SHA512 d17112ee48a7d06704d03598e6020b6172f93a6f19e5577657fc5ffe902b8a0472f53b880552eb653e855da3e743a863db446520af008d3b75fb1b438e90 diff --git a/net-analyzer/netdata/files/netdata-1.4.0-glibc-sysmacros.patch b/net-analyzer/netdata/files/netdata-1.4.0-glibc-sysmacros.patch deleted file mode 100644 index 7722af2e1a8..000 --- a/net-analyzer/netdata/files/netdata-1.4.0-glibc-sysmacros.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 471d1b5404cd60ea638450e39554ae2878fd5b0d Mon Sep 17 00:00:00 2001 -From: Costa Tsaousis-Date: Tue, 20 Dec 2016 20:31:24 +0200 -Subject: [PATCH] added sys/sysmacros.h; fixes #1408 - - src/common.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/common.h b/src/common.h -index c92c049..70cb4d6 100644 a/src/common.h -+++ b/src/common.h -@@ -64,6 +64,7 @@ - #include - #include - #include -+#include // #1408 - #include - #include - #include diff --git a/net-analyzer/netdata/netdata-1.2.0-r1.ebuild b/net-analyzer/netdata/netdata-1.2.0-r1.ebuild deleted file mode 100644 index 02c65adda6e..000 --- a/net-analyzer/netdata/netdata-1.2.0-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit linux-info systemd user fcaps - -if [[
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/netdata/files/, net-analyzer/netdata/
commit: 5c4ecb46864837ce4c6025910db09de686c5c071 Author: Craig Andrews gentoo org> AuthorDate: Wed Oct 4 13:19:52 2017 + Commit: Craig Andrews gentoo org> CommitDate: Wed Oct 4 13:20:22 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c4ecb46 net-analyzer/netdata: openrc and systemd fixes Create the var/cache/netdata directory if it doesn't already exist in the systemd script Fix the path to the netdata executable in the openrc script Eliminate bashisms in openrc script Gentoo-bug: 633380 Package-Manager: Portage-2.3.11, Repoman-2.3.3 .../netdata/files/netdata-1.8.0-openrc-fixes.patch | 105 + ...netdata-.ebuild => netdata-1.8.0-r1.ebuild} | 7 +- net-analyzer/netdata/netdata-.ebuild | 6 +- 3 files changed, 116 insertions(+), 2 deletions(-) diff --git a/net-analyzer/netdata/files/netdata-1.8.0-openrc-fixes.patch b/net-analyzer/netdata/files/netdata-1.8.0-openrc-fixes.patch new file mode 100644 index 000..517eaec51fa --- /dev/null +++ b/net-analyzer/netdata/files/netdata-1.8.0-openrc-fixes.patch @@ -0,0 +1,105 @@ +From 3f4db620484e777265a7e5f0cfe10ba840f7eefd Mon Sep 17 00:00:00 2001 +From: Craig Andrews+Date: Tue, 3 Oct 2017 10:52:02 -0400 +Subject: [PATCH 1/3] Eliminate bashisms in openrc script + +--- + system/netdata-openrc.in | 14 +++--- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/system/netdata-openrc.in b/system/netdata-openrc.in +index 465e1232c..5c4eafa57 100644 +--- a/system/netdata-openrc.in b/system/netdata-openrc.in +@@ -38,13 +38,13 @@ depend() { + } + + start_post() { +- if [[ ! -f @sysconfdir_POST@/netdata/netdata.conf ]]; then ++ if [ ! -f @sysconfdir_POST@/netdata/netdata.conf ]; then + ebegin "Downloading default configuration to @sysconfdir_POST@/netdata/netdata.conf" + sleep 2 + curl -s -o @sysconfdir_POST@/netdata/netdata.conf.new "${NETDATA_CONFIG_URL}" + ret=$? +- if [[ $ret -eq 0 && -s @sysconfdir_POST@/netdata/netdata.conf.new ]]; then +- mv @sysconfdir_POST@/netdata/netdata.conf{.new,} ++ if [ $ret -eq 0 && -s @sysconfdir_POST@/netdata/netdata.conf.new ]; then ++ mv @sysconfdir_POST@/netdata/netdata.conf.new @sysconfdir_POST@/netdata/netdata.conf + else + ret=1 + rm @sysconfdir_POST@/netdata/netdata.conf.new 2>/dev/null +@@ -57,20 +57,20 @@ stop_post() { + local result ret=0 count=0 sigkill=0 + + ebegin "Waiting for netdata to save its database" +- while [[ -f "${pidfile}" ]]; do +- if [[ $count -gt ${NETDATA_WAIT_EXIT_TIMEOUT} ]]; then ++ while [ -f "${pidfile}" ]; do ++ if [ $count -gt ${NETDATA_WAIT_EXIT_TIMEOUT} ]; then + sigkill=1 + break + fi + +- count=$[count + 1] ++ count=$((count + 1)) + kill -0 $(cat ${pidfile}) 2>/dev/null + ret=$? + test $ret -eq 0 && sleep 1 + done + eend $sigkill + +- if [[ $sigkill -eq 1 && -f "${pidfile}" ]]; then ++ if [ $sigkill -eq 1 && -f "${pidfile}" ]; then + ebegin "Netdata is taking too long to exit, forcing it to quit" + kill -SIGKILL $(cat ${pidfile}) 2>/dev/null + eend $? + +From b6d80fb3a3ae60077cbbc1e8dd0d01e1eb3ff67d Mon Sep 17 00:00:00 2001 +From: Craig Andrews +Date: Tue, 3 Oct 2017 14:56:53 -0400 +Subject: [PATCH 2/3] Fix the path to the netdata executable in the openrc + script + +Fixes #2826 +--- + system/netdata-openrc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/system/netdata-openrc.in b/system/netdata-openrc.in +index 5c4eafa57..512d48278 100644 +--- a/system/netdata-openrc.in b/system/netdata-openrc.in +@@ -23,7 +23,7 @@ + + extra_started_commands="getconf" + pidfile="/run/netdata.pid" +-command="${NETDATA_INSTALL_PATH}/usr/sbin/netdata" ++command="@sbindir_POST@/netdata" + command_background="yes" + command_args="-P ${pidfile} ${NETDATA_EXTRA_ARGS}" + # start_stop_daemon_args="-u ${NETDATA_OWNER}" + +From b5823e7865851c3cc2381c4fb45716f269a4e85f Mon Sep 17 00:00:00 2001 +From: Craig Andrews +Date: Tue, 3 Oct 2017 15:56:39 -0400 +Subject: [PATCH 3/3] Create the var/cache/netdata directory if it doesn't + already exist in the systemd script + +--- + system/netdata.service.in | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/system/netdata.service.in b/system/netdata.service.in +index 1d4af988a..58cdff225 100644 +--- a/system/netdata.service.in b/system/netdata.service.in +@@ -9,6 +9,9 @@ Group=netdata + RuntimeDirectory=netdata + RuntimeDirectoryMode=0775 + ExecStart=@sbindir_POST@/netdata -P /run/netdata/netdata.pid -D