summaryrefslogtreecommitdiff
path: root/net-analyzer
diff options
context:
space:
mode:
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/nagios-core/Manifest2
-rw-r--r--net-analyzer/nagios-core/nagios-core-4.3.3.ebuild2
-rw-r--r--net-analyzer/nagios/Manifest2
-rw-r--r--net-analyzer/nagios/nagios-4.3.3.ebuild2
-rw-r--r--net-analyzer/prometheus-blackbox_exporter/Manifest5
-rw-r--r--net-analyzer/prometheus-blackbox_exporter/files/prometheus-blackbox_exporter.confd2
-rw-r--r--net-analyzer/prometheus-blackbox_exporter/files/prometheus-blackbox_exporter.initd19
-rw-r--r--net-analyzer/prometheus-blackbox_exporter/metadata.xml11
-rw-r--r--net-analyzer/prometheus-blackbox_exporter/prometheus-blackbox_exporter-0.10.0.ebuild50
-rw-r--r--net-analyzer/prometheus-node_exporter/Manifest5
-rw-r--r--net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter-1.initd19
-rw-r--r--net-analyzer/prometheus-node_exporter/metadata.xml2
-rw-r--r--net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.15.0.ebuild48
-rw-r--r--net-analyzer/prometheus-snmp_exporter/Manifest5
-rw-r--r--net-analyzer/prometheus-snmp_exporter/files/prometheus-snmp_exporter.confd2
-rw-r--r--net-analyzer/prometheus-snmp_exporter/files/prometheus-snmp_exporter.initd19
-rw-r--r--net-analyzer/prometheus-snmp_exporter/metadata.xml11
-rw-r--r--net-analyzer/prometheus-snmp_exporter/prometheus-snmp_exporter-0.7.0.ebuild50
-rw-r--r--net-analyzer/vnstat/Manifest4
-rw-r--r--net-analyzer/vnstat/files/vnstat-1.17-conf.patch15
-rw-r--r--net-analyzer/vnstat/files/vnstat-1.17-run.patch11
-rw-r--r--net-analyzer/vnstat/vnstat-1.17-r1.ebuild123
-rw-r--r--net-analyzer/vnstat/vnstat-1.17-r2.ebuild66
-rw-r--r--net-analyzer/wireshark/Manifest2
-rw-r--r--net-analyzer/wireshark/wireshark-2.4.2.ebuild2
25 files changed, 347 insertions, 132 deletions
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index e8ca1e072d09..72474914e74e 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 7468 SHA256 325d84375de3679238126be983e67801ca70e60596d0ae3433778bec5f87ca88 SHA512 e1a9e9ea8aac7ab746c69925ed8d6e67fe52a0e1ef7e753ca66d205e680b9f5fedc83fbdaed1a4860bb5d63e1bb94415e1f49bca70432839cc2f72f122326d4c WHIRLPOOL 40adc8d7ee519b0837de94213731e2d98a037738fa0d52aa049e128207ab7969b1d2a97299cd291beda16b487c5eb9289a7b8619139717ad3fa7c27ce529542a
+EBUILD nagios-core-4.3.3.ebuild 7467 SHA256 5f2d273020d0643a818bee780b5d571226826bdfc890c20c90e0553f8a4989f5 SHA512 ded85ca44a60619ba61b39e80b05620e1545541271a51ecb0af78f560fbe3ea74c42964a7c364ec1b9730b0d5e37bb0b98c8ff4e44fe72593c329552ec77efea WHIRLPOOL 2d4c3d02945db7744eccf34d84f9485fc2faebf58a7d7fbacc13fbe65e93b5d257a22356bd2741673f2342be515395d5ddc8c2d30fe950e6a260e91f6e20c4dd
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 0b26c87cad81..fd40037f208c 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/nagios/Manifest b/net-analyzer/nagios/Manifest
index 221e2be857f1..ccc57d4a0e1b 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -1,5 +1,5 @@
EBUILD nagios-4.3.1.ebuild 392 SHA256 e340d184f1babbf01e594d9f5f0a4a91b62247a3a3faffc0c7304eb62e4ad38c SHA512 13cd73016da7a9675039b73f1f3b1cd4d2e0aedf617019278ce728653b3cb7fab7ed1ef572ff942a87cc651b1ee567f9701bfca7080bc90d17ddcbb5e16a7b58 WHIRLPOOL d04bee59b71c77dce8baf4569db4a311e5bcb367866d513667eaef74fe7619d147187d44e8951fd21776b103bdc46bb133a1e6ffea12f2184042698c7483d85a
-EBUILD nagios-4.3.3.ebuild 394 SHA256 194140150f27c1a6985d5b8992c0eeef601a0325f90c73d4d368c88f5dfb364c SHA512 c739a30790603f47f62705e2793eda0ac7d764c196065d952a1cffed10f1acd621872286540ea5565a9aa400a112422cbb0f1203bb0d7c4d8b95ab17a4aaa18e WHIRLPOOL 05f62d5b3ed77fc6a372a609bf2d9aebcfa3384b8f887c9306873147e5c95ffdbd273d9548c6cb8b264212bf9459d4322dfbf6e037bd34d3ddb559feb2df4e2e
+EBUILD nagios-4.3.3.ebuild 393 SHA256 29323069b5c57d3a89f8baad6eb38d1cf7f1d2bdcf285a7967bcda6c45d11723 SHA512 bb9ff8459e45457abb5faa993d1babf164e6f69816817b73af8cf9633768304530f418e1ba7e6dca5be9828668353bfb05caee4b2139818350194e8fe9f5db0f WHIRLPOOL 79784a3e59fc0b4229d9efac9aa2586a91d86c987bd76f235c7f42946b95014db9b36f383503efb4a7d7b11f39b40fb5097139143a4925f3b99af81689b45752
EBUILD nagios-4.3.4.ebuild 399 SHA256 827940978a650d133d3a87f6449ee29032d0fd12180e57416e82f7122899b24e SHA512 1efb7d777b2fd99310dfad42eeeec251347f065637fdf46e5faa8c5579a8f572654828e1e4084982c2f06d5c0e0a5a5fb2966621eac83bc973e3964bf40a471c WHIRLPOOL e722b805eb40ebcb64111259f17bf911442c54aa78423783673ae8a402561f69e9c21f93c7a119bc3afc9c20c251024425c1c1447efcd18d19f24abf47c47307
MISC ChangeLog 5914 SHA256 561ff371187a99842494e95c18e3bdbc765e0afec38f0b01788c435d26a3617e SHA512 a72ec5f266fd9944977d286d51a56d6815484a2d6f72886b4734f6fbc7b88d54c65a69e85df9757bb29b7986d9e804632c6f6d81cb539efd351f93d0107f688b WHIRLPOOL 56eafed78046177a4406cbad3bf7073c7f33f4bdbe49a552245659b451ac7c60f9eb7af2694924a5c8958b612a85929132279d966a50f4e9d48187792e1e0d36
MISC ChangeLog-2015 15996 SHA256 18fad7098e79526eccab8935fff43315b0b55387bcd7a3d3f47bdb62f1e6ada4 SHA512 7629c4a3878bf03acd177b1278f9833c3a1ca28cb34cb88078b8ec096663116f070a25216e9d4dd9d110906747f0f4fd14d6dc78e545507f560d1c3a8ab92cf5 WHIRLPOOL 9fe49e0312ef7ecf857cf92d4086193055443e353272eb8a24155ae7e5b9300eb0b8ae84a9f83e19a3f384c6e316772195a60e0c770fbde18b5b1019d03df365
diff --git a/net-analyzer/nagios/nagios-4.3.3.ebuild b/net-analyzer/nagios/nagios-4.3.3.ebuild
index 4c2bad9bdf5c..63748c40978e 100644
--- a/net-analyzer/nagios/nagios-4.3.3.ebuild
+++ b/net-analyzer/nagios/nagios-4.3.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.nagios.org/"
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=""
RDEPEND="~net-analyzer/nagios-core-${PV}
diff --git a/net-analyzer/prometheus-blackbox_exporter/Manifest b/net-analyzer/prometheus-blackbox_exporter/Manifest
new file mode 100644
index 000000000000..3a13db43a2ea
--- /dev/null
+++ b/net-analyzer/prometheus-blackbox_exporter/Manifest
@@ -0,0 +1,5 @@
+AUX prometheus-blackbox_exporter.confd 110 SHA256 51fbbc94dc7e7b6276f1dc4ea0caadaebb8f26e5200fdcb6487de821eda283f5 SHA512 aa8720c03c4bf21ad5f789a4e9c6df6059fb71413cfdc605f8868bcd54eab899aa527afa9d847c7780042a8d4d72468145a97f8d732ef6aad861dcbf96bdf2ed WHIRLPOOL eff0e8357fccdbdeb13e05ca4beb618b422e0f676f79d230fa84f1fd30b336a54891bb25358a36f8e614117b260ccebca23cb833192b731067cb801358d440d3
+AUX prometheus-blackbox_exporter.initd 614 SHA256 2ee8168bb637902211021049b9484e3cdaac79a84cc775dbf9fa6b220520c228 SHA512 4a25f59d0fb95ac35c07ab15623c2c905db04cb5a14cccd316bd522e2b4892a08d67a4edb15c6c02fbc2b84e92dc48b67f5d14c7617cfccfa09babf22e4d1beb WHIRLPOOL 73d62db2e7f29db4395dff429d99006e6ce23c95415b2b4e1bf08606729c9475ce2e671f0fcfa0a0966bb6ee9e0b83b8401f6a7c2f6d031ddcd1188067b9ee3e
+DIST prometheus-blackbox_exporter-0.10.0.tar.gz 530109 SHA256 fcadd04112bfd405c56011954bf225a72831d9c4ca4ef3fb5bfdb4107a225907 SHA512 497246b440b03b964c90f9bcf8ec1bca45c213bc4652ddb92c339b42586746b75a5145e87899381718ba628891faae3dfae39b0196272f572c7213e94ea7295b WHIRLPOOL 73ae4c5d5b1ed14e1f33157b56085f739c3a4078f605caf8798b1783a37fde342a6874b8a9fa0a71854f92511890c7ebbdb39433a2d6b0c701e29c61bccb1299
+EBUILD prometheus-blackbox_exporter-0.10.0.ebuild 1380 SHA256 0abaf1d0ebd70408ba856bebba9910d2114a2daddd74f7a136e482764ba1ae30 SHA512 21303173f3959b17fb9643e96d8d63add677f811e7725c50ad7230da119cd0cb4c7767bd9d0ff91784b23676e408e9c347348223f8ced930dbe34218fd42e82a WHIRLPOOL 239a047f104eb07bc819350896a5deac6a9bd902f9a538b9f52fdb18ef23687df6331cabb199d8560861ed5a5e65b759bf3b1de6cdaa2f458fddc4aff12310ba
+MISC metadata.xml 338 SHA256 4b34c24d764f68cd20b642b9f2b0149e59fc65cfd0d5ca0ad39b5f3649fa9dfc SHA512 e431b2ef89e797b9cbb290a70683a4392f07559851550dd22f5410f09c979730c8dd35c095f855565df8d72adb42c6e4b9d03882adf37240b0da28cc508ee2ad WHIRLPOOL 4b0d0fdb9fc3e63c5e5d6eeca8852791085c1b9917d5099a6ea0fa755d20f83b34cb98cc7c59d7f9c770cbb1f83de2ff462e71511242374f40e9bec8ce18aa33
diff --git a/net-analyzer/prometheus-blackbox_exporter/files/prometheus-blackbox_exporter.confd b/net-analyzer/prometheus-blackbox_exporter/files/prometheus-blackbox_exporter.confd
new file mode 100644
index 000000000000..39887477dff9
--- /dev/null
+++ b/net-analyzer/prometheus-blackbox_exporter/files/prometheus-blackbox_exporter.confd
@@ -0,0 +1,2 @@
+# arguments for prometheus blackbox exporter
+command_args="--config.file=/etc/blackbox_exporter/blackbox.yml"
diff --git a/net-analyzer/prometheus-blackbox_exporter/files/prometheus-blackbox_exporter.initd b/net-analyzer/prometheus-blackbox_exporter/files/prometheus-blackbox_exporter.initd
new file mode 100644
index 000000000000..45da799723d1
--- /dev/null
+++ b/net-analyzer/prometheus-blackbox_exporter/files/prometheus-blackbox_exporter.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 2016-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus blackbox exporter"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-${RC_SVCNAME}}
+group=${group:-${RC_SVCNAME}}
+
+command="/usr/bin/blackbox_exporter"
+command_args="${command_args:--config.file=/etc/blackbox_exporter/blackbox.yml}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+ --stdout /var/log/blackbox_exporter/${RC_SVCNAME}.log \
+ --stderr /var/log/blackbox_exporter/${RC_SVCNAME}.log"
+
+depend() {
+ after net
+}
diff --git a/net-analyzer/prometheus-blackbox_exporter/metadata.xml b/net-analyzer/prometheus-blackbox_exporter/metadata.xml
new file mode 100644
index 000000000000..5d0a20fee17b
--- /dev/null
+++ b/net-analyzer/prometheus-blackbox_exporter/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mrueg@gentoo.org</email>
+ <name>Manuel Rüger</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">prometheus/blackbox_exporter</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/prometheus-blackbox_exporter/prometheus-blackbox_exporter-0.10.0.ebuild b/net-analyzer/prometheus-blackbox_exporter/prometheus-blackbox_exporter-0.10.0.ebuild
new file mode 100644
index 000000000000..c5cf528c542b
--- /dev/null
+++ b/net-analyzer/prometheus-blackbox_exporter/prometheus-blackbox_exporter-0.10.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/blackbox_exporter"
+EGIT_COMMIT="v${PV/_rc/-rc.}"
+BLACKBOX_EXPORTER_COMMIT="75681e3"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus exporter for blackbox probing via HTTP, HTTPS, DNS, TCP and ICMP"
+HOMEPAGE="https://github.com/prometheus/blackbox_exporter"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+ default
+ sed -i -e "s/{{.Revision}}/${BLACBOX_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+ pushd src/${EGO_PN} || die
+ mkdir -p bin || die
+ GOPATH="${S}" promu build -v --prefix blackbox_exporter || die
+ popd || die
+}
+
+src_install() {
+ pushd src/${EGO_PN} || die
+ dobin blackbox_exporter/blackbox_exporter
+ dodoc {README,CONFIGURATION}.md blackbox.yml
+ insinto /etc/blackbox_exporter
+ newins example.yml blackbox.yml.example
+ popd || die
+ keepdir /var/lib/blackbox_exporter /var/log/blackbox_exporter
+ fowners ${PN}:${PN} /var/lib/blackbox_exporter /var/log/blackbox_exporter
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/net-analyzer/prometheus-node_exporter/Manifest b/net-analyzer/prometheus-node_exporter/Manifest
index 47a03be270f9..78cc41f90af7 100644
--- a/net-analyzer/prometheus-node_exporter/Manifest
+++ b/net-analyzer/prometheus-node_exporter/Manifest
@@ -1,6 +1,9 @@
+AUX prometheus-node_exporter-1.initd 615 SHA256 cdc4233ff3430a15a886d5a38e7f7d5b979663bd47e48706ed5de480838f9c25 SHA512 aecc8180b300660cb6b2882c45a99510d5c12aecaf1aaa24d62f2393c3f5c3e5dd9de6c5e73125f4eb6f3e18ca0d7b7e04e6338db2eed5ab06919e245f7e9d6a WHIRLPOOL 366a5cbea77dbd543e4ccb30bb2064dc8d91dd8d113b0b619eb3404034338424de030b0a6443f3b9567c8c6032a36b5e5c2a0eb99786c648430b468932d8cb4c
AUX prometheus-node_exporter.confd 111 SHA256 51b9d1c0a9a05f7ccaaa88ae8bc5f6c31c10c7efb097e9cae257cc6af658b533 SHA512 cce5db8eccf2ecfe1198aa8252b04fd6a96006f707e7132c2d01c5400d175551c3b9890c4d57fec9ccbe17594dfb937e1f99ead0e1c3fd8cf22930dabd70418d WHIRLPOOL be439ab6a38d5a61b5c33b4140040f61d783b64ec39d7f0bb837ce09f123293eaec435703df0870b80dc1fee73d0a8c86b65db1d6da0c04c34128037d9add866
AUX prometheus-node_exporter.initd 614 SHA256 2d35b4ecdf385700d1b341a4d4ec0691f9663a220acd45755313d15d7d0209e8 SHA512 5332d59b0548939fa41fa666f013eb573ad7bae699fd65ff6a0171d74ac5ab8d14306beff14046b8eba06fef62963f0f0b7194b47c511ddb4c6050ba72cdb831 WHIRLPOOL 9961e0505c642b82a8af26fe40a3e992504456363014c98536da12d34ec4626dd77c6f030e0512482a6146a1f6d98b22c0624a6a5b22b2681e72eed3e47ca047
DIST prometheus-node_exporter-0.14.0.tar.gz 1086402 SHA256 312d7e1c07d6a7548f2f116b983da87f7b3a7630f9332eb41c306fd71b2e6ec1 SHA512 28b1c3a17b0065f7005636f0751e535f9455675f7c17546a584fb709f43f2608e4854fe4e7f0e3790b89eff21016b41dccb0a96f16eae466de1040b57c4b1c98 WHIRLPOOL 176eb95a76fefb388817fa27f0b43fca9b1ed235d39e73e97254ef829025d7493f710ce0ef2cf11b00ffa509c08f7b12664cdff38939a5ea62eb79e7991c0bd3
+DIST prometheus-node_exporter-0.15.0.tar.gz 1324698 SHA256 87a057081e2034f85e997f9e1343aaf45e1b6ad9fa51411caf97a03fe1c46ccb SHA512 0630c112742ef029d24a0086f9cf0a2efcf1125987dc1e6978055d3e74b820bbd91fd2e7391aa5108881a08a2ec06aff4c1500ebbb6644b46fd7e6271f2b8fa9 WHIRLPOOL 8d4da98c4df9dd344ea68e64deb550197af04b01251dfc784c992007b24677843af8f5d973fafef6e679ce1b2a769512a43419406252cf5f9d35b91c17011a1f
EBUILD prometheus-node_exporter-0.14.0-r1.ebuild 1221 SHA256 68421cd22c0a53ef0b1471f326ad6f487f8fb39b7c95447a2d31257a81fd339d SHA512 12573499da3fadf971ce5341d85f06a6157f84294d2e10ed4da246f7af94681741e70a593b16ff4a199174f942c7207a7ffa223f8c631fa822913e902dcbe692 WHIRLPOOL b07e4ee0c052c69a16f98132868ee032bd64f6ff296f4626b787f1a81f9ebe7deb386f484b8d039226de377a5d57d91aad0846a5179d8982aaa09457a2b17b93
+EBUILD prometheus-node_exporter-0.15.0.ebuild 1226 SHA256 7303117307a7839fe48ae34273a2cd2428f78ca4fb04632445685902db309a8a SHA512 1df7bc1054410c4edd5a8849e1375ae5a798d932514349c18778232157b24df5817b2e705c48f2b57852d6d02400329cd34167308ad2f3283a31eb71a8ab6e60 WHIRLPOOL a990f41b989140aa31fbfe8cd0df76e1ed611de0b5173b5a308082dc26f228cc9b840a1bd9a2e9714c9325ed4317e14fe9ab8497956f0b2d78a070da4fa4f380
MISC ChangeLog 481 SHA256 0ee6994116c7d3d57b63373d23c1eae0c9f937018749b99d9d047fe5fd4d2b23 SHA512 bb4010b6957fef58e18717bed4add6840af8bb60c247e96d1be40612b0d88664186f81f5d99e94c6c0688783424b4bfd0037c71b1ede37097a362520718ef021 WHIRLPOOL b4f6808f2c6c20d1a47c5620942a2dea412f7c0c3bb477be84c89e7fe8dac0dbd107338f0acf344f857bc446e39aa328c62bf601e5d9eff257f4a57cecbb36f2
-MISC metadata.xml 345 SHA256 33246077887c4702208b9287ea57ed0b62e5eec5f1d5d84ff624c10b8f1e0af4 SHA512 d4966395f1b3e4ac0c5b16d9910e67d3552099f40e8c70d9094a40c415decd00c44f1f032d55ae7efd5ad6e55d103d001c0f8394fc3e7b0817699ad17e42774d WHIRLPOOL 5bd5a43ca3c506b460999fba8ac3823e2e137b146844ee59e7a6ffc1057715f02926493a3b335066abb92471becc388ac258aab7cd4849e614622f20bf3df370
+MISC metadata.xml 334 SHA256 dce4944e74dfe121777699fe9b10552be275ba92e947a3715f6b60869d67d526 SHA512 da17eb8e555adf4d4922ba8e0a549248dc2adf391f4285ce0f6919f194de327d80205c1e09af073eee526b073aba26e5551aa41a83118961d9e6eddd2887b23e WHIRLPOOL d03773ab82553723915864f5bf084d74183fe56cad0628157e6c97e1e95e922edc180db665b6633e09af7df0d279f7bf075ec9066817bd243e656a8a9d0c32e1
diff --git a/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter-1.initd b/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter-1.initd
new file mode 100644
index 000000000000..e8268e487d2d
--- /dev/null
+++ b/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter-1.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 2016-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus machine metrics exporter"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-${RC_SVCNAME}}
+group=${group:-${RC_SVCNAME}}
+
+command="/usr/bin/node_exporter"
+command_args="${command_args:---collector.textfile.directory=/var/lib/node_exporter/}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+ --stdout /var/log/node_exporter/${RC_SVCNAME}.log \
+ --stderr /var/log/node_exporter/${RC_SVCNAME}.log"
+
+depend() {
+ after net
+}
diff --git a/net-analyzer/prometheus-node_exporter/metadata.xml b/net-analyzer/prometheus-node_exporter/metadata.xml
index 43b9f018e074..d758c8dfc417 100644
--- a/net-analyzer/prometheus-node_exporter/metadata.xml
+++ b/net-analyzer/prometheus-node_exporter/metadata.xml
@@ -6,6 +6,6 @@
<name>Manuel Rüger</name>
</maintainer>
<upstream>
- <remote-id type="github">prometheus/prometheus-node_exporter</remote-id>
+ <remote-id type="github">prometheus/node_exporter</remote-id>
</upstream>
</pkgmetadata>
diff --git a/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.15.0.ebuild b/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.15.0.ebuild
new file mode 100644
index 000000000000..b350301d13ea
--- /dev/null
+++ b/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.15.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/node_exporter"
+EGIT_COMMIT="v${PV/_rc/-rc.}"
+NODE_EXPORTER_COMMIT="6e2053c"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus exporter for machine metrics"
+HOMEPAGE="https://github.com/prometheus/node_exporter"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+ default
+ sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+ pushd src/${EGO_PN} || die
+ mkdir -p bin || die
+ GOPATH="${S}" promu build -v --prefix node_exporter || die
+ popd || die
+}
+
+src_install() {
+ pushd src/${EGO_PN} || die
+ dobin node_exporter/node_exporter
+ dodoc {README,CHANGELOG,CONTRIBUTING}.md
+ popd || die
+ keepdir /var/lib/node_exporter /var/log/node_exporter
+ fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
+ newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/net-analyzer/prometheus-snmp_exporter/Manifest b/net-analyzer/prometheus-snmp_exporter/Manifest
new file mode 100644
index 000000000000..141334e57a07
--- /dev/null
+++ b/net-analyzer/prometheus-snmp_exporter/Manifest
@@ -0,0 +1,5 @@
+AUX prometheus-snmp_exporter.confd 98 SHA256 35a4150f56c8f898af0a28c92d9770df35ea30c8d3c59e1e63075c458b3b8ced SHA512 027ff624a0e5faae571e36cf0fdf860e13956976878a7b3ca2afbf5e6387ecb02d391974cf7c44c33468d34a16cf00d10ee153f3b7507b9cc5a62126b70c5a39 WHIRLPOOL 55fbeb2c15a17a8e588a51e6aad1b56a7bc6eaff278b070eba7dc953928843d73df0eb4b2c6e4fc079436be486949a0abfbdfa0e8503c90ad58fcf2ce3d42976
+AUX prometheus-snmp_exporter.initd 591 SHA256 5ed292deb2cd07181328c0cd520dec77e496b5b4237b1c8e9e8ba15277633406 SHA512 0e53ef6790dc60091c0ed3b9cb7f47fabf526db80f9f09e212880efff59e9c0b3abb19235fe9b82da15cfb8aacb1eab326902f51d4908af80348023ae59bd474 WHIRLPOOL 71e7fcbed414e4f93e408441c07748c3640385c54bbf09de25cb796c2e74b86abe9fecb49f827308c15d2a0780d6f3201ba9b0a9e0c92969fcf759b453bfc14e
+DIST prometheus-snmp_exporter-0.7.0.tar.gz 3250164 SHA256 da9d0c4baa21a317a88ebbb0e836a4665614d03421d2c4ecb7df7e5217920398 SHA512 b0564fcd38eb823d136b25c3aa4e8f1df495eb6f262f105e6686adab80a794cd2cc47f51f40606aa4b51d29e0ab6851216b147b37e406e450b4f9559caaee5d1 WHIRLPOOL a0c4a7e53cc24ea712f681440be5757c40f7585037fa8a7f1e71da7aee2fb1a4084d2648e3b0076c452f7740657b710d9eb986b1e97e8b5bf44b04617d2c3405
+EBUILD prometheus-snmp_exporter-0.7.0.ebuild 1283 SHA256 92190559f5197ec3082cc888d347a4f4cd3a93718dd805aa287c2eae3565d76e SHA512 f4ed186384e0521a3e3469c20a57b5282f51100c37c6033b519e46db8dcf1f2bcbefe2bddb140ff9f91728735ad108d1fd5a198aa3ee70c480826bb6fe2cf9c2 WHIRLPOOL 73afd775aead561d35b552d6c131f6e5316310949a6c7bf5ec60f7ee22c10e5d4e5ceeceec75b444777565c3e3a674ea00485fdb34193852c2d1e9b93a3e8773
+MISC metadata.xml 334 SHA256 42c6c31707ac483f87eb5d8605184dd2ea3d28f4e01b62b85ab018a1e1a69e7b SHA512 7fd3e4314022bf2ff86bd01f335d5c4402676970b9810575225aff3d40bd5bdc9ffc27b438c880dc0a665cf3873502b969dfb30644b3c106278fd353820d6599 WHIRLPOOL 1e769a6d9c4c8147f2f1d5b3e30f0c37e94db7f526828da6f1a1697ed8511e90a5541027c42976804c2071027fc65b9a044dac4480319283d1975a9d72d3e146
diff --git a/net-analyzer/prometheus-snmp_exporter/files/prometheus-snmp_exporter.confd b/net-analyzer/prometheus-snmp_exporter/files/prometheus-snmp_exporter.confd
new file mode 100644
index 000000000000..e80d6a1a8504
--- /dev/null
+++ b/net-analyzer/prometheus-snmp_exporter/files/prometheus-snmp_exporter.confd
@@ -0,0 +1,2 @@
+# arguments for prometheus snmp exporter
+command_args="--config-file=/etc/snmp_exporter/snmp.yml"
diff --git a/net-analyzer/prometheus-snmp_exporter/files/prometheus-snmp_exporter.initd b/net-analyzer/prometheus-snmp_exporter/files/prometheus-snmp_exporter.initd
new file mode 100644
index 000000000000..4d620b54b171
--- /dev/null
+++ b/net-analyzer/prometheus-snmp_exporter/files/prometheus-snmp_exporter.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 2016-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus snmp exporter"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-${RC_SVCNAME}}
+group=${group:-${RC_SVCNAME}}
+
+command="/usr/bin/snmp_exporter"
+command_args="${command_args:---config-file=/etc/snmp_exporter/snmp.yml}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+ --stdout /var/log/snmp_exporter/${RC_SVCNAME}.log \
+ --stderr /var/log/snmp_exporter/${RC_SVCNAME}.log"
+
+depend() {
+ after net
+}
diff --git a/net-analyzer/prometheus-snmp_exporter/metadata.xml b/net-analyzer/prometheus-snmp_exporter/metadata.xml
new file mode 100644
index 000000000000..9ea37fba673a
--- /dev/null
+++ b/net-analyzer/prometheus-snmp_exporter/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mrueg@gentoo.org</email>
+ <name>Manuel Rüger</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">prometheus/snmp_exporter</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/prometheus-snmp_exporter/prometheus-snmp_exporter-0.7.0.ebuild b/net-analyzer/prometheus-snmp_exporter/prometheus-snmp_exporter-0.7.0.ebuild
new file mode 100644
index 000000000000..15ca77ed1b70
--- /dev/null
+++ b/net-analyzer/prometheus-snmp_exporter/prometheus-snmp_exporter-0.7.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/snmp_exporter"
+EGIT_COMMIT="v${PV/_rc/-rc.}"
+SNMP_EXPORTER_COMMIT="9147920"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus exporter for snmp metrics"
+HOMEPAGE="https://github.com/prometheus/snmp_exporter"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+ default
+ sed -i -e "s/{{.Revision}}/${SNMP_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+ pushd src/${EGO_PN} || die
+ mkdir -p bin || die
+ GOPATH="${S}" promu build -v --prefix snmp_exporter || die
+ popd || die
+}
+
+src_install() {
+ pushd src/${EGO_PN} || die
+ dobin snmp_exporter/snmp_exporter
+ dodoc {README,CHANGELOG,CONTRIBUTING}.md
+ insinto /etc/snmp_exporter
+ newins snmp.yml snmp.yml.example
+ popd || die
+ keepdir /var/lib/snmp_exporter /var/log/snmp_exporter
+ fowners ${PN}:${PN} /var/lib/snmp_exporter /var/log/snmp_exporter
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index 06ac28a3be46..ebbbc3d48c61 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -1,3 +1,5 @@
+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.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
@@ -7,7 +9,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-r1.ebuild 3245 SHA256 eef8bbf28b4d7b375d1c1bc7641c3030905d1af52eda262b511404919bc7a2e9 SHA512 e057cc84373e4c60fe84e97836a066067b54ce13409f3eb83033fcd3f73dc7186276a00b89793602dbfc68d9a5dfa0cf18ba4619dcb6bd47a1bdf14b9a8bd6f7 WHIRLPOOL 2a0d5e64c8c23db5df2b119f5b797995cb4577c1ca6233aad80809019887046ecf5ccccd51fd1470b08753db73ca56629c115ac4f81d1571fec3cdeb3821229c
+EBUILD vnstat-1.17-r2.ebuild 1472 SHA256 35e2fac6008e530c4d02b9247ad909b02ccfbca81c11a2a899fad60cc8eef92e SHA512 194cf7b43dd74ba43844827ae20f57853bbbaab16808a3ce1f6911bd78f3d5d5a684b884d07794464c1e04afd0048363d0b3a07f12f8575a8fdaebb998b1e2b2 WHIRLPOOL bef4f21c7236efc316bfa46b5d58b54f8a7fc0298a02933668a3410a3b9edc240ed0a26b5f3c72df037d5a49f1cdbea249ab98ea2764984fed1207cad3a51652
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
new file mode 100644
index 000000000000..b939e7c04351
--- /dev/null
+++ b/net-analyzer/vnstat/files/vnstat-1.17-conf.patch
@@ -0,0 +1,15 @@
+--- a/cfg/vnstat.conf.JeR
++++ b/cfg/vnstat.conf
+@@ -115,10 +115,10 @@
+ UpdateFileOwner 1
+
+ # file used for logging if UseLogging is set to 1
+-LogFile "/var/log/vnstat/vnstat.log"
++LogFile "/var/log/vnstat/vnstatd.log"
+
+ # file used as daemon pid / lock file
+-PidFile "/var/run/vnstat/vnstat.pid"
++PidFile "/run/vnstat/vnstatd/vnstatd.pid"
+
+
+ # vnstati
diff --git a/net-analyzer/vnstat/files/vnstat-1.17-run.patch b/net-analyzer/vnstat/files/vnstat-1.17-run.patch
new file mode 100644
index 000000000000..e3b514d0c6b6
--- /dev/null
+++ b/net-analyzer/vnstat/files/vnstat-1.17-run.patch
@@ -0,0 +1,11 @@
+--- a/src/common.h.JeR
++++ b/src/common.h
+@@ -198,7 +198,7 @@
+ #define CREATEDIRS 1
+ #define UPDATEFILEOWNER 1
+ #define LOGFILE "/var/log/vnstat/vnstat.log"
+-#define PIDFILE "/var/run/vnstat/vnstat.pid"
++#define PIDFILE "/run/vnstat/vnstat.pid"
+
+ /* no transparency by default */
+ #define TRANSBG 0
diff --git a/net-analyzer/vnstat/vnstat-1.17-r1.ebuild b/net-analyzer/vnstat/vnstat-1.17-r1.ebuild
deleted file mode 100644
index 0c24c6dc6014..000000000000
--- a/net-analyzer/vnstat/vnstat-1.17-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit systemd toolchain-funcs user versionator
-
-DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
-HOMEPAGE="http://humdi.net/vnstat/"
-SRC_URI="http://humdi.net/vnstat/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gd selinux test"
-
-COMMON_DEPEND="
- gd? ( media-libs/gd[png] )
-"
-DEPEND="
- ${COMMON_DEPEND}
- test? ( dev-libs/check )
-"
-RDEPEND="
- ${COMMON_DEPEND}
- selinux? ( sec-policy/selinux-vnstatd )
-"
-
-pkg_setup() {
- enewgroup vnstat
- enewuser vnstat -1 -1 /var/lib/vnstat vnstat
-}
-
-src_prepare() {
- default
-
- tc-export CC
-
- sed -i \
- -e 's|^\(MaxBWethnone.*\)$|#\1|' \
- -e 's|^Daemon\(.*\) ""$|Daemon\1 "vnstat"|' \
- -e 's|vnstat[.]log|vnstatd.log|' \
- -e 's|vnstat[.]pid|vnstatd.pid|' \
- -e 's|/var/run|/run|' \
- cfg/${PN}.conf || die
- sed -i \
- -e '/PIDFILE/s|/var/run|/run|' \
- src/common.h || die
-}
-
-src_compile() {
- emake ${PN} ${PN}d $(usex gd ${PN}i '')
-}
-
-src_install() {
- use gd && dobin vnstati
- dobin vnstat vnstatd
-
- exeinto /usr/share/${PN}
- newexe "${FILESDIR}"/vnstat.cron-r1 vnstat.cron
-
- insinto /etc
- doins cfg/vnstat.conf
- fowners root:vnstat /etc/vnstat.conf
-
- keepdir /var/lib/vnstat
- fowners vnstat:vnstat /var/lib/vnstat
-
- newconfd "${FILESDIR}"/vnstatd.confd-r1 vnstatd
- newinitd "${FILESDIR}"/vnstatd.initd-r2 vnstatd
-
- systemd_newunit "${FILESDIR}"/vnstatd.systemd vnstatd.service
- systemd_newtmpfilesd "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf
-
- use gd && doman man/vnstati.1
- doman man/vnstat.1 man/vnstatd.1
-
- newdoc INSTALL README.setup
- dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
-}
-
-pkg_postinst() {
- local _v
- for _v in ${REPLACING_VERSIONS}; do
- if ! version_is_at_least 1.17-r1 ${_v}; then
- # This is an upgrade
- elog ""
- elog "Beginning with ${PN}-1.17-r1, we no longer install and use the cron job"
- elog "per default to update vnStat databases because you will lose some traffic"
- elog "if your interface transfers more than ~4GB in the time between two cron"
- elog "runs".
- elog ""
- elog "Please make sure that the vnstatd service is enabled if you want to"
- elog "continue monitoring your traffic."
-
- # Show this elog only once
- break
- fi
- done
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
-
- elog
- elog "Repeat the following command for every interface you"
- elog "wish to monitor (replace eth0):"
- elog " vnstat -u -i eth0"
- elog "and set correct permissions after that, e.g."
- elog " chown -R vnstat:vnstat /var/lib/vnstat"
- elog
- elog "It is highly recommended to use the included vnstatd to update your"
- elog "vnStat databases."
- elog
- elog "If you want to use the old cron way to update your vnStat databases,"
- elog "you have to install the cron job manually:"
- elog ""
- elog " cp /usr/share/${PN}/vnstat.cron /etc/cron.hourly/vnstat"
- elog ""
- elog "Note: if an interface transfers more than ~4GB in"
- elog "the time between cron runs, you may miss traffic."
- elog "That's why using vnstatd instead of the cronjob is"
- elog "the recommended way to update your vnStat databases."
- fi
-}
diff --git a/net-analyzer/vnstat/vnstat-1.17-r2.ebuild b/net-analyzer/vnstat/vnstat-1.17-r2.ebuild
new file mode 100644
index 000000000000..88ba28fdb0e4
--- /dev/null
+++ b/net-analyzer/vnstat/vnstat-1.17-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit systemd user
+
+DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
+HOMEPAGE="http://humdi.net/vnstat/"
+SRC_URI="http://humdi.net/vnstat/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gd selinux test"
+
+COMMON_DEPEND="
+ gd? ( media-libs/gd[png] )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ test? ( dev-libs/check )
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ selinux? ( sec-policy/selinux-vnstatd )
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.17-conf.patch
+ "${FILESDIR}"/${PN}-1.17-run.patch
+)
+
+pkg_setup() {
+ enewgroup vnstat
+ enewuser vnstat -1 -1 /var/lib/vnstat vnstat
+}
+
+src_compile() {
+ emake ${PN} ${PN}d $(usex gd ${PN}i '')
+}
+
+src_install() {
+ use gd && dobin vnstati
+ dobin vnstat vnstatd
+
+ exeinto /usr/share/${PN}
+ newexe "${FILESDIR}"/vnstat.cron-r1 vnstat.cron
+
+ insinto /etc
+ doins cfg/vnstat.conf
+ fowners root:vnstat /etc/vnstat.conf
+
+ keepdir /var/lib/vnstat
+ fowners vnstat:vnstat /var/lib/vnstat
+
+ newconfd "${FILESDIR}"/vnstatd.confd-r1 vnstatd
+ newinitd "${FILESDIR}"/vnstatd.initd-r2 vnstatd
+
+ systemd_newunit "${FILESDIR}"/vnstatd.systemd vnstatd.service
+ systemd_newtmpfilesd "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf
+
+ use gd && doman man/vnstati.1
+ doman man/vnstat.1 man/vnstatd.1
+
+ newdoc INSTALL README.setup
+ dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
+}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index ae41ae794f04..12cb6fb31571 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -7,7 +7,7 @@ DIST wireshark-2.4.1.tar.xz 28780384 SHA256 02ddbcf9b10f9dfa1e36eec00fe00cb5b5ce
DIST wireshark-2.4.2.tar.xz 28791712 SHA256 d1acb24735fd35e18e9b7a0555ec58277c2b87da45a19ebeb8087c3dda55f47d SHA512 212964482a1e45af490ef78b3f2465384f84c007a76c3a99e8de0e2c37d933fb34b0da5631f4a36ca12d2fa7cc4376d3d405cbe7f7113791ea09dba7e5915417 WHIRLPOOL 245454643e138c61ccb380ae236482fea702cf4c0507de1c1d3d6dc9f7312809533db7b0fba585f95b8caf5b76affa4da23ad263b8f95174dfbb9c2ee3300177
EBUILD wireshark-2.2.7.ebuild 6489 SHA256 0978c03c370a2d1b8e2e910bd1c3a57f8cd6984fa2e25b15e152b3fbbd4b95b9 SHA512 3aad3004619a02cd4a2bb8a9d4f87e0a669e2ea23a0e83377056477af4a2b5a6f7ed95d9c7fe1373e847fb186c014c87f5cb96f5f32d4bff7bfc2700710301f9 WHIRLPOOL a3715bb7c19f1007dac053ec1aaf1e49232b31605ec55761884bb6556e19fb1f0b53440657bf0f49330630d5beef435881f157cb6af3be02cc5cfd90134c156f
EBUILD wireshark-2.4.1-r3.ebuild 7337 SHA256 794e6daf4d2bd724e87882d0d879d55c456e3e935cdab3b36bfb32725b2e6509 SHA512 54e39d028ba1cbd4fcf925eca2c14b6ccc0a8a058b30a0a9adab5a8712eca2781ef0b5f0795bb2115a1c4dcc77e7ba56ef78327f804ac999be3d5ee3aaf66157 WHIRLPOOL 041b4fb98160d4ac4a45a1a83a04318f7a292512bbf928016b5f84411d533f49e5bd806fabbbabbff155d23d97fec2a21bedf0962fc934bc9a6ebdf32b80a654
-EBUILD wireshark-2.4.2.ebuild 7338 SHA256 3df14fd2f1c33f623dcf8cad2510661e26fecad268daf5ec9e957b783b7f437e SHA512 b292111218c9cd8d1bbb4334a34186119df3224d46b470277a31afa04b134cae8ddd50944b51b6b2e0dfcfd7a2da16f1a4d5c812c89174a116649dec115ba623 WHIRLPOOL 2e03235ef0013548d10d9e8935a7f1069800f87dca9246474b977cdabd91444163ecc0efaba5e03c2bf5e0615ced560a73028216d9320f8b607ffc15968120ba
+EBUILD wireshark-2.4.2.ebuild 7335 SHA256 18a9b9157b36518f0e6cf805848c1060b7efb362e8c49669435624ba77a6f3ae SHA512 a178a9581aa6fbc6c7ab7b90f816a6c5282d3b6b616a6634e72696ff0b42d19c2b2fcc6ea188c5beba5069472bf141c2af452eab9e56e023f81beb5c8eb2ea13 WHIRLPOOL 99d0d17608ae45d5c1b31d9b1eb1f4825560b31c125f0cf82f82bde7db916c553b8009b1a472631f5c23f7a385188d6f8566d8d7dbe7bf1e42c668b39be0bd19
EBUILD wireshark-99999999.ebuild 7244 SHA256 72ba7b56f2f65ede095d2694d246225ce9162512166962bcede6fe89d842cc52 SHA512 84107c356b10259f6b230931ff136c3dcd364e7aa928cc29609d253ec36e11193e7f723548965c9f085c49040a9ddcf9bfcfd476242178b25ae8213eb0617742 WHIRLPOOL e985f39f06d5dbda4a4a71290b8f024ef483c65ac3c5cf2fe9aac02c79f7ef685eeefeb5a0a5a75c75765342116d554983620aec0f24b893c86db9cdc19c9e61
MISC ChangeLog 28152 SHA256 4d533b118cf6326befb9d60fef7212306a14528010f3c1864ea6657e20b00605 SHA512 1dbf03f303e0e05eb243d70595fd88e7ea4d14e397a3d717fe2ac9ba05e2407e1928f2cd78b7bc6fe205ce8d660e75b6f11608546b32a70ffc1ec24629567fd5 WHIRLPOOL fbb5a086aa52c90e28c392813dd7b8ade906f4376ec596741e2396b9160e2e64a45148a793b45530ae3ab6dd744dccf6c30261cdf354ada3a50c11a545afd811
MISC ChangeLog-2015 107469 SHA256 077b97e93bc0bcebd520af0c72ec9df8da0af9b004423b34190b15c201341b2b SHA512 ce81239e7a9731845ee59ef8206094263b501ab74130cf2a34f8e052e6bf431f019c116c732e2b290c1c61e65ab548e1e10009d1d269cc83fed7f295aee555bc WHIRLPOOL 936c3ea54e274000a61a4114c7d69415f7289183b7c7f75b72925fa9ca0f0f6d42a4ef367d625d4e5892587eee680bbf63eb2945fbc4a98e68b04907ed3fdbc5
diff --git a/net-analyzer/wireshark/wireshark-2.4.2.ebuild b/net-analyzer/wireshark/wireshark-2.4.2.ebuild
index 2413590812e0..a16ad647b623 100644
--- a/net-analyzer/wireshark/wireshark-2.4.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
LICENSE="GPL-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ppc ~ppc64 x86 ~x86-fbsd"
IUSE="
adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2
+dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua