gentoo resync : 15.10.2017

13 files changed, 137 insertions, 11 deletions

diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index b0058ca64c5d..c4534e0b84d1 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -5,9 +5,11 @@ AUX cacti-spine-0.8.8h-fix-ac-macro.patch 217 SHA256 473634529cca89e1609219a4064
 DIST cacti-spine-0.8.8h.tar.gz 804951 SHA256 a693136839bd7d03cae5b3ff4614a4d21a2153ffb14d09fc061b843ab0b2bb30 SHA512 6a7147ab645be44de0d330c7801e569705817da10bf6cedba82c712e1701ada8aa8924a6b3b063ea680e6af24f815d6767e8773ad7b8da212abfa082b4211bd4 WHIRLPOOL 36daed4986ca84883e51ab6b02ebb2ade00205c30705cfc94e73835bc2fc427a60a2dba9c7ca3665d0c0b2fca21afab77d94cde63b740f3734f9279c929cccaf
 DIST cacti-spine-1.1.20.tar.gz 801877 SHA256 a8ccb24980099fbb6ee0a16f397f10fb9b3320db6a02c4e61b1483445d405f99 SHA512 df552157e64da04f57493351831a0602dea9ca3219ce3936884aec894e6698559d429ec62936a307b43fd49eff674c670d7e0a047924b5f03c30abeeec91491f WHIRLPOOL 1948229141f99fb04c799b46b323a047c47dc3c94303cb50f56018af8cbc1fe4d2c3a5b8c1683629802b3600e6e69b8ab5ce636e0d9c84ba61e9beadde11f2f1
 DIST cacti-spine-1.1.21.tar.gz 801907 SHA256 031c7eeea7e64b20754cccfcc65851443847a31765893ddcc528da4e384ca4bf SHA512 0dfdd3444639a471bc5c0d35ea3898532f2ebf16679677fee8ad291221ed607b54acc7fbf25e78da7c5597eeaed6b870ad7af66a95e20f95afce3270c8da5dd0 WHIRLPOOL 6521e622329c1a6e6ca5b8c97717380a4bc2fadde37af42fa6c1fd83f82a35ebc5cefce9788a360ff46abc62a9918e327404188f6c9b611b0064e1a86b41cab0
+DIST cacti-spine-1.1.25.tar.gz 802127 SHA256 d5452d320781107a2cbc289247ecf8c0b29f55379a0c008b020843508c7e435d SHA512 d9c4a924ce08d363a1ce7327172b6c83d606ccfb2b623b3b5a0f6df534a031caedbe55314cd415a58484c89df49d5e682853e5001849bd8e9767190fdc367809 WHIRLPOOL 0c2d5ec02c110b5ef5545ca1be769a2632c2bedd9c7627ef7f9a53995a956151627a10293fcfb19f34e223cb8c6cde914a2b399f14c2426a57bbdfe5f2046617
 EBUILD cacti-spine-0.8.8h.ebuild 999 SHA256 9dfc1173686e7bb7cdc44895735a91f77e0412436b90af2fada2670d74eeb827 SHA512 5b1226090b6cc63715b45e46a5d258b25ab67d596894212c755fc8c3602db4d8f96f9c26208b7bf4c3c27b11ef57cc3cda9913d709fc7d5f1ed9b44c5f52c241 WHIRLPOOL 3763b3ae6bc822edcc6e526bbb137be74766bdc105e58dd8e2d6a1969f352ed302508c6b09e2d34febf3fc1fb24e469edfec49f4db059167a1f47101b7843526
 EBUILD cacti-spine-1.1.20.ebuild 861 SHA256 1339a910525d2e15412e9b805c92877bdb49fdc9f462b6dc0abb6ac3d906d29d SHA512 4820e9d6245df29dfb6dd57cdc6a41dab158e177e4273895748612d2de9089f61dc3984fef204ac0ec0321d97c94258962edb14ac84a983ce34b7b2234dce2be WHIRLPOOL c671990e7c4c899be726dfab136ff50abc2cbc97440f88446e6f912f14b8f03c4e9a2fa884f909cccdcab1f5cfbee968923c93896c0a4871e703375b7f96c00e
-EBUILD cacti-spine-1.1.21.ebuild 863 SHA256 5e5f9ee85315aef7c3dbdbf8397d5afb857a4647a9ad7a553c87316c760b6eed SHA512 0520ba0fdaa6dee66803ac9567c2e49060e48dcad9d9eae868e3c063e601f45686cd1d46897e26a1843fbd2c854df05b3fa68659eda95b391a321777eefe59fa WHIRLPOOL 20561edecf53e00acbeb99a486f0b9df275fc95c795e92fb8c13e9c0f5f1059aa12b44eb108adcc62fdf685e2842f3aee0f0822af644fe41aedc4149aa59aeed
+EBUILD cacti-spine-1.1.21.ebuild 862 SHA256 05dac1a6ed0de32c13e63983c62738089ebf30ad0c053ec2caafe47c33147a6d SHA512 2c241b9da06c6e069736d7f517f56cd2690e2a89a4c1d11c148761d0d8cae05aee0a48d74d264ec166c8d74477b7d3738170a37577119c2bc3a8ef2d697811c2 WHIRLPOOL ae366e77ff4e1b4e3d8ae198918efeb3e207902db4462a3b4211103bc41a2cf208b927d530f60c4748114c6a735db073da0daac19e96e6878e09301049733dce
+EBUILD cacti-spine-1.1.25.ebuild 863 SHA256 5e5f9ee85315aef7c3dbdbf8397d5afb857a4647a9ad7a553c87316c760b6eed SHA512 0520ba0fdaa6dee66803ac9567c2e49060e48dcad9d9eae868e3c063e601f45686cd1d46897e26a1843fbd2c854df05b3fa68659eda95b391a321777eefe59fa WHIRLPOOL 20561edecf53e00acbeb99a486f0b9df275fc95c795e92fb8c13e9c0f5f1059aa12b44eb108adcc62fdf685e2842f3aee0f0822af644fe41aedc4149aa59aeed
 MISC ChangeLog 5144 SHA256 f4109f6f6cc548a8d9390a072215bcc6f16fe7724494eb7e14c09093c7700160 SHA512 607568b0cbe9ee8d1bbddaf9d9dd01c9652a5cdf12d7d2e944ca73c4c4550af004ff59276bcb84ac90179b4c4349e33261929703922dbf9862bc32de3939eea9 WHIRLPOOL 8a2b8005b6230e5348bac05fe25c89b3afc862496d00e45333a762bf2563fddd0cc914c53fe433eb9636a61b941667d567c2753031c66e530295f21869fa2545
 MISC ChangeLog-2015 7652 SHA256 c66b026913004af1b3c3f9222527b2b6256a198df5a1846ce70562c33e08c837 SHA512 4867bbe6054bb287d4b6142b1a03f5709eab730764f40ad56e434edaa6c45f83e817d1118042a4fa6b28b881481f4b8911dbcb35aad0414459d9e0d82c2e888c WHIRLPOOL 3a0530ff8febf7c22f78a7e3a9e2cd98268bbfaadf218acafe223c1e2f10b15266c6a5a8ae3539b0f8460934a8569a222c9fce53adbefd55006941dda3e98306
 MISC metadata.xml 728 SHA256 e44c360dfac0f02ddf82d23b13b4e9f45aca436e872a9508753a8e450cd04069 SHA512 a8aef67f6761ecf0ac98771a82908e67fb9aead1a32f7ececb8c80ae46c1a431abcfc1165ed471dd428bd6c0a5d4bdc2ddbea1c86ae5c917ff9786bacd6d0f38 WHIRLPOOL c073071c896c3cd8b8e8f7a408cd38dddf9d8e74851874dc5a2b9516c9626cc58923070220f8b4fdbc9d9a9828160fbcf21c1b3f96c6ff4d797fdfce2803a404
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.1.21.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.1.21.ebuild
index d148f4544d01..4c78d022f85d 100644
--- a/net-analyzer/cacti-spine/cacti-spine-1.1.21.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-1.1.21.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 hppa ~ppc ~ppc64 ~sparc ~x86"
 
 CDEPEND="
 	dev-libs/openssl:*
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.1.25.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.1.25.ebuild
new file mode 100644
index 000000000000..d148f4544d01
--- /dev/null
+++ b/net-analyzer/cacti-spine/cacti-spine-1.1.25.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils
+
+MY_P=${PN}-${PV/_p/-}
+
+DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
+HOMEPAGE="https://cacti.net/spine_info.php"
+SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+CDEPEND="
+	dev-libs/openssl:*
+	net-analyzer/net-snmp
+	virtual/mysql
+"
+DEPEND="
+	${CDEPEND}
+	sys-apps/help2man
+"
+RDEPEND="
+	${CDEPEND}
+	>net-analyzer/cacti-0.8.8
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.8d-ping.patch
+	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
+)
+
+src_prepare() {
+	default
+
+	AT_M4DIR="config" eautoreconf
+}
+
+src_install() {
+	dosbin spine
+	insinto /etc/
+	insopts -m0640 -o root
+	newins spine.conf{.dist,}
+	dodoc ChangeLog
+}
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 484670756762..aebd444c82cc 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -2,9 +2,11 @@ AUX postinstall-en.txt 2249 SHA256 7879329884e33f84108d5fbed732941c9fd8a53b56db4
 DIST cacti-0.8.8h.tar.gz 2585226 SHA256 0673bd9513dad381c8bbb9133c721a32bc6422dc91c5a81de16e3cd32e4d0600 SHA512 11bb0682a7220af5581f42579cf9c38d94aae202425ce15b824849684b1a6778d6f14e6a62ec94c608b7ba06562a825be7fd6d812d0800daa5eb56e640ac1c5f WHIRLPOOL 250ee38d969c9a7d9a71b15a25e48c2b9b22412c6c2394798d178172d9a1be056b009b328594559524adbd47ad05032992b13cb5a632af1a23f947fb55342402
 DIST cacti-1.1.20.tar.gz 8903728 SHA256 cbad90ef98d656bb10814e1444722dc00ff0c3a922b4591775984e890a81c942 SHA512 2d51c757916b366a188a3ab31771bafb6492aaa6ab2e778255945677bbb3f23f6fbfbb73ea9b05abf2f7cb26c0970bc208f68d5f1c016f8fe3b9da003dcd3b1b WHIRLPOOL a73b661f71e51b3f9be4413f211c735d1addad877020d7abc762043620869215177565a597a67dc40ff460784b00e8a765a9d348b39cdd2b2b15bccb3db70fb3
 DIST cacti-1.1.21.tar.gz 8905650 SHA256 e649fea4e8fc9900620af213218989e229aa25a1e1fb10dcde1844b1a2ae3bc0 SHA512 383bfc24c038154fd03d8997cba0fdf8d87ee69305f392b254102b6c279c0b7e53562a2d3d1f996315152a36da467821876e3834dd7b62bdc057a3b7838b94d2 WHIRLPOOL dea91e014e4b64a40bad4ab573a468fae0c6e1f7e380946cec5f5b270fe8abaacd3c73d71ad636e813e443117af0641269cfe2448f8c8487b1b7f7507e2a493e
+DIST cacti-1.1.25.tar.gz 8920466 SHA256 d0b911ff5b46abf858650bcb95bbeb1e482c3815e1a48129fde167ffe2d52389 SHA512 f5574cf0ba9d8fa39a6e547c9fe2a3c007901987abb82ff50d63672009bbf257ee58f47f02cea512dda6809e880e87e8a3ad826c26a9421f195569816d6489e0 WHIRLPOOL e229d13cc133c1e852e248c313ab22e0a1a53a123e6bc98396ea031a8307169a3278a9ef5bb63a69be667bf6d83c1c299cb97116db753a22a318ed061e75f3c5
 EBUILD cacti-0.8.8h.ebuild 1308 SHA256 42fb408c4c187c7733a7741701d94988734649097a6e76842d120fd5272ea1bc SHA512 6d48400c92aa9ef987ac43b5cbb6a4eeb9ad2235ffe1adc40cdadbe54ba0033090e0e4b8a9f48a6b85b0bf4e41c4f4f67da1869218344c59c777ecb173cd8784 WHIRLPOOL 9132c1a334e3426c7817893f212fbac3ffefbf8139e1f0e15b700d97c1cb2019391e420ba36fbc9e61bf992ecf2b567dcb0c838ddd361220435a934ff682f1ba
 EBUILD cacti-1.1.20.ebuild 1258 SHA256 8a90731cd9defdfdefb98d57868e37fc438eb8d16b303c92a33e571340585d5b SHA512 90246b8bbd88ac48ddd24df0dc32a43f8f387f2eb4215ed8280c59e2856f7060027cc4fa590446c2e7c3fce8c663da77ac5d169b9267ed8f04eb9c8207c6f517 WHIRLPOOL 50382cf522323d6c354322ee87c38ff1691049c718cf464a9bf6092cc770ff1a4be2286af3c15ca5773bad34ff25b2ef8ee40b0ab32a54cd8f9da452cdcce742
