Update net-analyzer/netdata-9999

3 files changed, 34 insertions, 18 deletions

diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 9a51d35b..31b4fac8 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,5 +1,5 @@
 AUX netdata-1.4.0-glibc-sysmacros.patch 560 SHA256 3dfd873d8faf9e7578f27c00294b31f3ad4749e2443d74f8fdf3dff65b492055 SHA512 58af1778c9fce5333e984a1a0d8612da4455596f72e6343a656d4aaaa8d6a0809cb2b02647cbdfaef61776a657282583e298a3d5bd555ea9d7d9ee09b819e787 WHIRLPOOL fbba339d641681f23fd25748635c693e1469f05bd9a51314236ef5782eec1c65529268eb18020408ff7a79685915f4ea76ff7b3afde31569cf94d1eb916c87e1
-AUX netdata.initd 2391 SHA256 502570a2fb66bd3c3ec0f99907021b01f754ae70d9c72a5e2e050fb561ffe20c SHA512 869b0e877a605e4a5f7f60b56ce5328973cc72b6feaabee8d47919f1c43aaa66716ef6d6d1e8111366318eeea67b299df7b54dc9aa1432f16f5ae4892b6b6152 WHIRLPOOL c1ce8316bfc9653ce2336e54656f2d6ebc11ccf509f110a0a0dfca95f8beb22a7b592cebbcebb303f930be21cbb20319d17a296c3b9731f5b31a87dab9e792f4
+AUX netdata.initd 2552 SHA256 5b801e4f4dd5be71a1bd580ea1b4b307533b961f5716b70162405102ecaf49fb SHA512 c79bcf24e83b7cbf0aaf02db9b76823e8b7e5633ba8d5ddb53eb51c071eeb041d95062b34cd58e057aa78d17afb7c05eb7bed4552e049faa453dcdab7f3cca30 WHIRLPOOL a876cc4dba18d6c551c5626e9278fc08fd0aac09081463064f82e0f58805339e80191ee47ea5c739e913040ccded6c65fa3a7ddd669be592b24b9ca09897b7eb
 DIST netdata-1.2.0.tar.gz 1393005 SHA256 886288bdc66c744256cd735d6a074407d2b6450610df3dd80ae9f99ff7475773 SHA512 5ffb9f8e33f8270f0ec8f40fd5140641582a15366e83b8b39010284613fda6cd338efdfb7f9ed47b6d898cf235fba23547df8c6a5f4fcbfe020bdd1e429d1f9f WHIRLPOOL 7bc84b11252eed665627485e2cd62565c4e037362cbeca61f0c1a604fb436d69fd3eff5552df661082b71f9c9c219ea03cfed9667f4f7c7174b05a97eae11285
 DIST netdata-1.3.0.tar.gz 1867166 SHA256 14800d75fce645c8b6850cc16035175c3c2f7e109c33fea2b8b563f3ec39d678 SHA512 8626d1a55ff600ba94f5c667322b91d15068be1acccc8350d4ef5520291af0934fe9a2712865da7d2d2a8da2a22b2d5fa1a1ae20fce19db5980f6d7ab2d016c5 WHIRLPOOL b94b6c6a0c3c55573f4178a644c6ea841b2ff495f1e7c7aacb85d03536317792f03270275e56f94a832e9ba2d3c6dae23044e833cb211961eea57b57d76c57f6
 DIST netdata-1.4.0.tar.gz 2051113 SHA256 4926e39894df9e37021f9811605be0dc16c220039cd5ee3e34148353e0f09b1b SHA512 bb20c80b064d69d7fbb0f1bace0ba8eef462b1cdaebbde8697dea960e09b34c76f57eb907f1ace3413932716d24598251efeeb17cbeffb6a083c88b7322c925b WHIRLPOOL bcf40f77ca2624c38b5278129b0b3c6727523693929dbb01fa80e59438ffc54ac94c6e50719cc2e969115aa284b16f41e9213f21033fed39d8a32e3e59c46f6c
@@ -10,6 +10,6 @@ EBUILD netdata-1.2.0-r1.ebuild 4101 SHA256 07d67cf03faffc23cecdb44df0420bd2cb4d5
 EBUILD netdata-1.3.0.ebuild 4605 SHA256 c1d3a96ccc8fe1b0d308853bc27b28719f5b7df47ffba3613cf5e138c11de661 SHA512 557d157147d5c76e10145b714e0c9b19e58ecf1bfc21179727892c75375dd0c60375501b12ca9bddcbae8667ff95b209f872e6078394c67970c9b0e43c2542f6 WHIRLPOOL 1ce4ee7fa76d76174a55d88c705086cdc81bd4c60ad35aa82f04768ecb83d83be819c056af90259d476af7c0defd52ed7b28cdd4fc56f933b78412cd129cbc14
 EBUILD netdata-1.4.0-r1.ebuild 4795 SHA256 7e4161b6fa5f82169233cdaef19057ab2e97f716d7d2429f9974c83e465cf911 SHA512 aaec94a718e24c96d5a37a64db490c3e336722c2fe34cb50d9ecf852ee21d84dc930b5cb65a30a371f94337b532ef7d526355ce851ee6af73310d7e94623c935 WHIRLPOOL c87ba7616f394547fec5a6e21a447d3b51793b6a7bd3e9ade59c20b5501d9b3d4223e9e7064cf2c0d66e51e7d5afc40d6a689af6b2d25d628d547ad4c7343449
 EBUILD netdata-1.5.0.ebuild 4871 SHA256 1f5eb32dd03dcf60c73d0ebe49344eb5ff83660d301142af9e2b4c68d6a24127 SHA512 ebaf93650737505e06897307f4b7a9f0feac2f5282e6e0f89a2e882320e1b3f0f73975cc2a7bcb0e57f3d561e0c5e915d5edc8c2e1fadf22f696d415a6d821f8 WHIRLPOOL ecda35ad8b44975c5d3c0c0c937cf848b4f4d5a0d40412b11edb43eaf6d60589da2a0e9db66c491793bc0171941e2a0e0e7ecfb3bd82c724bdd0ca76b1650d71
-EBUILD netdata-1.6.0.ebuild 5163 SHA256 f9b629ba2428a8fd239621e6e9c01ac1077fc51dcd51cd85b9b8acddae80e9e4 SHA512 a75fa9e9b86aff3ea91cbfeec7dfcbcd207ff1ef250d457e2bde2e7ec7974862e3deaab8f32d1db4ddb39d4121eaf9d5ec3c7103e4a3d5e7d0d1d71079c80359 WHIRLPOOL 9ce148f4e57f499c12c6c3e1de81f5e003dd1dd27a4be8e220a96adaf002da812d1500aad4260e77185d96bc9c8828335f5840798da6254582b66218f8d3849d
-EBUILD netdata-1.7.0.ebuild 5163 SHA256 f9b629ba2428a8fd239621e6e9c01ac1077fc51dcd51cd85b9b8acddae80e9e4 SHA512 a75fa9e9b86aff3ea91cbfeec7dfcbcd207ff1ef250d457e2bde2e7ec7974862e3deaab8f32d1db4ddb39d4121eaf9d5ec3c7103e4a3d5e7d0d1d71079c80359 WHIRLPOOL 9ce148f4e57f499c12c6c3e1de81f5e003dd1dd27a4be8e220a96adaf002da812d1500aad4260e77185d96bc9c8828335f5840798da6254582b66218f8d3849d
-EBUILD netdata-9999.ebuild 5163 SHA256 f9b629ba2428a8fd239621e6e9c01ac1077fc51dcd51cd85b9b8acddae80e9e4 SHA512 a75fa9e9b86aff3ea91cbfeec7dfcbcd207ff1ef250d457e2bde2e7ec7974862e3deaab8f32d1db4ddb39d4121eaf9d5ec3c7103e4a3d5e7d0d1d71079c80359 WHIRLPOOL 9ce148f4e57f499c12c6c3e1de81f5e003dd1dd27a4be8e220a96adaf002da812d1500aad4260e77185d96bc9c8828335f5840798da6254582b66218f8d3849d
+EBUILD netdata-1.6.0.ebuild 5566 SHA256 131c75b8d6ba42452771f8523a53ab904dc5c466ce6e8a8ba2db44b92c4cb00b SHA512 d05cae4e15fa2ea45f6a8642760ff7a8cec3749e1c7f19a3026f9032671de1fe8d4b264af805420130a1cf7b69a2e42cbd8a069a3e7f4fc324a6a60ad6868156 WHIRLPOOL ee9841cfc7706b6942fb920bd880cbab6f4010f614fd8894b1fb4bddd23d60a39a94f52466263528d02b995b7ab4920d38c39f45c4e154e59f263de4f43cd992
+EBUILD netdata-1.7.0.ebuild 5566 SHA256 131c75b8d6ba42452771f8523a53ab904dc5c466ce6e8a8ba2db44b92c4cb00b SHA512 d05cae4e15fa2ea45f6a8642760ff7a8cec3749e1c7f19a3026f9032671de1fe8d4b264af805420130a1cf7b69a2e42cbd8a069a3e7f4fc324a6a60ad6868156 WHIRLPOOL ee9841cfc7706b6942fb920bd880cbab6f4010f614fd8894b1fb4bddd23d60a39a94f52466263528d02b995b7ab4920d38c39f45c4e154e59f263de4f43cd992
+EBUILD netdata-9999.ebuild 5566 SHA256 131c75b8d6ba42452771f8523a53ab904dc5c466ce6e8a8ba2db44b92c4cb00b SHA512 d05cae4e15fa2ea45f6a8642760ff7a8cec3749e1c7f19a3026f9032671de1fe8d4b264af805420130a1cf7b69a2e42cbd8a069a3e7f4fc324a6a60ad6868156 WHIRLPOOL ee9841cfc7706b6942fb920bd880cbab6f4010f614fd8894b1fb4bddd23d60a39a94f52466263528d02b995b7ab4920d38c39f45c4e154e59f263de4f43cd992
diff --git a/net-analyzer/netdata/files/netdata.initd b/net-analyzer/netdata/files/netdata.initd
index e5d8fe1c..f50f6cea 100755
--- a/net-analyzer/netdata/files/netdata.initd
+++ b/net-analyzer/netdata/files/netdata.initd
@@ -37,7 +37,17 @@ depend() {
 }
 
 start_pre() {
-	checkpath -o "${NETDATA_OWNER}" -d /var/log/netdata /var/cache/netdata /var/run/netdata
+	local -i rc=0
+
+	checkpath -o "${NETDATA_OWNER}" -m 0770 -d \
+		/var/cache/netdata		   \
+		/var/lib/netdata		   \
+		/var/lib/netdata/registry
+	: $(( rc += ${?} ))
+	checkpath -o "${NETDATA_OWNER}" -m 0775 -d \
+		/var/log/netdata
+	: $(( rc += ${?} ))
+
 	return ${?}
 }
 
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index 147308aa..ce992eca 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -43,7 +43,7 @@ HOMEPAGE="https://github.com/firehol/netdata https://my-netdata.io/"
 
 LICENSE="GPL-3+ MIT BSD"
 SLOT="0"
