summaryrefslogtreecommitdiff
path: root/net-analyzer
diff options
context:
space:
mode:
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/Manifest.gzbin49960 -> 50298 bytes
-rw-r--r--net-analyzer/chaosreader/Manifest3
-rw-r--r--net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild2
-rw-r--r--net-analyzer/chaosreader/chaosreader-0.94.ebuild24
-rw-r--r--net-analyzer/masscan/Manifest5
-rw-r--r--net-analyzer/masscan/files/masscan-1.0.3-gcc5.patch11
-rw-r--r--net-analyzer/masscan/masscan-1.0.5.ebuild (renamed from net-analyzer/masscan/masscan-1.0.3-r2.ebuild)22
-rw-r--r--net-analyzer/nessus-client/Manifest3
-rw-r--r--net-analyzer/nessus-client/nessus-client-1.0.2-r1.ebuild56
-rw-r--r--net-analyzer/nessus-client/nessus-client-1.0.2-r2.ebuild2
-rw-r--r--net-analyzer/pmacct/Manifest4
-rw-r--r--net-analyzer/pmacct/pmacct-1.5.1.ebuild2
-rw-r--r--net-analyzer/pmacct/pmacct-1.6.2.ebuild2
-rw-r--r--net-analyzer/prometheus-redis_exporter/Manifest7
-rw-r--r--net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.confd30
-rw-r--r--net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.initd19
-rw-r--r--net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.logrotated7
-rw-r--r--net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.service16
-rw-r--r--net-analyzer/prometheus-redis_exporter/metadata.xml11
-rw-r--r--net-analyzer/prometheus-redis_exporter/prometheus-redis_exporter-0.15.0.ebuild52
-rw-r--r--net-analyzer/prometheus-uwsgi_exporter/Manifest7
-rw-r--r--net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.confd16
-rw-r--r--net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.initd19
-rw-r--r--net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.logrotated7
-rw-r--r--net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.service16
-rw-r--r--net-analyzer/prometheus-uwsgi_exporter/metadata.xml11
-rw-r--r--net-analyzer/prometheus-uwsgi_exporter/prometheus-uwsgi_exporter-0.7.0.ebuild54
-rw-r--r--net-analyzer/prometheus/Manifest4
-rw-r--r--net-analyzer/prometheus/prometheus-2.2.1.ebuild (renamed from net-analyzer/prometheus/prometheus-2.2.0.ebuild)2
-rw-r--r--net-analyzer/wireshark/Manifest8
-rw-r--r--net-analyzer/wireshark/metadata.xml1
-rw-r--r--net-analyzer/wireshark/wireshark-2.4.5.ebuild2
-rw-r--r--net-analyzer/wireshark/wireshark-2.5.0.ebuild2
-rw-r--r--net-analyzer/wireshark/wireshark-2.5.1.ebuild261
34 files changed, 563 insertions, 125 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 8f88f7ce6081..d9d8ac74a778 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
Binary files differ
diff --git a/net-analyzer/chaosreader/Manifest b/net-analyzer/chaosreader/Manifest
index 3b127691165f..d8e109769a42 100644
--- a/net-analyzer/chaosreader/Manifest
+++ b/net-analyzer/chaosreader/Manifest
@@ -4,6 +4,5 @@ AUX chaosreader-0.94-divisionbyzero.patch 640 BLAKE2B 50d8d24212d1150128f22d74d0
AUX chaosreader-0.94-oldmultiline.patch 487 BLAKE2B 596eac7253649813d6f3486522a998c8c647d2cde8830964480a394b91486f3b710c2fb7a54862be6ef8f60c8db40052cf8d4e6c8e638efc648194462354e244 SHA512 dcb98d8e5000fd0d130217e582ae21a519fd6e1554cd1e4902db632e7760c1708c9754f97f28f90d3371ccf76bb7b499b023d0985c27e799c27205f410515941
AUX chaosreader-0.94-zombies.patch 349 BLAKE2B 607cd4f48c77613ab794f8d2fe00f5653854fe3d5a669412190e520015724cc9ad1c246e308a0c43c1ec0b4e29ec261c6eb77910dccbc0f8ddfdc730ff9f8cac SHA512 d3348cd6f29d01b1e94e4aa7f89b7f76fa9a4c8a557c437d0495ae32c6a6399019fe3affed5f1611a77a6b70fd1f30d011c87e00b614640c155f3afd8470a0f3
DIST chaosreader-0.94.bz2 41039 BLAKE2B 664ac7de3ea15dcc2942f7d9ffa4a7ffd2066a521345877127594ece197cab8d49d2f3441335c012dc09041543cda31c723d021ae86a512b4d578f958acc3afc SHA512 f2c2b31e6f7fc27c5cb59a43ce9cdea67de520c79f6354c9a0f627c098d73f4666461fb4f3c393a0a9ac36105979fe36b08035c4404371db2f573dd534e1adad
-EBUILD chaosreader-0.94-r1.ebuild 798 BLAKE2B 21f05d27abc4da3457da6c49f43c4a132c5a83b2e6a23ce78b58d6b9b9422629f411bae7b6dec704685d32137a17731a01b653da6f5403f8f95f818d79dd6dc1 SHA512 c0d95454d4cb0bc2b8c429d2c40e0c0fcc5ada85e726c6511e5c1ed5bd168a61f44ccecfc89a60ee4b27d1987a8fbbbb1486c38757524a2d17ee6b339269641d
-EBUILD chaosreader-0.94.ebuild 578 BLAKE2B a5f7f8a8333ad8f5f17d8ee2254ab8d0f94650576f15977f8c1ba1372456ec35c06f6ae3df2515c7a67bd879360891c95c60b4107e79461ff27f43e64b0a04e6 SHA512 2aa14858e54b22764d751dda2a08520ea38abff12740719d31d596712d916a4bb0faafb0f39d3ec601c68d12bc2b459e4a5422287472c528a3251e78dcb3e5d6
+EBUILD chaosreader-0.94-r1.ebuild 797 BLAKE2B ba97daaaa2377c2fd3b21ab297c5e7c3613896d57a6406b9b602437fe980a483f2cd0cd60eb97050588fd6c5f2ba07f6685baa76bcd62a838ff936c72636c327 SHA512 517498a840b8143362be0d9c97a9fa5b7b03f91eea3acb09f067cc8e4ae7e1dd23316592e7de0571484a5c31a33e45006e3299ac15b7329b337ce03046f1991e
MISC metadata.xml 412 BLAKE2B c0864f8b120780471a2c840a1258abc3a70d3183e318aecd7e2ac4852428bf2c57fa32713e50283dbcb5de311ab33893c0b8f66a2bc72463872e7758e5d96ab9 SHA512 fe8a71cba4549b081b24d302c3b97cfbce59e5c338089fd12f706320fd9752fe2ca7f8875a768da68a9ef9c8e36a3e291a29b5a79e414586c38c21e6d54d340c
diff --git a/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild b/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild
index a1d5cbdad5b1..33c7a6f55825 100644
--- a/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild
+++ b/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://chaosreader.sourceforge.net"
SRC_URI="https://dev.gentoo.org/~spock/portage/distfiles/${P}.bz2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
LICENSE="GPL-2"
IUSE=""
diff --git a/net-analyzer/chaosreader/chaosreader-0.94.ebuild b/net-analyzer/chaosreader/chaosreader-0.94.ebuild
deleted file mode 100644
index 0e9d613171e6..000000000000
--- a/net-analyzer/chaosreader/chaosreader-0.94.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="Trace TCP/UDP/... sessions and fetch application data."
-HOMEPAGE="http://chaosreader.sourceforge.net"
-SRC_URI="https://dev.gentoo.org/~spock/portage/distfiles/${P}.bz2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
-LICENSE="GPL-2"
-IUSE=""
-DEPEND=">=dev-lang/perl-5.8.0"
-S=${WORKDIR}
-
-src_prepare() {
- epatch "${FILESDIR}"/chaosreader-0.94-zombies.patch
-}
-
-src_install() {
- newbin ${P} chaosreader || die
-}
diff --git a/net-analyzer/masscan/Manifest b/net-analyzer/masscan/Manifest
index a6221eea2410..a776d81f8f11 100644
--- a/net-analyzer/masscan/Manifest
+++ b/net-analyzer/masscan/Manifest
@@ -1,7 +1,6 @@
-AUX masscan-1.0.3-gcc5.patch 293 BLAKE2B 81ff8ded612464f7a098e883d0a5b567ea3db2fe53543ce8feb5f702eafdf9fd157182c4130de433c2144eccf4721eb0b58ad85faf5b21a801d50ab8c6d6a96e SHA512 78718499c8548dcf88fa7f57c38ddf5fe5c9b5720a5141b4dd7e1b24d2f33e4b640c7ff3d3a8ba38590431c5e4fc3a7f16825b2e2fb05d6836d84d68f431d6ba
AUX masscan.conf 174 BLAKE2B 03a04c87f99de4c98ef2635111f61dc8c5f41c0b91e224786ead69aaa40c295fea46e63083c8e24e589158c4a8726c20aea2105fb674d06ae10c68c01ce345b1 SHA512 dee80bdeac6755a7edd24a12b25fc071e45680a8849eeb60193ad1089262989aeb7b44f75b0de34e6b07dac1ceecb759f1776e27bec2bfcd13b077baad0ebb77
-DIST masscan-1.0.3.tar.gz 333393 BLAKE2B b75cab481b5f87694553f373b8fde82ae4c5e001b98816e41138bda7b682edfbd04bfe419f77021784611982cc41b10694ad412d1c784d41b4ba7a0f0c95031b SHA512 e64b11deaaaa71d5be95e8f2b1fdfa679f5c8e8074c97f9d60d57659f33aec0699673c5aab72824f62d1a8b0e8c9188dcf296dd078bc6c2dbdad95c35c3a5f40
DIST masscan-1.0.4.tar.gz 343513 BLAKE2B e50789c8a2246c4109990e93c9c53cf68b2b555955f675e1a9acd4074c2b85773aba58f3644db1f98a88c4cff85cff5a9035f2fbc56978103458dc34e6dc353a SHA512 eb82d8ad4d6a5c77cf79197e18470a68f7c361f0785180d631e9625578e90af6ffdaa45b728349da5a1cb945a8f902541b8f708be8a4075737ccb06e948d6e2b
-EBUILD masscan-1.0.3-r2.ebuild 981 BLAKE2B b6632841e6585690de0478ce52cfa15588093adc7764b3f27294b459fe336f7bae8a12fa43e5830c6a06a5fe64bf6ea749cd18d1da59ccbd11a53802b0e5ca67 SHA512 73af493d6e0f90b62383c3a3931b761b90d185a650bcfedf1565c077996b238c9247ee6eee24d5b26f4cb5a674ce937b1ecafeea7e5e7b4221c838d79e7cdfb7
+DIST masscan-1.0.5.tar.gz 353901 BLAKE2B 83145955b42f660788fdd7687b0a88ad84d6f31a4f99fc1fe4691f266f3c3492882334d9f0b4acf3c31d33950daedda56b6623cd3ba6ef9a27914613f09d485b SHA512 55d58234994ebea10bcb3f45a24cdb51b020350faa116aee3a48861a119f66c339d1f533c978f52e37ccf5266be6fd2802765f13461d94eb28ec8d18c68e2f88
EBUILD masscan-1.0.4.ebuild 802 BLAKE2B ca40492b8bd1cd457a6bff9cf36fa8d4dca1506159c2356901e076b2008c3a6beb9489a6deaf4d557a48bdb968db0c0b8a90d821a021131cf9851046b18dedf0 SHA512 009a6801721979fef9d79101bd9f3badd492c386d4abbef0b2b7a861de23685ceecb885feb0c1ba1cfc06ee9a53e86c293c893445164b72d600734f7c0a834d6
+EBUILD masscan-1.0.5.ebuild 790 BLAKE2B c16f2071b9997fd7f7cc384f4c495190fde59ec90fc8fccf528b7bf749eed1fcfc7ae01c2c0646eadebc19a0c839480d6a714ef9f4bf22c6063adc3c335827cd SHA512 c0f1e61cbc4795d39058125170fabeb0e08a2ef089c56157bf7175b4fa67d51836a55e49b2f8a4229fc97e973015402151b041ececb8139f63ecab90b7c2478a
MISC metadata.xml 975 BLAKE2B 6867f941d5c26ae55542c5ae8e7c75b5d6ff4995dde7757d9666b50659028a8a86706fb2f551778603141ae8b063a7395ce27aaec035eba06adad1fe9a37fa3d SHA512 454748e7c1338b149c4273ac52361a671eece56eff745f07ab6b966689737fd6ffc1b901c3a5844f1fd584fdd78016c6bfd63e9957f9eb8b2463c352165df782
diff --git a/net-analyzer/masscan/files/masscan-1.0.3-gcc5.patch b/net-analyzer/masscan/files/masscan-1.0.3-gcc5.patch
deleted file mode 100644
index 6bf92fd25d14..000000000000
--- a/net-analyzer/masscan/files/masscan-1.0.3-gcc5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/string_s.h
-+++ b/src/string_s.h
-@@ -77,7 +77,7 @@
- typedef int errno_t;
- errno_t fopen_s(FILE **fp, const char *filename, const char *mode);
-
--#elif defined(__GNUC__) && (__GNUC__ == 4)
-+#elif defined(__GNUC__)
- #include <inttypes.h>
- /* GCC 4 */
- # define sprintf_s snprintf
diff --git a/net-analyzer/masscan/masscan-1.0.3-r2.ebuild b/net-analyzer/masscan/masscan-1.0.5.ebuild
index 894968ab55bd..b8f0e1839d5c 100644
--- a/net-analyzer/masscan/masscan-1.0.3-r2.ebuild
+++ b/net-analyzer/masscan/masscan-1.0.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=6
+inherit toolchain-funcs
DESCRIPTION="Mass IP port scanner"
HOMEPAGE="https://github.com/robertdavidgraham/masscan"
@@ -13,33 +13,29 @@ LICENSE="AGPL-3"
KEYWORDS="~amd64 ~x86"
RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}"
src_prepare(){
- epatch "${FILESDIR}"/${PN}-1.0.3-gcc5.patch
+ default
sed -i \
-e '/$(CC)/s!$(CFLAGS)!$(LDFLAGS) $(CFLAGS)!g' \
-e '/^GITVER :=/s!= .(.*!=!g' \
-e '/^SYS/s|gcc|$(CC)|g' \
- -e '/$(CC)/s!-DGIT=\"$(GITVER)\"!!g' \
-e '/^CFLAGS =/{s,=,+=,;s,-g -ggdb,,;s,-O3,,;}' \
+ -e '/^CC =/d' \
Makefile || die
-}
-src_compile() {
- emake CC="$(tc-getCC)"
+ tc-export CC
}
src_install() {
- emake CC="$(tc-getCC)" DESTDIR="${D}" PREFIX=/usr install
+ dobin bin/masscan
insinto /etc/masscan
doins data/exclude.conf
doins "${FILESDIR}"/masscan.conf
- mv doc/bot.{hml,html} || die
- dohtml doc/bot.html
+ dodoc doc/bot.html *.md
+
doman doc/masscan.8
- dodoc *.md
}
diff --git a/net-analyzer/nessus-client/Manifest b/net-analyzer/nessus-client/Manifest
index b700a0586ad2..bbbba366a23b 100644
--- a/net-analyzer/nessus-client/Manifest
+++ b/net-analyzer/nessus-client/Manifest
@@ -1,6 +1,5 @@
AUX nessus-client-1.0.2-make.patch 2647 BLAKE2B d7f7d3d9ead2562efe78e39cfde8bb6a4421649b3b58a7dc1fc35aea29c4e3a869e15291bf5dc2a7a7124e46a104ee02e9c99e651a0e5124e376873f0fa579fc SHA512 534ffc58b34cb382ba6e87cce27f8a842bb945f3cd5dbe239dc0acd1f8a3757347d3c529d41f7a213021491933030650fe70a161365eba2a80f81362ced3e48b
DIST NessusClient-1.0.2.tar.gz 2058324 BLAKE2B 8e2d27bc2c88d57bb57088d6061119144282db547d3f21bb242c9ba20e7f091fdbae3ee26f21ab4b8c33b8a3ff901c311e77ecb2d28aecf3d066152db2d2efcc SHA512 999e8ba11208351ffc37bad9fabc8c0b01e4abc2a638660818a1877cdb21a5d3b40d330b722debe9833e87db60e4f8aef53044f14fe5eeb8ffe57f3522bfa927
DIST nessus-client.png.bz2 10043 BLAKE2B 471dabb9effab168d6a92595a258679e961e8e1a64c29aa4b0ff0d013b67bf5b417d764390eddfff6bd9bdae0f385d1858890ec97dfbffa2f1d45b26e40c7dc3 SHA512 39e2b41e3b4fcfdace80085c917754fb0a4cfebcf1f684d97e36e5212e8e2e3539f10527909d7e4e350afdc73801ac1fb5bff2bb5c12be4770e2bb27487542af
-EBUILD nessus-client-1.0.2-r1.ebuild 1245 BLAKE2B 0ce6ec60532f3c26a6dfc78fa7883be381a0d761c19789fa5a8646710df0a063430b6eae54c4d5c9e24b103654608b5dfdc7fad80f674ffe021481bd0fa1f35f SHA512 01e860aab8d49353588f62ff5a3927f13fba469d1c19fc0acccb9650dd859ffba5598ec70f295c29e469994c5fbf5cc34b749fbb54fca0ab855a55bc92858a44
-EBUILD nessus-client-1.0.2-r2.ebuild 1315 BLAKE2B 30d5e5e4328dce04ad2b8a4169ff1667359c87d73e5c608660aef55826443363629480b30fd44241316db8b2d1110cef6c440fd00572da6cce015dfdee55e7f8 SHA512 eee1a449f0fec4da390be04ae75d5c3896849898f3485415313179b5be8fd0cc4383042d6cd2f7e49c9401483c34b40fec6a266eff631e5948c52db45299d297
+EBUILD nessus-client-1.0.2-r2.ebuild 1314 BLAKE2B 24fe7a4d2a23e898f7ab7b611cb6376862276a632eae3ca541eb472eb8b980caf6dfd6d2464ba2fe9ab2283f33b0fd9b78d22cb568b9bb584951569f9109ad58 SHA512 80eeaa4af943c450800246eceadb707df73d4c0e708678fc40d5b4a69a006288b551061b42b72142f7076aa594d1d3ed0aef04066458c2bf78a52abff4f8aca9
MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/nessus-client/nessus-client-1.0.2-r1.ebuild b/net-analyzer/nessus-client/nessus-client-1.0.2-r1.ebuild
deleted file mode 100644
index 52a9411efebd..000000000000
--- a/net-analyzer/nessus-client/nessus-client-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-MY_PN=NessusClient
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A client for the Nessus vulnerability scanner"
-HOMEPAGE="http://www.nessus.org/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz
- mirror://gentoo/nessus-client.png.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="doc"
-
-RDEPEND="!net-analyzer/nessus-core
- dev-libs/openssl
- >=x11-libs/gtk+-2.8.8:2"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-text/htmldoc )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-make.patch
- sed -i \
- -e "/NESSUS_DOCDIR/s|/doc/NessusClient|/doc/${PF}|g" \
- nessus.tmpl.in || die
-}
-
-src_configure() {
- tc-export CC
- econf
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc CHANGES README_SSL VERSION
-
- doicon "${WORKDIR}"/${PN}.png
- make_desktop_entry NessusClient "Nessus Client" nessus-client "Network"
-}
-
-pkg_postinst() {
- if ! use doc; then
- elog "If you do not have documentation installed, nessus-client"
- elog "will complain. To install documentation, please emerge with"
- elog "the doc useflag set. Beware that it will emerge app-text/htmldoc,"
- elog "a big package."
- fi
-}
diff --git a/net-analyzer/nessus-client/nessus-client-1.0.2-r2.ebuild b/net-analyzer/nessus-client/nessus-client-1.0.2-r2.ebuild
index 92cbf3844529..f7bdb5234055 100644
--- a/net-analyzer/nessus-client/nessus-client-1.0.2-r2.ebuild
+++ b/net-analyzer/nessus-client/nessus-client-1.0.2-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="libressl doc"
RDEPEND="!net-analyzer/nessus-core
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index 5b65947a781f..08eb6eeaedbd 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -3,7 +3,7 @@ AUX pmacctd-init.d 839 BLAKE2B 06d09dd80b526c9e12579e0ee2f76de96d91fef6f533727c5
DIST pmacct-1.5.1.tar.gz 874563 BLAKE2B 7dfa381c6f6fbde0c01d790046a087f0291f2347c0c2f776f12f5a3ef1864531a496cb05aa6fbea08c12d3f393cd7c6ad3af280807a759ea8934bdeeecb6a972 SHA512 c3a0ddaf1b8679df2097147ce844eb2a3e3058599aea457e463cd4e65a7601e0ce5bac5ca5e1c82afecd5edc92dae673eed3ed1787bfbd3e8ac2af5677885bb7
DIST pmacct-1.6.2.tar.gz 1311678 BLAKE2B 123629ca2e5e58bb4e684001b1c6d2d510e18450eed1c6e45bbe79ec7bb37072ba9b844fe0d8826a7923d0b09cf6923ea87d4e22fb2f251e7ebb9744d1c59b93 SHA512 8495f97752ae586fd842eed49ce91db3e4753133f7d380d067e7df153abeea469e5126800074e9071cb7227a3f1df64d4642dfece624fbbfa39b4537fde38b46
DIST pmacct-1.7.0.tar.gz 1351888 BLAKE2B d80d996bd247a90074b79bab69d709f70df74c7d89a552d01d86e718b165bc0091c560f4c5164db0c770b952d7bfe6660ac8c3a057f5ae8f321c015b9bdc40d3 SHA512 14f1cecc562f008d9b79259f885fc3a1d0a74efa4840d6150277c9bb3c67a233ca9a6b921d9d83fd488d1eb6f535075d7fbf53de0036c48611ffcbf5eb7559b5
-EBUILD pmacct-1.5.1.ebuild 1617 BLAKE2B b806e1be064f1261d7b4b27f3c1378d30c815ef538bab6f84f0b101ed03720047b381668f0d79078bb85db5b6be7ba44d7bf20c59ccbb5ec2c278b071528ecc9 SHA512 8e83f6d7300c20cd083a92bf9f53a9e62767587c950eecd5677c6d7aa0f63efa87f9bd65ad48cbedc5f3597bbc02d6f1d40b78e13aa325b750cf2d7ab32d545d
-EBUILD pmacct-1.6.2.ebuild 1797 BLAKE2B 1d7135b7ac2b1f6cd9b9640e614923765a73456d326c721187d0bbf424ec533bd1c1376578dabacfba3bbb003786bbbc9943de3e2643b7a68090d95fe2a69ef7 SHA512 43fccffe30d711724a937cbbe236f379f33b6d2bdebde91743bc5d05355532a46ac85bb8a949f2563d2d023dd2dbf3b940526698e59ea6acf569f0ff9eea7438
+EBUILD pmacct-1.5.1.ebuild 1613 BLAKE2B ee811680e02b2ee6ad710c38520247935720da1f0e49011ff7b8ae6ec3f2f22793e337e872e41d206978130e331e58ad73af31bd4fd485aad7c42c8016b9a0a3 SHA512 7d59db86eb9a0bca64c83b4b51af301f183affbb492960949bf4ae9f69b2dc69c1120d0dd31c50c80614101ac82523d5b7af7e355af12fde708dee96f2774793
+EBUILD pmacct-1.6.2.ebuild 1792 BLAKE2B b83603b5294fa7e6ceaa232ca3a8eacb20306a4cb04f9692e58fd857b2fd3e085898710a2b9af7142acb7b98231b860863a2b0a75d770b7029c7d35003c1ef32 SHA512 ef4fb78a56a8ffaec1d26bb736bace51641f68f4e67e42dcb7356019000889225cac7472b0074924786521dfcfcc03854a91e88fde6d7ac48d1939b7f99a6fcd
EBUILD pmacct-1.7.0.ebuild 1969 BLAKE2B cf2c83edc5ede644a2673e471418967a74e1c882e6fa736773f779ffeff3355f0f0aa0b6d0aa3f6fc83a8e3f7e2a779e731969c6bbc78a280fd4d81e9d8691e4 SHA512 3692ebc01a464fb66bf4fa1891ad8ae5f9c9c2299b9038a1bc49fb742a54312c10005f8e860c268f5727b93ee1fe9059e6d87838318d2940d1048d3f6950928a
MISC metadata.xml 1140 BLAKE2B 293f22275f422c2fe1c4961c08e9215b471e01a9b7cb52b380fd6c420cafd9fa4dc32db96cb6f529eea0f58dbfcb1ba08db3edb645a204933272808cf47dd223 SHA512 1b35f356c2991f002b7803897442c78040d41cf62cc60833454642e2389c256463df47a43ce125441239370cbcbd388d529146841fa7cb98079e85e23122f51c
diff --git a/net-analyzer/pmacct/pmacct-1.5.1.ebuild b/net-analyzer/pmacct/pmacct-1.5.1.ebuild
index 22ffb38dbf1d..42f78533f6aa 100644
--- a/net-analyzer/pmacct/pmacct-1.5.1.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.5.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.pmacct.net/${P/_}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
IUSE="64bit debug geoip ipv6 mongodb mysql postgres sqlite threads ulog"
RDEPEND="
diff --git a/net-analyzer/pmacct/pmacct-1.6.2.ebuild b/net-analyzer/pmacct/pmacct-1.6.2.ebuild
index 0b22f3b865ca..72d65265800b 100644
--- a/net-analyzer/pmacct/pmacct-1.6.2.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.6.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.pmacct.net/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE="64bit debug geoip geoipv2 ipv6 jansson kafka mongodb mysql nflog postgres rabbitmq sqlite threads"
REQUIRED_USE="
?? ( geoip geoipv2 )
diff --git a/net-analyzer/prometheus-redis_exporter/Manifest b/net-analyzer/prometheus-redis_exporter/Manifest
new file mode 100644
index 000000000000..2cf0cda89c71
--- /dev/null
+++ b/net-analyzer/prometheus-redis_exporter/Manifest
@@ -0,0 +1,7 @@
+AUX prometheus-redis_exporter.confd 1274 BLAKE2B 9219114db37ca7005de03cc911111c5ad0f8a4aa7ac8fd29c983651d2d3508f23a2065bf79102a56cdc76c807934ece56a431085ef1c0b549120411b1adafdc8 SHA512 8a119f447269cb605ca00be96124fba113042c4e50227f50575077200a3146597cdd9ce084a7dee4b92e18d8e1cfdbcc45abdf0305e366e889e149ffe9fddf78
+AUX prometheus-redis_exporter.initd 618 BLAKE2B 15e68da38f7644013ffafc94de4740912918fcfb5c0b2ee8bf6f05b059ce25be9e9edf268d0fd67f646910e9df3f84770d2c765c1a4ff64f54f44feb15e6d205 SHA512 d6d4410fb66a1eb0402b26e8dac77e263aa686f1abc72a04a30465f9ebaa24eb8f77f6a712bbbdd9fb360180c728317ee9f9927a075c0f86383c1346b7c9a09a
+AUX prometheus-redis_exporter.logrotated 123 BLAKE2B a81bb20061fb4a971a854bc0b29b1273f504987770b28a6a1381a5e9cc713171420643b29d39025d747ddbb8fc6204cc9f1852985e72d7dcf444da1803690fd8 SHA512 ed69382e027ab631fc7e938e51dace227070804aca458c9785475f15ca485b7edc5e28e2c2577272290397901754363830e8a488f226e03a60f43defb1194fc3
+AUX prometheus-redis_exporter.service 456 BLAKE2B 215d061d7f823287a48c387a547b752734a15d02392874b76771915426f53b650ab1aa8506a910fcd8302d7f129828f79840abe689b236ffbcc1401ba1d9beb9 SHA512 3edfb3d91fa4cbff30594b66c75222bd2a41527610c24f65a967d6895f0f82c76ee22d113827409a475a24c65c44effc73df55b31a23b47c71ea347c345b79d6
+DIST prometheus-redis_exporter-0.15.0.tar.gz 1232990 BLAKE2B ade899ef0f21594d3bb59c379f44d941e2a42f06a5c2ba5b304cc0b8b83def12eb036e6011a7d88abe7d97104ae663cb025ca60287ec9aba7be93a734d84c959 SHA512 8892306500943ec18d8fa5110fc6f4954ec886fca4d0023cdc2134ee2498c6f39ab06bec8f998ecde796cc2053b66103146503b76a185db3da5cbab81ebd9f2a
+EBUILD prometheus-redis_exporter-0.15.0.ebuild 1456 BLAKE2B 4efc6a890875ce7619d4ec1f88b3eba6f1bc3c10d2ada7ba7fbe8339e9a829aa51ccbea95fbb7a3cb4241589ccabd762de28b1e8018af8856cf191c2472db8c5 SHA512 8d9e3275bdc72a21615c71549eefa1b20ac31f128e3d83d6911b103ef0a281efa2e5c52a32557307c9ddbbd94352d87d17944ea468f7e71074d85e015777e342
+MISC metadata.xml 333 BLAKE2B 8eb8199bafb906f2b58072cf9765c7c44a4daeb54216db95f25a6c1545bf30720d73314fafe5d129dbbc200990e7a553e0ddc1486c22aa5d24c8616d21d4af80 SHA512 b1a040dc4cc2762aea081dc99209191da6f0d3d77c343148e3eb539bbc6527586e46de1b97e7cbec9f5098adb2f655059aa8609542353ddd88d19febb43c6fec
diff --git a/net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.confd b/net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.confd
new file mode 100644
index 000000000000..8573aef35405
--- /dev/null
+++ b/net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.confd
@@ -0,0 +1,30 @@
+# -check-keys string
+# Comma separated list of keys to export value and length/size
+# -debug
+# Output verbose debug information
+# -log-format string
+# Log format, valid options are txt and json (default "txt")
+# -namespace string
+# Namespace for metrics (default "redis")
+# -redis-only-metrics
+# Whether to export go runtime metrics also
+# -redis.addr string
+# Address of one or more redis nodes, separated by separator
+# -redis.alias string
+# Redis instance alias for one or more redis nodes, separated by separator
+# -redis.file string
+# Path to file containing one or more redis nodes, separated by newline. NOTE: mutually exclusive with redis.addr
+# -redis.password string
+# Password for one or more redis nodes, separated by separator
+# -separator string
+# separator used to split redis.addr, redis.password and redis.alias into several elements. (default ",")
+# -use-cf-bindings
+# Use Cloud Foundry service bindings
+# -version
+# Show version information and exit
+# -web.listen-address string
+# Address to listen on for web interface and telemetry. (default ":9121")
+# -web.telemetry-path string
+# Path under which to expose metrics. (default "/metrics")
+
+#command_args="--web.listen-address=:9121 --redis.addr=localhost:6379"
diff --git a/net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.initd b/net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.initd
new file mode 100644
index 000000000000..741a0b4e4682
--- /dev/null
+++ b/net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 2016-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus Exporter for Redis Metrics"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-${RC_SVCNAME}}
+group=${group:-${RC_SVCNAME}}
+
+command="/usr/bin/redis_exporter"
+command_args="${command_args:---web.listen-address=:9121 --redis.addr=localhost:6379}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+ --stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
+ --stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+
+depend() {
+ after net
+}
diff --git a/net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.logrotated b/net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.logrotated
new file mode 100644
index 000000000000..b1252b3d13f4
--- /dev/null
+++ b/net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.logrotated
@@ -0,0 +1,7 @@
+/var/log/prometheus-redis_exporter/prometheus-redis_exporter.log {
+ missingok
+ size 5M
+ rotate 3
+ compress
+ copytruncate
+}
diff --git a/net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.service b/net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.service
new file mode 100644
index 000000000000..9d2ba756a261
--- /dev/null
+++ b/net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Prometheus Exporter for Redis Metrics
+Documentation=https://github.com/oliver006/redis_exporter/
+After=network-online.target
+
+[Service]
+User=prometheus-redis_exporter
+Restart=on-failure
+Environment=REDIS_EXPORTER_ARGS="--web.listen-address=:9121 --redis.addr=localhost:6379"
+ExecStart=/usr/bin/redis_exporter $REDIS_EXPORTER_ARGS
+ExecReload=/bin/kill -HUP $MAINPID
+TimeoutStopSec=20s
+SendSIGKILL=no
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-analyzer/prometheus-redis_exporter/metadata.xml b/net-analyzer/prometheus-redis_exporter/metadata.xml
new file mode 100644
index 000000000000..ad438766d9bb
--- /dev/null
+++ b/net-analyzer/prometheus-redis_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>zmedico@gentoo.org</email>
+ <name>Zac Medico</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">oliver006/redis_exporter</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/prometheus-redis_exporter/prometheus-redis_exporter-0.15.0.ebuild b/net-analyzer/prometheus-redis_exporter/prometheus-redis_exporter-0.15.0.ebuild
new file mode 100644
index 000000000000..3e3d871df3c8
--- /dev/null
+++ b/net-analyzer/prometheus-redis_exporter/prometheus-redis_exporter-0.15.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot systemd
+
+EGO_PN="github.com/oliver006/redis_exporter"
+EGIT_COMMIT="a0d9e4c704b4d35cd08544d395038f417716a03a"
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus Exporter for Redis Metrics. Supports Redis 2.x, 3.x and 4.x"
+HOMEPAGE="https://github.com/oliver006/redis_exporter"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+ default
+ sed -e "s|\(^[[:space:]]*VERSION[[:space:]]*=[[:space:]]*\).*|\1\"${PV}\"|" \
+ -e "s|\(^[[:space:]]*BUILD_DATE[[:space:]]*=[[:space:]]*\).*|\1\"$(LC_ALL=C date -u)\"|" \
+ -e "s|\(^[[:space:]]*COMMIT_SHA1[[:space:]]*=[[:space:]]*\).*|\1\"${EGIT_COMMIT}\"|" \
+ -i src/${EGO_PN}/main.go || die
+}
+
+src_compile() {
+ pushd src/${EGO_PN} || die
+ GOPATH="${S}" \
+ go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
+ popd || die
+}
+
+src_install() {
+ dobin bin/redis_exporter
+ dodoc src/${EGO_PN}/README.md
+ local dir
+ for dir in /var/{lib,log}/${PN}; do
+ keepdir "${dir}"
+ fowners ${PN}:${PN} "${dir}"
+ done
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/${PN}.service"
+}
diff --git a/net-analyzer/prometheus-uwsgi_exporter/Manifest b/net-analyzer/prometheus-uwsgi_exporter/Manifest
new file mode 100644
index 000000000000..684cecf0d60a
--- /dev/null
+++ b/net-analyzer/prometheus-uwsgi_exporter/Manifest
@@ -0,0 +1,7 @@
+AUX prometheus-uwsgi_exporter.confd 857 BLAKE2B ab9ab9a1b80247d552a64d2b3d4d5ff22cf4d8f9dc6c4b819ccf8c8e2508de30cd1212a8bdfcc814f9c11867c0115867fd8b2ddcc7796a22b9dbd5b60ad1f55a SHA512 45b158629daec99a19508bddc297c3e2c5a781ef6d0e0571cff8d51308460faa499d5ce47829061be470a4d9177a90f806937ddf3322d35d2e950620e8c56ddd
+AUX prometheus-uwsgi_exporter.initd 627 BLAKE2B 37b6a417bbf2073dd30c7233266edd683e571217eb0aa12a9617ffafe44bbba449e508a437da1facf387e1ad801003a20bf8eed57177c5f62fad875d7ac185d6 SHA512 9735466e203f42c415742c2f6384357c7cd6e2e990dd75761ba79fff471680f2a41ae3324431e6c214f33c227b7d3eaece459cb9f10c6fba9a6080adf2448e30
+AUX prometheus-uwsgi_exporter.logrotated 123 BLAKE2B 29d0ba2bb1ae46aee8b6c635a8d22ef11738d6a83d2f99bea7105e984a9d6319a10f9e7ba2b34d44a3b15abda970525fbf70b218d5e01d3114032a6111fcf745 SHA512 4aaa140fb2827279717b21e17f09af1c2dbb26d03ab39b0921e61774a1bfc402629b8e3af210307fa8ed8e0147986280123e09b6d3533fb4284a9021190745de
+AUX prometheus-uwsgi_exporter.service 465 BLAKE2B babe8338d8b89e1e0d31bc35b08aa6714667daa051c4048d70ae467cf8c78184686f745e16ec4e04681cd86b2408a2c6171cb17e4a7cf95dc388a16e079da5e4 SHA512 603630107b9bb64065dd9c29416036e03a167dca33d50417c9ecd5542d15bfcbcdd7435a29a20a9764b2e7982e6e7d14c7f3438d116ef204e326f401073a5360
+DIST prometheus-uwsgi_exporter-0.7.0.tar.gz 3039893 BLAKE2B a6efdae7f9a19ad21a283b586b5667bd99456274ed419d1b64aaf4cdb4df1e1c4fb2a08edf6df2b15813d21311fe54c2f2394f0bf25ac11c49db8a924596da05 SHA512 380ef4515eaa81d4dee853682efa7a5e82af2ec00c096e7471028c9932d46e0a7406b75cb40f0f8efec15cd77b06c5477a07919d0b44720e3e194b5bb023b593
+EBUILD prometheus-uwsgi_exporter-0.7.0.ebuild 1312 BLAKE2B e8b1accdd2f511749db197fc58e14b845b2bd52dacef5e1ef1d617c57b80a8e360753a1e5304a746edc20714a6a94bb1c120f9a8a45a247ed1bd9d57663b4bd7 SHA512 f47253ced3a79ea39e754301407c8a086ae72dbf93d20fc36388f0c752eb25ee2297b68e74583c7eae25a6fa341f948e9aca8b7b3da04ddc063dbd8030356c9c
+MISC metadata.xml 333 BLAKE2B 95f858b4f8e6c056cdc531b5a8e5dcd4f1a3ef72937d8e9d25276fec38ac13d5da50c3a97c221735bb93cc1bc431e6408c5ef4a68a694a94f077270bb4acac62 SHA512 95be3084c4d196026c2447fbdba6c4c8ca982f04757e613a2b097c0481ca49b5eb0a10e0814fd7bbf1dbcc5862e5704a5ae6cc0b7192e0f4fe87e0ba9ea14e0d
diff --git a/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.confd b/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.confd
new file mode 100644
index 000000000000..6db54fb3cc0e
--- /dev/null
+++ b/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.confd
@@ -0,0 +1,16 @@
+# --web.listen-address=":9117"
+# Address on which to expose metrics and web interfaces.
+# --web.telemetry-path="/metrics"
+# Path under which to expose metrics.
+# --stats.uri="" URI for accessing uwsgi stats.
+# --stats.timeout=5s Timeout for trying to get stats from uwsgi.
+# --collect.cores Collect cores information per uwsgi worker.
+# --log.level="info" Only log messages with the given severity or above.
+# Valid levels: [debug, info, warn, error, fatal]
+# --log.format="logger:stderr"
+# Set the log target and format. Example:
+# "logger:syslog?appname=bob&local=7" or
+# "logger:stdout?json=true"
+# --version Show application version.
+
+#command_args="--web.listen-address=:9117 --stats.uri=http://localhost:1717"
diff --git a/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.initd b/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.initd
new file mode 100644
index 000000000000..b456a0b10505
--- /dev/null
+++ b/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 2016-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="uWSGI metrics exporter for prometheus.io"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-${RC_SVCNAME}}
+group=${group:-${RC_SVCNAME}}
+
+command="/usr/bin/uwsgi_exporter"
+command_args="${command_args:---web.listen-address=:9117 --stats.uri=http://localhost:1717}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+ --stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
+ --stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+
+depend() {
+ after net
+}
diff --git a/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.logrotated b/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.logrotated
new file mode 100644
index 000000000000..8703cb2be385
--- /dev/null
+++ b/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.logrotated
@@ -0,0 +1,7 @@
+/var/log/prometheus-uwsgi_exporter/prometheus-uwsgi_exporter.log {
+ missingok
+ size 5M
+ rotate 3
+ compress
+ copytruncate
+}
diff --git a/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.service b/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.service
new file mode 100644
index 000000000000..39824c7efe7e
--- /dev/null
+++ b/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=uWSGI metrics exporter for prometheus.io
+Documentation=https://github.com/timonwong/uwsgi_exporter/
+After=network-online.target
+
+[Service]
+User=prometheus-uwsgi_exporter
+Restart=on-failure
+Environment=UWSGI_EXPORTER_ARGS="--web.listen-address=:9117 --stats.uri=http://localhost:1717"
+ExecStart=/usr/bin/uwsgi_exporter $UWSGI_EXPORTER_ARGS
+ExecReload=/bin/kill -HUP $MAINPID
+TimeoutStopSec=20s
+SendSIGKILL=no
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-analyzer/prometheus-uwsgi_exporter/metadata.xml b/net-analyzer/prometheus-uwsgi_exporter/metadata.xml
new file mode 100644
index 000000000000..ba98a1a69cd7
--- /dev/null
+++ b/net-analyzer/prometheus-uwsgi_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>zmedico@gentoo.org</email>
+ <name>Zac Medico</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">timonwong/uwsgi_exporter</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/prometheus-uwsgi_exporter/prometheus-uwsgi_exporter-0.7.0.ebuild b/net-analyzer/prometheus-uwsgi_exporter/prometheus-uwsgi_exporter-0.7.0.ebuild
new file mode 100644
index 000000000000..26946cce453c
--- /dev/null
+++ b/net-analyzer/prometheus-uwsgi_exporter/prometheus-uwsgi_exporter-0.7.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot systemd
+
+EGO_PN="github.com/timonwong/uwsgi_exporter"
+EGIT_COMMIT="v${PV/_rc/-rc.}"
+UWSGI_EXPORTER_COMMIT="20e35a9"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="uWSGI metrics exporter for prometheus.io"
+HOMEPAGE="https://github.com/timonwong/uwsgi_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}}/${UWSGI_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 uwsgi_exporter || die
+ popd || die
+}
+
+src_install() {
+ pushd src/${EGO_PN} || die
+ dobin uwsgi_exporter/uwsgi_exporter
+ dodoc README.md
+ popd || die
+ local dir
+ for dir in /var/{lib,log}/${PN}; do
+ keepdir "${dir}"
+ fowners ${PN}:${PN} "${dir}"
+ done
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/${PN}.service"
+}
diff --git a/net-analyzer/prometheus/Manifest b/net-analyzer/prometheus/Manifest
index c94109ec819a..139c448ae498 100644
--- a/net-analyzer/prometheus/Manifest
+++ b/net-analyzer/prometheus/Manifest
@@ -1,7 +1,7 @@
AUX prometheus-3.initd 851 BLAKE2B 600d9e541206f99c0ddddc0f5a1d37d9bea69d8f45ce6562a2d3c040a75c3665d9862829fc44134db2fbbbbf1d38b7dc4010c9c284f5af38f0dd2cf4be1f9d11 SHA512 7d3650ef5b632507ade4cfb00a167ec7c2d3d8e91551ef8f4550f9947038df0b22a3dd0a33e093296eeb0ca88f1d12ae40e73c7fec4df03e5dcc7630893ded59
AUX prometheus.confd 43 BLAKE2B c83afa8ad1133c9e93abd40c862ff5b3ac9a3b3c4447b915ae1482d92096dec9f200d089de2458a6cdb0e72d2bf0652d56e3afd6d5a3cd8a3ed7a6c9a0e3e42c SHA512 37468e897cd34b50b0edc65ada3f0c2e05459c3d96bb7f82d58b6de5bf10a127f1bf7912af93d83d94e3ea7287cfeb2311e36535f291d01a11d152a0b438591c
DIST prometheus-2.1.0.tar.gz 5669858 BLAKE2B 96b9d7b1eb13017806cb2745cb874468a419550c7372aa8abada9d1a4e7fe386785f05abe8fd5681745db4a0c17260d5fde704a3b3ac5807107da0a935177264 SHA512 8adbbfcf6cf5b0bdd4a96f51f6c179c828d75a231b35f9ef40db6c07bcb8ffa6a3eb969b55a52ac70528ad5c8fe486be866db6ae174006220e0cfaa1da624346
-DIST prometheus-2.2.0.tar.gz 5629498 BLAKE2B 6d48a58258e47fe35201581fa11070b1951b633768895ce810448d13d8184072b85160510d355b06a2d09bf0c9a5785c29f0ac062fe0472b29a4c94b74ccd7cc SHA512 680ae3cb653452f1506bc62cf909994bd142ee53c9f6520391786967cfd09bd96c774fbacc09e1c9c06ebf759899a45fd0040fe7eef53c1256df390a41dcc8bf
+DIST prometheus-2.2.1.tar.gz 5629500 BLAKE2B 7645267a2c5ed1c4138a5dd3929a48cb9dfa27789db38e98addbb06c37c6b482abfcf296ef1a5836bebd971d8224136c24a4ccd3093175882bb0beda1673deff SHA512 a94cf867de2b3be65b0a07307f89ebfa9c0a319820a72b3b6691edcd2e2b56b5268d27fb52bdaefea0e7084906d69b818e5292a39ccd5991e04e56d594f56ea7
EBUILD prometheus-2.1.0.ebuild 2000 BLAKE2B 2cfc7d475c7d51dde9b0dfd914bd4a835d463c7228859a888a3dcf73f21bfcbeff721d35837cb2b73b019c22e2d887191f0d3cbb80583b8db65d10775e96c860 SHA512 68e73fa3684510f0da380a211db0bc09e396795ee4424217afc3179a1c57531e21873ac82109bba916ca8bdf1f3f0f16d030dc15c7f462d96b943f383ac9a5e8
-EBUILD prometheus-2.2.0.ebuild 2022 BLAKE2B 67fdb06755be1aea0e9743cf096b3cc14e6fdc3ebe48714fa6f4777a6c835b6c5f41b490311dfadc7e8211485c1072691e23f19fee44577ddb7d68c28ac5e1ea SHA512 72715c59d003451975c43a99c4c540be556a82dfbefa86ab33996aa4231f0d0aec014fd332562018330fb16dd9258cb2351b180f3cd75ad63f3e55f4690ab418
+EBUILD prometheus-2.2.1.ebuild 2022 BLAKE2B 35b2eb824625cac8505bcc933130dd2810fd19855f73d975ef1e665baf98a60b95d4f3afcac1edc4b9cb2d6a030e7aeecff9926a460fddd9ea4ad8fa9f34cd6b SHA512 e378cbd27a7e2d033bf2ab6203955207d27f879f8c040cc54e873db8e64b225bf7aa6e977238d0203e00fe688c6328fef611516aea6d8e4afc4a5ea4649df127
MISC metadata.xml 331 BLAKE2B 80bf59233349fc1fdc6c102fb65ba146bcde2c5c2a6039ec9b9f50f21a36fb1e8c864cba422e721d01216c792ffcf0429a3a840540305442b5e516ac09c03850 SHA512 06fd0da413c0280a902bbdf50e1e0557375d2208021fda3c3081d8a25a4b17ad1ca647d994dd97ba2d838ea5c87148d3ffd13a8a54cb8dc007b45927df8de47a
diff --git a/net-analyzer/prometheus/prometheus-2.2.0.ebuild b/net-analyzer/prometheus/prometheus-2.2.1.ebuild
index 7c4a1eb8c4e1..a9b8e6255937 100644
--- a/net-analyzer/prometheus/prometheus-2.2.0.ebuild
+++ b/net-analyzer/prometheus/prometheus-2.2.1.ebuild
@@ -7,7 +7,7 @@ inherit user golang-build golang-vcs-snapshot
EGO_PN="github.com/prometheus/prometheus"
MY_PV=${PV/_rc/-rc.}
EGIT_COMMIT="v${MY_PV}"
-PROMETHEUS_COMMIT="f63e7db"
+PROMETHEUS_COMMIT="bc6058c"
ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index f4482c2a68fb..e92621b26887 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -8,10 +8,12 @@ DIST wireshark-2.4.3.tar.xz 28807920 BLAKE2B 831691d084fc9ed6198b23c0347efa48739
DIST wireshark-2.4.4.tar.xz 28818372 BLAKE2B 1a28cabdc8dfbed16244c6906ef360c2d3edee3cd75a5134ea7b21b138c3be08de9327a1415cb308f7a01c382e0aa5cf14e4466b4c3762c29a7f7cbc4683890e SHA512 b6625f860a10e10babd686820680a5e169594f171e7e176fc96325255ec096481da2e8a0fdff10b42cead82011740714a4331003dda0d48bf3b419da37834bdc
DIST wireshark-2.4.5.tar.xz 28836740 BLAKE2B 797540daca259a2d5d7dc6e637f2b504b6d14191af4040e6b344c95db6c776b7de80c25c59c98ab84d0337cc96c7313b42c13103a3c3944768a793130deae258 SHA512 2f2c201d6b8a37dcbe03bc9affbf97d632d8e40e4fe5b3a3e79cbd5cfbeb5b9111919850546ccae355fcb042def3456438eb1c4d73f7d56d373e7898311b42f3
DIST wireshark-2.5.0.tar.xz 28197388 BLAKE2B 5d50d3752078a71d1d83f48a85ee564d14950efab39d5679430a61a266f9b93749278cd19d155036326753fbab86f83c5edb764adec5d68325730dbba19a920f SHA512 963c03dd363850cd0ad8a32a3e8c85410f2b23fadc081f00e4e3a2ad3a324a5f35626fbb7e490ec01c61260500363fef93c52bf7796b917e9490fff4044ee67f
+DIST wireshark-2.5.1.tar.xz 28229472 BLAKE2B ac832e3d8727a20754153949d7dfba9cfbc359955e55c06a9181ecbd3c9d9ddac269a745a430c47907b3e205d1b593241e0908b5b6c232613cbd4d23c96c4f61 SHA512 c3e1abb1c8b6a035640d655c59bfb8a9a846c88f49035b8086ae81a6e74cb296419f15bc4969489208fdce6578d279663c6fbc8d6eebff1b6097d1dbd0e71b75
EBUILD wireshark-2.2.7-r1.ebuild 6481 BLAKE2B 36529064a3216f6c9ae71ae23ec31049c6a0d7862be41c333f369bfdd0cb62ac5315883c465d2be517e2a4ddd780d110e59c413725f791f0cf9ac0380dbe36ce SHA512 cd90dd82e3418c000ff142a207a4f05db6bfdb5f8087b4c7b1f595bede0847277fba43a615972c2222e4261c647849ff3165fba64d67dcd55e4441b76324e3d0
EBUILD wireshark-2.4.3-r1.ebuild 7378 BLAKE2B 1b79f8342f72b96831dc875072c90f53d903e6e750e0fadd0f39aa1787bce4ebbbc8073e47f9945b32e437a5dc1e2e04e98d3e6c5e4cadea10bdbe34fc497e52 SHA512 88aa8d2e67db9a8d309d412a890ff52c91ea296cf1592fe7445ebb9c8707cadbad44d66ccb3c9ea71ceb2cc23dd958028e51db88a3f65b3446c50f3c13c9ad0d
EBUILD wireshark-2.4.4.ebuild 7383 BLAKE2B b3c2fb215055d0ba48c4edd8a2a846f77187ddb1add61477e03d20a817f0bcf5054876eea2180268afeab0e636325d3afc7de553da6a66fe4fbef98fbde94aaa SHA512 79432eeaa844a0984b35087019dd26c99f4f6b0b4195d3f6cb440a4d13017b42d894718d5d90a0c866502a8aef1a0e92684cca61909c13ae9d32f9809fb3b356
-EBUILD wireshark-2.4.5.ebuild 7384 BLAKE2B b721d072b55aa02654819c782bb0612bbbad0e96a08e76ed7aecb7dd305c2e107ff8b14ec197610254957f7d1facf77ae9458e5ed9e328754b9e4936f9ecb7ab SHA512 f04d308bfe6e84274b72f2718082e155030b7ebc3be6f5618b3a0c38129acf7c4092bd366c0a9e543e26e6c8a84825c1558a285997bd8b23228c8b5dfc531f1e
-EBUILD wireshark-2.5.0.ebuild 7109 BLAKE2B b382d712d053dc7003aab929c53724ad86bb6c71811b77e94c246af5b28bca60eb22d58d09d34075c0b0eb572134c03f19593eaf7caec25ffebfdf7607b495f8 SHA512 d36bad8ff3372c18af5be721a7469a66e93e317ba12efe902ddecd033092b233ed4c00c113222ac341579211bbf147b01914b2895bb4ee8fb854cd0d9ec3a428
+EBUILD wireshark-2.4.5.ebuild 7381 BLAKE2B 910684b7eca92816c5414e752dd09ce20ee3308ce46bb6c8fbf17f877be650ee69eb4fe78f114d45bfcb100acc7ec16abf06cd73c77b8870b65b9d6f32a8c1bb SHA512 4ec91ba8bc3cd5d6d630b1968a28fe130e007905238bd058a7e34d7b7462dfdbd4fbaef4ce09a8210c5ca3196bea4b12f48c60d740172fe66b12e1305985f100
+EBUILD wireshark-2.5.0.ebuild 7114 BLAKE2B d252f4e884aec64a208b65153ba6464401e90514fd3f22db01fcad74e72fefc2fc924b5b250017fd33694a14906015ef895509913b6bf2aa20bb017ef7cd657c SHA512 bdab94fcd73685fa84892cc4c9e784a024a3ee462d040aa30b4ccc4bf67f3c9a577c9ea2a5b3bb031ea2aa0f1b893f8ea23d49e2762dad1e391680d2de7babc7
+EBUILD wireshark-2.5.1.ebuild 6630 BLAKE2B 200d42a90d72ffde32c1619dff27bd08c6dca406019f725d811ff80811e2f4643836a6da4ce042e27c69a48590d3c44b50b94769a675aa0a125402582665e030 SHA512 7e00d6f7bcdce34a4443f6198dd020e74de2ba4c66ada506adb9ee4ac5f103ab81249572966749317d060859f146a1362ed869818bcd7b0d84098d4b2401ac7e
EBUILD wireshark-99999999.ebuild 7128 BLAKE2B 9e7037c3cb3635e0c2e39635f98061bc188dc575053bf54824c9fdfaa8b335b4e7c28dbdc1d11e7aebaac989902c675d8958db0b20829ea0e5bef6fdb6791296 SHA512 692cb84ef62ac6dacc77b7002abe5f15000507d16027fa4dd95146a633ac2ab143847ed97f882bc0bf68e6a67e8fc8f02e7ac336b85148df0764c011c85bde1c
-MISC metadata.xml 4772 BLAKE2B 30bdf52594176cdd8314d5292ed55500f26841c71900acd0d0772e1555f51e9979cce7ff3b301beee21dab10565ccc259596cc78bab455fe8cf42cda40314d86 SHA512 1694eb364cf39049d899d056d209c6fd51cd72b6477132312587de7af4f49bc026d5873e97c3c80e3b99228b3f57da99a00f0a10a6596e4659d2a89d1fd6965b
+MISC metadata.xml 4866 BLAKE2B 924525b4564d387c926456f555360a61c531d6e235fd975aeb3bf947355423de87f00a5f3735db99fa89abd106d0929698fb7998660b8da5f9bfc3933e6925da SHA512 4a978831ac7845604c1cd680140cde27e1f202be9743e5559910fa97eb5b71f3c49199d6512a11599b4c1a9aa87fa5d4bb7cf69d88c50fdd8817f38f2e9d7223
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index 9801f150cc4c..1b60471afb82 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -41,6 +41,7 @@ be exported to XML, PostScript®, CSV, or plain text.
<flag name="libssh">Use <pkg>net-libs/libssh</pkg> (for sshdump)</flag>
<flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for handling XML configuration in dissectors</flag>
<flag name="lz4">Use <pkg>app-arch/lz4</pkg> for compression/decompression</flag>
+<flag name="maxminddb">Use <pkg>dev-libs/libmaxminddb</pkg> for IP address geolocation</flag>
<flag name="mergecap">Install mergecap, to merge two or more capture files into one</flag>
<flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag>
<flag name="nghttp2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</flag>
diff --git a/net-analyzer/wireshark/wireshark-2.4.5.ebuild b/net-analyzer/wireshark/wireshark-2.4.5.ebuild
index b56e421d4d18..f91e77ad25ff 100644
--- a/net-analyzer/wireshark/wireshark-2.4.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.5.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 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ~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
diff --git a/net-analyzer/wireshark/wireshark-2.5.0.ebuild b/net-analyzer/wireshark/wireshark-2.5.0.ebuild
index bcdf2d88a691..0a7fd52a45da 100644
--- a/net-analyzer/wireshark/wireshark-2.5.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.5.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
LICENSE="GPL-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~hppa ~ia64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86"
IUSE="
adns androiddump bcg729 +capinfos +caps +captype ciscodump
cpu_flags_x86_sse4_2 +dftest doc doc-pdf +dumpcap +editcap geoip gtk
diff --git a/net-analyzer/wireshark/wireshark-2.5.1.ebuild b/net-analyzer/wireshark/wireshark-2.5.1.ebuild
new file mode 100644
index 000000000000..e8b30ed44ce1
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.5.1.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic gnome2-utils multilib qmake-utils user xdg-utils
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="
+ adns androiddump bcg729 +capinfos +caps +captype ciscodump
+ cpu_flags_x86_sse4_2 +dftest doc +dumpcap +editcap gtk kerberos libssh
+ libxml2 lua lz4 maxminddb +mergecap +netlink nghttp2 +pcap portaudio +qt5
+ +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp
+ sshdump ssl +text2pcap tfshark +tshark +udpdump zlib
+"
+REQUIRED_USE="
+ ciscodump? ( libssh )
+ sshdump? ( libssh )
+"
+
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+ >=dev-libs/glib-2.14:2
+ dev-libs/libgcrypt:0
+ netlink? ( dev-libs/libnl:3 )
+ adns? ( >=net-dns/c-ares-1.5 )
+ bcg729? ( media-libs/bcg729 )
+ caps? ( sys-libs/libcap )
+ gtk? (
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:3
+ x11-libs/pango
+ x11-misc/xdg-utils
+ )
+ kerberos? ( virtual/krb5 )
+ libssh? ( >=net-libs/libssh-0.6 )
+ libxml2? ( dev-libs/libxml2 )
+ lua? ( >=dev-lang/lua-5.1:* )
+ lz4? ( app-arch/lz4 )
+ maxminddb? ( dev-libs/libmaxminddb )
+ nghttp2? ( net-libs/nghttp2 )
+ pcap? ( net-libs/libpcap )
+ portaudio? ( media-libs/portaudio )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ || (
+ media-libs/speexdsp
+ <media-libs/speex-1.2.0
+ )
+ x11-misc/xdg-utils
+ )
+ sbc? ( media-libs/sbc )
+ smi? ( net-libs/libsmi )
+ snappy? ( app-arch/snappy )
+ spandsp? ( media-libs/spandsp )
+ ssl? ( net-libs/gnutls:= )
+ zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+ ${CDEPEND}
+ dev-lang/perl
+ !<virtual/perl-Pod-Simple-3.170
+ !<perl-core/Pod-Simple-3.170
+ doc? (
+ app-doc/doxygen
+ dev-ruby/asciidoctor
+ )
+ qt5? (
+ dev-qt/linguist-tools:5
+ )
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+"
+RDEPEND="
+ ${CDEPEND}
+ gtk? ( virtual/freedesktop-icon-theme )
+ qt5? ( virtual/freedesktop-icon-theme )
+ selinux? ( sec-policy/selinux-wireshark )
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
+ "${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch
+ "${FILESDIR}"/${PN}-2.4-androiddump.patch
+ "${FILESDIR}"/${PN}-99999999-androiddump.patch
+)
+
+pkg_setup() {
+ enewgroup wireshark
+}
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+
+ # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+ # --with-ssl to ./configure. (Mimics code from acinclude.m4).
+ if use kerberos; then
+ case $(krb5-config --libs) in
+ *-lcrypto*)
+ ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+ ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+ ewarn "license and the GPL, so do your check before distributing such package."
+ myconf+=( "--with-ssl" )
+ ;;
+ esac
+ fi
+
+ # Enable wireshark binary with any supported GUI toolkit (bug #473188)
+ if use gtk || use qt5; then
+ myconf+=( "--enable-wireshark" )
+ else
+ myconf+=( "--disable-wireshark" )
+ fi
+
+ if ! use qt5; then
+ myconf+=( "--with-qt=no" )
+ fi
+
+ if use qt5; then
+ export QT_MIN_VERSION=5.3.0
+ append-cxxflags -fPIC -DPIC
+ fi
+
+ econf \
+ $(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+ $(use dumpcap && use_with pcap dumpcap-group wireshark) \
+ $(use_enable androiddump) \
+ $(use_enable capinfos) \
+ $(use_enable captype) \
+ $(use_enable ciscodump) \
+ $(use_enable dftest) \
+ $(use_enable doc guides) \
+ $(use_enable dumpcap) \
+ $(use_enable editcap) \
+ $(use_enable mergecap) \
+ $(use_enable randpkt) \
+ $(use_enable randpktdump) \
+ $(use_enable reordercap) \
+ $(use_enable sharkd) \
+ $(use_enable sshdump) \
+ $(use_enable text2pcap) \
+ $(use_enable tfshark) \
+ $(use_enable tshark) \
+ $(use_enable udpdump) \
+ $(use_with adns c-ares) \
+ $(use_with bcg729) \
+ $(use_with caps libcap) \
+ $(use_with gtk gtk 3) \
+ $(use_with kerberos krb5) \
+ $(use_with libssh) \
+ $(use_with libxml2) \
+ $(use_with lua) \
+ $(use_with lz4) \
+ $(use_with maxminddb) \
+ $(use_with nghttp2) \
+ $(use_with pcap) \
+ $(use_with portaudio) \
+ $(use_with sbc) \
+ $(use_with smi libsmi) \
+ $(use_with snappy) \
+ $(use_with spandsp) \
+ $(use_with ssl gnutls) \
+ $(use_with zlib) \
+ $(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+ $(usex netlink --with-libnl=3 --without-libnl) \
+ $(usex qt5 --with-qt=5 '') \
+ $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') \
+ $(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
+ $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
+ $(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
+ --disable-warnings-as-errors \
+ --sysconfdir="${EPREFIX}"/etc/wireshark \
+ ${myconf[@]}
+}
+
+src_install() {
+ default
+
+ # FAQ is not required as is installed from help/faq.txt
+ dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+
+ # install headers
+ local wsheader
+ for wsheader in \
+ config.h \
+ epan/*.h \
+ epan/crypt/*.h \
+ epan/dfilter/*.h \
+ epan/dissectors/*.h \
+ epan/ftypes/*.h \
+ epan/wmem/*.h \
+ wiretap/*.h \
+ ws_diag_control.h \
+ ws_symbol_export.h \
+ wsutil/*.h
+ do
+ insinto /usr/include/wireshark/$( dirname ${wsheader} )
+ doins ${wsheader}
+ done
+
+ #with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
+ insinto /usr/include/wiretap
+ doins wiretap/wtap.h
+
+ if use gtk || use qt5; then
+ local s
+ for s in 16 32 48 64 128 256 512 1024; do
+ insinto /usr/share/icons/hicolor/${s}x${s}/apps
+ newins image/wsicon${s}.png wireshark.png
+ done
+ for s in 16 24 32 48 64 128 256 ; do
+ insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+ newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
+ done
+ fi
+
+ prune_libtool_files
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+
+ # Add group for users allowed to sniff.
+ enewgroup wireshark
+
+ if use pcap; then
+ fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+ cap_dac_read_search,cap_net_raw,cap_net_admin \
+ "${EROOT}"/usr/bin/dumpcap
+ fi
+
+ ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+ ewarn "add yourself to the wireshark group. This security measure ensures"
+ ewarn "that only trusted users are allowed to sniff your traffic."
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}