-EBUILD cacti-1.1.21.ebuild 1260 SHA256 9e1f68ebaee9e7229e139e3d95269863d6a4983a41b8de0e0d80dad0284819c5 SHA512 6a2811d73ba933ededc5b1157180f8cfd3aa64da392e34dd56cf8a1402720906b2d7169359fe3f079987cf50014d010f2ac6f6b39b0de379ffd57d6fb5317ad1 WHIRLPOOL c33e5d42e8ebc02465df235c4aaa379b95547537400c2c71aaf585e648855ba99c28c8b3b0db42efa592562c01d143131371e06c1e58d570565db357ded303ff
+EBUILD cacti-1.1.21.ebuild 1259 SHA256 d85789f10a42d9c56f166df0d5f7185bee5829f754bef93fc2200affe2aa95b1 SHA512 e9f48fbc4348eb47d07c0d47272e001d0f815fa6527b2bb48989e818d4984bb042d19f4c0369f29cc7b2537c884b8c1483f1058c95720c8f440aa62bf4903884 WHIRLPOOL a968f18d75cd7ef0b10cc13e71b878650de242fc8136523b0e52b9b15466e19db269c36fb6823b2280b6210e329c02cf988be7c78a33131131c88ec07962c307
+EBUILD cacti-1.1.25.ebuild 1260 SHA256 9e1f68ebaee9e7229e139e3d95269863d6a4983a41b8de0e0d80dad0284819c5 SHA512 6a2811d73ba933ededc5b1157180f8cfd3aa64da392e34dd56cf8a1402720906b2d7169359fe3f079987cf50014d010f2ac6f6b39b0de379ffd57d6fb5317ad1 WHIRLPOOL c33e5d42e8ebc02465df235c4aaa379b95547537400c2c71aaf585e648855ba99c28c8b3b0db42efa592562c01d143131371e06c1e58d570565db357ded303ff
 MISC ChangeLog 6068 SHA256 b9a798f16089824899d4534b3047ea47bc4c3f5c961bb75939ede4394c939f09 SHA512 d289b3977cd4e2a6029cc976427dbd7258e5d31074ab63b2f0b26820d347b0b6a0a43d395bdf850851402ec36afc3e36d64f094d1e70d546177671276eba0cf2 WHIRLPOOL 36c0d2056e11d758c86a9b3458677ed1682c80a362949660c7a23ee1e3161f622ae80ba792c10e55aae943c0431fc4c373588b3e57ded9af7e131868b48f8367
 MISC ChangeLog-2015 30467 SHA256 36b345341f9a47ef2d54bd1272e9d54fade878bc9aa0a983f52e9739c58f4a97 SHA512 e0890043839852c1b0e41962ac38e6e881e1d1b9eba6055c969b276e8a3d878a9aa0291c0b01fc8053442ab3d722ded00736b20b59cf8135df7ee617502af542 WHIRLPOOL 8fae89c873c85a58a937879bf554c316096d744a3e86c809fcc02ff8c278f5c56603af8cedf841bce462c52ccfe24c1af9550d81484b6f81c399b7066c51bff5
 MISC metadata.xml 834 SHA256 f5fe19c82f443bc060d5035e3b96d494d79de2a29963090fcca821b4e3d3226e SHA512 f74b807c0629400ad06ee2b03650be38524268b2590d455ab4b672bc2c6c13856f881226a7c1d6e74e1acb6f85abc3d5bd311abaa6571216aca7698e8368e616 WHIRLPOOL 7f5ecdbe61e052c3430d54a1b8b8bb6435bf1bfa15f1014db7dc5b3dd74f38f2b18029855f1db387c645211fa5db84d20cee37937ab1e2e9ab25b5e023e6a59b
diff --git a/net-analyzer/cacti/cacti-1.1.21.ebuild b/net-analyzer/cacti/cacti-1.1.21.ebuild
index 08d211285f65..b0f3b50324d5 100644
--- a/net-analyzer/cacti/cacti-1.1.21.ebuild
+++ b/net-analyzer/cacti/cacti-1.1.21.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.cacti.net/"
 SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="snmp doc"
 
 need_httpd