-IUSE="caps +compression ipmi mysql nfacct nodejs postgres +python systemd cpu_flags_x86_sse2"
+IUSE="caps +compression fping ipmi mysql nfacct nodejs postgres +python systemd cpu_flags_x86_sse2"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )"
@@ -62,6 +62,7 @@ RDEPEND="
 	virtual/awk
 	caps? ( sys-libs/libcap )
 	compression? ( sys-libs/zlib )
+	fping? ( >=net-analyzer/fping-4.0 )
 	ipmi? ( sys-libs/freeipmi )
 	nfacct? (
 		net-firewall/nfacct
@@ -71,6 +72,8 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		dev-python/pyyaml[${PYTHON_USEDEP}]
+		virtual/python-dnspython
+		virtual/python-ipaddress
 		mysql? (
 			|| (
 				dev-python/mysqlclient[${PYTHON_USEDEP}]
@@ -120,12 +123,6 @@ src_configure() {
 src_install() {
 	default
 
-	cat >> "${T}"/"${PN}".sysctl.conf <<- EOF
-	kernel.mm.ksm.run = 1
-	kernel.mm.ksm.sleep_millisecs = 1000
-	EOF
-
-	dodoc "${T}"/"${PN}".sysctl.conf
 	newdoc "${ED}"/usr/libexec/netdata/charts.d/README.md charts.md
 	newdoc "${ED}"/usr/libexec/netdata/plugins.d/README.md plugins.md
 
@@ -139,7 +136,10 @@ src_install() {
 		fi
 	fi
 
-	use nodejs || rm -r "${ED}"/usr/libexec/netdata/node.d
+	if ! use nodejs; then
+		rm -r "${ED}"/usr/libexec/netdata/node.d
+		rm "${ED}"/usr/libexec/netdata/plugins.d/node.d.plugin
+	fi
 
 	rm -r "${ED}"/usr/share/netdata/web/old
 	rm 2>/dev/null \
@@ -149,7 +149,10 @@ src_install() {
 		"${ED}"/usr/libexec/netdata/plugins.d/README.md
 	rmdir -p "${ED}"/var/log/netdata "${ED}"/var/cache/netdata 2>/dev/null
 
-	fowners -Rc root:"${NETDATA_GROUP}" /usr/share/"${PN}"/web || die
+	# netdata includes 'web root owner' settings, but ignores them and fails to
+	# serve its pages if netdata:netdata isn't the owner :(
+	fowners -Rc "${NETDATA_USER}":"${NETDATA_GROUP}" /usr/share/"${PN}"/web ||
+		die "Failed settings owners: ${?}"
 
 	insinto /etc/netdata
 	doins system/netdata.conf
@@ -173,10 +176,6 @@ pkg_postinst() {
 			elog "echo 1000 >/sys/kernel/mm/ksm/sleep_millisecs"
 			echo
 			elog "If you enable it, you will save 20-60% of netdata memory."
-			echo
-			elog "You may copy /usr/share/doc/${PF}/${PN}.sysctl.conf to"
-			elog "/etc/sysctl.d/${PN}.conf in order to activate this change"
-			elog "automatically upon reboot."
 		fi
 	else
 		elog "INFORMATION:"
@@ -189,4 +188,11 @@ pkg_postinst() {
 		elog "If you can have it, you will save 20-60% of netdata memory."
 	fi
 
+	if ! use prefix; then
+		# This should be handled by FILECAPS, but wasn't... plus we want a
+		# fallback.
+		setcap cap_dac_read_search,cap_sys_ptrace+ep "${EROOT%/}"/usr/libexec/netdata/plugins.d/apps.plugin ||
+		chmod 4755 "${EROOT%/}"/usr/libexec/netdata/plugins.d/apps.plugin ||
+		eerror "Cannot set capabilities or SUID on '/usr/libexec/netdata/plugins.d/apps.plugin'"
+	fi
 }