summaryrefslogtreecommitdiff
path: root/net-analyzer
diff options
context:
space:
mode:
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/arpwatch/Manifest3
-rw-r--r--net-analyzer/arpwatch/arpwatch-2.1.15-r10.ebuild69
-rw-r--r--net-analyzer/arpwatch/files/arpwatch.confd-r117
-rw-r--r--net-analyzer/arpwatch/files/arpwatch.initd-r127
-rw-r--r--net-analyzer/cacti-spine/Manifest2
-rw-r--r--net-analyzer/cacti-spine/cacti-spine-1.1.20.ebuild2
-rw-r--r--net-analyzer/cacti/Manifest2
-rw-r--r--net-analyzer/cacti/cacti-1.1.20.ebuild2
-rw-r--r--net-analyzer/hexinject/Manifest4
-rw-r--r--net-analyzer/hexinject/files/hexinject-1.6-fix-build-system.patch18
-rw-r--r--net-analyzer/hexinject/hexinject-1.6-r1.ebuild36
-rw-r--r--net-analyzer/hexinject/hexinject-1.6.ebuild34
-rw-r--r--net-analyzer/ifstatus/Manifest2
-rw-r--r--net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild2
-rw-r--r--net-analyzer/monitoring-plugins/Manifest2
-rw-r--r--net-analyzer/monitoring-plugins/files/define-own-mysql-port-constant.patch102
-rw-r--r--net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild104
-rw-r--r--net-analyzer/munin/Manifest3
-rw-r--r--net-analyzer/munin/munin-2.0.34.ebuild413
-rw-r--r--net-analyzer/nagios-plugins/Manifest2
-rw-r--r--net-analyzer/nagios-plugins/files/define-own-mysql-port-constant.patch100
-rw-r--r--net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r2.ebuild118
-rw-r--r--net-analyzer/pmacct/Manifest16
-rw-r--r--net-analyzer/pmacct/metadata.xml14
-rw-r--r--net-analyzer/pmacct/pmacct-1.5.2.ebuild71
-rw-r--r--net-analyzer/pmacct/pmacct-1.5.3_pre20150925-r1.ebuild76
-rw-r--r--net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild71
-rw-r--r--net-analyzer/pmacct/pmacct-1.6.0.ebuild73
-rw-r--r--net-analyzer/pmacct/pmacct-1.6.1.ebuild73
-rw-r--r--net-analyzer/pmacct/pmacct-1.6.2.ebuild2
-rw-r--r--net-analyzer/pmacct/pmacct-1.7.0.ebuild (renamed from net-analyzer/pmacct/pmacct-1.6.1-r1.ebuild)11
-rw-r--r--net-analyzer/prometheus-node_exporter/Manifest3
-rw-r--r--net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.initd19
-rw-r--r--net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.14.0-r1.ebuild48
-rw-r--r--net-analyzer/prometheus/Manifest8
-rw-r--r--net-analyzer/prometheus/prometheus-1.8.1.ebuild (renamed from net-analyzer/prometheus/prometheus-1.8.0.ebuild)2
-rw-r--r--net-analyzer/prometheus/prometheus-2.0.0_rc2.ebuild (renamed from net-analyzer/prometheus/prometheus-2.0.0_rc1.ebuild)2
-rw-r--r--net-analyzer/wireshark/Manifest4
-rw-r--r--net-analyzer/wireshark/metadata.xml2
-rw-r--r--net-analyzer/wireshark/wireshark-2.4.2.ebuild2
40 files changed, 1089 insertions, 472 deletions
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index c96cd30927b4..a1b5804104fd 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -1,8 +1,11 @@
AUX arpwatch.confd 270 SHA256 bf36f7b717291733787bd00ac22d49dafc251cd50fcc27266d56d51364fd62fa SHA512 901375c1031c776f159cc526662e727be41dd9630037a492b718c9cc48d2fb580b22bcdf90a84a02049924e67fb84a2668e3519a7ab24e6c8ad07d20cc5adf41 WHIRLPOOL d6f691d769f2320870061667b241e8504207e1e326ab9c6cdede575f2e34696fc3f722a8038044c500855ff361c7f64aa3a64e3086b2c03665d41cabc1c32c35
+AUX arpwatch.confd-r1 559 SHA256 b52aab07e97c0a8771d9a44ee0e88b3c675f9041f5afd0d09fcdec8f1220dc3b SHA512 d1fc4993db4b9a1e11fee0629b92b6372266085551e6e89f5f33a9dd092ee70087f2766c46cb983040917c47e478c0c8206efd1b9fde8d030a3e249c28970c9c WHIRLPOOL dd3ca9304c724622ecb4216f7e024f07cffd16528e06c3ed4ed320d9cd044a0919b851c045e69c240737a20af4fa37084f58a8f9993812d9e70a151f71fdf973
AUX arpwatch.initd 991 SHA256 d1b6667f2abf5910b6b1d845049b6504faa3346cc8cc4744a8314e4fad0d3672 SHA512 de62ab2026bb04f557731b741023b6fc2333656f4709226459e8bb17fee2959ad9e24077eae730443efa3736b6f0268c474ca65905c371d228c2f2869ec4986e WHIRLPOOL 36c4a091b888f69ca3a17b2a9e494c2162ea7a01bd7cd521b645009028855ec621936a867a9fb4b362b59cfde1e82414a2a6e1eb5ed44295fe0fa87b13376315
+AUX arpwatch.initd-r1 752 SHA256 99590d709dce12503388432406dcf908c3c689ecb7952e2afe9084ac65686a0d SHA512 735e284132aaa2125d7b248c81a27be2208963d84b7b434f251ee3f7a350e81c9e3cff58bc812bebd26450b711322c188876e96d6638a4ba3dbde4e8fc040c04 WHIRLPOOL 5f0fd3739a82bf01fa0803a948ac3df7658bd3c00722a1e63bc08087eb9418b3e9bdc7c6c6c7abda2e6e899d66890e25e1f61fefc063be2e7a24c2a6ef12e2ba
DIST arpwatch-2.1a15.tar.gz 202729 SHA256 c1df9737e208a96a61fa92ddad83f4b4d9be66f8992f3c917e9edf4b05ff5898 SHA512 f770b5b7954afe910dafb016e6e886a4e785564bcdc0ea0de9d7b1ca6a9a0b219a9d1b50b6f42a67afc2f836e782e8ff85ba5780583015d62c9694ac53f0bf90 WHIRLPOOL e653eb83d8dbc8777c3aaa5920bc1e5b46c64aa740c64a79b24a42abdee4625baa72a51f9f0441549b7325fcb07b94f1964887df1b6d707eddde162e1073691f
DIST arpwatch-patchset-0.7.tar.xz 132868 SHA256 ccc3f84f452306b153175bbdec33f9913848ac57866a4ee52b974d7087b7fe48 SHA512 2cbfa37acd29c30232da9ad0a742ddc9cd35c228fb786c6798555962841006ba0f47e31097722a3303e25f2e7c665b6e93707e49c02a8a9171b484b56a133e00 WHIRLPOOL f6624f459f2172b10beb6eaa15e0e5111566cd360195e4ca08ec4e5962bb1156aaf133701730e8146cb049a9759f7063bbc225d99f824827bb8bb72d3e0cebb3
DIST arpwatch-patchset-0.8.tar.xz 131692 SHA256 de504e93277696b35c2e184a3ff6cf28f4ff559a549873af3cb4aa8b0965e00f SHA512 3e8f1c043f09fbeacadb40c1db47fb907314ed18bb3fb506c6c510977fd0e6dd9950becc830cf7c10911a7eec97e56e0af8c8c3d7df811e8ab820290973ea0b0 WHIRLPOOL 9b8efd22dc3f5500868c092bc4c3a022094b2e134b9098dcb2596aca8ba411592ecfb1f54d7f01fcf117d3109ed4c2c3db21225970bc15a8c437da93a9181dcb
+EBUILD arpwatch-2.1.15-r10.ebuild 1608 SHA256 9ad4248e0f1523feafbaa3cbcbb017ec5c69d7cdcf3aff11de27290e9975a9de SHA512 1c7bebf0f62c0b421b87dc18f5b509495b30a75b997c748b00420333bc3815b6236a64fc3be60173fa353b813c1de0b33207173dea3c2750314bb0439e38a271 WHIRLPOOL bdb53beac6b9f835c64382e2801e91e2e669b4b84a243eb794b21dc4733b8e7f4ca63bbc9f9f868e3ac94a9479ecd68f471e31ec1a927b08dc8f99bbc2619ec2
EBUILD arpwatch-2.1.15-r8.ebuild 1388 SHA256 25b638af397f39831891ead4ad2d001a460e64d41d753f2d936ae6a05b1c0f7c SHA512 73e3289f751cce19f522353c68b65d7222561adc70e79f58b848344487258c744541b03179bf712a38ed81f3565bb41c1262aa78eaa2ede1314a9751353fb0fe WHIRLPOOL a9301dd755f82d55e8bc3eee5879f2c5b19b8162c4b299c3e7d4a8936d410b17d67131d84e99aa71ea7f32ba58ddde36bee8a304ead31598881a3f8167e69856
EBUILD arpwatch-2.1.15-r9.ebuild 1370 SHA256 5835ab298ceb0f6b74b4d134b9755d1a3aaf0105a7c8568a9ba077b3c0555673 SHA512 dbd27d01b2be37e056bad0d23544c43f75ddf6f0f4fba8e9a2a21d5d10c5ceccde02a0882548c8350b9510d90ebce87e60485dad1521363e882deec3396741bb WHIRLPOOL d5c06bb39913cff9124b6d90ec499d0e38634eedada5252206bf3eff54409a3428e26151d1c988a387a00cc808031c9b64d718bfd02048df7e1be69907ad9260
MISC ChangeLog 4319 SHA256 6e635c33144ae5f6e740999ffa3fdc17db6c040bf2a6c8d2a7da89153b7e3e6f SHA512 29e6a5722940d97daccf157d21ed8d4fb710b8f2bc830dd94f087db73969ffd5a3fdf5645782370c80f1297c7538830c05303aa9824a11eb1a6466b502232afb WHIRLPOOL f61b3a72ed41351d56ce1e6e86374a70e0a20fe855af726396c1d1dde76767eeefbbb5507233347c08eb5c26a3665cba537693766b540009e5d0b91d9c169c3e
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r10.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r10.ebuild
new file mode 100644
index 000000000000..986da0386f7d
--- /dev/null
+++ b/net-analyzer/arpwatch/arpwatch-2.1.15-r10.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user versionator
+
+PATCH_VER="0.8"
+MY_P="${PN}-$(replace_version_separator 2 'a')"
+
+DESCRIPTION="An ethernet monitor program that keeps track of ethernet/IP address pairings"
+HOMEPAGE="http://ee.lbl.gov/"
+SRC_URI="
+ ftp://ftp.ee.lbl.gov/${MY_P}.tar.gz
+ https://dev.gentoo.org/~jer/arpwatch-patchset-${PATCH_VER}.tar.xz
+"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="selinux"
+
+DEPEND="
+ net-libs/libpcap
+ sys-libs/ncurses:*
+"
+RDEPEND="
+ ${DEPEND}
+ selinux? ( sec-policy/selinux-arpwatch )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ # We need to create /var/lib/arpwatch with this group, so it must
+ # exist during src_install.
+ enewgroup arpwatch
+}
+
+pkg_postinst() {
+ # The user, however, is not needed until runtime.
+ enewuser arpwatch -1 -1 -1 arpwatch
+}
+
+src_prepare() {
+ local patchdir="${WORKDIR}/arpwatch-patchset"
+
+ eapply "${patchdir}"/*.patch
+ eapply_user
+
+ cp "${patchdir}"/*.8 ./ || die "failed to copy man pages from ${patchdir}"
+}
+
+src_install () {
+ dosbin arpwatch arpsnmp arp2ethers massagevendor arpfetch bihourly.sh
+ doman arpwatch.8 arpsnmp.8 arp2ethers.8 massagevendor.8 arpfetch.8 bihourly.8
+
+ insinto /usr/share/arpwatch
+ doins ethercodes.dat
+
+ insinto /usr/share/arpwatch/awk
+ doins duplicates.awk euppertolower.awk p.awk e.awk d.awk
+
+ diropts --group=arpwatch --mode=770
+ dodir /var/lib/arpwatch
+ dodoc README CHANGES
+
+ newinitd "${FILESDIR}"/arpwatch.initd-r1 arpwatch
+ newconfd "${FILESDIR}"/arpwatch.confd-r1 arpwatch
+}
diff --git a/net-analyzer/arpwatch/files/arpwatch.confd-r1 b/net-analyzer/arpwatch/files/arpwatch.confd-r1
new file mode 100644
index 000000000000..a4da503406a2
--- /dev/null
+++ b/net-analyzer/arpwatch/files/arpwatch.confd-r1
@@ -0,0 +1,17 @@
+# See arpwatch.8 for more information
+
+# Specify the interface for arpwatch to listen on here (default: lo).
+# If you need to listen on more than one interface, you should
+# run multiple arpwatch services; for example "arpwatch" and
+# "arpwatch.eth1". These additional services can be configured by
+# symlinking to the "arpwatch" service script, and by creating a new
+# conf.d file whose name matches the new service (symlink) name.
+#
+# Example:
+#
+# ARPWATCH_IFACE="eth0"
+#
+ARPWATCH_IFACE="lo"
+
+# Additional options to pass to arpwatch.
+ARPWATCH_OPTS="-N -p"
diff --git a/net-analyzer/arpwatch/files/arpwatch.initd-r1 b/net-analyzer/arpwatch/files/arpwatch.initd-r1
new file mode 100644
index 000000000000..ffe165205c6a
--- /dev/null
+++ b/net-analyzer/arpwatch/files/arpwatch.initd-r1
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Default to "lo" for the interface, so that the init script will work
+# out-of-the-box.
+: ${ARPWATCH_IFACE:=lo}
+
+ARPWATCH_DATAFILE="/var/lib/arpwatch/${RC_SVCNAME}.dat"
+
+command="/usr/sbin/arpwatch"
+pidfile="/run/${RC_SVCNAME}.pid"
+command_args="-i ${ARPWATCH_IFACE}
+ -u arpwatch
+ -f ${ARPWATCH_DATAFILE}
+ -P ${pidfile}
+ ${ARPWATCH_OPTS}"
+
+depend() {
+ need "net.${ARPWATCH_IFACE}"
+}
+
+start_pre() {
+ # The "arpwatch" user must be a member of the "arpwatch" group for
+ # this to work.
+ checkpath --file --owner root:arpwatch --mode 0660 "${ARPWATCH_DATAFILE}"
+}
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index c4534e0b84d1..b225c55fc3ca 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -7,7 +7,7 @@ DIST cacti-spine-1.1.20.tar.gz 801877 SHA256 a8ccb24980099fbb6ee0a16f397f10fb9b3
DIST cacti-spine-1.1.21.tar.gz 801907 SHA256 031c7eeea7e64b20754cccfcc65851443847a31765893ddcc528da4e384ca4bf SHA512 0dfdd3444639a471bc5c0d35ea3898532f2ebf16679677fee8ad291221ed607b54acc7fbf25e78da7c5597eeaed6b870ad7af66a95e20f95afce3270c8da5dd0 WHIRLPOOL 6521e622329c1a6e6ca5b8c97717380a4bc2fadde37af42fa6c1fd83f82a35ebc5cefce9788a360ff46abc62a9918e327404188f6c9b611b0064e1a86b41cab0
DIST cacti-spine-1.1.25.tar.gz 802127 SHA256 d5452d320781107a2cbc289247ecf8c0b29f55379a0c008b020843508c7e435d SHA512 d9c4a924ce08d363a1ce7327172b6c83d606ccfb2b623b3b5a0f6df534a031caedbe55314cd415a58484c89df49d5e682853e5001849bd8e9767190fdc367809 WHIRLPOOL 0c2d5ec02c110b5ef5545ca1be769a2632c2bedd9c7627ef7f9a53995a956151627a10293fcfb19f34e223cb8c6cde914a2b399f14c2426a57bbdfe5f2046617
EBUILD cacti-spine-0.8.8h.ebuild 999 SHA256 9dfc1173686e7bb7cdc44895735a91f77e0412436b90af2fada2670d74eeb827 SHA512 5b1226090b6cc63715b45e46a5d258b25ab67d596894212c755fc8c3602db4d8f96f9c26208b7bf4c3c27b11ef57cc3cda9913d709fc7d5f1ed9b44c5f52c241 WHIRLPOOL 3763b3ae6bc822edcc6e526bbb137be74766bdc105e58dd8e2d6a1969f352ed302508c6b09e2d34febf3fc1fb24e469edfec49f4db059167a1f47101b7843526
-EBUILD cacti-spine-1.1.20.ebuild 861 SHA256 1339a910525d2e15412e9b805c92877bdb49fdc9f462b6dc0abb6ac3d906d29d SHA512 4820e9d6245df29dfb6dd57cdc6a41dab158e177e4273895748612d2de9089f61dc3984fef204ac0ec0321d97c94258962edb14ac84a983ce34b7b2234dce2be WHIRLPOOL c671990e7c4c899be726dfab136ff50abc2cbc97440f88446e6f912f14b8f03c4e9a2fa884f909cccdcab1f5cfbee968923c93896c0a4871e703375b7f96c00e
+EBUILD cacti-spine-1.1.20.ebuild 860 SHA256 b9a076ee6ef9abc8bfa430481b2a614d3aa8b63ebdef3ac9f5434f3e8ebb1e18 SHA512 dc1c9f975baea6553163fd29c13fff1bb3a99e268b2bab5fca31619e9880f579545ccf75a508525889ccd9d96923f29703f1860e5b35acbcbee69a12b064fb1a WHIRLPOOL b0c5f96ad0e67152cccd9006eafab167fe8564d4d5520019602b17e4e8d0dbef83dbbb3f6cbeb2ed91e430a8d21010ccbb8f5076f7d0c86234bd18903ac45db5
EBUILD cacti-spine-1.1.21.ebuild 862 SHA256 05dac1a6ed0de32c13e63983c62738089ebf30ad0c053ec2caafe47c33147a6d SHA512 2c241b9da06c6e069736d7f517f56cd2690e2a89a4c1d11c148761d0d8cae05aee0a48d74d264ec166c8d74477b7d3738170a37577119c2bc3a8ef2d697811c2 WHIRLPOOL ae366e77ff4e1b4e3d8ae198918efeb3e207902db4462a3b4211103bc41a2cf208b927d530f60c4748114c6a735db073da0daac19e96e6878e09301049733dce
EBUILD cacti-spine-1.1.25.ebuild 863 SHA256 5e5f9ee85315aef7c3dbdbf8397d5afb857a4647a9ad7a553c87316c760b6eed SHA512 0520ba0fdaa6dee66803ac9567c2e49060e48dcad9d9eae868e3c063e601f45686cd1d46897e26a1843fbd2c854df05b3fa68659eda95b391a321777eefe59fa WHIRLPOOL 20561edecf53e00acbeb99a486f0b9df275fc95c795e92fb8c13e9c0f5f1059aa12b44eb108adcc62fdf685e2842f3aee0f0822af644fe41aedc4149aa59aeed
MISC ChangeLog 5144 SHA256 f4109f6f6cc548a8d9390a072215bcc6f16fe7724494eb7e14c09093c7700160 SHA512 607568b0cbe9ee8d1bbddaf9d9dd01c9652a5cdf12d7d2e944ca73c4c4550af004ff59276bcb84ac90179b4c4349e33261929703922dbf9862bc32de3939eea9 WHIRLPOOL 8a2b8005b6230e5348bac05fe25c89b3afc862496d00e45333a762bf2563fddd0cc914c53fe433eb9636a61b941667d567c2753031c66e530295f21869fa2545
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.1.20.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.1.20.ebuild
index 278cc3ade74f..0ca89463112f 100644
--- a/net-analyzer/cacti-spine/cacti-spine-1.1.20.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-1.1.20.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
CDEPEND="
dev-libs/openssl:*
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index aebd444c82cc..9b2c74bfd2c9 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -4,7 +4,7 @@ DIST cacti-1.1.20.tar.gz 8903728 SHA256 cbad90ef98d656bb10814e1444722dc00ff0c3a9
DIST cacti-1.1.21.tar.gz 8905650 SHA256 e649fea4e8fc9900620af213218989e229aa25a1e1fb10dcde1844b1a2ae3bc0 SHA512 383bfc24c038154fd03d8997cba0fdf8d87ee69305f392b254102b6c279c0b7e53562a2d3d1f996315152a36da467821876e3834dd7b62bdc057a3b7838b94d2 WHIRLPOOL dea91e014e4b64a40bad4ab573a468fae0c6e1f7e380946cec5f5b270fe8abaacd3c73d71ad636e813e443117af0641269cfe2448f8c8487b1b7f7507e2a493e
DIST cacti-1.1.25.tar.gz 8920466 SHA256 d0b911ff5b46abf858650bcb95bbeb1e482c3815e1a48129fde167ffe2d52389 SHA512 f5574cf0ba9d8fa39a6e547c9fe2a3c007901987abb82ff50d63672009bbf257ee58f47f02cea512dda6809e880e87e8a3ad826c26a9421f195569816d6489e0 WHIRLPOOL e229d13cc133c1e852e248c313ab22e0a1a53a123e6bc98396ea031a8307169a3278a9ef5bb63a69be667bf6d83c1c299cb97116db753a22a318ed061e75f3c5
EBUILD cacti-0.8.8h.ebuild 1308 SHA256 42fb408c4c187c7733a7741701d94988734649097a6e76842d120fd5272ea1bc SHA512 6d48400c92aa9ef987ac43b5cbb6a4eeb9ad2235ffe1adc40cdadbe54ba0033090e0e4b8a9f48a6b85b0bf4e41c4f4f67da1869218344c59c777ecb173cd8784 WHIRLPOOL 9132c1a334e3426c7817893f212fbac3ffefbf8139e1f0e15b700d97c1cb2019391e420ba36fbc9e61bf992ecf2b567dcb0c838ddd361220435a934ff682f1ba
-EBUILD cacti-1.1.20.ebuild 1258 SHA256 8a90731cd9defdfdefb98d57868e37fc438eb8d16b303c92a33e571340585d5b SHA512 90246b8bbd88ac48ddd24df0dc32a43f8f387f2eb4215ed8280c59e2856f7060027cc4fa590446c2e7c3fce8c663da77ac5d169b9267ed8f04eb9c8207c6f517 WHIRLPOOL 50382cf522323d6c354322ee87c38ff1691049c718cf464a9bf6092cc770ff1a4be2286af3c15ca5773bad34ff25b2ef8ee40b0ab32a54cd8f9da452cdcce742
+EBUILD cacti-1.1.20.ebuild 1257 SHA256 4f18a415eef789a4954134db937336f316eee1c8c0f2f4ecdfed06c1e75473dd SHA512 830f0dff90239b799454a572bf3b3412b59c57b323db30d61337ef7a73023e44cac4267f672f9cb48002afda86ad0091b047ef89a47b09bfc8aa733d0c2a450e WHIRLPOOL 78148e827368503bf79d1ec55ce12b646becc4082adc9b0928d5d082c569a56fa242d46e4a350dd6de6d3e7a14b5f6a2586ba26196d54ff4b526f846c59c4646
EBUILD cacti-1.1.21.ebuild 1259 SHA256 d85789f10a42d9c56f166df0d5f7185bee5829f754bef93fc2200affe2aa95b1 SHA512 e9f48fbc4348eb47d07c0d47272e001d0f815fa6527b2bb48989e818d4984bb042d19f4c0369f29cc7b2537c884b8c1483f1058c95720c8f440aa62bf4903884 WHIRLPOOL a968f18d75cd7ef0b10cc13e71b878650de242fc8136523b0e52b9b15466e19db269c36fb6823b2280b6210e329c02cf988be7c78a33131131c88ec07962c307
EBUILD cacti-1.1.25.ebuild 1260 SHA256 9e1f68ebaee9e7229e139e3d95269863d6a4983a41b8de0e0d80dad0284819c5 SHA512 6a2811d73ba933ededc5b1157180f8cfd3aa64da392e34dd56cf8a1402720906b2d7169359fe3f079987cf50014d010f2ac6f6b39b0de379ffd57d6fb5317ad1 WHIRLPOOL c33e5d42e8ebc02465df235c4aaa379b95547537400c2c71aaf585e648855ba99c28c8b3b0db42efa592562c01d143131371e06c1e58d570565db357ded303ff
MISC ChangeLog 6068 SHA256 b9a798f16089824899d4534b3047ea47bc4c3f5c961bb75939ede4394c939f09 SHA512 d289b3977cd4e2a6029cc976427dbd7258e5d31074ab63b2f0b26820d347b0b6a0a43d395bdf850851402ec36afc3e36d64f094d1e70d546177671276eba0cf2 WHIRLPOOL 36c0d2056e11d758c86a9b3458677ed1682c80a362949660c7a23ee1e3161f622ae80ba792c10e55aae943c0431fc4c373588b3e57ded9af7e131868b48f8367
diff --git a/net-analyzer/cacti/cacti-1.1.20.ebuild b/net-analyzer/cacti/cacti-1.1.20.ebuild
index 7947fe008161..ea74ba637169 100644
--- a/net-analyzer/cacti/cacti-1.1.20.ebuild
+++ b/net-analyzer/cacti/cacti-1.1.20.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.cacti.net/"
SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
IUSE="snmp doc"
need_httpd
diff --git a/net-analyzer/hexinject/Manifest b/net-analyzer/hexinject/Manifest
index 6f1954f3ba24..6c24de43327b 100644
--- a/net-analyzer/hexinject/Manifest
+++ b/net-analyzer/hexinject/Manifest
@@ -1,4 +1,8 @@
AUX hexinject-1.5-fix-build-system.patch 433 SHA256 87a83bb89c834aba9f6fdf5e9c56de6473660278834ee67bfeeeabc64423f89c SHA512 db17bbb6d1ac936b5eedadd9460bacb1f59c21556fcc8c60e135920383d6990b0498a1f74182352b8061629934e728a865e2cba922abec4c7c7035bbc346e2e1 WHIRLPOOL cf691c1ff0c7c7d44abd85a2f6153fe99dce19319dcc009c9259c1a095deac79444ec47bb97b48fcf94b63fd2a6923997332f5b65327d5e8136af147d75b37dd
+AUX hexinject-1.6-fix-build-system.patch 462 SHA256 cb410b131fd447f8b18b2e69bd35a0ae79df1689eb32f8ff97365eb8e250e8c5 SHA512 5cf816c71789d6c487acd757e62d44c4ca0ada32393d2de138311e61eb22c0ca5c49a9e539a7fe333b4fc8ea48ec29b49c4e14db97bc267c45aaa39f8fab04d1 WHIRLPOOL f1ee404a7e79a724495782011e9ec12f3bfa2987775b2f3d421b64b76fcbd3af9c0f3a6e39edf3da012af5ef22c25a240743b6fceb8be73cd241c330993da5b3
DIST hexinject-1.5.tar.gz 14449 SHA256 329f0686069988ac0dae4a00082b205ac9669bc8e202d4b112c600bcbc198ce9 SHA512 cd145b6f2ae9d739effca03959fb474df11d28ff015c0e5bd1e30c341f60085154795f3c8a601b7241623944b3868b6fc9a3e1530a3aa4e7aaa2b3794a5aa34a WHIRLPOOL 96e065ca7135f12db6e5949fb8fd537e0981f5b0cc1d57d40eb59003aabc87ae2459872cb11108727c0032b6c5282d385512678859da081d783bc692f8044c93
+DIST hexinject-1.6.tar.gz 16876 SHA256 06e64636923af593c742129d81b717667223bff39918f26bf56809ead9700e65 SHA512 7432122a7ca42b7ac066cc55daec2d4a656b08e0f390db1a49f626181080d07687026d04a150573e3341e4e76f87a20b6466deddcc9d022e7d66fadcb8dac1ad WHIRLPOOL 8c49413e47e142aa6b48acad8cb9b4510065a76f6615ad417a7e0734aaa481f1ee126ca9824e075fce7a614162ef22a8c46ed7d78b13b7db60876548fa71e009
EBUILD hexinject-1.5.ebuild 756 SHA256 09565bedd7830e8f0d97ffdd8a51d4fe2da4ea8909b8e99465849c801184c513 SHA512 2d17be0ac7931ac94d94924681f8f6f7ed0ed4b2072f2e5e46a5bf1277b4a67b62cdcabdad61d3db5fc7eb216258135d4ce389e4cae4a5ab476a209a62878a92 WHIRLPOOL 8fd175a1aeaca97833912647e1e8414ee268c19a7bb229a7ed8fa227346e076036e319451037b8a39b75e342e21e9f4969680dc9f2c161f8b4d6f45e2d81152e
+EBUILD hexinject-1.6-r1.ebuild 697 SHA256 41e20a5b1b14c9bb9f13cd55009c1a3d5a4646a802f3e53616bb75342ebf4c28 SHA512 89ca26ae193bca85ca9fe8ca0e5075f96254887666f24d84ae2e194d941d3e50bc7f46a40bbde3c319b3cdf977080e29b5924a1d2e11dfadb601f23c9914f2a8 WHIRLPOOL 5412f1c71a395a23aad3bac62fe55832268415f19c948af8a1698708c8def0f5fedc4664115c8051ff240dfe2b0a0b248bf8da3294d21b36b418bfcea072a373
+EBUILD hexinject-1.6.ebuild 696 SHA256 029ad872cb49c6de2cd30dadb23792e253044998d08e538577a54a06f1685eb7 SHA512 0a41dbb13e7551603261a7c40ce956779a62a1bb6e35fa35530d957f3872fb223cd961cf6e1734fcd7bc6ce9c91b81e799b18699e1ac5c8d82eb42c55beb91f5 WHIRLPOOL e3ca179cb32794d7a760cdb5896f4bea4e1dd73d6d50d1cebcd0c2c4b0b98785177e00902dc1e540c96c73d0fb62319342a8efb2155522f9c583a708060e617f
MISC metadata.xml 1004 SHA256 e507c67a149b536ccfaaaaf3bbbcf5f2afb75e19fa2a3a641dfa400ded2ff182 SHA512 e9e01a46cc45ab6625e4d444d857a31340b93879c24cb7e2a1d420e644b376f484ad4076bc36302ab536bf88a9ffd7c1850115d3c2433181b82c948e84077ccd WHIRLPOOL 891d1d137c3481c9bb69cf843fed93fe0167b328cbd5e95bbbe115bb8802ec9923a896b3d0b1296838bbc563d584c66f95e7b1c4f8ff3c41d72d5499f853546c
diff --git a/net-analyzer/hexinject/files/hexinject-1.6-fix-build-system.patch b/net-analyzer/hexinject/files/hexinject-1.6-fix-build-system.patch
new file mode 100644
index 000000000000..fbe91199bbfa
--- /dev/null
+++ b/net-analyzer/hexinject/files/hexinject-1.6-fix-build-system.patch
@@ -0,0 +1,18 @@
+Author: holgersson <holgersson@posteo.de>
+Date: Fri Oct 20 18:30:00 2017 +0200
+
+Don’t call gcc directly, and respect CFLAGS. As this project
+is plain C I don’t care fore CXXFLAGS here.
+
+--- a/Makefile 2017-10-20 18:15:11.743805540 +0200
++++ b/Makefile 2017-10-20 18:24:55.120009439 +0200
+@@ -1,6 +1,6 @@
+-CC = gcc
+-CFLAGS = -Wall
+-LDFLAGS = -lpcap
++CC ?= gcc
++CFLAGS += -Wall
++LDFLAGS = -lpcap
+
+ all:
+ $(CC) $(CFLAGS) $(LDFLAGS) -o hexinject hexinject.c
diff --git a/net-analyzer/hexinject/hexinject-1.6-r1.ebuild b/net-analyzer/hexinject/hexinject-1.6-r1.ebuild
new file mode 100644
index 000000000000..e36c1803461e
--- /dev/null
+++ b/net-analyzer/hexinject/hexinject-1.6-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Network packet sniffer and injector"
+HOMEPAGE="http://hexinject.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+tools experimental"
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}
+ experimental? ( dev-lang/tcl )"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.6-fix-build-system.patch )
+
+src_configure() {
+ default
+
+ tc-export CC
+}
+
+src_install() {
+ dobin hexinject
+ use tools && dobin hex2raw prettypacket
+ use experimental && dobin packets.tcl
+ einstalldocs
+}
diff --git a/net-analyzer/hexinject/hexinject-1.6.ebuild b/net-analyzer/hexinject/hexinject-1.6.ebuild
new file mode 100644
index 000000000000..5d8011ced352
--- /dev/null
+++ b/net-analyzer/hexinject/hexinject-1.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Network packet sniffer and injector"
+HOMEPAGE="http://hexinject.sourceforge.net/"
+SRC_URI="http://downloads.sourceforge.net/project/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+tools experimental"
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}
+ experimental? ( dev-lang/tcl )"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+ default
+ append-cflags -std=gnu89
+ tc-export CC
+}
+
+src_install() {
+ dobin hexinject
+ use tools && dobin hex2raw prettypacket
+ use experimental && dobin packets.tcl
+ einstalldocs
+}
diff --git a/net-analyzer/ifstatus/Manifest b/net-analyzer/ifstatus/Manifest
index 8f8aead801f0..c6b4ff4833db 100644
--- a/net-analyzer/ifstatus/Manifest
+++ b/net-analyzer/ifstatus/Manifest
@@ -3,7 +3,7 @@ AUX ifstatus-1.1.0-gcc6.patch 397 SHA256 d27ccad23815b517d1bd56a5b97ad2a0b71efcc
AUX ifstatus-1.1.0-tinfo.patch 472 SHA256 3206a39f60b2174c38bc96bb3e942549fb579bdee074a42e49637b55a83bce80 SHA512 0b30c07113d2bd8012438bdefcc494d8a80e14143af9e2099d511f934d50995e3f9cf3fcbafce947c139753f118dbee484742241a1ee3ea85593012a4835b56c WHIRLPOOL eea8ce897de8efcfe90cc28ad1b71f9800fd9536b562592b164639d793a7f9a7ce923e8fefb86c136590db3bb640fbe036cf61e31fe398407c36067876dda95a
DIST ifstatus-v1.1.0.tar.gz 25233 SHA256 0ca8a8655a1edf07698efbd5e1d4adc962dbb1bfb078b4899062e89bb05eac10 SHA512 2660310be7186067315414218e3d3d269499e391c7ffa12022ac53a0456ddbe0f7d5562b788fe6b2569b7d0eba7acf5699e0386769a91606a3e14b51239a2766 WHIRLPOOL 7aebc62d229160a07a28e876d2d7daa6847ed16d6c6b0f457de70d85584afce36f6e4903befb383720426f6ee20def4d1d02245fabf8671a6df367517d2a648b
EBUILD ifstatus-1.1.0-r1.ebuild 897 SHA256 2f1ced83f8dc72cbb326abbb4de97aa3b01f97a3ded12134c14c6cd2d842cf69 SHA512 71e51872bfb0653fa56446ee7be7c5e09f4dd88ebd41d670c7ef1ac769b480a66437ab739a84418b1a86dce9beec9fac822b96e2fe0456b58c5e00d5e47d7b6b WHIRLPOOL 0ea24e6583a26380487a89bf9fdcd44940a27b1ac2ac3ae5cc5cdf9f7c566d9ac30670a4ee10803f090c619ab1b35271d0bd9f06bfb75bc755ee8c24b7646baa
-EBUILD ifstatus-1.1.0-r2.ebuild 931 SHA256 bb30b3789bccabdb1752ccd4ebed58f1b4844e0d7a3c63023c08a6fd3ed418fb SHA512 8176f35ded4077fea63ebe1a599182bb21f0fcb31d156c61cc475908c2998aca1c16cdb20e1e2f67a7c049bbc0296e7d65784cc958537a968c9f5016b7c9813a WHIRLPOOL 3a57618022eb7e7570daeb5886bcf9c67c4f4514c9c7fbaed2e2c84fe195733974ec649a0ae9f169ce7fc0260d0d77fa86bc3ddb0fcfdbbee679e88102127774
+EBUILD ifstatus-1.1.0-r2.ebuild 930 SHA256 090de08d43be72e3739b986de63d2fb141b84c01013f087851aba46afb675816 SHA512 cb6db21e6b3e09a0488ae5a6f3f0735b765ff56f023a605960f02a3e81e7d8757881f53324dd761d25d44c766851ca606232bcf02e0ffb8ce2c49e7c5286e12f WHIRLPOOL 3e1d4c5b8da478e02a1e75424f9172a1df3dfa81f8367bf60f669020d4a245d16565d079f3cd74290f89f2a6af1ec42f592e28bc189d90fefabb1f525569d4d5
MISC ChangeLog 2512 SHA256 0c2cc57a849fd2b11e60ba40aa1b6defa0f5f228bba97c3b7ab40e115c766275 SHA512 02a80f476fffbc87d25c4aeb2d3af82d719afc923559c10f92e72799eb83166900678b6eec059d484c41f4e2accf772a887be79db1ddd16100d768cd42f7e5e9 WHIRLPOOL 8ec55abf53e17de826029fedc6dfb319181fe9d422eea8300849a0e042da50bc388b50347509846d4b2c4a1c61f9cb0e2f1870dee78c347be70134645836b287
MISC ChangeLog-2015 2829 SHA256 800ae990ab28b0396c1ca27625925756348ba1fb1e75f2f89e8c7f8e6b26e953 SHA512 1ad26b9846faea01376f3f7195ffea9a41db1e654870113d5f254866003fd92d86156e71a594e0e0ce9b1d4d2e19556508b4b7c51f9e7bc5e7e164085113bbd3 WHIRLPOOL 9d9944020146238167408284645b9d6275f5736348f359dd27321421cf46aba351c63db90990e802052575027aad17f53207aeb1fdff842b074aa225c14c282a
MISC metadata.xml 358 SHA256 702bea6dc122b1e98b1408004c4a30767a184c15119451fe9984e9e2f406a682 SHA512 b23a7f0e009c71d86cd145b033b4bc7f77e7a316f048d8236e9bb2bf9cd34671ec24af37b11ef934791c6f046e1a761087c7f5e570bac80b09e30862e162d005 WHIRLPOOL 40cba310ce594df402e63c6ce5967f6a18bce005b90d6d8473b7902d49428d3eda01268c4909b49dcaab6fcde7202bdb2ccc1f7bcf678b944ce8398eb66175b4
diff --git a/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild b/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild
index cc2baff02f50..dcd4cdbcb380 100644
--- a/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild
+++ b/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild
@@ -4,7 +4,7 @@
EAPI=6
inherit eutils toolchain-funcs
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc x86"
DESCRIPTION="A simple CLI program for displaying network statistics in real time"
HOMEPAGE="http://ifstatus.sourceforge.net/"
diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
index a4bebc0963d7..c2d42024ff99 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1,6 +1,8 @@
+AUX define-own-mysql-port-constant.patch 3296 SHA256 1fbc168247ccd2664063ecda4d57ce5fe5e21d027fefd4b95857aab945453abb SHA512 3ead6340800ac15fbe76e223599a5b3dbc6b6b13b72b684919aa43487838564ad7117b4e67fa7f36f0f58554fd8b8d6233efbcb82e6927a0c31f22c6a9ab5dbb WHIRLPOOL edf49532bbdd8583723721a1055d008f44102391f9bf5d653ce1b6efc6aec3fb807fc06cb5b87523709c2e20851e89ebad1d2b8080f74b11b7993af1fc3085a5
DIST monitoring-plugins-2.1.2.tar.gz 2613060 SHA256 76c6b58f0867ab7b6c8c86c7e94fcce7183618f6daab63488990d0355f5600aa SHA512 845eb7636691aa5402119384c3d4256969e959fbc29ef5257c24fc4c21536cad3dade30747f36c9ad998cb37df0f325df66ea679d3d5b96c2993b59a9a325fed WHIRLPOOL aea22e1a3d3c7622b4645118cf8b5d499882bd30b6af8bdd81287fb99fe42bff7f906b54fda411ac2c33ff6e42872a6ea6af4dcd7611bdc95d308c0fcd954e43
DIST monitoring-plugins-2.2.tar.gz 2461548 SHA256 296a538f00a9cbef7f528ff2d43af357a44b384dc98a32389a675b62a6dd3665 SHA512 5f8cfa132891d6d96e69bee3f2c26f7d4546f572be6a18f25ea5d9069f162cb2e424361289a5c26bec60d7b63d28a269437fd6f25645903a1c142fdcbbf77f27 WHIRLPOOL 5ca16cbc63cbbe3472f82b87b2c4111df4877bc33b0a9bf638507aaf8020194adc6e8244c5a002ae636121ae58d7a112cb2c5cba6e384c136e5636bbfc4a6141
EBUILD monitoring-plugins-2.1.2.ebuild 2858 SHA256 64a1c31aa98c89bce7e97adc9ebc4d1880caa4bf5ea4d4ba8718857ea71e3a05 SHA512 9426fdb164c60771cc3dddc6cff2e526ae7770400378b74dde706a2cfce7dba51aecddfb7c7a532e6bc07078d05cf28d64ddddc3e4eefeb4ec2bb70f44151f7a WHIRLPOOL 53739d5dc73981a520bae34597014c2bcd3fb916356ab11fdc57fa8618141ce34e2b9dfad64976f607b6a567729654f3c4d0897046e200643a0f6a65c1b2314e
+EBUILD monitoring-plugins-2.2-r2.ebuild 3014 SHA256 5d78f8fdb076820d2334f7405cce0eb64b4a1486c6498b7102347abae61eec50 SHA512 116db40f08b66e142691fd1dafda2c53e5ff8d069617d6778f98ac0aa25b514f6a4a10da8a51a1241921ac7ca43a0c5c6e6df191771cf0a8250874228cd066da WHIRLPOOL 052a29348d950a537c9e370de12c5d6cbe8f14cec76388167b100ee78e713b2d3afdf1cb8c0759cef84a0da63ec33faf96e18314d536f4aa5f6778213fae92a2
EBUILD monitoring-plugins-2.2.ebuild 2875 SHA256 74d2d84ae9d9620a65801f706f7fe3e0d6846cdad46e381ea773107c3f43737d SHA512 67a2e298d56b06cfa7ef0f718889c4e300cccd668e7335f6574e36b929dbf349473ce4c4541a083a703440e8d61abea0551e2e245bfec4dbf95cd174e72114d5 WHIRLPOOL 30bcf8f9576d35670441d005ba6f5089600d7625010db48f2de26180155c72221783099320c225700242057ff145d4c504ca4e753bb7c549789cec53b75f8287
MISC ChangeLog 4406 SHA256 0763915a056d3bf9a24757a76b6a36ea9d7ad01e90363cd7129700006ff255cd SHA512 c66af4340242619c68762cd664eea7a81518bbd873747f0d22c5ff902be298e265ee468df03e58ebb7a0142fb2fee9306fc66906c38096845f11188e89ddc464 WHIRLPOOL 9731fa3642854f51a2ca6499a0bfb30e3fdb4574dd34677701a5cc0f2707a8b9836b23abb0d858f532373268c02921ab0cf422154a5571e19489a70d9e84f1a4
MISC ChangeLog-2015 589 SHA256 f642f2d89f87baaddd8fbdbb798a9e9603a81c39da412d4832668a25ce505ee4 SHA512 dff7df956fa977e38f4b7094d2edd78ca1aaa34b3c8a78620c7d265d8935cb3bf69a1f8446c391b6abb78ee2a82250e47278cc7b5b466c6485c07b8c2b403416 WHIRLPOOL f026417f1ee1dace25a47d2ff59c4dac96abb01ba506c38f69dfae001755589e0ce67fb44e994ac645081e8c12ae12d4efe6bd0b04f2411ad844d87e1bff2bcb
diff --git a/net-analyzer/monitoring-plugins/files/define-own-mysql-port-constant.patch b/net-analyzer/monitoring-plugins/files/define-own-mysql-port-constant.patch
new file mode 100644
index 000000000000..b7406bc9af80
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/files/define-own-mysql-port-constant.patch
@@ -0,0 +1,102 @@
+From d6bd787123aa9ccd96edec8286ec22dd0442c620 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Fri, 27 Oct 2017 07:58:43 -0400
+Subject: [PATCH 1/3] plugins/check_mysql*.c: define our own default MySQL
+ port.
+
+The MYSQL_PORT constant used to be defined in mysql.h, and was used as
+the default port in the two plugins check_mysql and check_mysql_query.
+Now that mysql.h no longer defines that constant, our plugins fail to
+build against newer versions of MySQL and MariaDB.
+
+Since MYSQL_PORT used the "default port" on the local system, it
+actually was not the best choice as the default for the check plugins:
+when monitoring remote MySQL servers, the usual default of 3306 is
+more likely to be correct than whatever the local server happens to be
+listening on.
+
+As a result, we fix the issue by defining our own constant, called
+CHECK_PORT_DEFAULT, as "3306" at the top of both check_mysql.c and
+check_mysql_query.c. The existing uses of MYSQL_PORT have been changed
+to use the new CHECK_PORT_DEFAULT.
+
+This change is backwards-incompatible: any users who compiled in a
+MYSQL_PORT other than 3306 and who were running their checks on the
+same server as the database will now need to specify that port
+explicitly.
+
+Closes: https://github.com/monitoring-plugins/monitoring-plugins/issues/1508
+---
+ plugins/check_mysql.c | 8 ++++++--
+ plugins/check_mysql_query.c | 8 ++++++--
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
+index 5773afd9..c44919d0 100644
+--- a/plugins/check_mysql.c
++++ b/plugins/check_mysql.c
+@@ -36,6 +36,10 @@ const char *email = "devel@monitoring-plugins.org";
+
+ #define SLAVERESULTSIZE 70
+
++/* The default port that MySQL servers listen on. */
++#define CHECK_PORT_DEFAULT 3306
++
++
+ #include "common.h"
+ #include "utils.h"
+ #include "utils_base.h"
+@@ -58,7 +62,7 @@ char *ciphers = NULL;
+ bool ssl = false;
+ char *opt_file = NULL;
+ char *opt_group = NULL;
+-unsigned int db_port = MYSQL_PORT;
++unsigned int db_port = CHECK_PORT_DEFAULT;
+ int check_slave = 0, warn_sec = 0, crit_sec = 0;
+ int ignore_auth = 0;
+ int verbose = 0;
+@@ -505,7 +509,7 @@ void
+ print_help (void)
+ {
+ char *myport;
+- xasprintf (&myport, "%d", MYSQL_PORT);
++ xasprintf (&myport, "%d", CHECK_PORT_DEFAULT);
+
+ print_revision (progname, NP_VERSION);
+
+diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c
+index 49a14dd3..6f492442 100644
+--- a/plugins/check_mysql_query.c
++++ b/plugins/check_mysql_query.c
+@@ -33,6 +33,10 @@ const char *progname = "check_mysql_query";
+ const char *copyright = "1999-2007";
+ const char *email = "devel@monitoring-plugins.org";
+
++/* The default port that MySQL servers listen on. */
++#define CHECK_PORT_DEFAULT 3306
++
++
+ #include "common.h"
+ #include "utils.h"
+ #include "utils_base.h"
+@@ -48,7 +52,7 @@ char *db_pass = NULL;
+ char *db = NULL;
+ char *opt_file = NULL;
+ char *opt_group = NULL;
+-unsigned int db_port = MYSQL_PORT;
++unsigned int db_port = CHECK_PORT_DEFAULT;
+
+ int process_arguments (int, char **);
+ int validate_arguments (void);
+@@ -299,7 +303,7 @@ void
+ print_help (void)
+ {
+ char *myport;
+- xasprintf (&myport, "%d", MYSQL_PORT);
++ xasprintf (&myport, "%d", CHECK_PORT_DEFAULT);
+
+ print_revision (progname, NP_VERSION);
+
+--
+2.13.6
+
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
new file mode 100644
index 000000000000..76e7997e8b71
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic multilib user
+
+DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu"
+HOMEPAGE="https://www.monitoring-plugins.org/"
+SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba snmp ssh +ssl"
+
+# Most of the plugins use automagic dependencies, i.e. the plugin will
+# get built if the binary it uses is installed. For example, check_snmp
+# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
+# installed. End result: most of our runtime dependencies are required
+# at build time as well.
+#
+# REAL_DEPEND contains the dependencies that are actually needed to
+# build. DEPEND contains those plus the automagic dependencies.
+#
+REAL_DEPEND="dev-lang/perl
+ ldap? ( net-nds/openldap )
+ mysql? ( virtual/mysql )
+ postgres? ( dev-db/postgresql:= )
+ ssl? (
+ !gnutls? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ gnutls? ( net-libs/gnutls )
+ )
+ radius? ( net-dialup/freeradius-client )"
+
+DEPEND="${REAL_DEPEND}
+ dns? ( net-dns/bind-tools )
+ game? ( games-util/qstat )
+ fping? ( net-analyzer/fping )
+ samba? ( net-fs/samba )
+ ssh? ( net-misc/openssh )
+ snmp? ( dev-perl/Net-SNMP
+ net-analyzer/net-snmp[-minimal] )"
+
+# Basically everything collides with nagios-plugins.
+RDEPEND="${DEPEND}
+ !net-analyzer/nagios-plugins"
+
+# At least one test is interactive.
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" )
+
+src_configure() {
+ append-flags -fno-strict-aliasing
+
+ # Use an array to prevent econf from mangling the ping args.
+ local myconf=()
+
+ if use ssl; then
+ myconf+=( $(use_with !gnutls openssl /usr)
+ $(use_with gnutls gnutls /usr) )
+ else
+ myconf+=( --without-openssl )
+ myconf+=( --without-gnutls )
+ fi
+
+ # The autodetection for these two commands can hang if localhost is
+ # down or ICMP traffic is filtered. Bug #468296.
+ myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" )
+
+ if use ipv6; then
+ myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" )
+ fi
+
+ econf \
+ $(use_with mysql) \
+ $(use_with ipv6) \
+ $(use_with ldap) \
+ $(use_with postgres pgsql /usr) \
+ $(use_with radius) \
+ "${myconf[@]}" \
+ --libexecdir="/usr/$(get_libdir)/nagios/plugins" \
+ --sysconfdir="/etc/nagios"
+}
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
+ NEWS README REQUIREMENTS SUPPORT THANKS )
+
+pkg_preinst() {
+ enewgroup nagios
+ enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+pkg_postinst() {
+ elog "This ebuild has a number of USE flags that determine what you"
+ elog "are able to monitor. Depending on what you want to monitor, some"
+ elog "or all of these USE flags need to be set."
+ elog
+ elog "The plugins are installed in ${EROOT%/}/usr/$(get_libdir)/nagios/plugins"
+}
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 3a23696bbcb9..9af74c048f6f 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -17,8 +17,11 @@ AUX munin.apache.include-2.4 577 SHA256 21245e9eb7b759d2d2e65c2d1424da6d8c6fd8f4
DIST munin-2.0.33-gentoo-1.tar.xz 11024 SHA256 f956d9051e0da05231bb8777c0ca3342ca5bb86e48c44a68289c41c42c440e46 SHA512 c1f49f01fd641e157145d9710a091696c09380887a374ee845e516d40384ee6bc576019f3510ac322436b1f10ee1b675ae512b9f677a6a0fa2ef022cbb7269b8 WHIRLPOOL 3c0fbccc4c8ee9a2dacf8ce1845d149198c8d53ed17cd62fd17bae60986ca6616e12213d4f520fd06e8329accec559a7f9529559f21dc62de3aa0b66680d7ab7
DIST munin-2.0.33-gentoo-2.tar.xz 11288 SHA256 a7cc6b060cc1344c9b40278a960ab8fa6848e5db53f8665a952fb602ab0c0c55 SHA512 4d185529199377e85fb3e7d0a8c38de2ae500d2f992292e6ae016d11e81642833725987ac006b5f535963593c7698c676d28091805691e8b46c016fc2580917d WHIRLPOOL 98d2916c10adf554ab1672c602271673cb6dea7ae72fb7849b1bdf16d6f63c6f330def1f4a3cb62fd1fab4e888b2dede2807cde9a7907058f37a0f87a8b67a6b
DIST munin-2.0.33.tar.gz 1349546 SHA256 99dbc1e5f4f0fed4e28f295245333544193f9a26c597f2a78571ae20b4d450b6 SHA512 33c56fcb347396f29662f304aa50f0e3dfc909b067ea49809762bbbb4dd2cd7e95789c318adcef64923e6d0248dcf9ea6fe933c49d920b6b7856d85511d40d67 WHIRLPOOL 2429b605d19bbf4caa460e9f2b46de8e2462bf606bd1143bcdcbb4f2e079b2acf5f87def86affa6152ed8b26cf14bc83d62274bb58424818deb2b5f2024de7f0
+DIST munin-2.0.34-gentoo-1.tar.xz 11920 SHA256 c9c2a7c1e8022092fd661896b9196662b82facab965a70308cb6a273e9bcd40b SHA512 706f8dd1ba49eadb5e89f821f52d4c691b0270885a4167639b6417f9516bb2b0b8b212a82f50fb892e03b57817d650b3552754ecb437718c7e7ef3cdfaf83b2b WHIRLPOOL e82d38d47baf77ea3ad4cab06a6f84d213fe3cf4d1df9911750769409a2ee93366dd6b25e885af01484c708bf658aec8605aff18793e5ee2e8b72b51ea6fe40c
+DIST munin-2.0.34.tar.gz 1349842 SHA256 5152f006900ce5619b5c8d32441c24566f565e3f83e74379b287bef2fae58f6f SHA512 db802266842e103017c8c3bc0fc676d0d6146a37b06e69e709cfb396d67c42ac4932b8d4979e4d1a108fc0c2467c66423799212f6ea1279fb9ed64352ddf41cc WHIRLPOOL a7e491124b882f46fc56f3e2b264380d056f3cabe41f1f5bf8afe47c3e88332b9ad0ef305dfc1f5dfc4ba194d9d58472b5512b01b929a1ccacc1e88092ff8d40
EBUILD munin-2.0.33-r1.ebuild 12318 SHA256 19905d3f9e0fffa8ad906bf2d9543899eab67a075d121c2bc3d2c38d9654bc01 SHA512 6455ff958815279a54a3123f8705c2076f652eea6d643b9a0505eca4e6dd66c8bae2be419ba9df2109ae410d770dcc2a9f3d8c15d948c093d75c098c36cb6d42 WHIRLPOOL 6e06780811f184410e36037cc51a75d16f53ec8e099042ff258f48f7bb8875a4c312a1e41b996c1eeeafee28a4813ab8f639a9430e83408663037762ba871380
EBUILD munin-2.0.33.ebuild 12184 SHA256 241922f8f69f56dd3732191e102386392c84dd2ce83ff4161f95f37362d4e227 SHA512 389ac592f1860a021feba2c6beff4d6b55ec5997adbb356b4130ef88e69cb8797e166315af4429956223ae4c6b58b39687dbd1db3578a5f56bff5a8f4d8ccbbb WHIRLPOOL d1bf9b0cf6da0e2a2b7442cf3b02d277ce943881d8245007b5f4c637b570f62091f007ed86eb14dc22eaff1e2946a1d39eedcd269bfd996ec3ccb4451a0921e8
+EBUILD munin-2.0.34.ebuild 12231 SHA256 752f9cafd050ec8be2999df3511683a9257a5de3b4a7aad840f507e16f07c65f SHA512 45ed07d3bcaa18b2c09d2ad7ce8f2d59ef5de79159c968fade90904377229a761ed7e9bb971233b5a39f2ff9faec4916a02e358e36ae7a9942f15a8b6a55de71 WHIRLPOOL c283f5c4a2d3eadec93f1961d9b9272c2e66c28f615fd02c97192bd42d1aa561641c634ba3c0d3ff0115220bd783aed8b8526e554c88639473162a7d6c596070
EBUILD munin-2.1.9999.ebuild 11520 SHA256 5af629f8ff08f1c76a3e1d8d4eae5db42c2b371dcfb050ba89b90b7f88c52971 SHA512 6069e6d31b9385885e98e815d4bf33227689fa8e74c48f4aa7b6af673be76d25ef26e777ef819563a8978a3cd73bc518b0ad3e5807c58a5b0e575aeb712f5ce5 WHIRLPOOL 6fb6950643ea7fd601be1b877ffcaae1322b8816b17a29e84cc0844ee914ff242e460369218e4adb32d78b4eea1fcbdc244d3fdfada0d43cb77b846c956aac25
MISC ChangeLog 5446 SHA256 cd90509cc51c905cf6b36f78ff98e3def854593831b4bf9264fb6b0745da36d4 SHA512 ff33e1515f24f42dfb968b44055b931ca2f0312a8e92e04da267298fe64b27c3fc7a8e84584dcf6483d38c92c3cfe54255c5bad5fe9f303f5b3029b995ffb0ff WHIRLPOOL 745f937aee96f15345153b9f9f540baefcd2a549c58086c007d463279a329e67a5339a1a1aad129bca0973391f547f8c7b1d2a721c29bc7a07164a62158ffbbd
MISC ChangeLog-2015 35218 SHA256 9d7cc15eb23b6e6511947c3bb9c8a38f71febe9be2411fd138dc97bb6b8ff83b SHA512 cd6ea50386d5ad031b82c8b865f3577acdaea375eaf6bcdbc0b22ea7b4de0f4742fb0e2a672d54f0b2a2d8a13e7be083a2884f6f98c3c97fa6d1d3d664ea0540 WHIRLPOOL 9bfcef1920d4470a413bb602261ec2b78499852ff07ccd11e038944ed81092878a8f3746540d5e61776fc080ad41c974d18dc5bc38d13522b1078f7f4b9a559c
diff --git a/net-analyzer/munin/munin-2.0.34.ebuild b/net-analyzer/munin/munin-2.0.34.ebuild
new file mode 100644
index 000000000000..e1f2ead7110a
--- /dev/null
+++ b/net-analyzer/munin/munin-2.0.34.ebuild
@@ -0,0 +1,413 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PATCHSET=1
+
+inherit eutils user java-pkg-opt-2 systemd
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Munin Server Monitoring Tool"
+HOMEPAGE="http://munin-monitoring.org/"
+SRC_URI="
+ https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
+REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
+
+# Upstream's listing of required modules is NOT correct!
+# Some of the postgres plugins use DBD::Pg, while others call psql directly.
+# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
+# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
+DEPEND_COM="
+ dev-lang/perl:=[berkdb]
+ dev-perl/DBI
+ dev-perl/Date-Manip
+ dev-perl/File-Copy-Recursive
+ dev-perl/List-MoreUtils
+ dev-perl/Log-Log4perl
+ dev-perl/Net-CIDR
+ dev-perl/Net-DNS
+ dev-perl/Net-Netmask
+ dev-perl/Net-SNMP
+ dev-perl/Net-Server[ipv6(-)?]
+ virtual/perl-Digest-MD5
+ virtual/perl-Getopt-Long
+ virtual/perl-MIME-Base64
+ virtual/perl-Storable
+ virtual/perl-Text-Balanced
+ virtual/perl-Time-HiRes
+ apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
+ asterisk? ( dev-perl/Net-Telnet )
+ cgi? (
+ dev-perl/FCGI
+ dev-perl/CGI-Fast
+ )
+ dhcpd? (
+ >=net-misc/dhcp-3[server]
+ dev-perl/Net-IP
+ dev-perl/HTTP-Date
+ )
+ doc? ( dev-python/sphinx )
+ http? ( dev-perl/libwww-perl )
+ irc? ( dev-perl/Net-IRC )
+ ldap? ( dev-perl/perl-ldap )
+ kernel_linux? ( sys-process/procps )
+ memcached? ( dev-perl/Cache-Memcached )
+ mysql? (
+ virtual/mysql
+ dev-perl/Cache-Cache
+ dev-perl/DBD-mysql
+ )
+ postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
+ ssl? ( dev-perl/Net-SSLeay )
+ syslog? ( virtual/perl-Sys-Syslog )
+ !minimal? (
+ dev-perl/HTML-Template
+ dev-perl/IO-Socket-INET6
+ dev-perl/URI
+ >=net-analyzer/rrdtool-1.3[graph,perl]
+ virtual/ssh
+ )
+ "
+
+# Keep this seperate, as previous versions have had other deps here
+DEPEND="${DEPEND_COM}
+ dev-perl/Module-Build
+ java? ( >=virtual/jdk-1.5 )
+ test? (
+ dev-perl/Test-Deep
+ dev-perl/Test-LongString
+ dev-perl/Test-Differences
+ dev-perl/Test-MockModule
+ dev-perl/Test-MockObject
+ dev-perl/File-Slurp
+ dev-perl/IO-stringy
+ dev-perl/IO-Socket-INET6
+ )"
+RDEPEND="${DEPEND_COM}
+ virtual/awk
+ ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
+ java? (
+ >=virtual/jre-1.5
+ || ( net-analyzer/netcat6 net-analyzer/netcat )
+ )
+ !minimal? (
+ virtual/cron
+ media-fonts/dejavu
+ )
+ selinux? ( sec-policy/selinux-munin )
+ !<sys-apps/openrc-0.11.8"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ enewgroup munin
+ enewuser munin 177 -1 /var/lib/munin munin
+ enewuser munin-async -1 /bin/sh /var/spool/munin-async
+ esethome munin-async /var/spool/munin-async
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ epatch "${WORKDIR}"/patches/*.patch
+
+ eapply_user
+
+ java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+ local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
+ use cgi || cgidir="${T}/useless/cgi-bin"
+
+ local cgiuser=$(usex apache2 apache munin)
+
+ cat >> "${S}"/Makefile.config <<- EOF
+ PREFIX=\$(DESTDIR)/usr
+ CONFDIR=\$(DESTDIR)/etc/munin
+ DOCDIR=${T}/useless/doc
+ MANDIR=\$(PREFIX)/share/man
+ LIBDIR=\$(PREFIX)/libexec/munin
+ HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
+ CGIDIR=${cgidir}
+ CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
+ CGIUSER=${cgiuser}
+ DBDIR=\$(DESTDIR)/var/lib/munin
+ DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
+ SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
+ LOGDIR=\$(DESTDIR)/var/log/munin
+ PERLSITELIB=$(perl -V:vendorlib | cut -d"'" -f2)
+ JCVALID=$(usex java yes no)
+ STATEDIR=\$(DESTDIR)/run/munin
+ EOF
+}
+
+# parallel make and install need to be fixed before, and I haven't
+# gotten around to do so yet.
+src_compile() {
+ emake -j1
+ use doc && emake -C doc html
+}
+
+src_test() {
+ if [[ ${EUID} == 0 ]]; then
+ eerror "You cannot run tests as root."
+ eerror "Please enable FEATURES=userpriv before proceeding."
+ return 1
+ fi
+
+ local testtargets="test-common test-node test-plugins"
+ use minimal || testtargets+=" test-master"
+
+ LC_ALL=C emake -j1 ${testtargets}
+}
+
+src_install() {
+ local dirs="
+ /var/log/munin
+ /var/lib/munin/plugin-state
+ /etc/munin/plugin-conf.d
+ /etc/munin/plugins"
+ use minimal || dirs+=" /etc/munin/munin-conf.d/"
+
+ keepdir ${dirs}
+ fowners munin:munin ${dirs}
+
+ # parallel install doesn't work and it's also pointless to have this
+ # run in parallel for now (because it uses internal loops).
+ emake -j1 DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
+
+ # we remove /run from the install, as it's not the package's to deal
+ # with.
+ rm -rf "${D}"/run || die
+
+ # remove the plugins for non-Gentoo package managers; use -f so that
+ # it doesn't fail when installing on non-Linux platforms.
+ rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
+
+ insinto /etc/munin/plugin-conf.d/
+ newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
+
+ newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
+ newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
+
+ newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
+
+ dodir /usr/lib/tmpfiles.d
+ cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF
+ d /run/munin 0700 munin munin - -
+ EOF
+
+ systemd_dounit "${FILESDIR}"/munin-async.service
+ systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
+ systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
+ systemd_dounit "${FILESDIR}"/munin-node.service
+
+ cat >> "${T}"/munin.env <<- EOF
+ CONFIG_PROTECT=/var/spool/munin-async/.ssh
+ EOF
+ newenvd "${T}"/munin.env 50munin
+
+ dodoc README ChangeLog INSTALL
+ if use doc; then
+ cd "${S}"/doc/_build/html || die
+ docinto html
+ dodoc -r *
+ cd "${S}" || die
+ fi
+
+ dodir /etc/logrotate.d/
+ sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \
+ "${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
+
+ dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
+
+ if use syslog; then
+ sed -i -e '/log_file/s| .*| Sys::Syslog|' \
+ "${D}"/etc/munin/munin-node.conf || die
+ fi
+
+ # Use a simpler pid file to avoid trouble with /run in tmpfs. The
+ # munin-node service is ran as user root, and only later drops
+ # privileges.
+ sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
+ "${D}"/etc/munin/munin-node.conf || die
+
+ keepdir /var/spool/munin-async/.ssh
+ touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
+ fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
+ fperms 0750 /var/spool/munin-async{,/.ssh}
+ fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
+
+ if use minimal; then
+ # This requires the presence of munin-update, which is part of
+ # the non-minimal install...
+ rm "${D}"/usr/libexec/munin/plugins/munin_stats
+ else
+ # remove font files so that we don't have to keep them around
+ rm "${D}"/usr/libexec/${PN}/*.ttf || die
+
+ if use cgi; then
+ sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
+
+ keepdir /var/cache/munin-cgi
+ touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
+ fowners $(usex apache2 apache munin) \
+ /var/cache/munin-cgi \
+ /var/log/munin/munin-cgi-{graph,html}.log
+
+ if use apache2; then
+ insinto /etc/apache2/vhosts.d
+ newins "${FILESDIR}"/munin.apache.include munin.include
+ newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
+ fi
+ else
+ sed \
+ -e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
+ -i "${D}"/etc/munin/munin.conf || die
+ fi
+
+ keepdir /var/lib/munin/.ssh
+ cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
+ IdentityFile /var/lib/munin/.ssh/id_ecdsa
+ IdentityFile /var/lib/munin/.ssh/id_rsa
+ EOF
+
+ fowners munin:munin /var/lib/munin/.ssh/{,config}
+ fperms go-rwx /var/lib/munin/.ssh/{,config}
+
+ dodir /usr/share/${PN}
+ cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
+ # Force the shell to bash
+ SHELL=/bin/bash
+ # Mail reports to root@, not munin@
+ MAILTO=root
+
+ # This runs the munin task every 5 minutes.
+ */5 * * * * /usr/bin/munin-cron
+
+ # Alternatively, this route works differently
+ # Update once a minute (for busy sites)
+ #*/1 * * * * /usr/libexec/munin/munin-update
+ ## Check for limit excess every 2 minutes
+ #*/2 * * * * /usr/libexec/munin/munin-limits
+ ## Update graphs every 5 minutes
+ #*/5 * * * * nice /usr/libexec/munin/munin-graph
+ ## Update HTML pages every 15 minutes
+ #*/15 * * * * nice /usr/libexec/munin/munin-html
+ EOF
+
+ cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
+ # Mail reports to root@, not munin@, only execute one at a time
+ !mailto(root),serial(true)
+
+ # This runs the munin task every 5 minutes.
+ @ 5 /usr/bin/munin-cron
+
+ # Alternatively, this route works differently
+ # Update once a minute (for busy sites)
+ #@ 1 /usr/libexec/munin/munin-update
+ ## Check for limit excess every 2 minutes
+ #@ 2 /usr/libexec/munin/munin-limits
+ ## Update graphs every 5 minutes
+ #@ 5 nice /usr/libexec/munin/munin-graph
+ ## Update HTML pages every 15 minutes
+ #@ 15 nice /usr/libexec/munin/munin-html
+ EOF
+
+ # remove .htaccess file
+ find "${D}" -name .htaccess -delete || die
+ fi
+}
+
+pkg_config() {
+ if use minimal; then
+ einfo "Nothing to do."
+ return 0
+ fi
+
+ einfo "Press enter to install the default crontab for the munin master"
+ einfo "installation from /usr/share/${PN}/f?crontab"
+ einfo "If you have a large site, you may wish to customize it."
+ read
+
+ ebegin "Setting up cron ..."
+ if has_version sys-process/fcron; then
+ fcrontab - -u munin < /usr/share/${PN}/fcrontab
+ else
+ # dcron is very fussy about syntax
+ # the following is the only form that works in BOTH dcron and vixie-cron
+ crontab - -u munin < /usr/share/${PN}/crontab
+ fi
+ eend $?
+
+ einfo "Press enter to set up the SSH keys used for SSH transport"
+ read
+
+ # generate one rsa (for legacy) and one ecdsa (for new systems)
+ ssh-keygen -t rsa \
+ -f /var/lib/munin/.ssh/id_rsa -N '' \
+ -C "created by portage for ${CATEGORY}/${PN}" || die
+ ssh-keygen -t ecdsa \
+ -f /var/lib/munin/.ssh/id_ecdsa -N '' \
+ -C "created by portage for ${CATEGORY}/${PN}" || die
+ chown -R munin:munin /var/lib/munin/.ssh || die
+ chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
+
+ einfo "Your public keys are available in "
+ einfo " /var/lib/munin/.ssh/id_rsa.pub"
+ einfo " /var/lib/munin/.ssh/id_ecdsa.pub"
+ einfo "and follows for convenience"
+ echo
+ cat /var/lib/munin/.ssh/id_*.pub
+}
+
+pkg_postinst() {
+ elog "Please follow the munin documentation to set up the plugins you"
+ elog "need, afterwards start munin-node."
+ elog ""
+ elog "To make use of munin-async, make sure to set up the corresponding"
+ elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
+ elog ""
+ if ! use minimal; then
+ elog "Please run"
+ elog " emerge --config net-analyzer/munin"
+ elog "to automatically configure munin's cronjobs as well as generate"
+ elog "passwordless SSH keys to be used with munin-async."
+ fi
+ elog ""
+ elog "Further information about setting up Munin in Gentoo can be found"
+ elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
+
+ if use cgi; then
+ chown $(usex apache2 apache munin) \
+ "${ROOT}"/var/cache/munin-cgi \
+ "${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
+
+ if use apache2; then
+ elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
+ elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
+ elog "host you want it to be served."
+ elog "If you want to enable CGI-based HTML as well, you have to add to"
+ elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
+ else
+ elog "Effective CGI support has just been added in 2.0.7-r6."
+ elog "Documentation on how to use it is still sparse."
+ fi
+ fi
+
+ # we create this here as we don't want Portage to check /run
+ # symlinks but we still need this to be present before the reboot.
+ if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
+ mkdir "${ROOT}"/run/munin
+ chown munin:munin "${ROOT}"/run/munin
+ chmod 0700 "${ROOT}"/run/munin
+ fi
+}
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index cdcf3a5744fe..5f467d74eee9 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -1,6 +1,8 @@
+AUX define-own-mysql-port-constant.patch 3271 SHA256 25d25d3aafa1a3e77df0ec87398a066c9db711a2559b32bdaa400ce3760b4da9 SHA512 18cb9be96b3e39a07eeb1cf6bccbbe26766ac355f4822c132253e25a6909c418071c2dc546fb60c055b78f620180035e57436a8ebb771ae1096b78d2e1c7c6ec WHIRLPOOL 0e1995aea8946108c98ad31793406b40b325768482b601530112da121d030375bee961d01e398f756d195097d4e0a196df1e3c5bc19cfece8295c7f5f1805d73
DIST nagios-plugins-2.0.3.tar.gz 2659772 SHA256 8f0021442dce0138f0285ca22960b870662e28ae8973d49d439463588aada04a SHA512 2753e6f3fc7433a5583fee01e63a65b9ea74155964f2b6e6bf3458e56cb29ea5dbd020f83816044a717b66d6548d203b3a082fba0faedcd629c7a8457bc19b36 WHIRLPOOL 4b0e4024833373df3f0db44657345a1f4495c4022e56bf6b369cc2846f9127e565520f6b7cdf1b94384592e78327d584da7d939a3ac0586e0ae67fd1258c138b
DIST nagios-plugins-2.2.1.tar.gz 2728818 SHA256 647c0ba4583d891c965fc29b77c4ccfeccc21f409fdf259cb8af52cb39c21e18 SHA512 6ffe313a56a305b382f62abc0f0958d7078f9050e1340f30721d6e6f71944b57b1650e90e6835c35dd7c9f3f4b4cee9f235b8382b0811db30b3729daaafc9bc3 WHIRLPOOL 57579a7948ab1ce5c66db47e7221b5b8087e3fa027b2a69ad95129ba44af6ba13eaa4b766f3a2de11f708a80e3f44d6d54c6d513388e58c5be75c7bb166325e8
EBUILD nagios-plugins-2.0.3-r2.ebuild 2828 SHA256 8ad04b08572e3e7d56ae11f9e0b82fd87f041040fd8fbf1cfdb8a2fdd4fe6b78 SHA512 cabe19f142006c4d104721361c2c58fc7a103717041050a21bc21b47adb6702bf05c77f1ed8b063f74b11a59a2dd1120d8478e5b1d803636aeb9f1ae92c2ae91 WHIRLPOOL 3bdfcb4df0bb46509d9ce0cdfbe3e0e74cb9e7452f0f0c314f570bffac452366e858f4d0175292da9e97188c5a0ec0ffff972ca0bf821fe93ef520328c12f016
+EBUILD nagios-plugins-2.2.1-r2.ebuild 3115 SHA256 357090140031d7109f91ae8181ba24907a60a5c13eb6ee4f13d7fc2302704712 SHA512 b70231b8e2fd2dedf9e3308ac2005e43d6fef8ea2f17555cc155e689f0194e38977f9961ec233a84f81560c6dedfbdbf1d2108ce5238035a4ed101c46fbf2329 WHIRLPOOL b841614c25cd7de02a397c50581f2699b5998c4934488e040747e700e8f1b431b348785c9e69cc140e5d64c3cab774fc12d72426cbac06cb850901f9191307b4
EBUILD nagios-plugins-2.2.1.ebuild 2979 SHA256 29d987c96b656566dcc806be515cf6fd157f707f813830bd520fef7690616589 SHA512 d11747ef8007eedb29f51598bdd2109fbb17a8cc93304b441b22be94fbbbb4ce8b59132340e20999428123650972708f3812fc8134cc95256d4ab09cff6f2ba2 WHIRLPOOL 5db78b4a161216381bf3cb3d1488c37f9fd37ae7f0702d0778cdf06047763823bcd4f0710bb2bbb1a38b9b8924f8197645702161cf0d27bd95cde41dc70dc073
MISC ChangeLog 4744 SHA256 4c08d4f657682469e96dd1a18715ab6b6439de60e0b69132de016bd98acf3138 SHA512 5af2e792504b1771880084c26439b4446bf614c3e1fcc00a1b84c600eb35ce02b729af739d8f7443671a093f16d37ba5f20129c1d43aaab54640e109c128762a WHIRLPOOL 4765d0aae5d3f87f28506bcdbbfbf7e6bcf1dd5a66366b0c05c69423a910b8d4f54168f397dc84343ec85dce9d9a5170c84be02e88dbc837a4698698f0768f4c
MISC ChangeLog-2015 16032 SHA256 0fcc0dcd50ab5fd579c2fe7d87c33deb815f396f4c70a31909f1da00a47b7a74 SHA512 2ac4eb36d06e72159faa28f62cafa23f8e3b5db0f030209717cf65775f1ff3bd3f95511fd5c17f95866689e77624ab76835876dc00c1598bae45d6f6e4ed9fe5 WHIRLPOOL 2eb21e54a88026a1adfbd242b1ed2892b4c28b8fb418f6dee36f2077571d9b9f25f6c82f9b3774847e62aa6e5261b695d4bdfc3d31cf06ced31aa493a6a47496
diff --git a/net-analyzer/nagios-plugins/files/define-own-mysql-port-constant.patch b/net-analyzer/nagios-plugins/files/define-own-mysql-port-constant.patch
new file mode 100644
index 000000000000..67bc65cad880
--- /dev/null
+++ b/net-analyzer/nagios-plugins/files/define-own-mysql-port-constant.patch
@@ -0,0 +1,100 @@
+From 43ff2e8607c0b7095c2a4dcab6e466bc67e2e2ff Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Thu, 26 Oct 2017 15:01:17 -0400
+Subject: [PATCH 1/3] plugins/check_mysql*.c: define our own default MySQL
+ port.
+
+The MYSQL_PORT constant used to be defined in mysql.h, and was used as
+the default port in the two plugins check_mysql and check_mysql_query.
+Now that mysql.h no longer defines that constant, our plugins fail to
+build against newer versions of MySQL and MariaDB.
+
+Since MYSQL_PORT used the "default port" on the local system, it
+actually was not the best choice as the default for the check plugins:
+when monitoring remote MySQL servers, the usual default of 3306 is
+more likely to be correct than whatever the local server happens to be
+listening on.
+
+As a result, we fix the issue by defining our own constant, called
+CHECK_PORT_DEFAULT, as "3306" at the top of both check_mysql.c and
+check_mysql_query.c. The existing uses of MYSQL_PORT have been changed
+to use the new CHECK_PORT_DEFAULT.
+
+This change is backwards-incompatible: any users who compiled in a
+MYSQL_PORT other than 3306 and who were running their checks on the
+same server as the database will now need to specify that port
+explicitly.
+
+Closes: https://github.com/nagios-plugins/nagios-plugins/issues/288
+---
+ plugins/check_mysql.c | 7 +++++--
+ plugins/check_mysql_query.c | 7 +++++--
+ 2 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
+index 83f89c85..c0b61292 100644
+--- a/plugins/check_mysql.c
++++ b/plugins/check_mysql.c
+@@ -36,6 +36,9 @@ const char *email = "devel@nagios-plugins.org";
+
+ #define SLAVERESULTSIZE 70
+
++/* The default port that MySQL servers listen on. */
++#define CHECK_PORT_DEFAULT 3306
++
+ #include "common.h"
+ #include "utils.h"
+ #include "utils_base.h"
+@@ -58,7 +61,7 @@ char *ciphers = NULL;
+ bool ssl = false;
+ char *opt_file = NULL;
+ char *opt_group = NULL;
+-unsigned int db_port = MYSQL_PORT;
++unsigned int db_port = CHECK_PORT_DEFAULT;
+ int check_slave = 0, warn_sec = 0, crit_sec = 0;
+ int ignore_auth = 0;
+ int verbose = 0;
+@@ -505,7 +508,7 @@ void
+ print_help (void)
+ {
+ char *myport;
+- xasprintf (&myport, "%d", MYSQL_PORT);
++ xasprintf (&myport, "%d", CHECK_PORT_DEFAULT);
+
+ print_revision (progname, NP_VERSION);
+
+diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c
+index 436e0685..e9c3acfb 100644
+--- a/plugins/check_mysql_query.c
++++ b/plugins/check_mysql_query.c
+@@ -33,6 +33,9 @@ const char *progname = "check_mysql_query";
+ const char *copyright = "1999-2014";
+ const char *email = "devel@nagios-plugins.org";
+
++/* The default port that MySQL servers listen on. */
++#define CHECK_PORT_DEFAULT 3306
++
+ #include "common.h"
+ #include "utils.h"
+ #include "utils_base.h"
+@@ -48,7 +51,7 @@ char *db_pass = NULL;
+ char *db = NULL;
+ char *opt_file = NULL;
+ char *opt_group = NULL;
+-unsigned int db_port = MYSQL_PORT;
++unsigned int db_port = CHECK_PORT_DEFAULT;
+
+ int process_arguments (int, char **);
+ int validate_arguments (void);
+@@ -300,7 +303,7 @@ void
+ print_help (void)
+ {
+ char *myport;
+- xasprintf (&myport, "%d", MYSQL_PORT);
++ xasprintf (&myport, "%d", CHECK_PORT_DEFAULT);
+
+ print_revision (progname, NP_VERSION);
+
+--
+2.13.6
+
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r2.ebuild
new file mode 100644
index 000000000000..7cdc0f879966
--- /dev/null
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="Official plugins for Nagios"
+HOMEPAGE="http://nagios-plugins.org/"
+SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl"
+
+# Most of the plugins use automagic dependencies, i.e. the plugin will
+# get built if the binary it uses is installed. For example, check_snmp
+# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
+# installed. End result: most of our runtime dependencies are required
+# at build time as well.
+#
+# REAL_DEPEND contains the dependencies that are actually needed to
+# build. DEPEND contains those plus the automagic dependencies.
+#
+REAL_DEPEND="dev-lang/perl
+ ldap? ( net-nds/openldap )
+ mysql? ( virtual/mysql )
+ postgres? ( dev-db/postgresql:* )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ radius? ( net-dialup/freeradius-client )"
+
+DEPEND="${REAL_DEPEND}
+ nagios-dns? ( net-dns/bind-tools )
+ nagios-game? ( games-util/qstat )
+ nagios-ping? ( net-analyzer/fping )
+ samba? ( net-fs/samba )
+ ssh? ( net-misc/openssh )
+ snmp? ( dev-perl/Net-SNMP
+ net-analyzer/net-snmp[-minimal] )"
+
+# Basically everything collides with nagios-plugins.
+RDEPEND="${DEPEND}
+ !net-analyzer/monitoring-plugins
+ selinux? ( sec-policy/selinux-nagios )"
+
+# At least one test is interactive.
+RESTRICT="test"
+
+DOCS=(
+ ACKNOWLEDGEMENTS
+ AUTHORS
+ CODING
+ ChangeLog
+ FAQ
+ NEWS
+ README
+ REQUIREMENTS
+ SUPPORT
+ THANKS
+)
+
+PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" )
+
+src_prepare() {
+ default
+
+ # Fix the path to our perl interpreter
+ sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \
+ "${S}"/plugins-scripts/*.pl \
+ || die 'failed to fix perl interpreter path'
+}
+
+src_configure() {
+ # Use an array to prevent econf from mangling the ping args.
+ local myconf=()
+
+ if use ssl; then
+ myconf+=( $(use_with ssl openssl /usr) )
+ else
+ myconf+=( --without-openssl )
+ myconf+=( --without-gnutls )
+ fi
+
+ # The autodetection for these two commands can hang if localhost is
+ # down or ICMP traffic is filtered. Bug #468296.
+ myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" )
+
+ if use ipv6; then
+ myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" )
+ fi
+
+ econf \
+ $(use_with mysql) \
+ $(use_with ipv6) \
+ $(use_with ldap) \
+ $(use_with postgres pgsql /usr) \
+ $(use_with radius) \
+ "${myconf[@]}" \
+ --libexecdir="/usr/$(get_libdir)/nagios/plugins" \
+ --sysconfdir="/etc/nagios"
+}
+
+pkg_preinst() {
+ enewgroup nagios
+ enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+pkg_postinst() {
+ elog "This ebuild has a number of USE flags that determine what you"
+ elog "are able to monitor. Depending on what you want to monitor, some"
+ elog "or all of these USE flags need to be set."
+ elog
+ elog "The plugins are installed in ${ROOT}usr/$(get_libdir)/nagios/plugins"
+}
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index 79b5eaf36c71..87ab4d553c41 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,19 +1,11 @@
AUX pmacctd-conf.d 153 SHA256 a29a5d9aca2df30ca9c62e3441d2f3616eb506c457074ae690a390d55a040763 SHA512 1637316833db6e2a7c2d531deb4d68d647948bc03da8aecf0c6a34dd2f0c58d58d8473270e6096cf232e98c07946bac265161d4a8577def6cb72a4e8c9778c31 WHIRLPOOL b0a58e7268535eca709371bef9282583fbc70e6ce1d2d92c42203e9a2f227ed0218bf684f3e54241fa80ccd49381b020ecf49f582193d629ae8f8632e17ba901
AUX pmacctd-init.d 839 SHA256 fc222bea9cde5ce6edac88e2ff16b14b261228a21f4b251f992c4615f70dc58e SHA512 c340e62eebfc15ee72591178451d46052e03ef1656a0b81a4b53c02b69df1e5a365742ddf98d9f7f0a8de1345b6a111b8e5ee9009f33fed2a3204344a15690a3 WHIRLPOOL 8420e71c590bf4875622862ac44dc3d0c47dc28e3d6335a9dca0a8ac30cb571cc535fe08d4c4f4ede6a1acc34fc0a17bc508fb9655aa1bdbec673c10e3458b74
DIST pmacct-1.5.1.tar.gz 874563 SHA256 96134549a10947f3f6d610b670a26f1a54e01af4be0eff09bf48c19246d33584 SHA512 c3a0ddaf1b8679df2097147ce844eb2a3e3058599aea457e463cd4e65a7601e0ce5bac5ca5e1c82afecd5edc92dae673eed3ed1787bfbd3e8ac2af5677885bb7 WHIRLPOOL bd071ac30493f5ee2e0393eb9277dfae2d2fdd6283293aee589ae41ab326b0aaef0ec9b70a421eeca4df857a0046ca7b196e0692ffdd2ea12d9a7c66a74e9a32
-DIST pmacct-1.5.2.tar.gz 897530 SHA256 c12e3897e2f9aa89333968da46eb46855f357750ac1e06e36e72f374e2b54df9 SHA512 3705432cc2a28e179de637b8fc11becd2022b36191a13d440d5bec7d7e594d0936773f202f3d82e983a83695176380aa6a7c27748b632b180000590be0ead599 WHIRLPOOL e7bb1fa1b7372af7d932e19da1d14f3922d8a8ebda245fa03e2a5f283c66141a9299cc9dfa6f32e9384c7d2c9a2d2ef35ef62d7b9910e4f76cacc132231420e5
-DIST pmacct-1.5.3_pre20150925.tar.gz 896168 SHA256 ae63580ae879b3ce20e9725690b6337a72857376192dd2f610e0359ee9d4364c SHA512 e6675855f403ee746b0243cce1ee0e28fd649d2b1c6c1e33f012d7858f977952ba6ed5d1ee47ce42a4f6950b139be2bc50a88740fd19c4775d61d1fb1aa6c05d WHIRLPOOL c7f5003754835f0e1883f13bfba740667ebcbef54a49cc8b8f6fcca1f2db2dea337c910417ff75d86dcfa6bc294fa9b44567bc0d5d07b79ffcfc9b11b1efad5d
-DIST pmacct-1.6.0.tar.gz 1253947 SHA256 1b8d65032b21e152811b6a20ee38ac18ded7ee9ff27cd86870673f088db3c395 SHA512 6c227648a67b69096c814a41f3931f516f2286c110d635ad351de96ee3a918b53a9c723b2199d0dd3ebff1ac20471d9cde2cab2d1b97c147b08ba1a4bd42f872 WHIRLPOOL 66fe8d57ed04f3433dd9ce974b75d0810fecacbd163cbc29e83de70b211c5a6498fe7c627dfc783c8e123dc742ecfad920b2c8ecc19dc830f328eecf1522b566
-DIST pmacct-1.6.1.tar.gz 1280968 SHA256 eb332a6812d1e02134900a1d115a24f315de7c861a9b63093c1226753486cbe7 SHA512 e4c24d4c09716374a1315f8b4a70f3c58fb45848d80cf5c36e5a7653c47249717353a297826e341ec9fd741dd77b840241ad8f5e9d33f4c3dd0525661127cf27 WHIRLPOOL 2ba781d320ceccf7a815d5dd1f8e2362d3fa5085fecafe4e6d75116ca3dafb7ce49d4c455add1615773a83e614f7b7c941c2e4c6ec8424b1cdaf559227f3ab98
DIST pmacct-1.6.2.tar.gz 1311678 SHA256 e6ede7f500fb1771b5cdfb63dfa016e34c19b8aa2d2f672bd4c63016a5d6bbe2 SHA512 8495f97752ae586fd842eed49ce91db3e4753133f7d380d067e7df153abeea469e5126800074e9071cb7227a3f1df64d4642dfece624fbbfa39b4537fde38b46 WHIRLPOOL ebfa8caeaa1cf48d6b3785cb600d4459e9408e9e8e110b636d0dd0108fcd33a8660259d99469960d32aff720b5387b029891f4d6419dab88920f3bae89f0871a
+DIST pmacct-1.7.0.tar.gz 1351888 SHA256 19c3795db452191c2b1b9533fecaf69c6767c9fb7b4ae60ae3f28e24eb2ee9c8 SHA512 14f1cecc562f008d9b79259f885fc3a1d0a74efa4840d6150277c9bb3c67a233ca9a6b921d9d83fd488d1eb6f535075d7fbf53de0036c48611ffcbf5eb7559b5 WHIRLPOOL d0b09160195ea53e7b83f7a70cb8a051874dd5d3ef00c27fd9becc0dcf5b72f2ce2e01d73994ca54fee14feacacb0029bbfa94a7e73c40010a21718d48e25891
EBUILD pmacct-1.5.1.ebuild 1617 SHA256 893f3e9680d8b169475ad664f509ee0c41434221cb6a03fe7ca197760ba1df1c SHA512 8e83f6d7300c20cd083a92bf9f53a9e62767587c950eecd5677c6d7aa0f63efa87f9bd65ad48cbedc5f3597bbc02d6f1d40b78e13aa325b750cf2d7ab32d545d WHIRLPOOL 328e020598b27816d19b5a243bc4803f1074f14181a53eda3e30f2e6f222891a4fb772610c0b195e514a1208d5e5907ce8f22a0e39396c8ddd3ad03a74e29fe5
-EBUILD pmacct-1.5.2.ebuild 1620 SHA256 347e9ba060161fdee3ea24c9925fdcd1f7d47bc396c6c6c1ba13f06a46c89e2f SHA512 74f357d94b6bb4867525abc312e6f0424089b3adda6d3321af15c16136049123e54a77603c7f4c3e04255b4aafc98292b98bd06591bce72eabb7d052512f5514 WHIRLPOOL af3d188e3b4917cbb0c1a21457eebcd63e112c8bd3090f0e0ba07cc0f272a182254de78849466595c43072700939326fa8fbc8ae8b9ccfb47cece2a5317936cf
-EBUILD pmacct-1.5.3_pre20150925-r1.ebuild 1733 SHA256 860fa5ba5c6af4266c73de3a9cf21da657c1c4431a997b3687dff9b9946bab46 SHA512 ea54111bbf5bd0be3eb4a856c1596902dc7df5ad0678b220408a75ea03555a8d94e486e88f45898dc6ae767a1c76e937f2414376648b8ed67bb16074ada62984 WHIRLPOOL c649c38b0ddbebea789f04a6e65e3b53e1107e16cd5f781af369a3c223dffb62e1da7a71d9add77b44ad0bc7e420b041dccd2d8cb642ddd46bab926c021e089a
-EBUILD pmacct-1.5.3_pre20150925.ebuild 1629 SHA256 2cb39f885706ae03524c23dc1318d7c07cd405c74d62fdb6ee646d246b17451b SHA512 dca90f9561ae23b4cd556e8af7d552f04973ace68d77a7eab224fdd263760b7fe257c007e4aa2602f1ec8f478447b0be50006bbc1a922fabb9bb4f739557c459 WHIRLPOOL 695accbe526be5298a1e69f8e9712a7712646d08ad1bc8771cbfdcc699c6f1cd0b77c56919d389a885c98b73899ce3551b1cb17f33e9b56fd570c9d38b1c8828
-EBUILD pmacct-1.6.0.ebuild 1647 SHA256 9c684f5630261c946a0a204a9e9b88cb56b5f5fd7449ebd6ec36df95a9b50120 SHA512 7fd9a1472a047e710fc5f1ef09be2291725aacb0278235f06440e027b95dcaf540e6353f746a62f915760337e00d3704c1f44effcf7cf925bb53567edd2b3f79 WHIRLPOOL ab90646a44861c3cd9576b120de9288cd2d68ceaf89af5f9e0e175c01c1dff29bfe920c086115a003aec4a12e06ca3b876519a6d777cf2d12fa47285bd8d49f7
-EBUILD pmacct-1.6.1-r1.ebuild 1797 SHA256 71a6e8efb3d8d09f2fea98f1770158e1e786a275888518b5a08298c15c2f83c3 SHA512 43fccffe30d711724a937cbbe236f379f33b6d2bdebde91743bc5d05355532a46ac85bb8a949f2563d2d023dd2dbf3b940526698e59ea6acf569f0ff9eea7438 WHIRLPOOL 54a487491997e87644890ee78e86b86bda6cdb80b257a6a245dff1494aacb3f49e737a75f78ed944d65215b0a88e660f9a9ea54710a81685a484fc89af364256
-EBUILD pmacct-1.6.1.ebuild 1647 SHA256 9c684f5630261c946a0a204a9e9b88cb56b5f5fd7449ebd6ec36df95a9b50120 SHA512 7fd9a1472a047e710fc5f1ef09be2291725aacb0278235f06440e027b95dcaf540e6353f746a62f915760337e00d3704c1f44effcf7cf925bb53567edd2b3f79 WHIRLPOOL ab90646a44861c3cd9576b120de9288cd2d68ceaf89af5f9e0e175c01c1dff29bfe920c086115a003aec4a12e06ca3b876519a6d777cf2d12fa47285bd8d49f7
-EBUILD pmacct-1.6.2.ebuild 1792 SHA256 062ba2df34c054b5dfda57e0d65980462718738c3b3e9fdd0fff2f3aa9742621 SHA512 ef4fb78a56a8ffaec1d26bb736bace51641f68f4e67e42dcb7356019000889225cac7472b0074924786521dfcfcc03854a91e88fde6d7ac48d1939b7f99a6fcd WHIRLPOOL 123f4bf4557ab1f87b798debf4a06a6ead402c1b6c56bf92bac04162ef538c5dd67ce0c998bc26b6f0d9aa1af11abcd90122b7add7baa8f98cc1eccd3fc20879
+EBUILD pmacct-1.6.2.ebuild 1797 SHA256 71a6e8efb3d8d09f2fea98f1770158e1e786a275888518b5a08298c15c2f83c3 SHA512 43fccffe30d711724a937cbbe236f379f33b6d2bdebde91743bc5d05355532a46ac85bb8a949f2563d2d023dd2dbf3b940526698e59ea6acf569f0ff9eea7438 WHIRLPOOL 54a487491997e87644890ee78e86b86bda6cdb80b257a6a245dff1494aacb3f49e737a75f78ed944d65215b0a88e660f9a9ea54710a81685a484fc89af364256
+EBUILD pmacct-1.7.0.ebuild 1969 SHA256 7f189f44f3a48e4575821377048376ba809320bae7b3666df05503bba36896fd SHA512 3692ebc01a464fb66bf4fa1891ad8ae5f9c9c2299b9038a1bc49fb742a54312c10005f8e860c268f5727b93ee1fe9059e6d87838318d2940d1048d3f6950928a WHIRLPOOL f8c4a46195ea3acbf37c8771a86aeac638b5f4715cb8ed3cd619e29387aaaec6030909aa9bc85e413ce1d2c403019a166ac2059b347f82104c031da5afe2e694
MISC ChangeLog 4667 SHA256 76e28f799b6a169c966ab4e4eaf08d9cd4cef27c24ea6b6d32249ce26f781626 SHA512 71550717ae9cb8c2376c6b36e65335037f90f891d7e17ff8ee21b4d969255a4962fcdae982531adbbaaa0747173aef17a8a59ac55e30f138087c0df13c11e651 WHIRLPOOL 3c453b68841013608174bfc2ac9bd0b605911bb511ffc88f46c184cd2a110258ca36dde9fe6ae94a4d6295fd25751826f9e8fd95cd5210e33d53a892fff5fcab
MISC ChangeLog-2015 16467 SHA256 701fc37effed3fae7496e033804882c9a5b444a768253c24ae2c6426466ad06d SHA512 f064726b88efb5fefc14159aad389238e71076521ec3c89179181e2bea14b92ea07bd75c16ffeae5af68e59945d4a0203fc911cab6a16f512080051470e10796 WHIRLPOOL eb39cb3355047a59500742de13a8fcb224ab51bd94409462c20b77c62c502cd429d385c22acf6d3539e99dffaa03f45b7b7f6580f268795a8d62f853e05eb1b1
-MISC metadata.xml 920 SHA256 7c47d50473b86620b2e2367e5dfe49152a9eaa31eff2cfa82665207642cab6b0 SHA512 a664364683c690536a88f70a9bee2916d58369fc9f4fae16fa818fa27da583214cedc38cabff773577b32786776f4abb382bbccd5584cd049f7f65b3b82decd9 WHIRLPOOL 7063960eeb90eeadfd05115ddc8ffc0ec919cd1040bf1080e574b3afdb45c3fee3328ccddcff3b9ccf2251a2a556799deae03e85fd4bd7c92b52e99486aee22d
+MISC metadata.xml 1140 SHA256 77a23129a81bfeb2a2b255a8b6af510c21610ae197e689407a583413a29b4e1a SHA512 1b35f356c2991f002b7803897442c78040d41cf62cc60833454642e2389c256463df47a43ce125441239370cbcbd388d529146841fa7cb98079e85e23122f51c WHIRLPOOL 6bf403da1202af204ef3e442bc4c98e5e70f1a6af08c2811c85438d0ab85d36af335e2d5e51b63de1505226aa8be3f688dca8888eb02efb7fbb1713813c6da62
diff --git a/net-analyzer/pmacct/metadata.xml b/net-analyzer/pmacct/metadata.xml
index cc407997e255..178cb4633b4f 100644
--- a/net-analyzer/pmacct/metadata.xml
+++ b/net-analyzer/pmacct/metadata.xml
@@ -7,12 +7,14 @@
</maintainer>
<use>
<flag name="64bit">Use 64bit counters instead of 32bit ones</flag>
-<flag name="geoipv2">Add support for GeoIP2 through <pkg>dev-libs/libmaxminddb</pkg></flag>
-<flag name="jansson">Add support for JSON through <pkg>dev-libs/jansson</pkg></flag>
-<flag name="kafka">Add support for Apache Kafka through <pkg>dev-libs/librdkafka</pkg></flag>
-<flag name="mongodb">Add support for mongodb backend</flag>
-<flag name="nflog">Add support for NFLOG through uacctd</flag>
-<flag name="rabbitmq">Add support for RabbitMQ through <pkg>net-libs/rabbitmq-c</pkg></flag>
+<flag name="geoipv2">Enable support for GeoIP2 through <pkg>dev-libs/libmaxminddb</pkg></flag>
+<flag name="jansson">Enable support for JSON through <pkg>dev-libs/jansson</pkg></flag>
+<flag name="kafka">Enable support for Apache Kafka through <pkg>dev-libs/librdkafka</pkg></flag>
+<flag name="mongodb">Enable support for MongoDB through <pkg>dev-libs/mongo-c-driver</pkg></flag>
+<flag name="ndpi">Enable support for nDPI through <pkg>net-libs/nDPI</pkg></flag>
+<flag name="nflog">Enable support for NFLOG through uacctd</flag>
+<flag name="rabbitmq">Enable support for RabbitMQ through <pkg>net-libs/rabbitmq-c</pkg></flag>
<flag name="ulog">Enable support for ULOG in older kernels (deprecated)</flag>
+<flag name="zmq">Enable support for ZeroMQ through <pkg>net-libs/zeromq</pkg></flag>
</use>
</pkgmetadata>
diff --git a/net-analyzer/pmacct/pmacct-1.5.2.ebuild b/net-analyzer/pmacct/pmacct-1.5.2.ebuild
deleted file mode 100644
index f27118bbbe3c..000000000000
--- a/net-analyzer/pmacct/pmacct-1.5.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="A network tool to gather IP traffic information"
-HOMEPAGE="http://www.pmacct.net/"
-SRC_URI="http://www.pmacct.net/${P/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="64bit debug geoip ipv6 mongodb mysql postgres sqlite threads ulog"
-
-RDEPEND="
- net-libs/libpcap
- geoip? ( dev-libs/geoip )
- mongodb? (
- >=dev-libs/mongo-c-driver-0.8.1-r1
- <dev-libs/mongo-c-driver-0.98
- )
- mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql:* )
- sqlite? ( =dev-db/sqlite-3* )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P/_/}"
-
-DOCS=(
- CONFIG-KEYS ChangeLog FAQS KNOWN-BUGS QUICKSTART README TODO TOOLS UPGRADE
- docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-
-src_configure() {
- tc-export CC AR RANLIB
-
- econf \
- $(use_enable 64bit) \
- $(use_enable debug) \
- $(use_enable geoip) \
- $(use_enable ipv6) \
- $(use_enable mongodb) \
- $(use_enable mysql) \
- $(use_enable postgres pgsql) \
- $(use_enable sqlite sqlite3) \
- $(use_enable threads) \
- $(use_enable ulog) \
- $(usex mysql "--with-mysql-includes=$(mysql_config --variable=pkgincludedir)" '') \
- $(usex mysql "--with-mysql-libs=$(mysql_config --variable=pkglibdir)" '') \
- --disable-debug
-}
-
-src_install() {
- default
-
- for dirname in examples sql; do
- docinto ${dirname}
- dodoc -r ${dirname}/*
- done
-
- newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
- newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
-
- insinto /etc/pmacctd
- newins examples/pmacctd-imt.conf.example pmacctd.conf
-}
diff --git a/net-analyzer/pmacct/pmacct-1.5.3_pre20150925-r1.ebuild b/net-analyzer/pmacct/pmacct-1.5.3_pre20150925-r1.ebuild
deleted file mode 100644
index bf3780777ae8..000000000000
--- a/net-analyzer/pmacct/pmacct-1.5.3_pre20150925-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="A network tool to gather IP traffic information"
-HOMEPAGE="http://www.pmacct.net/"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="64bit debug geoip geoipv2 ipv6 mongodb mysql postgres sqlite threads ulog"
-REQUIRED_USE="
- ?? ( geoip geoipv2 )
-"
-
-RDEPEND="
- net-libs/libpcap
- geoip? ( dev-libs/geoip )
- geoipv2? ( dev-libs/libmaxminddb )
- mongodb? (
- >=dev-libs/mongo-c-driver-0.8.1-r1
- <dev-libs/mongo-c-driver-0.98
- )
- mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql:* )
- sqlite? ( =dev-db/sqlite-3* )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/pmacct-daily"
-
-DOCS=(
- CONFIG-KEYS ChangeLog FAQS KNOWN-BUGS QUICKSTART README TODO TOOLS UPGRADE
- docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-
-src_configure() {
- tc-export CC AR RANLIB
-
- econf \
- $(use_enable 64bit) \
- $(use_enable debug) \
- $(use_enable geoip) \
- $(use_enable geoipv2) \
- $(use_enable ipv6) \
- $(use_enable mongodb) \
- $(use_enable mysql) \
- $(use_enable postgres pgsql) \
- $(use_enable sqlite sqlite3) \
- $(use_enable threads) \
- $(use_enable ulog) \
- $(usex mysql "--with-mysql-includes=$(mysql_config --variable=pkgincludedir)" '') \
- $(usex mysql "--with-mysql-libs=$(mysql_config --variable=pkglibdir)" '') \
- --disable-debug
-}
-
-src_install() {
- default
-
- for dirname in examples sql; do
- docinto ${dirname}
- dodoc -r ${dirname}/*
- done
-
- newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
- newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
-
- insinto /etc/pmacctd
- newins examples/pmacctd-imt.conf.example pmacctd.conf
-}
diff --git a/net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild b/net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild
deleted file mode 100644
index f28070082930..000000000000
--- a/net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="A network tool to gather IP traffic information"
-HOMEPAGE="http://www.pmacct.net/"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="64bit debug geoip ipv6 mongodb mysql postgres sqlite threads ulog"
-
-RDEPEND="
- net-libs/libpcap
- geoip? ( dev-libs/geoip )
- mongodb? (
- >=dev-libs/mongo-c-driver-0.8.1-r1
- <dev-libs/mongo-c-driver-0.98
- )
- mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql:* )
- sqlite? ( =dev-db/sqlite-3* )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/pmacct-daily"
-
-DOCS=(
- CONFIG-KEYS ChangeLog FAQS KNOWN-BUGS QUICKSTART README TODO TOOLS UPGRADE
- docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-
-src_configure() {
- tc-export CC AR RANLIB
-
- econf \
- $(use_enable 64bit) \
- $(use_enable debug) \
- $(use_enable geoip) \
- $(use_enable ipv6) \
- $(use_enable mongodb) \
- $(use_enable mysql) \
- $(use_enable postgres pgsql) \
- $(use_enable sqlite sqlite3) \
- $(use_enable threads) \
- $(use_enable ulog) \
- $(usex mysql "--with-mysql-includes=$(mysql_config --variable=pkgincludedir)" '') \
- $(usex mysql "--with-mysql-libs=$(mysql_config --variable=pkglibdir)" '') \
- --disable-debug
-}
-
-src_install() {
- default
-
- for dirname in examples sql; do
- docinto ${dirname}
- dodoc -r ${dirname}/*
- done
-
- newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
- newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
-
- insinto /etc/pmacctd
- newins examples/pmacctd-imt.conf.example pmacctd.conf
-}
diff --git a/net-analyzer/pmacct/pmacct-1.6.0.ebuild b/net-analyzer/pmacct/pmacct-1.6.0.ebuild
deleted file mode 100644
index 91a703ca1ffe..000000000000
--- a/net-analyzer/pmacct/pmacct-1.6.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="A network tool to gather IP traffic information"
-HOMEPAGE="http://www.pmacct.net/"
-SRC_URI="http://www.pmacct.net/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="64bit debug geoip geoipv2 ipv6 mongodb mysql postgres sqlite threads"
-REQUIRED_USE="
- ?? ( geoip geoipv2 )
-"
-
-RDEPEND="
- net-libs/libpcap
- geoip? ( dev-libs/geoip )
- geoipv2? ( dev-libs/libmaxminddb )
- mongodb? (
- >=dev-libs/mongo-c-driver-0.8.1-r1
- <dev-libs/mongo-c-driver-0.98
- )
- mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql:* )
- sqlite? ( =dev-db/sqlite-3* )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-DOCS=(
- CONFIG-KEYS ChangeLog FAQS QUICKSTART TOOLS UPGRADE
- docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-
-src_configure() {
- tc-export CC AR RANLIB
-
- econf \
- $(use_enable 64bit) \
- $(use_enable debug) \
- $(use_enable geoip) \
- $(use_enable geoipv2) \
- $(use_enable ipv6) \
- $(use_enable mongodb) \
- $(use_enable mysql) \
- $(use_enable postgres pgsql) \
- $(use_enable sqlite sqlite3) \
- $(use_enable threads) \
- $(usex mysql "--with-mysql-includes=$(mysql_config --variable=pkgincludedir)" '') \
- $(usex mysql "--with-mysql-libs=$(mysql_config --variable=pkglibdir)" '') \
- --disable-debug
-}
-
-src_install() {
- default
-
- for dirname in examples sql; do
- docinto ${dirname}
- dodoc -r ${dirname}/*
- done
-
- newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
- newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
-
- insinto /etc/pmacctd
- newins examples/pmacctd-imt.conf.example pmacctd.conf
-}
diff --git a/net-analyzer/pmacct/pmacct-1.6.1.ebuild b/net-analyzer/pmacct/pmacct-1.6.1.ebuild
deleted file mode 100644
index 91a703ca1ffe..000000000000
--- a/net-analyzer/pmacct/pmacct-1.6.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="A network tool to gather IP traffic information"
-HOMEPAGE="http://www.pmacct.net/"
-SRC_URI="http://www.pmacct.net/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="64bit debug geoip geoipv2 ipv6 mongodb mysql postgres sqlite threads"
-REQUIRED_USE="
- ?? ( geoip geoipv2 )
-"
-
-RDEPEND="
- net-libs/libpcap
- geoip? ( dev-libs/geoip )
- geoipv2? ( dev-libs/libmaxminddb )
- mongodb? (
- >=dev-libs/mongo-c-driver-0.8.1-r1
- <dev-libs/mongo-c-driver-0.98
- )
- mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql:* )
- sqlite? ( =dev-db/sqlite-3* )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-DOCS=(
- CONFIG-KEYS ChangeLog FAQS QUICKSTART TOOLS UPGRADE
- docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-
-src_configure() {
- tc-export CC AR RANLIB
-
- econf \
- $(use_enable 64bit) \
- $(use_enable debug) \
- $(use_enable geoip) \
- $(use_enable geoipv2) \
- $(use_enable ipv6) \
- $(use_enable mongodb) \
- $(use_enable mysql) \
- $(use_enable postgres pgsql) \
- $(use_enable sqlite sqlite3) \
- $(use_enable threads) \
- $(usex mysql "--with-mysql-includes=$(mysql_config --variable=pkgincludedir)" '') \
- $(usex mysql "--with-mysql-libs=$(mysql_config --variable=pkglibdir)" '') \
- --disable-debug
-}
-
-src_install() {
- default
-
- for dirname in examples sql; do
- docinto ${dirname}
- dodoc -r ${dirname}/*
- done
-
- newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
- newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
-
- insinto /etc/pmacctd
- newins examples/pmacctd-imt.conf.example pmacctd.conf
-}
diff --git a/net-analyzer/pmacct/pmacct-1.6.2.ebuild b/net-analyzer/pmacct/pmacct-1.6.2.ebuild
index 72d65265800b..0b22f3b865ca 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 ~x86"
+KEYWORDS="~amd64 ~ppc ~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/pmacct/pmacct-1.6.1-r1.ebuild b/net-analyzer/pmacct/pmacct-1.7.0.ebuild
index 0b22f3b865ca..ff729c382305 100644
--- a/net-analyzer/pmacct/pmacct-1.6.1-r1.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.7.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
DESCRIPTION="A network tool to gather IP traffic information"
HOMEPAGE="http://www.pmacct.net/"
@@ -10,8 +10,8 @@ SRC_URI="http://www.pmacct.net/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="64bit debug geoip geoipv2 ipv6 jansson kafka mongodb mysql nflog postgres rabbitmq sqlite threads"
+KEYWORDS="~amd64 ~x86"
+IUSE="64bit debug geoip geoipv2 ipv6 jansson kafka mongodb mysql ndpi nflog postgres rabbitmq sqlite threads zmq"
REQUIRED_USE="
?? ( geoip geoipv2 )
kafka? ( jansson )
@@ -29,10 +29,12 @@ RDEPEND="
<dev-libs/mongo-c-driver-0.98
)
mysql? ( virtual/mysql )
+ ndpi? ( net-libs/nDPI )
nflog? ( net-libs/libnetfilter_log )
postgres? ( dev-db/postgresql:* )
rabbitmq? ( net-libs/rabbitmq-c )
sqlite? ( =dev-db/sqlite-3* )
+ zmq? ( >=net-libs/zeromq-4.2.0:= )
"
DEPEND="
${RDEPEND}
@@ -46,6 +48,7 @@ DOCS=(
src_configure() {
tc-export CC AR RANLIB
+ append-cppflags -DMYSQL_SERVER_VERSION=99999999
econf \
$(use_enable 64bit) \
@@ -57,11 +60,13 @@ src_configure() {
$(use_enable kafka) \
$(use_enable mongodb) \
$(use_enable mysql) \
+ $(use_enable ndpi) \
$(use_enable nflog) \
$(use_enable postgres pgsql) \
$(use_enable rabbitmq) \
$(use_enable sqlite sqlite3) \
$(use_enable threads) \
+ $(use_enable zmq) \
--disable-debug
}
diff --git a/net-analyzer/prometheus-node_exporter/Manifest b/net-analyzer/prometheus-node_exporter/Manifest
index 78cc41f90af7..cdd5cdfe62e6 100644
--- a/net-analyzer/prometheus-node_exporter/Manifest
+++ b/net-analyzer/prometheus-node_exporter/Manifest
@@ -1,9 +1,6 @@
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 334 SHA256 dce4944e74dfe121777699fe9b10552be275ba92e947a3715f6b60869d67d526 SHA512 da17eb8e555adf4d4922ba8e0a549248dc2adf391f4285ce0f6919f194de327d80205c1e09af073eee526b073aba26e5551aa41a83118961d9e6eddd2887b23e WHIRLPOOL d03773ab82553723915864f5bf084d74183fe56cad0628157e6c97e1e95e922edc180db665b6633e09af7df0d279f7bf075ec9066817bd243e656a8a9d0c32e1
diff --git a/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.initd b/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.initd
deleted file mode 100644
index 57202a4ce47b..000000000000
--- a/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/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/prometheus-node_exporter-0.14.0-r1.ebuild b/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.14.0-r1.ebuild
deleted file mode 100644
index 5714d4e1feb6..000000000000
--- a/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.14.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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="840ba5d"
-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/prometheus"
-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}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-analyzer/prometheus/Manifest b/net-analyzer/prometheus/Manifest
index 0d46377b8343..1e225f8a0b34 100644
--- a/net-analyzer/prometheus/Manifest
+++ b/net-analyzer/prometheus/Manifest
@@ -1,9 +1,9 @@
AUX prometheus-3.initd 659 SHA256 2f5790b241f544e2f73687c15b1cf8efc79fbfbff5502cf973c6bef4ce850498 SHA512 14321f0a0e39e4ed1b879ba956855046c21dff85770d3d269492a6d0b911af69ccbf047ec48b91c56bfb678da9390fb236ce165326dc2139b1255d448f2512fa WHIRLPOOL 595254176744eb3794b760830bb4036813df31dd6ce5f91890463db9db8bde3733b23914c8b725e5543e49d5c3c9ea1a4bd9f87b7ce612e17533ad4bb03884f8
AUX prometheus.confd 43 SHA256 940f1a3ad08f0eb370951b1a42c29a9217cba9ae2f5cb6cc675bdec1d51e8309 SHA512 37468e897cd34b50b0edc65ada3f0c2e05459c3d96bb7f82d58b6de5bf10a127f1bf7912af93d83d94e3ea7287cfeb2311e36535f291d01a11d152a0b438591c WHIRLPOOL b8bdd0bc16fde3fb99cf8939427781a1b250df7e4a607fb8c780f75d502e7d2aa76aef6a1b4c082d3aa32f0a9a21b3b39df72fcf5e6d26592df43661f8d08169
AUX prometheus.initd 664 SHA256 566db492c8da87e1de8b655247dce11e43d83b85c9bf9bef7a9fd715e4667516 SHA512 95e2ac4969c26f2e91330b521223e94912d68832ef29429e68930479c29b24027c138011bd1f480546c14a07ae15800967e9ff114cdec3cabd0c15bdca489665 WHIRLPOOL e972726fac805f43772dc871a2a3af45d5421f1c15ab05fd0e7d5368b282164021a0079cfd9d3f5de4656739ccfa339ed80d3fb2ae50b429d5ae806441edc5fa
-DIST prometheus-1.8.0.tar.gz 5194115 SHA256 556247d750b3618b74ccf59669f74a8c0c39e72cdf51cbcc0c0bcc392de195df SHA512 1ac00ddae4753f99f167db9b6efc5fa442918284f59468b8e1c7743e3f946eab895678c87e12a73bf158e3c0bf3df7345dd59855baaabb54fc86f1ae1014192d WHIRLPOOL 9ff6f0dc36f022b2be107ce59878f81b210b196858064655a74e098650abc77d5a0c2afb11dd5ebb242d1e2addbc3a182b1a6ce1f751eed723e3fff3434d319c
-DIST prometheus-2.0.0_rc1.tar.gz 5538094 SHA256 5d80280d4f8de0e5c79b02fa2ab9cbe4cf49a287ed268ed85a0f87abd257d226 SHA512 c89509693608a4f00713cb3b9f11b533236898af4a08580ecb4aa5f198d7f568719ddb78225f9d260128288aa7e037d0a0a820f8e42e2db4c7745e2f993fb4fe WHIRLPOOL 1765d9eb600da28e12d2c679a60f050d9557bbf974a53ff86363fb66fb82d64c4b55a85f9aac4c80039c317a88028c794e8387e0db3f0b925b86057d5ae17f7e
-EBUILD prometheus-1.8.0.ebuild 1603 SHA256 fd4ee62da65a03450f6192c00ba513c82f286d09ecf6e2587e637d3257c19ffb SHA512 dce3a7f7706f60c84aec1e994eba9c8af32995972ac3312e13ce1ea44c79eb8315e32c8ab735b5054bd7f6ff72125e1dd20c62de6360c01de7e18a8bd2a9d8ad WHIRLPOOL b37ddb874abcbae32d01e2700139e3b42f2d8b538d728779e0237376d7a3c88322ad7fb5c9e7649a95b25cb379df78c496ed78366d6a9b659d19d70a2020a8c7
-EBUILD prometheus-2.0.0_rc1.ebuild 2000 SHA256 a4c9a98be5c9fcdfde08360a8eeabf19258d699f9ac402727836b959b237ee9f SHA512 0a141038f1dace00a6ebc0e54b5d4714bb72efdc733e99c8c32efb194f8b1ff7c726f5951199ca64448402d4f9b7aa9985353620bcf3410616532171e97dc0a1 WHIRLPOOL 22e1c4b127f02c5c4a5b00774f2774d56e45274a5bc178d7cbdb1f7586dc06c9ee5591d9dc9ca15194c6787038139378778f361a364df5b8beee428d26e00f6e
+DIST prometheus-1.8.1.tar.gz 5194859 SHA256 dc2b7bb5b5f1273c131921d3e306fd198f2a5547abc58dcf511b700c62963595 SHA512 936728f51a12a080a0689c17b134f70f747bb2219f750ea5f7df7460169b3e484689d75df319cfae12fc939b556e4f59ed49682731e43405a4a91e4bbcd9cbb7 WHIRLPOOL 755ac91ecfe9234675bac2cee2c63a50c80a5e02267818b1ac7747c669df81e4e267dd884aa1da7463339f5344e8fdbb488c7521d0d7817360bad74ece256a86
+DIST prometheus-2.0.0_rc2.tar.gz 5539456 SHA256 99340e1708f9dd216048d0de8ce1a069c70879760d833dfee1ef480966d2d53c SHA512 c895e0a561e89a13cee4cba1f4899ffcb4a8094f72618b9c7c2e48a035ceef3b844c0c8b9603f0886fac3e0d1c43b1e235f784f18d289e47c0e858b5d53ed47b WHIRLPOOL 60070eddcaa06ada89e5612c893c97098c48c6d5953d17e1cfe6b16708c332aa9d855aaecf6aa00c28527b22ad77ce6ff26cbade01ea2e71d1bafc9ece59f655
+EBUILD prometheus-1.8.1.ebuild 1603 SHA256 9993a83bfa5726247b2d48a4d6530ba925722f09d515fd00460d9edf46e48a90 SHA512 ee00454a690fd3bb2990baf2612860938916dae85485ec40c7e5921a9b34920ce88a23d18703daf662959b8bb5952deff68d622c7e1b727b91e3b530304c2b91 WHIRLPOOL bd95c86ecb27317c48648cdd5b77fea8574042856b8a496c9b6d7d7340cef92b15979abc0100e5b9f42a0841ab301899f1902e6f2d9859113fe689fc6b5fcb81
+EBUILD prometheus-2.0.0_rc2.ebuild 2000 SHA256 924c2f0264af7e066a1982f1202b2955255c7f71c7bd5b081d5ec3e63efd21cd SHA512 3926d27cd71e34a32f17d3351874f24138de27c0d951685e12322503cbf086c63e30c85cf32dd4a05c17638d965ae399ff80e505702a57e9573fa2594c83cbd1 WHIRLPOOL a64820058773b240b3b273475485c69eeb4d66d44c166f17dfe061acd809734dff171867208ff80011237b6a891cff69c15afefe26f899792fae584383f08a2d
MISC ChangeLog 552 SHA256 be1d133e356e6eb2ad19eb3900722da8fa6495af85bc38a2b90f6845c62dc27d SHA512 7d5bf11cda31ce2fcae3a752ec9eb0d17b212c0ea1a480e09436d41a24eae4ba5689aa43727a8ac5882c5b1ddc741c717a3c8d509d69204fd44eeb00460a4e60 WHIRLPOOL 7ddcb758ecc1426a520a97c6b27b1c0e9752422c9c0f16b1746e11aa91edc37f5289b096430a0b8e05535818901f6f1745144107a2000cb771843de038b07963
MISC metadata.xml 331 SHA256 1e206a714f59c466b3f41285ea73b6b3a0919c2f8c0a4cf5350ccea436bb26d9 SHA512 06fd0da413c0280a902bbdf50e1e0557375d2208021fda3c3081d8a25a4b17ad1ca647d994dd97ba2d838ea5c87148d3ffd13a8a54cb8dc007b45927df8de47a WHIRLPOOL 0c98900489068124a7afcf1f40d1c9964089ead950e8e16dbc4a0389487187d9af6802a6e86fb6dcf541784f09acd8e0ee27f3215deb16de56495af2b1ee85fc
diff --git a/net-analyzer/prometheus/prometheus-1.8.0.ebuild b/net-analyzer/prometheus/prometheus-1.8.1.ebuild
index de0cc31726df..1a0cce6982b9 100644
--- a/net-analyzer/prometheus/prometheus-1.8.0.ebuild
+++ b/net-analyzer/prometheus/prometheus-1.8.1.ebuild
@@ -6,7 +6,7 @@ inherit user golang-build golang-vcs-snapshot
EGO_PN="github.com/prometheus/prometheus"
EGIT_COMMIT="v${PV}"
-PROMETHEUS_COMMIT="3569eef"
+PROMETHEUS_COMMIT="3a7c51a"
ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
diff --git a/net-analyzer/prometheus/prometheus-2.0.0_rc1.ebuild b/net-analyzer/prometheus/prometheus-2.0.0_rc2.ebuild
index 697c41569454..6aa654dad848 100644
--- a/net-analyzer/prometheus/prometheus-2.0.0_rc1.ebuild
+++ b/net-analyzer/prometheus/prometheus-2.0.0_rc2.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="5ab8834"
+PROMETHEUS_COMMIT="ce63a5a"
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 e5dac527790e..9cde2e940b47 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,8 +5,8 @@ AUX wireshark-99999999-androiddump.patch 198 SHA256 7607082abf45448fd4def4693522
DIST wireshark-2.2.7.tar.bz2 32309420 SHA256 689ddf62221b152779d8846ab5b2063cc7fd41ec1a9f04eefab09b5d5486dbb5 SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 WHIRLPOOL 0361821da9c113a8de1339cc48cae0291be84bcffb1ba34b1fc3f457b22525329e954a2060f7eef25bca550d0ccdaf4a9e9587d35394b0abd9b0d38bc6023e44
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.2.ebuild 7335 SHA256 18a9b9157b36518f0e6cf805848c1060b7efb362e8c49669435624ba77a6f3ae SHA512 a178a9581aa6fbc6c7ab7b90f816a6c5282d3b6b616a6634e72696ff0b42d19c2b2fcc6ea188c5beba5069472bf141c2af452eab9e56e023f81beb5c8eb2ea13 WHIRLPOOL 99d0d17608ae45d5c1b31d9b1eb1f4825560b31c125f0cf82f82bde7db916c553b8009b1a472631f5c23f7a385188d6f8566d8d7dbe7bf1e42c668b39be0bd19
+EBUILD wireshark-2.4.2.ebuild 7341 SHA256 25f8c3f7da9f8a1c57b842faf8dd5385836815991f69ca52eb9bddc47dfeaf65 SHA512 531a6e329021adffd3d6ad7935b817c8fbdbd7b9956e96765ae68d484351a227bf8d38df175c2c437549ce842ebb48e6eda7c03ede374ffef257bdf045a67051 WHIRLPOOL 86eeecb80d0282370cb04b50537b676616a466db1024d305239f4b12bf8c2aaa7c05d48a6ba7fb81a7eaa938e5c64fe1cfd38c2be725b2c1281197d37a203df0
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
-MISC metadata.xml 4697 SHA256 3ac6d14b99bd32da2eda362b754999e36a3d56fdc22abc305a5fba1b39e81b2d SHA512 4ffb089fb47613cce521dac37c8e732ace1acfdb7889dc13538db55362a513078d6f1aab31be353e5b97d86faa18234dcf90afa97e040134af75af060d9c7a40 WHIRLPOOL b1305127e4ee772102a1b104ae87b4c4f29371eca8aedb5d63fc6cb0429bfebc57f8744eefc3e251803f6a4d12b2f5bd3acb8ed5925c2dc476a79bb3ed22e2cc
+MISC metadata.xml 4696 SHA256 b27e2b52729677c9fdf899b53beaed74f9a1cf6aceb2851161814e9f76c8fbf0 SHA512 51ab08d5390ea4d2a4b4e2ce505e9d28932c9dc08d739107e4dada664603fb1a0a89e08f2431af4f84b5f6be303b0b2ad28e2a22fecd7186497809b708be7c51 WHIRLPOOL e217f2ccc3b2a489267e3010c5b78da1e1116111c6670b30a08b92f35209dcd675f0094e29d3f81e9eca83c3bf0fd39e38180ba94df198b90b8712fa3befd662
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index e88111bc335c..2297d39cd5df 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -56,6 +56,6 @@
<flag name="text2pcap">Install text2pcap, to generate a capture file from an ASCII hexdump of packets</flag>
<flag name="tfshark">Install tfshark, a terminal-based version of the FileShark capability</flag>
<flag name="tshark">Install tshark, to dump and analyzer network traffic from the command line</flag>
- <flag name="udpdump">Install udpdumpi, to get packets exported from a source (like a network device or a GSMTAP producer) that are dumped to a pcap file</flag>
+ <flag name="udpdump">Install udpdump, to get packets exported from a source (like a network device or a GSMTAP producer) that are dumped to a pcap file</flag>
</use>
</pkgmetadata>
diff --git a/net-analyzer/wireshark/wireshark-2.4.2.ebuild b/net-analyzer/wireshark/wireshark-2.4.2.ebuild
index a16ad647b623..9372865de979 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 ~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