diff --git a/net-analyzer/cacti/cacti-1.1.25.ebuild b/net-analyzer/cacti/cacti-1.1.25.ebuild
new file mode 100644
index 000000000000..08d211285f65
--- /dev/null
+++ b/net-analyzer/cacti/cacti-1.1.25.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils webapp
+
+# Support for _p* in version.
+MY_P=${P/_p*/}
+
+DESCRIPTION="Cacti is a complete frontend to rrdtool"
+HOMEPAGE="https://www.cacti.net/"
+SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="snmp doc"
+
+need_httpd
+
+RDEPEND="
+	dev-lang/php[cli,mysql,session,sockets,xml]
+	dev-php/adodb
+	net-analyzer/rrdtool[graph]
+	virtual/cron
+	virtual/mysql
+	snmp? ( >=net-analyzer/net-snmp-5.2.0 )
+"
+
+src_prepare() {
+	default
+	sed -i -e \
+		's:$config\["library_path"\] . "/adodb/adodb.inc.php":"adodb/adodb.inc.php":' \
+		"${S}"/include/global.php || die
+
+	rm -rf lib/adodb || die # don't use bundled adodb
+}
+
+src_compile() { :; }
+
+src_install() {
+	dodoc docs/{CHANGELOG,txt/manual.txt}
+	dodoc -r docs/html/
+	rm -rf docs
+
+	webapp_src_preinst
+
+	edos2unix `find -type f -name '*.php'`
+
+	dodir ${MY_HTDOCSDIR}
+	cp -r . "${D}"${MY_HTDOCSDIR}
+
+	webapp_serverowned ${MY_HTDOCSDIR}/rra
+	webapp_serverowned ${MY_HTDOCSDIR}/log
+	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 72474914e74e..87ae61dd0dd9 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -14,7 +14,7 @@ DIST nagios-4.3.4.tar.gz 11101966 SHA256 c90b7812d9e343db12be19a572e15c415c5d635
 DIST nagios-core-gentoo-icons-20141125.tar 40960 SHA256 68b715f636eb291343cab3259862bbed8b6b898520b58df522438524de3d8761 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766 WHIRLPOOL 7ec3a944b2a659b456d3168818ca5b1af3a427436e6af2f3e5d6cba6fc7b1c7bad6f552301f064df31988865b3b32fd117d9e6f61c630d6d817a51cbbbcb331d
 EBUILD nagios-core-3.5.1.ebuild 6154 SHA256 074c4b31f7ec83caff01f8133cbea7c9d2f9e76db0128337e90cea704c536797 SHA512 c402040b5449fe096d40d0313ee08380089788c57da4dc780a8736eb335fb775379db4667145baed355dbbe9128e99d2662f54d9a57e44f2cc5fc35f0fe2bf01 WHIRLPOOL 3dc306c99a2d8da810a671ff7026348817f887c23e9839c9f61f9f7fbee2e39634064316f5b7e481c5c61b43cfdc96bf282be2f3cfc1c68e7ced0ae55edbdeda
 EBUILD nagios-core-4.3.1-r1.ebuild 7579 SHA256 59dc0741a74350b7b8ea45eeed8ee615b9914227f4d1de0fa1e007ec43a15a4f SHA512 8a4273cb4e2f50ed4e69d190743c362db3c1c9480ea19d061501dc57e48fea7e6b3c1811107714667b7ead9eb748ee8a7a106b792f066422ef13640b14bd5aac WHIRLPOOL a3ec231a49d488aaca020f654ec5e1e531bc7c3b3623e2b35b040260bbb10d789245d4d4ed3b8684cc3a98a4e8709fca5d9ac5703e68c83287f90c374838f6a2
-EBUILD nagios-core-4.3.3.ebuild 7467 SHA256 5f2d273020d0643a818bee780b5d571226826bdfc890c20c90e0553f8a4989f5 SHA512 ded85ca44a60619ba61b39e80b05620e1545541271a51ecb0af78f560fbe3ea74c42964a7c364ec1b9730b0d5e37bb0b98c8ff4e44fe72593c329552ec77efea WHIRLPOOL 2d4c3d02945db7744eccf34d84f9485fc2faebf58a7d7fbacc13fbe65e93b5d257a22356bd2741673f2342be515395d5ddc8c2d30fe950e6a260e91f6e20c4dd
+EBUILD nagios-core-4.3.3.ebuild 7466 SHA256 60f009661f96fe9d6e970decb9d801563d2042d8fe1e64c5cf34c16985d2c6bf SHA512 860b07673f9d77e296bfc471291cd07de65b1195ea2cfd0bad7ceffdf316afa23fda0c5f90a2de2c7115f053f54dbced5e45627d6747512af62833d0c398682b WHIRLPOOL e01ddd9d1151771597bbd652a4723c4834f2fe9a2b2ee32b1523c250519b6431c073cb922aa51e41b5306986efe42bde0f2d7ed03ba34e56778933ae029c54b4
 EBUILD nagios-core-4.3.4.ebuild 6647 SHA256 5a1c13161c3a456fb3d29aaaa48f19a59219357213787f3db9ae2b2d4ccc7499 SHA512 7cbe1d7067a862543aafcd591a2cf8b5abe40af75f7daa3eecbc4aa3f8afaaa5a0f366c4f4175b1680f7d30c481aa2d39296049a9963631c6c29edad465949e4 WHIRLPOOL a864fa1548be74e7976f29b87f11709bd474d079b8ff9ee0d17b5f5db5e3a911cbdaa5333eac751d1edca5ea4417555e2cc7de14a85f8f2446cbf41ea1893217
 MISC ChangeLog 9808 SHA256 b19bd88b156c5328fb84b82463c7e9f2368bb6345056f69dfba49efce0b46fdd SHA512 89556c2ce3a8975682c9b9da2098dd5410dc98e432d9aa37a7bde5445e0dfc0cbd6c2c7963b5ceee516b0ebe92df5944ab2da93af37515419921cc940d936919 WHIRLPOOL 9725300fcaf5bcd46d7f6d0ea1b6e5d58f4982a82d194a76fa795fd6596bba9e640b7cfba72471dd650b06c46dad7cad77e48043fbd0a2ce1210f3eb9233a641
 MISC ChangeLog-2015 33539 SHA256 28d8b03589fb01e259aac550508273f287ead57f10f905a9b3c26ac0a6e1232e SHA512 32de57ce104d88c4b92cf54b47cfddd3abfb5a31ab7d3ff9371b1c2b3522ccb2a97331f66284b48cf04438a6453a9b54c5f8e1b1749fd506807691f31f5ba661 WHIRLPOOL 406df23c9449f282a40f3ed16ffea06635ad3d523d1f33423305803fbb2f484997a80ba422e736b6c2bfe59ab0f2238eeb94307ba22702a28ef75b99d2050ac2
diff --git a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
index fd40037f208c..553186b60646 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index ebbbc3d48c61..abd0bc271703 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -1,5 +1,6 @@
-AUX vnstat-1.17-conf.patch 356 SHA256 3193bdf800a73715f1c34b62a734056325c80a38e0dfb53885ee3edd35ec85b0 SHA512 52a063ff1b99fdbc43912ee3efbcfc30f514fd1394724fefb883eed7cf650071c4877581d64d5534be1a84a631deb4880201ad6e1dd05017a06cbec652aae227 WHIRLPOOL 1250ac8983feda813978bee03481387dc6c7afc4e2b0166474514f42581bb5d47c7d0d245a6fe5b02448c3a8ebb8026465c5e7a94e5a70a4bae8189a773a5a89
-AUX vnstat-1.17-run.patch 300 SHA256 f8f8152d8bc368886a08288be10894357261492afc4ac9f3838174be2d47e123 SHA512 d0dfec867d8d169967a5a7724360cf4833d3c933a47bcba329e0f7c007bbdd58c0d7b14e209385f209027f75f5892e062b081456bd2d54c88e818c86a4061f9e WHIRLPOOL 32c303fba762945cbbdc37c27bd53059c90cd8337913baa37ddaa19ab5529b6254d3b9f9864d7cbc4e87fdda6116fe609bd204c90ce9c6de469e16fa4a4187c4
+AUX vnstat-1.17-conf.patch 352 SHA256 e0924807ebbd8bf14ae6bc4fe91e358247c287143bda1b6424a1f348f570cf3e SHA512 d95fd80ae1887137dda7b13812cdb962a35a06f60e182fc66017bcc68ee5aa9aaadca01745b8194f468f8ed453ebe347c87ae7ddb4985e0e88450a33a1f8830c WHIRLPOOL 798087016751bea5f7e43ef0225b7b9ce662bef524382a5f08a9b977b441465a1c94f0b32be716faccb1078dbc8e395de690958012eef48fe1d67d938260a0b0
+AUX vnstat-1.17-drop-root.patch 359 SHA256 c3802f925e7a05132e233a85069529068daed08bf9fe359d235ac672f8262b7d SHA512 9e0b5d5d8b26c0657f8af41e615365e8e71dda051225bda103466754dd39f2e77ae277ad9f539920c7ae77e86618a9944ee33fb4a35d60ee3593541a38549362 WHIRLPOOL ee7f71674c2084a6d46e6e360e03c18900a793eeeb987848f69c31a8d0848a7c0b7670f50c4ea63b0134610956e3431a9ad5a2bf0b1b78d0cb3f4a96f6b506f3
+AUX vnstat-1.17-run.patch 296 SHA256 f192ddd0fa44cb6ae1942d1fb46a5ae4c9149271df71bb36c166713be87f455b SHA512 4baacbe8c3f1bcfb585060e0502ea7bc24dc7e964ecd381dadc7fb33395aa5655c33e83726a402e5dba212b92a4a498926add3b50aebb674458542772cf51afd WHIRLPOOL 62891f42ed3989859e2142de298291813d16d79398ab2064a7f0fbd8a1bbcdde9c54ebb0a6e966e5dc2ef07bb2ee0902837140b6dbbd5df6dbdb49b8a0816259
 AUX vnstat.cron 220 SHA256 b6b437c680606061b98af19758cbacc3f883f73cd86f0bbfbcfe756c982cd3fd SHA512 c901385f97323d1a686cee63d015eaf9ad38ed195a1c0e25dae671dd7061ebc918498684c55b90b0674960891dfca4b83f458174892c1b9efb48cd362fdb8477 WHIRLPOOL 1432dfdfdf2f121deeff6f8147b344ff61838a8fe54d7bc5bb3ac6c1b9675a64b6e331bd3e33ee0e9fe2488bde42ad8c4e279ea3b1d1d5ed304b4b2ef4205429
 AUX vnstat.cron-r1 177 SHA256 614966fa153b024515a4d6363d3046df9bdda07c7d18bc7aeb4f8347d80e7134 SHA512 8074d65cf2f28bd5c02fe741dbe20f8404bc2e25b94b43d0bcc829ca088828227805caf9cb8cae020ae0a9370d68dc3c757fedf07d48c0fc71ba944f2da1cb94 WHIRLPOOL 9c44e29673064d7c1ac77f8af0bd5aa3117bb46560f4cddee829a3e6a3d617ba468a867298d6d7e58c840c752402e35a8b82dedd8571d13454a167bdbc188676
 AUX vnstatd.confd 216 SHA256 2cd5b91f86bc26aca85166a50de89faaccbf1ea8f219efb48b50b7ed0f3fe377 SHA512 d645817913d5b52e928561b3d6a0e869d8ae5db81b97af91c1ebfc6a8cd2df666c1653e6dc5f91c0a890033a89692f77eaf081c1cae5590446c69a70ea263946 WHIRLPOOL 3a974a3dc30a33a3a2ca22db551068f1df3444f4248e896482e26d1c5b0bd717706ef30e18f5a6ee193966bef1466a13d3c6ad35e86f42f025ebb3c02e622a22
@@ -9,7 +10,7 @@ AUX vnstatd.initd-r2 874 SHA256 5ce75e189239ab52b9114defda6c46f57c18ed88d0ffc811
 AUX vnstatd.systemd 262 SHA256 26c4a8e6e1800fd912229bb9463355cde8591261d51f4936765bb94a4ea25cff SHA512 35f9714641d1b3288bed659bd010ef1b8f0316f915622dcf5d3250e1acdd3b438762ae934fab2f6cd350274c7ec0f70a7d8946448bbc6db67be6f91cd86aa47c WHIRLPOOL 3d7f67a773204d3f933c7692b006419376aeead550c3bd169545586f7e7f69deb20585b44bd264be5ec0e83002f2cab3c8d8e11d4d12103fe07c3ae84b52df9f
 AUX vnstatd.tmpfile 35 SHA256 91c9577f36c7f7ec32bb2963035a6ac49e7556ac6adc41564c033db8889b669e SHA512 e13b52e3c4fe8743074ab2704b6a6cbe0c855589fe19e05bba98f0193473437f350dfdc9675689172c54ed83491d9caef0cbb842f6c2533b98366cd78a4f0bac WHIRLPOOL dd6b74ff518ba3b652b3db0519bb45a370c50341ba5e1c8f37b01c2a5dc03341dffda2a88e389e66f6d620fa90a63f6ddf5e05c474d92d7644be156312989cda
 DIST vnstat-1.17.tar.gz 238397 SHA256 18e4c53576ca9e1ef2f0e063a6d83b0c44e3b1cf008560d658745df5c9aa7971 SHA512 c9c119a89054dacdc15026c766a20d88336d7689dd4264530d0347fcc58f3cbfc806b271e0f83e76c3b4a31ab793a628ee7d7b696943da919ee4cd2fdb481cc3 WHIRLPOOL 38f64c6eadf7bbfcc1cd6cc3d8f8ea3da4846dd64caf242628ce9d0e6f9b8f565dff9d31ecd1633b3a0a8b5e7dcd4545f1adeafeb4f42547ad87be77317622e3
-EBUILD vnstat-1.17-r2.ebuild 1472 SHA256 35e2fac6008e530c4d02b9247ad909b02ccfbca81c11a2a899fad60cc8eef92e SHA512 194cf7b43dd74ba43844827ae20f57853bbbaab16808a3ce1f6911bd78f3d5d5a684b884d07794464c1e04afd0048363d0b3a07f12f8575a8fdaebb998b1e2b2 WHIRLPOOL bef4f21c7236efc316bfa46b5d58b54f8a7fc0298a02933668a3410a3b9edc240ed0a26b5f3c72df037d5a49f1cdbea249ab98ea2764984fed1207cad3a51652
+EBUILD vnstat-1.17-r3.ebuild 1514 SHA256 eee2e21edfbc26b210a1dc19d5d3052d58f7ebfd91fe89bbc6b8d0a99d7a7c73 SHA512 0c8d1fbd7285ac41d74c77554c97eac98b4649be0d60dc1e2725e112ab38940970f96b81ba79cfa99222d959fbf0de046212c782453e93dc92d5667566fa9459 WHIRLPOOL 304c650d3fc39069d0ac81a4810f70bd2fe58c5d29c7321f2326d4cf7755df77bf1501989009f4a02142cfc3a0ddf29be0545e559e3270ac2e0fc59898da5c21
 EBUILD vnstat-1.17.ebuild 1430 SHA256 d05f7cede84c40a709d44a69e1717fb1d9a801df75ce95a51f6ec144aa58a8d8 SHA512 14d709e9ba19b7707d62fd5a82dc483f50b76efa884015a14600dd1489132a1c0a687444b802bbd917252acbfa84c291210cd2078778a16796d0bacb576b360d WHIRLPOOL 1bab57fa5b8b832d7277c4b05820af2898b66f9c5b4617ebcbdd52049020e87344f5e78c44756571ae1bc2201fda0a0fa36dbb9ce6078e4dd8aeaee1080d109c
 MISC ChangeLog 4350 SHA256 8dc324d38ef67a70ae4206f377deed192838d9685f91f11e4faf44045ae48dd4 SHA512 cef200253f77a3059ed18d1630da13c5f33aad335d2399d0fc8e94f687643a983e02fd749480324f77ba0d905e95196ffb73e3d238d1d0436b5b75fa05f30d19 WHIRLPOOL 3a3cf0f596faa146a4127436274dbaec11a604ed129cd95709027701c0b41827012a2db7564b0d1812e1bf726aa47c437c374e245ce0386e6277677cea15eb4c
 MISC ChangeLog-2015 9786 SHA256 db76c2eba2b1cd31b5afd4096dd5e15479842d0dc2835c22b4b6c70d7be0f0c5 SHA512 483b71d6778421520e2696c2ed0e2efc480a40f7f4a36ea0aeaa6fe02b386393c4805f551079e1d304eb73d1c1a443248b6b3449dba7e6734eb0ea54fbdd93bf WHIRLPOOL f721d1991070b8dc468a8ca6d6692b049d8e2ed78ae3100ab0dcc67246c3a005f9cbe2016bc8c45015a92d6d9393070d7f9cf30b0eefbedcebbcc9d6731be09e
diff --git a/net-analyzer/vnstat/files/vnstat-1.17-conf.patch b/net-analyzer/vnstat/files/vnstat-1.17-conf.patch
index b939e7c04351..5bcbdafb2a74 100644
--- a/net-analyzer/vnstat/files/vnstat-1.17-conf.patch
+++ b/net-analyzer/vnstat/files/vnstat-1.17-conf.patch
@@ -1,4 +1,4 @@
---- a/cfg/vnstat.conf.JeR
+--- a/cfg/vnstat.conf
 +++ b/cfg/vnstat.conf
 @@ -115,10 +115,10 @@
  UpdateFileOwner 1
diff --git a/net-analyzer/vnstat/files/vnstat-1.17-drop-root.patch b/net-analyzer/vnstat/files/vnstat-1.17-drop-root.patch
new file mode 100644
index 000000000000..c0446c3b3410
--- /dev/null
+++ b/net-analyzer/vnstat/files/vnstat-1.17-drop-root.patch
@@ -0,0 +1,15 @@
+--- a/cfg/vnstat.conf
++++ b/cfg/vnstat.conf
+@@ -81,10 +81,10 @@
+ ##
+ 
+ # switch to given user when started as root (leave empty to disable)
+-DaemonUser ""
++DaemonUser "vnstat"
+ 
+ # switch to given user when started as root (leave empty to disable)
+-DaemonGroup ""
++DaemonGroup "vnstat"
+ 
+ # how often (in seconds) interface data is updated
+ UpdateInterval 30
diff --git a/net-analyzer/vnstat/files/vnstat-1.17-run.patch b/net-analyzer/vnstat/files/vnstat-1.17-run.patch
index e3b514d0c6b6..4afe449ceed3 100644
--- a/net-analyzer/vnstat/files/vnstat-1.17-run.patch
+++ b/net-analyzer/vnstat/files/vnstat-1.17-run.patch
@@ -1,4 +1,4 @@
---- a/src/common.h.JeR
+--- a/src/common.h
 +++ b/src/common.h
 @@ -198,7 +198,7 @@
  #define CREATEDIRS 1
diff --git a/net-analyzer/vnstat/vnstat-1.17-r2.ebuild b/net-analyzer/vnstat/vnstat-1.17-r3.ebuild
index 88ba28fdb0e4..6e0d7ba752b6 100644
--- a/net-analyzer/vnstat/vnstat-1.17-r2.ebuild
+++ b/net-analyzer/vnstat/vnstat-1.17-r3.ebuild
@@ -26,6 +26,7 @@ RDEPEND="
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.17-conf.patch
+	"${FILESDIR}"/${PN}-1.17-drop-root.patch
 	"${FILESDIR}"/${PN}-1.17-run.patch
 )