summaryrefslogtreecommitdiff
path: root/net-analyzer
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-12-25 23:06:25 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-12-25 23:06:25 +0000
commit441d1370330332b7d78f238d2f5e13f7aed5e4e0 (patch)
tree6a5171dd615dfeee62a45044144c66e864738fb0 /net-analyzer
parentab3da91fb6c91a9df52fff8f991570f456fd3c7a (diff)
gentoo christmass resync : 25.12.2020
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/Manifest.gzbin45853 -> 45868 bytes
-rw-r--r--net-analyzer/bwbar/Manifest2
-rw-r--r--net-analyzer/bwbar/bwbar-1.2.3.ebuild2
-rw-r--r--net-analyzer/cacti/Manifest2
-rw-r--r--net-analyzer/cacti/cacti-1.2.14.ebuild2
-rw-r--r--net-analyzer/fail2ban/Manifest2
-rw-r--r--net-analyzer/fail2ban/metadata.xml4
-rw-r--r--net-analyzer/icinga2/Manifest6
-rw-r--r--net-analyzer/icinga2/icinga2-2.12.0.ebuild170
-rw-r--r--net-analyzer/icinga2/icinga2-2.12.2.ebuild149
-rw-r--r--net-analyzer/icinga2/icinga2-2.12.3.ebuild2
-rw-r--r--net-analyzer/kapacitor/Manifest2
-rw-r--r--net-analyzer/kapacitor/kapacitor-1.5.5.ebuild2
-rw-r--r--net-analyzer/mtr/Manifest7
-rw-r--r--net-analyzer/mtr/files/mtr-0.80-impl-dec.patch12
-rw-r--r--net-analyzer/mtr/files/mtr-0.87-ipv6.patch59
-rw-r--r--net-analyzer/mtr/files/mtr-0.87-tinfo.patch11
-rw-r--r--net-analyzer/mtr/mtr-0.87.ebuild51
-rw-r--r--net-analyzer/mtr/mtr-0.93-r2.ebuild62
-rw-r--r--net-analyzer/nessus-bin/Manifest4
-rw-r--r--net-analyzer/nessus-bin/nessus-bin-8.13.1.ebuild (renamed from net-analyzer/nessus-bin/nessus-bin-8.13.0.ebuild)0
-rw-r--r--net-analyzer/netdata/Manifest4
-rw-r--r--net-analyzer/netdata/netdata-1.28.0.ebuild (renamed from net-analyzer/netdata/netdata-1.27.0.ebuild)0
-rw-r--r--net-analyzer/ngrep/Manifest4
-rw-r--r--net-analyzer/ngrep/ngrep-1.45-r3.ebuild54
-rw-r--r--net-analyzer/ngrep/ngrep-1.47.ebuild2
-rw-r--r--net-analyzer/pmacct/Manifest2
-rw-r--r--net-analyzer/pmacct/files/pmacctd-init.d2
-rw-r--r--net-analyzer/scapy/Manifest2
-rw-r--r--net-analyzer/scapy/scapy-2.4.3.ebuild42
-rw-r--r--net-analyzer/tcptraceroute/Manifest3
-rw-r--r--net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r2.ebuild40
-rw-r--r--net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild2
-rw-r--r--net-analyzer/tracebox/Manifest1
-rw-r--r--net-analyzer/tracebox/tracebox-0.4.4-r100.ebuild66
-rw-r--r--net-analyzer/wireshark/Manifest10
-rw-r--r--net-analyzer/wireshark/files/wireshark-3.4.2-cmake-lua-version.patch11
-rw-r--r--net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild (renamed from net-analyzer/wireshark/wireshark-3.4.1.ebuild)13
-rw-r--r--net-analyzer/wireshark/wireshark-3.4.2.ebuild (renamed from net-analyzer/wireshark/wireshark-3.4.0.ebuild)0
-rw-r--r--net-analyzer/wireshark/wireshark-99999999.ebuild21
40 files changed, 132 insertions, 698 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 20fca1138f6b..6a76b3b41eaf 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
Binary files differ
diff --git a/net-analyzer/bwbar/Manifest b/net-analyzer/bwbar/Manifest
index 2ca301da6b3e..dd24b3affbef 100644
--- a/net-analyzer/bwbar/Manifest
+++ b/net-analyzer/bwbar/Manifest
@@ -1,4 +1,4 @@
AUX bwbar-1.2.3-libpng15.patch 345 BLAKE2B 1c2e3733ee08d4203021f647072b7cce88a7526dd717f9cecf8912a0717e0531aa25c7eef304efab097a094020ff901c8ceca9db02cfd853a4f91bb5ebc4e916 SHA512 14c07dc56320a748b864c8c3ad8b3c9408838db8630930409f2f16f6bcfbf6fab14e6eb1ae803e4f6b33127220c53a51d01a4b981f3ddd8bc8fb1be2952192f8
DIST bwbar-1.2.3.tar.bz2 30202 BLAKE2B b7c0ed980e5af14e5e2fa2a3fafb8b7f75d96a0bac8b3effed2a7a54098bb00741b07f2ba32e6cb81dc4accd42a0f370c6bd95a5eec1301b1090e96d2e2ce80f SHA512 cb534f50007db6e39aa134d0d9a08ec6935c8a393f8dd5ab80f3c6ef94048821e065cd6c1be80657a2d6338fd16a73dcc0f89f5b15aba9e3bd38f0737a6d43c4
-EBUILD bwbar-1.2.3.ebuild 534 BLAKE2B 38286119521a53160eb87b701e6b3ffe9af5b8eca532a933c297b65a849de6b654f550d212192580ffa58369a90ce82fe6e055af6aca41d91cedb296cc6b814c SHA512 d61e518d3d604d4d41154dc223d78a2f9fb722ff3ad8e3de2410627004f3246bf9ff97227d52337c05298b6284173c0819e1c25f5be62f8d3fafe9a44ea1148d
+EBUILD bwbar-1.2.3.ebuild 531 BLAKE2B 30d5c93b4279483bf028d07d4bcd9871e5a30ea85ab8d604289a74d00743ed82946818f9f2a10380a8f356f1505dbcd4ffb10f30239953f9f88b5c908a75f091 SHA512 f75015b4240784f0e5ef7a7a014821477056c222c505dea539c4d898466aed0436a79bf5d4e0242eb31aa0967c8089772dabe8f79e8866229fc42d49ac70bbc1
MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/bwbar/bwbar-1.2.3.ebuild b/net-analyzer/bwbar/bwbar-1.2.3.ebuild
index 67fb9f200db9..89b0d4b0da7e 100644
--- a/net-analyzer/bwbar/bwbar-1.2.3.ebuild
+++ b/net-analyzer/bwbar/bwbar-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index d9041f7109e1..e634b4925690 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -2,5 +2,5 @@ AUX postinstall-en.txt 2249 BLAKE2B ec7a32177aca0ebec0194fc4dee825251a5ac71c1005
DIST cacti-1.2.13.tar.gz 25182816 BLAKE2B 934deba81a0ac66d4f6a6efcb254204f3d26b40ee56b3b0b926334cefc99a8dcda688250218b796446e6dc9ad3b0efdbe4a0e408873921ff38977485c3fcf9af SHA512 e111c90b77a43bb3ea7cd5cc90cd95a09be95413443db474c04e30d5b00ff96a69e8cb2792a3995462f4623538fc33b89029ff13c25181beff015c47e506d4b9
DIST cacti-1.2.14.tar.gz 25182521 BLAKE2B 555c30ebd06ac71df608a1564892ecd176cf46fa079fd3615dc59fd984bc8bedd4512d971dc3c2731848107da728724ef459d84f0308bef8b0b6ab943b8bc3cf SHA512 734d8e059ea47630072269d92ad79e773268c5dd1cd9c565d23c41b2a74c8892bdc5190f7de6bb9ed281a67ade9c8ef6d723a9d4f486a4ba9aca99182d6ad056
EBUILD cacti-1.2.13.ebuild 1011 BLAKE2B c9c42e80eb588faec3c8c16337905c5006fabe200bab3b0d1c8dfe6ff02391a52947d9efa30f331bd3352030d8d48bafbfe90d1b11ff9de1fe3eeffd7d2fdb16 SHA512 2b58b91c60e77448d15b8fd91b05692a3102e0ce699452b11a71b0c9767820e65a47e1feb816dfad6a0a16f3869e8f765ef97e67f08250a47a49f6cdadde92a8
-EBUILD cacti-1.2.14.ebuild 1014 BLAKE2B 6a411ccf50676e6fbe8f67144d445a7519318ccf83f7003ad9b322ff8cd0c4871c8b582e646041ca1920fda51f6c7dd96f9e598eb0195a4e22abd603c5bd4d3a SHA512 a564373a907200a00816b135240c10eb1dc8741dbcb88a2488e43a4794be0194b470b55e31c481ccc36b75d1b7dd6a2ed761bc48f02944562785db311b35fe8b
+EBUILD cacti-1.2.14.ebuild 1012 BLAKE2B edd61f2b0d8c3e56408860f60f944b9871c4f5f8b2856c61dadb457aae41609e20c12730f92ad32611c032a29cc6fd7027df233b9366b6660eb44c331ffd9fe2 SHA512 e0a7c40e3adb32df85cdd1a0708392eb56506e17688f8b052aeef2158eb6d591da2b19136f8215f6c79dd820cf6bc7ba0172b70918c26333da0e326f1a1fe8d8
MISC metadata.xml 834 BLAKE2B 964a66f49027e0190434a6fe4dfdabd9153cb9a44b8b23ee1a0331e9c38a9ca1480b35412a2088d2ffc7feba6232330e26c8156b4461d663cb8c3bebbdf0e250 SHA512 f74b807c0629400ad06ee2b03650be38524268b2590d455ab4b672bc2c6c13856f881226a7c1d6e74e1acb6f85abc3d5bd311abaa6571216aca7698e8368e616
diff --git a/net-analyzer/cacti/cacti-1.2.14.ebuild b/net-analyzer/cacti/cacti-1.2.14.ebuild
index 66775efc3b40..5c30aa1a848d 100644
--- a/net-analyzer/cacti/cacti-1.2.14.ebuild
+++ b/net-analyzer/cacti/cacti-1.2.14.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/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index b0bba48e9b06..045343b614e5 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -3,4 +3,4 @@ DIST fail2ban-0.11.2.tar.gz 559552 BLAKE2B 0c61c1d5f6eb23d585533fbb84e69343cb305
EBUILD fail2ban-0.11.1-r2.ebuild 3304 BLAKE2B bd423b357180362b03a602e661c348440f559af0007acaebd3b87fac825b66ed5a2f9d87f72c83a59f460d31ff88d0fab9dc58be1fdf15f2a77bb6753ad26ff8 SHA512 a0b3ac50485c7d74b0a2865ac90858fb9ddfc7b5a61902e22b21187e01e9a8f15e230983353d5998d9bb4f20cc4fd1f5dcc5986dab7d4acf8bac329e8a295ca8
EBUILD fail2ban-0.11.2.ebuild 3357 BLAKE2B 9c7a838c885ba4a1d976d9433dcc1c084322e94a989a8f14eaa27e80a87ae84a2c9ce154f56e8629b9f5f4770e6ea2688d29550f5c0253ffb27ed2295acab295 SHA512 b22ad2a16221b97bd927769694ba9d90d0f751b2b0156811866dd52bed1c7b19d8e2d9c805cbd3ccd16dba526802ab90e3a9fcd6acb8d638a0ba81b205059f21
EBUILD fail2ban-99999999.ebuild 3235 BLAKE2B 68151b88460a56e1caa151bfe38a5e5f8e3338ef9c3d67e80463d4cada9036656b48c896c7fe88eb7f60ef6122f2921cf3472abe3676d07be32ec3ad65469cc7 SHA512 c51672b159da9332469c04b92b7e94deb7c87346aabc011ecf6a2fbbc600df6cebfb4e1eab5525a459903f30335ce20da466d79f56f20ea3d02b6562d4bac261
-MISC metadata.xml 372 BLAKE2B 7fca866187d9a128e6fb6787a4099d7a6442e0e51e558786773b91c3e2f06e67167d76f9bc96be0fe1baa1c44fc3f0e9e2105a327a10cb2720b3e3f9e4303a66 SHA512 4d5710e2fb4a7c353ca6bd3203bceef57d4d004367993dc1044800ee8713a3f4697fe8ba3472a73ecd015503656dfb7cd68d674c99188ce5702769cfeaf06b25
+MISC metadata.xml 478 BLAKE2B 29151d47650874f2adc5077f58e9beb2d943d9a7df465d73ae7d21277c47103af8496723965cc25c71f5c4778c78e44792a547fa674a4f2e07a812e450258999 SHA512 93b6aa4f37cf7374690eca92dd65a3ef8fee2155cfea5c8f64dff10c9f26828bf6a9e0b542cbab23a409b2cddbb1bf3911b324f8f61669c481f0b1a3d7e9dadc
diff --git a/net-analyzer/fail2ban/metadata.xml b/net-analyzer/fail2ban/metadata.xml
index ece130a93bd2..1512403ed499 100644
--- a/net-analyzer/fail2ban/metadata.xml
+++ b/net-analyzer/fail2ban/metadata.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="person">
+ <email>sam@gentoo.org</email>
+ <name>Sam James</name>
+ </maintainer>
<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 63e08bd39129..d5b6a8a21a87 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -2,14 +2,10 @@ AUX icinga2-2.12.1-boost-1.74.0.patch 19210 BLAKE2B e6e09b631dc70b740212ad20d4e1
AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd124872af84032519a5ee1237b0ebc38783e673cb87169feb48b7690978e9b7d2e38549a7272f403fc SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082
AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc4786bd2705f94c70a03b84f34a55435f6d9dfcc0483e35da60c1f536dec1060bdc232108c622e0615 SHA512 a43911717fe891e70690647daa57426f70d10f9cb02c721962be4c13cfe8a95bc3ff84b9ba2a293adafc8ddacf8ea6771bd66e7ff6dabe3e732176bf6e6e474a
DIST icinga2-2.11.6.tar.gz 7480970 BLAKE2B d247a4c0272227e0dfa2df46f91d84c7630c56df8d77d7de30aea715509b68fddbe74ef58c9b50acb4965e7108c3f9c23cf4e9c0f1a572763c34dd87cfaae1ec SHA512 e455d10612721ef6090256618c5a87e2f06e6284c2b2d137b85058bb5cdc30f3524fbcab5559acbe891e37d90f862c1b117115451bb3b59b8a2f67bb9d027e6e
-DIST icinga2-2.12.0.tar.gz 7530104 BLAKE2B 6f4a37d638449596d163add4ee070d24c1eb5f483e32f6c666454353578e6399a04cda949cb51b135516be7b437196e5beeff0e5e24a7bc26b855de87e24a797 SHA512 2a0ead159cfd71ebb662b909d8c4a64bdf13235b14d37b67057034da4fbf8764167b175e20f635989a98faafabb5da4f71321a4f8592172bed5cbb3ee557b276
DIST icinga2-2.12.1.tar.gz 7532104 BLAKE2B addb3bb6f81cb41e1ec23e989d6151af6f39fdded5a76a791806114cc2ba46c786b5d6674e9e0e86eb701cb5132f766cdf3cbdfbbcc0f9263db3a7ba844705c6 SHA512 8c266db67fb7aa27dc86e9dc28fa0e1ff7b11260ed529d3963c5cf25a5230fc9f02d7d44076948fbde6e39e2cb02f2d99c2c5b72396154baf95aaa5eba461529
-DIST icinga2-2.12.2.tar.gz 7534173 BLAKE2B 58aa25be81cfd9d674371dcd17043fbdd8fd9f03b2fdbe994101dfe6088ed289e64c213bb5ec1c62863fc2a5d015f2ee928a4bd45343eeead62aea3472faf187 SHA512 db61843f0ea0e05ea8c0ae035e6fdaf1ebc03115b0690a0465ef1847426656acd8ffc108e36056a46cfbc4eb9538c612bbb5adff2db72c9cc51330fcdd62c136
DIST icinga2-2.12.3.tar.gz 7534454 BLAKE2B 021f940b3885c90cc43b4708c83430685fdb692d5ce95ed0f667a95b7dd2f4817b30fb7b05f1e214ba3aa31cef806af0f83e68447ece94916d806fb95f66526e SHA512 28b87e03a8ffeb7a1d19ddf9555151b826f7bf1fd33b0139c2fc8abe7c89d66d96089d5b32d0aaccc3876040514b2bfbde9970416d5ec4ea3b023b17c0fb1799
EBUILD icinga2-2.11.6.ebuild 4584 BLAKE2B 26ebea2c0c182362d24720bf50b95bc5ec364629c0229d2399c666081570909d66f3cfb4dd357a0b5c61447a5a369bbb833fc51c1fc1a99a6902ed33c4ca6402 SHA512 801050caf9c1ac07a2177f61965aac1829b8ba8bb8961c7a6f300ac1fadee3cee290cf58d499c8e6f52dada72a659baaf8905cf636cd3dd369764a2a4781af09
-EBUILD icinga2-2.12.0.ebuild 4582 BLAKE2B e4f9f977636053c64d8a1bb86bf8f62cb5f42f9a3fea84bb90eb03470533a6b29a24851023b6353558fd8ae3ef7622759887b559b7080aae400505eaeb7e8838 SHA512 94ef9210e2b300cf6aecf8b3caedc9fde4e17b53b90ad554737a94c0207d86a31c139e1280ae55ca17332cbe70326afccb1e7670d2eea279fcc5d42dbbfa9678
EBUILD icinga2-2.12.1.ebuild 4060 BLAKE2B f775606357a69066c8cbf1cd2e686f623e4e88824e703f6b4dfe4280ca3ea0620436ef156625974ff5e9cc177b206101a968892b68fc4783828a4192b39ea67e SHA512 5f37665f4efce4dc3f7bc26620b8573606ea45a77858a66c0feb881644dba96c9ee1215912c9b0787e58e5e63ab988d0b96ab7de854890dc0467cd02b300c4fb
-EBUILD icinga2-2.12.2.ebuild 4062 BLAKE2B d1f56152154fbb597dcafbe5e567af8e84b7bb264cec07a513c2d0f8f1933714c0da7c34754e33c39198d46a964629c31010f4657c849bc0779da26daf2b5b79 SHA512 d9757572257d0bd9ca576cc454b885b9b7f4f5419b3de85e61e1b7bdf75b40dd4dc9355543249d61d9900a1c5d0023812d7f4fdbbb934b5af35d25cdec0d5004
-EBUILD icinga2-2.12.3.ebuild 4062 BLAKE2B d1f56152154fbb597dcafbe5e567af8e84b7bb264cec07a513c2d0f8f1933714c0da7c34754e33c39198d46a964629c31010f4657c849bc0779da26daf2b5b79 SHA512 d9757572257d0bd9ca576cc454b885b9b7f4f5419b3de85e61e1b7bdf75b40dd4dc9355543249d61d9900a1c5d0023812d7f4fdbbb934b5af35d25cdec0d5004
+EBUILD icinga2-2.12.3.ebuild 4060 BLAKE2B f775606357a69066c8cbf1cd2e686f623e4e88824e703f6b4dfe4280ca3ea0620436ef156625974ff5e9cc177b206101a968892b68fc4783828a4192b39ea67e SHA512 5f37665f4efce4dc3f7bc26620b8573606ea45a77858a66c0feb881644dba96c9ee1215912c9b0787e58e5e63ab988d0b96ab7de854890dc0467cd02b300c4fb
EBUILD icinga2-9999.ebuild 3930 BLAKE2B 20bacd633c55857af4e85b4ddf36ad86cae209adf380a183c35157bd69c553d70731ba699a6c706c0f77cfd03563af8fdad9748856cd1b91a9b387c5f175a035 SHA512 1249cb4f89bbee800a7cc8e8a35da90b6978878c14860e2d93651de641268328b2b1ffafb2363fb96c3b45de3b180b278a59cadcf0a4b2210655f3d8770a3285
MISC metadata.xml 870 BLAKE2B f18bef5b15712d2fddf22edaaf628b4b9bacbb92fd03750b0d956aa7e13baaf389c131b929236158f1df8c718c754bd55ef6031cca282db0b22d2a4d94a353a3 SHA512 30744556867891c0a4e3ab86dbebdd6b1191bfe25f8b9f997fc8c88b3b8d69365a33184c7ae2cfa7fee5c19e8c348c768fcdaede7a0e4ab5c28927bc09151ae0
diff --git a/net-analyzer/icinga2/icinga2-2.12.0.ebuild b/net-analyzer/icinga2/icinga2-2.12.0.ebuild
deleted file mode 100644
index 72756f463b8e..000000000000
--- a/net-analyzer/icinga2/icinga2-2.12.0.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-if [[ ${PV} != 9999 ]]; then
- inherit cmake-utils depend.apache eutils systemd toolchain-funcs wxwidgets
- SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm64 x86"
-else
- inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs wxwidgets
- EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
- EGIT_BRANCH="master"
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
-WX_GTK_VER="3.0"
-
-CDEPEND="
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- >=dev-libs/boost-1.66.0:=[context]
- console? ( dev-libs/libedit )
- mariadb? ( dev-db/mariadb-connector-c:= )
- mysql? ( dev-db/mysql-connector-c:= )
- postgres? ( dev-db/postgresql:= )
- dev-libs/yajl"
-
-DEPEND="
- ${CDEPEND}
- sys-devel/bison
- >=sys-devel/flex-2.5.35"
-
-RDEPEND="
- ${CDEPEND}
- plugins? ( || (
- net-analyzer/monitoring-plugins
- net-analyzer/nagios-plugins
- ) )
- mail? ( virtual/mailx )
- acct-user/icinga
- acct-group/icinga
- acct-group/icingacmd
- acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
- depend.apache_pkg_setup
-}
-
-src_configure() {
- sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
- local mycmakeargs=(
- -DICINGA2_UNITY_BUILD=FALSE
- -DCMAKE_VERBOSE_MAKEFILE=ON
- -DCMAKE_BUILD_TYPE=None
- -DCMAKE_INSTALL_SYSCONFDIR=/etc
- -DCMAKE_INSTALL_LOCALSTATEDIR=/var
- -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
- -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
- -DICINGA2_USER=icinga
- -DICINGA2_GROUP=icingacmd
- -DICINGA2_COMMAND_GROUP=icingacmd
- -DICINGA2_RUNDIR=/run
- -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
- -DUSE_SYSTEMD=$(usex systemd ON OFF)
- -DLOGROTATE_HAS_SU=ON
- )
- # default to off if minimal, allow the flags to be set otherwise
- if use minimal; then
- mycmakeargs+=(
- -DICINGA2_WITH_MYSQL=OFF
- -DICINGA2_WITH_PGSQL=OFF
- )
- else
- mycmakeargs+=(
- -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
- -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
- )
- fi
- # LTO
- if use lto; then
- mycmakeargs+=(
- -DICINGA2_LTO_BUILD=ON
- )
- else
- mycmakeargs+=(
- -DICINGA2_LTO_BUILD=OFF
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
- cd "${BUILDDIR}" || die
-
- emake DESTDIR="${D}" install
-
- einstalldocs
-
- newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
-
- if use mysql ; then
- docinto schema
- newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
- docinto schema/upgrade
- dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
- fi
- if use mariadb ; then # same as mysql
- docinto schema
- newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
- docinto schema/upgrade
- dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
- fi
- if use postgres ; then
- docinto schema
- newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
- docinto schema/upgrade
- dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
- fi
-
- keepdir /etc/icinga2
- keepdir /var/lib/icinga2/api/zones
- keepdir /var/lib/icinga2/api/repository
- keepdir /var/lib/icinga2/api/log
- keepdir /var/spool/icinga2/perfdata
-
- rm -r "${D}/run" || die "failed to remove /run"
- rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
- fowners root:icinga /etc/icinga2
- fperms 0750 /etc/icinga2
- fowners icinga:icinga /var/lib/icinga2
- fowners icinga:icinga /var/spool/icinga2
- fowners -R icinga:icingacmd /var/lib/icinga2/api
- fowners icinga:icinga /var/spool/icinga2/perfdata
- fowners icinga:icingacmd /var/log/icinga2
-
- fperms ug+rwX,o-rwx /etc/icinga2
- fperms ug+rwX,o-rwx /var/lib/icinga2
- fperms ug+rwX,o-rwx /var/spool/icinga2
- fperms ug+rwX,o-rwx /var/log/icinga2
-
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles
- doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
- doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
- fi
-
- if use nano-syntax; then
- insinto /usr/share/nano
- doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
- fi
-}
-
-pkg_postinst() {
- if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
- elog "DB IDO schema upgrade may be required required.
- https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
- fi
-}
diff --git a/net-analyzer/icinga2/icinga2-2.12.2.ebuild b/net-analyzer/icinga2/icinga2-2.12.2.ebuild
deleted file mode 100644
index 8ec76ee82fac..000000000000
--- a/net-analyzer/icinga2/icinga2-2.12.2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-if [[ ${PV} != 9999 ]]; then
- SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
-else
- inherit git-r3
- EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="https://icinga.com/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console jumbo-build libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
-
-# Add accounts to DEPEND because of fowners in src_install
-DEPEND="
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- >=dev-libs/boost-1.66.0:=[context]
- console? ( dev-libs/libedit )
- mariadb? ( dev-db/mariadb-connector-c:= )
- mysql? ( dev-db/mysql-connector-c:= )
- postgres? ( dev-db/postgresql:= )
- dev-libs/yajl:=
- acct-user/icinga
- acct-group/icinga
- acct-group/icingacmd"
-BDEPEND="
- sys-devel/bison
- >=sys-devel/flex-2.5.35"
-RDEPEND="
- ${DEPEND}
- plugins? ( || (
- net-analyzer/monitoring-plugins
- net-analyzer/nagios-plugins
- ) )
- mail? ( virtual/mailx )
- acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-PATCHES=(
- # https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875
- "${FILESDIR}/${PN}-2.12.1-boost-1.74.0.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
- -DCMAKE_INSTALL_SYSCONFDIR=/etc
- -DCMAKE_INSTALL_LOCALSTATEDIR=/var
- -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
- -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
- -DICINGA2_USER=icinga
- -DICINGA2_GROUP=icingacmd
- -DICINGA2_COMMAND_GROUP=icingacmd
- -DICINGA2_RUNDIR=/run
- -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
- -DUSE_SYSTEMD=$(usex systemd)
- -DLOGROTATE_HAS_SU=ON
- -DICINGA2_LTO_BUILD=$(usex lto)
- )
- # default to off if minimal, allow the flags to be set otherwise
- if use minimal; then
- mycmakeargs+=(
- -DICINGA2_WITH_MYSQL=OFF
- -DICINGA2_WITH_PGSQL=OFF
- )
- else
- mycmakeargs+=(
- -DICINGA2_WITH_PGSQL=$(usex postgres)
- -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
- )
- fi
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
-
- if use mysql || use mariadb; then
- docinto schema
- newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
- docinto schema/upgrade
- dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
- fi
- if use postgres; then
- docinto schema
- newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
- docinto schema/upgrade
- dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
- fi
-
- keepdir /etc/icinga2
- keepdir /var/lib/icinga2/api/zones
- keepdir /var/lib/icinga2/api/repository
- keepdir /var/lib/icinga2/api/log
- keepdir /var/spool/icinga2/perfdata
-
- rm -r "${D}/run" || die "failed to remove /run"
- rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
- fowners root:icinga /etc/icinga2
- fperms 0750 /etc/icinga2
- fowners icinga:icinga /var/lib/icinga2
- fowners icinga:icinga /var/spool/icinga2
- fowners -R icinga:icingacmd /var/lib/icinga2/api
- fowners icinga:icinga /var/spool/icinga2/perfdata
- fowners icinga:icingacmd /var/log/icinga2
-
- fperms ug+rwX,o-rwx /etc/icinga2
- fperms ug+rwX,o-rwx /var/lib/icinga2
- fperms ug+rwX,o-rwx /var/spool/icinga2
- fperms ug+rwX,o-rwx /var/log/icinga2
-
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles
- doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
- doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
- fi
-
- if use nano-syntax; then
- insinto /usr/share/nano
- doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
- fi
-}
-
-pkg_postinst() {
- if [[ "${PV}" != 9999 ]]; then
- local v
- for v in ${REPLACING_VERSIONS}; do
- if ver_test "${PV}" -gt "${v}"; then
- elog "DB IDO schema upgrade may be required."
- elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
- fi
- done
- fi
-}
diff --git a/net-analyzer/icinga2/icinga2-2.12.3.ebuild b/net-analyzer/icinga2/icinga2-2.12.3.ebuild
index 8ec76ee82fac..ad2f31c9b0f3 100644
--- a/net-analyzer/icinga2/icinga2-2.12.3.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.12.3.ebuild
@@ -7,7 +7,7 @@ inherit cmake systemd
if [[ ${PV} != 9999 ]]; then
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm64 x86"
else
inherit git-r3
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
diff --git a/net-analyzer/kapacitor/Manifest b/net-analyzer/kapacitor/Manifest
index f4cb76d76d4c..2de96a10214c 100644
--- a/net-analyzer/kapacitor/Manifest
+++ b/net-analyzer/kapacitor/Manifest
@@ -5,5 +5,5 @@ DIST kapacitor-1.5.1.tar.gz 5668659 BLAKE2B 5caf7a51945d84010f25dcbe198d4a1b7fc2
DIST kapacitor-1.5.5.tar.gz 5708426 BLAKE2B 432d24f3bbe0f42e36b881e0c709cebd96dd3674ddf752f6a25cfb333108c903073b887e12d630d6c9e33a77b1256ea090cfe216cd9eb30b9bee53c48b7ab154 SHA512 34a2577a9c6f069ab8f747b9bd2f80f941bbedcccd740c24ec9f308804ec259e78cf14c924fcee3315b6f9f7f59adb9c50aedf06587898b8a0fb54f721d79212
EBUILD kapacitor-1.4.1-r1.ebuild 1257 BLAKE2B fd245b633ce69fc8b9ba050952ef8be7be86576ef62a3ea9ce2f4141bc5c8725419230bd6f7ddcbc6efa34e59f75fd8ff9696c37939cf5a9d5f38a73cc5a64bc SHA512 db7bee7212c8871a8d73f1d3bf40d12acf40925f6d7cc4a5dcfed60a8a9a446129c3752565ef105a396b177501d4327bf3234814b32985b92c4245528519e9d8
EBUILD kapacitor-1.5.1.ebuild 1257 BLAKE2B fd245b633ce69fc8b9ba050952ef8be7be86576ef62a3ea9ce2f4141bc5c8725419230bd6f7ddcbc6efa34e59f75fd8ff9696c37939cf5a9d5f38a73cc5a64bc SHA512 db7bee7212c8871a8d73f1d3bf40d12acf40925f6d7cc4a5dcfed60a8a9a446129c3752565ef105a396b177501d4327bf3234814b32985b92c4245528519e9d8
-EBUILD kapacitor-1.5.5.ebuild 1294 BLAKE2B a85b84c2177a8540c15afbd9b8565fdf0cffdd7822d90a3ae91580c7ccf5688223f54435a2d718d0079d892f3b3e1bbb4712e746a93c609eb2eac4139f73f36d SHA512 53f00e8ec3e37f095f353274363d1d2ca3871e49f69feb9b25ffe23e9e62a9c17bcc8ec155915eae547259e4e6044f22bde04762ae95c7d496166d02fec4757f
+EBUILD kapacitor-1.5.5.ebuild 1291 BLAKE2B 2358a6e632ff90c5d81e8c5b6aac80b51556a8a1b227c613066136b963a5544cc7b8a98c5d7512d78f0d63d779cf29f0f479a070fcc94618abcc3154471bb02a SHA512 21fb950d58cee3883fe29da65f44a015fa3ee09bf981c7a2d72d7cd9c4ad10391a96d1b695c9641c93e87f41fb2a32431fa82a28fdafda243c81697b508d6e74
MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/net-analyzer/kapacitor/kapacitor-1.5.5.ebuild b/net-analyzer/kapacitor/kapacitor-1.5.5.ebuild
index 255afd9819a0..b30d15009984 100644
--- a/net-analyzer/kapacitor/kapacitor-1.5.5.ebuild
+++ b/net-analyzer/kapacitor/kapacitor-1.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index 216fa0b8a909..fc53a216ff1c 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -1,12 +1,5 @@
-AUX mtr-0.80-impl-dec.patch 226 BLAKE2B ba16f81170ad40b472760f9130f139f092c69d7028912fc5c93b3e709bc4628e7778a97f77bd7ad98a16a5220ab476caa980c2adab306689fd8f77743788a1f1 SHA512 71c53c22f4ff99b29cd71f4e910e857ea0f4f497d25dcd59295ca2b59eb7be40d021d865489a53234d5fa4395f6baf011073d117653ad82aef78562a60898b1c
-AUX mtr-0.87-ipv6.patch 1846 BLAKE2B 7d2166183a203454eca233b8ad2bc3e97c4dd7fcacd6325d83694938c026cf9cee25d8ecc3d799e8ffa09315361117f41981e382af296538cbf6fffb23b5121e SHA512 07a43b798b30893583fb08e7e65a6833ece98f18656f6a31e7e61acd1f582d68d35b63d5aada4175d5df2451cbd856370e85f514e1ee8447ada9a91a83af1345
-AUX mtr-0.87-tinfo.patch 380 BLAKE2B b81110442dde3e7d0337c2b6e6685a377593b6c91c31fd20fbf42cd54296282aec3ab73a8f047ed4742a7a369a18ecf9b26bcd3f56d5e9a5e565e6f66b906f5f SHA512 91442d319840620273c712e7668d8895a28a10615afa4e06a16a3f86c2dc319a9484c7a8b92a8ad7de97f56c52b881a230ebd3fe59e45a7a4df85fcd77c74229
AUX mtr-0.88-tinfo.patch 450 BLAKE2B 7241ab3ffcf80c9775700328de031c39172f384258339495abcd937271ad29b429bebe5922f5288113683e5910c5ea513d2a131aa50b230ab51bfaf332e31379 SHA512 996905be6f96f71a742d3a00c0a5c6730b69709f50db4132284e12030dd80929ed838f7a7a94bf3634698bd17234a1324a84f81a5dfe5f4a71ab70e9f8f294aa
-DIST mtr-0.87.tar.gz 184645 BLAKE2B e96535b0bd46ee63c5e6110ee465195a9ead6ff7c7ea3629b2668631f25e9181cf4236ba0e2cfc0517e7c70683bbb6347d9c26a2b09701d89e225c27aa2faae4 SHA512 172ba2f78a6ee4deb427ac2fb00dff16843215dbd23663fbe41fcc957ffe278b408a73a0c7e1c05788b235e2d03fb53f9971b8b82d4de2f95edcaa9f2cff3cf9
-DIST mtr-0.93.tar.gz 291015 BLAKE2B 6ac0e21f9e06fbfee9e9ada4cddb6cd9685ae669a05d1ed257a2c238ab78ac16e1a1e152ef1359ca530b0eced14c9333df2b691c27cbc29173c843ebc64eaaa9 SHA512 046e98a661bd6248ce819411ceb6e2b875b92877de38523594898df507836c113573cf40d7d4cc548370f515abe99e0aa4d8b3ba44ad54dd00f8e93c8a96c021
DIST mtr-0.94.tar.gz 143616 BLAKE2B e9b4619a85a515d729f0987d5882fb91e4bfa3be82476efbfdb832d0b13ed334be1c1a1bcf8ab4ca820002e79ca4a24d0b50f2739d9284b7dec0b8852a1a91e0 SHA512 0e58bd79562ff80f9308135562ab22aa1f1eea686aefd3aef07bac05e661e34b60fde7c66c96bf4f0919f546376fbd6106ecd8fa92328c24f6f903097496bf11
-EBUILD mtr-0.87.ebuild 1154 BLAKE2B 7dabf8118eb039767ee7f67948667de349928e053525f41af128db531bfe92192613ad5047ef0836deca9b23da72816b9fbd628546cc76131c9bb4b7b6ce8948 SHA512 51b6c6ed2710f98729551d2ba2ff4d79f048d31c31fd839a9ec8268be675e940d7e91cf2e9f1255d6b6a715ef43f1a5cb2b1a1817ac72c63b8b413091b2a85c0
-EBUILD mtr-0.93-r2.ebuild 1331 BLAKE2B aa44ba0f4126312bbfed53cf22fab692f84775f966c61b5b3b3cfb76d476cc6ef7db231194d957a7e5f7c5c140f4217b08737a31f250c4e984b1e981267d0283 SHA512 bc24e0412acc8f0a5c1dfbe556ec9ee0fe9044b2ce8e39366f555068a1471b80517f0d443a21e36bdc542d255f594d336c9817f5cfa75f21a0da8c38247f5612
EBUILD mtr-0.94.ebuild 1389 BLAKE2B 165b9a35094f2a1ea4adf246b79335e97310b7633a0aad75997dbc22a2a9f7e9b94f09c9395b68fb49e9c34e2ed2da48a9c63a84d0e879216e3360b1870915a6 SHA512 e0a6ece96b0302de707a498421e12ff106b90ffc82f3a2366a6325d837e240bab832e33dfb008f8ed21abd66f68d747baf059190760199a77de8d8fb28f0e914
EBUILD mtr-9999.ebuild 1241 BLAKE2B 5c4b500e1ef1995947154e627d262b79ca135a6ee6c231e2f865b955952bb5f968f227d82f9a4217d963b4387a2afc379ef46c90fc88c43eff227676b34e78e7 SHA512 e954551e3a37dfca502d2c76e77134193ae7cdba68e74dd755a1f853ddbbe274488bf7bc758711805875f06e80e1790b638d2adfb247421c06c0aa706b9bb163
MISC metadata.xml 556 BLAKE2B 23e3fd72b2360a5a1a5361df09a8116a70ed178a2e1367c21e7ce77b4f8956a521b8ffb69719eeca673e5766aa8733623baa579a8998adcf884e29a850bdeaca SHA512 a61448154f21ee3870c53bf3877cfbbad543fa11d9e0d1a4579cdcb18215e46129993df0dec9e01c97e76915ecb052c3f16e4c19cc85ac0f21c19cc4d45f71e1
diff --git a/net-analyzer/mtr/files/mtr-0.80-impl-dec.patch b/net-analyzer/mtr/files/mtr-0.80-impl-dec.patch
deleted file mode 100644
index 5b41a54c744b..000000000000
--- a/net-analyzer/mtr/files/mtr-0.80-impl-dec.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/gtk.c b/gtk.c
-index e42f4f6..333d7c8 100644
---- a/gtk.c
-+++ b/gtk.c
-@@ -24,6 +24,7 @@
- #include <unistd.h>
- #include <sys/time.h>
- #include <sys/types.h>
-+#include <string.h>
-
- #ifndef NO_GTK
- #include <stdio.h>
diff --git a/net-analyzer/mtr/files/mtr-0.87-ipv6.patch b/net-analyzer/mtr/files/mtr-0.87-ipv6.patch
deleted file mode 100644
index 32a62853387c..000000000000
--- a/net-analyzer/mtr/files/mtr-0.87-ipv6.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/net.c
-+++ b/net.c
-@@ -320,9 +320,13 @@
- struct sockaddr_storage local;
- struct sockaddr_storage remote;
- struct sockaddr_in *local4 = (struct sockaddr_in *) &local;
-+#ifdef ENABLE_IPV6
- struct sockaddr_in6 *local6 = (struct sockaddr_in6 *) &local;
-+#endif
- struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote;
-+#ifdef ENABLE_IPV6
- struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote;
-+#endif
- socklen_t len;
-
- ttl = index + 1;
-@@ -437,9 +441,13 @@
- struct sockaddr_storage local;
- struct sockaddr_storage remote;
- struct sockaddr_in *local4 = (struct sockaddr_in *) &local;
-+#ifdef ENABLE_IPV6
- struct sockaddr_in6 *local6 = (struct sockaddr_in6 *) &local;
-+#endif
- struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote;
-+#ifdef ENABLE_IPV6
- struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote;
-+#endif
- socklen_t len;
-
- ttl = index + 1;
-@@ -726,8 +734,12 @@
-
- /* sendto() assumes packet length includes the IPv4 header but not the
- IPv6 header. */
-+#ifdef ENABLE_IPV6
- spacketsize = abs(packetsize) -
- ( ( af == AF_INET ) ? 0 : sizeof (struct ip6_hdr) );
-+#else
-+ spacketsize = abs(packetsize);
-+#endif
- rv = sendto(sendsock, packet, spacketsize, 0, remotesockaddr, salen);
- if (first && (rv < 0) && ((errno == EINVAL) || (errno == EMSGSIZE))) {
- /* Try the first packet again using host byte order. */
-@@ -1535,11 +1547,15 @@
- struct sockaddr_in name_struct;
- #endif
- struct sockaddr_in * sa4;
-+#ifdef ENABLE_IPV6
- struct sockaddr_in6 * sa6;
-+#endif
- struct sockaddr * name = (struct sockaddr *) &name_struct;
- struct sockaddr_storage remote;
- struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote;
-+#ifdef ENABLE_IPV6
- struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote;
-+#endif
- socklen_t len;
- int s;
-
diff --git a/net-analyzer/mtr/files/mtr-0.87-tinfo.patch b/net-analyzer/mtr/files/mtr-0.87-tinfo.patch
deleted file mode 100644
index 4dbdef1cc2fb..000000000000
--- a/net-analyzer/mtr/files/mtr-0.87-tinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,6 +25,8 @@
- AC_DEFINE(NO_CURSES, 1, [Define if you don't have the curses libraries available.])
- CURSES_OBJ=)
-
-+AC_SEARCH_LIBS(raw, [ncurses curses cursesX tinfo])
-+
- AC_CHECK_LIB(ncurses, use_default_colors,
- AC_DEFINE(HAVE_USE_DEFAULT_COLORS, 1, [Define this if your curses library has the use_default_colors() command.]))
-
diff --git a/net-analyzer/mtr/mtr-0.87.ebuild b/net-analyzer/mtr/mtr-0.87.ebuild
deleted file mode 100644
index c3577104b26d..000000000000
--- a/net-analyzer/mtr/mtr-0.87.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils fcaps flag-o-matic
-
-DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
-HOMEPAGE="https://www.bitwizard.nl/mtr/"
-SRC_URI="https://www.bitwizard.nl/mtr/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="gtk ipv6"
-
-RDEPEND="
- sys-libs/ncurses:0=
- gtk? (
- dev-libs/glib:2
- x11-libs/gtk+:2
- )
-"
-DEPEND="
- ${RDEPEND}
- sys-devel/autoconf
- virtual/pkgconfig
-"
-
-DOCS=( AUTHORS FORMATS NEWS README SECURITY TODO )
-FILECAPS=( cap_net_raw /usr/sbin/mtr )
-PATCHES=(
- "${FILESDIR}"/${PN}-0.80-impl-dec.patch
- "${FILESDIR}"/${PN}-0.87-ipv6.patch
- "${FILESDIR}"/${PN}-0.87-tinfo.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # In the source's configure script -lresolv is commented out. Apparently it
- # is needed for 64bit macos still.
- [[ ${CHOST} == *-darwin* ]] && append-libs -lresolv
-
- econf \
- $(use_enable ipv6) \
- $(use_with gtk) \
- --disable-gtktest
-}
diff --git a/net-analyzer/mtr/mtr-0.93-r2.ebuild b/net-analyzer/mtr/mtr-0.93-r2.ebuild
deleted file mode 100644
index 880c2729a41f..000000000000
--- a/net-analyzer/mtr/mtr-0.93-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools eutils fcaps
-
-DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
-HOMEPAGE="https://www.bitwizard.nl/mtr/"
-SRC_URI="https://www.bitwizard.nl/mtr/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="gtk ipv6 ncurses"
-
-RDEPEND="
- gtk? (
- dev-libs/glib:2
- x11-libs/gtk+:2
- )
- ncurses? ( sys-libs/ncurses:0= )
-"
-DEPEND="
- ${RDEPEND}
-"
-BDEPEND="
- virtual/pkgconfig
-"
-DOCS=( AUTHORS NEWS SECURITY TODO )
-FILECAPS=( cap_net_raw usr/sbin/mtr-packet )
-PATCHES=(
- "${FILESDIR}"/${PN}-0.88-tinfo.patch
-)
-
-src_prepare() {
- default
-
- sed -i -e 's|m4_esyscmd(\[build-aux/git-version-gen .tarball-version\])|'"${PV}"'|g' configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable ipv6) \
- $(use_with gtk) \
- $(use_with ncurses)
-}
-
-src_test() {
- [[ "$UID" = 0 ]] && default
-}
-
-pkg_postinst() {
- fcaps_pkg_postinst
-
- if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
- ewarn "mtr needs root privileges to run. To grant them:"
- ewarn " % sudo chown root ${EPREFIX}/usr/sbin/mtr"
- ewarn " % sudo chmod u+s ${EPREFIX}/usr/sbin/mtr"
- fi
-}
diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest
index 69d05f532bc0..db775c2c17ff 100644
--- a/net-analyzer/nessus-bin/Manifest
+++ b/net-analyzer/nessus-bin/Manifest
@@ -1,4 +1,4 @@
AUX nessusd-initd 582 BLAKE2B 67c5e73262512c590b5b4fc0668297a504677aa3d771fdeee2809c921d988faef19cbf10a7fb26d52114e1a67d33ef197e32c561cd5b2003c8abbde2dfe5cb4f SHA512 f825fad89564303aeff423f3c32a1544ee4b063ef57702cd54220aebed8e01e7b178ff5bd10b48b654ebdee78657a9bc41caf779a23968d008916fd51e88b2f4
-DIST Nessus-8.13.0-es8.x86_64.rpm 41087764 BLAKE2B 38ccb0fe298dbcb9e7fe7481a137a3f5ed0b2d22c575ac6669b72f9e2588d834b287e3aab9632f6f5e7823100eeaaac9fda0fd966b5f850ca3dc73eaa1c8102d SHA512 3fddaba821efa27059c22c1df5d7fad36813e6f1aad48402d4ea2eafba036a1cb8f74c29aebbc39065db7efc66c3669b1514d6f2fc4d0cf69ca5f7a75a5d2a50
-EBUILD nessus-bin-8.13.0.ebuild 1986 BLAKE2B 382d860d6249b1f637dff9ae84b899d38bacd165cd63edf4e5b667f1a46b8c23ad2baaf642a48d3616c0328d5eaddea2c0e56b2aa904aba958af7cdf7973458c SHA512 010f19e6f5d169bba67e03a157c4f4c5b2b634e086820cf61c2601c3689f9fc8a8f9c71700efc2d33cede6590d5244e62f229a67cda4c354a685f1be24ee3f5f
+DIST Nessus-8.13.1-es8.x86_64.rpm 41186604 BLAKE2B 462cc6bd9c2f5b50fce330fa5919e9b6e5c93285361c385d06d6f0377ecb9fa8ce349714b71d0f97604c4e755d54e510edb5561c9dccfdb1fad3e35a7e6504d6 SHA512 d2a2b3a94b78bbf6261ae0ad4f66475cf0aea14316de1f2133795767c14048cb12b9857e497182770b04e006c00f65a7fe592f4fce0c480d08efafb2c17ad7a2
+EBUILD nessus-bin-8.13.1.ebuild 1986 BLAKE2B 382d860d6249b1f637dff9ae84b899d38bacd165cd63edf4e5b667f1a46b8c23ad2baaf642a48d3616c0328d5eaddea2c0e56b2aa904aba958af7cdf7973458c SHA512 010f19e6f5d169bba67e03a157c4f4c5b2b634e086820cf61c2601c3689f9fc8a8f9c71700efc2d33cede6590d5244e62f229a67cda4c354a685f1be24ee3f5f
MISC metadata.xml 345 BLAKE2B 05fdd17a4decd9a096175a59991a6df8260591c09193fef114895d7d29e0f08210aacd4517678410813d06a27b1032889c529e2966427c5a9ad454f9534d25f5 SHA512 3535519b1c621f6df120e6aa39f9a11ec132b68499a029915650218c16e9ca1a07cb30409ace95b2aa0204194a61c7b4743051e1f4ffc94cb5ba3372cac72e8c
diff --git a/net-analyzer/nessus-bin/nessus-bin-8.13.0.ebuild b/net-analyzer/nessus-bin/nessus-bin-8.13.1.ebuild
index 1e569f0e0f10..1e569f0e0f10 100644
--- a/net-analyzer/nessus-bin/nessus-bin-8.13.0.ebuild
+++ b/net-analyzer/nessus-bin/nessus-bin-8.13.1.ebuild
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index dd27ae23c3dc..e4bad07a7e5f 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,4 +1,4 @@
-DIST netdata-1.27.0.tar.gz 6217873 BLAKE2B 6a3b577d3c67efd925c8b496f19ef7f76fe990f381bbd8a9c1decf5e55a56e565c1b4a5f8aa95421f0e12d122a9142f23942a2d28bec434027f326b5239397d1 SHA512 90d6aa30600385e64a90b28569712f0d09e4c0dfa6de46ac17aede81189797e39c823092067b5ee8118289c7b62a224b8e7107d85f8bd6cc90311c4efaa631e8
-EBUILD netdata-1.27.0.ebuild 3422 BLAKE2B 33b578b75b69c9762b816cb5d30a502757470fc780c7f7dbfa7f33660dfd33dfc2504b509f7cbe8cd94354163ec056886eee188b6851cdc2e4f3d2f83819a4b7 SHA512 d2453b66acc2cd802e00e7de98c0730bd468669c8bd17fcfbddbc3b3347656e5754813fc11240cf2633ad38b219ef62dac0c42c21910b47ea659ec0057c910cb
+DIST netdata-1.28.0.tar.gz 6218048 BLAKE2B 9ee0eea1a17df207ffbc934b3c0dfe261fb3c3a51312947df0e287fc29c4dacf35e414593da0b3829999cea6bb03eab89fe7f1743fdcc3be39d532427a9239b2 SHA512 98048ebb10ff9db9cd273fb7b66e30aa14f6cd71e53a0c80c7ac5bd45c9f85b64b1d2d5fd12734921a11b584f67435563e26f0249aab61458b563405bbc54b17
+EBUILD netdata-1.28.0.ebuild 3422 BLAKE2B 33b578b75b69c9762b816cb5d30a502757470fc780c7f7dbfa7f33660dfd33dfc2504b509f7cbe8cd94354163ec056886eee188b6851cdc2e4f3d2f83819a4b7 SHA512 d2453b66acc2cd802e00e7de98c0730bd468669c8bd17fcfbddbc3b3347656e5754813fc11240cf2633ad38b219ef62dac0c42c21910b47ea659ec0057c910cb
EBUILD netdata-9999.ebuild 3422 BLAKE2B 33b578b75b69c9762b816cb5d30a502757470fc780c7f7dbfa7f33660dfd33dfc2504b509f7cbe8cd94354163ec056886eee188b6851cdc2e4f3d2f83819a4b7 SHA512 d2453b66acc2cd802e00e7de98c0730bd468669c8bd17fcfbddbc3b3347656e5754813fc11240cf2633ad38b219ef62dac0c42c21910b47ea659ec0057c910cb
MISC metadata.xml 1229 BLAKE2B 4247be48b9fc7f1e16f9a145d5c5fa6036d7721fd829d3e515903043a29397e29d9ef550ce21bb17bb3c4da012b41ef2961d4772f99b37169bc25b79e840696a SHA512 264dda2113eec7e86976c09bb0074a21c3255344be635131d737bda61ba8f95e103882d44957e92a7a44d73473448ada0041c80e63fa221b72c8d19d2953447e
diff --git a/net-analyzer/netdata/netdata-1.27.0.ebuild b/net-analyzer/netdata/netdata-1.28.0.ebuild
index 7690ff9704cf..7690ff9704cf 100644
--- a/net-analyzer/netdata/netdata-1.27.0.ebuild
+++ b/net-analyzer/netdata/netdata-1.28.0.ebuild
diff --git a/net-analyzer/ngrep/Manifest b/net-analyzer/ngrep/Manifest
index 480412a2eeaf..a24a23bda19f 100644
--- a/net-analyzer/ngrep/Manifest
+++ b/net-analyzer/ngrep/Manifest
@@ -2,8 +2,6 @@ AUX ngrep-1.45-build-fixes.patch 4778 BLAKE2B 058c0414edf1c37efd85f00a38d41d27ce
AUX ngrep-1.45-prefix.patch 575 BLAKE2B 1d5933c457507bdd10662005dac7a14a1b78d221f126a8cc33d0d952b81b10c936a86b83471be76219445d9332ea165a0fac3d3e6f37ae15096fef337ece404a SHA512 e33321ded5c0b86a279108a0d72d5e1d65699c39f50ac9291c4256867ce3f2b06d86d7186e51359deac82beadb7e8503ca5023c5401068aecebaffa4d01c2afc
AUX ngrep-1.45-setlocale.patch 495 BLAKE2B 10d70be3c787344f120ed2faf527425af68ab723b23840ae5d1c460431b06777b0b691760854bf3fb64a72dfec85aa1b8110558f0037981f10a674cd53428ffb SHA512 007cf6793ef407b4069ebe84b9fe5e5a23c3d2d7f5c538ce0a81d1b6c2643b79387136854d50eb68b13aaaf6e3d7b1a469e7afdeebedba79efea1960b2d1a87e
AUX ngrep-1.47-regex.patch 683 BLAKE2B 5eaed7398a140dee747664ce05c3f9afb9f57f827ef96efd4ad284be313dd234c15603bcd842c7d2c96a46900de46205cec1d0270cc83d36b5e9feedf1f3b2b3 SHA512 e435f1e4fb35fbed0eeef414da2fd19c09311287b466e667c9150d53a1ae52abbe31173758192c9638eaecf54e4c3be99020e9831a2543b2e4d0c61f5b9f55de
-DIST ngrep-1.45.tar.bz2 463361 BLAKE2B 31f7828fb28197f06a583cd6d250b5d70bfbd2bc5dae657daaed3f7ea286aec4dff9cca449c72a3c27d8e8b30d861304872eaaaa11abc9eb71f2acc94d9fc9f2 SHA512 0feb4080f834449d57ae99897c573d2b8148711cfb550fa4ff415169dedb1f0d23f4b03f625660162ca72f8ad06e19874c1af46da6afd8f8fe8dd553558c14f7
DIST ngrep-1.47.tar.gz 187067 BLAKE2B 4fa47ed343b88e84fb5a3ab6e4dc8139cb008ffcbea901a67664335ad76d36e975e037620cebb1b204ba22e5b139e822c7cfbc74a061fc6cacae631be3f87a52 SHA512 47ba65878df6b555701c866721a8a935eabdcce636d398284cbfe5f63baf68c62d994a2f373ea4fc8f44fbed3eecee149f2ee48d39c71c04d34e5a088db8c657
-EBUILD ngrep-1.45-r3.ebuild 1050 BLAKE2B 405266d7b8805ff562241b5ac72e0a0319754884b64934e71c650e63577da53e18704a32648bc72c1aae35a4036606c4922169d10a3e2b8d481632c141a25ce9 SHA512 6bdd2ebb0b45d9c7744243a0f16c193b3d4501b10716ffdf614774a9ba63168be8d14c2b2795322b41469e820a3aeb511e57343ebbbef01abc45292192af93d0
-EBUILD ngrep-1.47.ebuild 977 BLAKE2B d21dfa617c287895d12884125ddd71c7120f4927ae272144d51ee219b939511c19869a59911339d0ed72991abf4e8814ce7909d714353959c1857dc8dde872fe SHA512 46b2fbbef2f0471cd0c72f2daf7e7bd655c98fd4ca397cfffbacdb6b094a7a3d22c28ab553a72936d3abe6a2cef3fcc8e5dd587e1f0b4602e750c197c230889d
+EBUILD ngrep-1.47.ebuild 976 BLAKE2B ae6431ab7b83c039dc2bc83adf85ad77b36e2191e89362a259dbd66649898851b086553fb05e2e85fa01991baaee54cbb678deab0f49aaf38addf4a91f83865d SHA512 ec26676f4873a6ef973b96c3668f92b99e29932785b9c8850b7847664512552f47ba253983047a18d558a2e1af8650a1ad5bfa94a31f180a4c05e9e53adc07cd
MISC metadata.xml 669 BLAKE2B 79852bd4c0d1185bcbf60e5ba9e5a9c58b6d6720942cd0cd6d7f8f4f6d445d9ba3fa888bbfba625d1627df4a0aaed22513163075806483a576e199acb9c5fb4d SHA512 d680774ca1d7a66bbe9badb840ebf3f0249c80d0850a229797d17a09da27e2fad9510449ceecfb62b3141ad105fd2970713a14879df57e0bb14c26ac66c807ad
diff --git a/net-analyzer/ngrep/ngrep-1.45-r3.ebuild b/net-analyzer/ngrep/ngrep-1.45-r3.ebuild
deleted file mode 100644
index daa699482be9..000000000000
--- a/net-analyzer/ngrep/ngrep-1.45-r3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils user
-
-DESCRIPTION="A grep for network layers"
-HOMEPAGE="http://ngrep.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ngrep/${P}.tar.bz2"
-
-LICENSE="ngrep"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ipv6"
-
-DEPEND="
- dev-libs/libpcre
- net-libs/libpcap
-"
-RDEPEND="${DEPEND}"
-
-DOCS=(
- doc/CHANGES.txt
- doc/CREDITS.txt
- doc/README.txt
- doc/REGEX.txt
-)
-
-src_prepare() {
- # Remove bundled libpcre to avoid occasional linking with them
- rm -r pcre-5.0 || die
-
- epatch \
- "${FILESDIR}"/${P}-build-fixes.patch \
- "${FILESDIR}"/${P}-setlocale.patch \
- "${FILESDIR}"/${P}-prefix.patch
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable ipv6) \
- --disable-pcap-restart \
- --enable-pcre \
- --with-dropprivs-user=ngrep \
- --with-pcap-includes="${EPREFIX}"/usr/include/pcap
-}
-
-pkg_preinst() {
- enewgroup ngrep
- enewuser ngrep -1 -1 -1 ngrep
-}
diff --git a/net-analyzer/ngrep/ngrep-1.47.ebuild b/net-analyzer/ngrep/ngrep-1.47.ebuild
index 6ca8a342aa3a..641f886507d9 100644
--- a/net-analyzer/ngrep/ngrep-1.47.ebuild
+++ b/net-analyzer/ngrep/ngrep-1.47.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/jpr5/ngrep/archive/V${PV/./_}.tar.gz -> ${P}.tar.gz"
LICENSE="ngrep"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="ipv6"
DEPEND="
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index 7fe6480be432..9e602fa777c4 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -2,7 +2,7 @@ AUX pmacct-1.7.3-nDPI-3.0.patch 1157 BLAKE2B e7beb25fa1b239193d4c4deb7521b1b0305
AUX pmacct-1.7.4--Werror.patch 327 BLAKE2B 1b77ca15ef64a48ca6b477be9f37fa7b88d79e7fedb47895648b6637e9af9e38c959b8838d28d1370dd11b4c722d2b18adabcdd72c8e074dbc10467b770ea6de SHA512 06e1cce962022e51c960881c6f169c91605c5ed597960085f38b5c9fffa4056813014c08070ba7f016cb0f6c449038df9666e5f0d7ab7879563d2dfdc53d2b0a
AUX pmacct-1.7.4-nDPI-3.2.patch 1712 BLAKE2B 103650626f7e4cb8f7f76738c3b151f38c517d27ec0c5b4c1b2ab14f6a22fb20150b01c0bd171e99c70749d8cd62aa6f04cce229d3056e0382bedd6bd9e28b24 SHA512 3ed43f04bc7aa709390748c503f390f98a6b057825fc6d608730803ffd70e6a081c455085067507567b7f43f49c8e6ebc00d4762bc2aeee66a9784ebfdb80c80
AUX pmacctd-conf.d 153 BLAKE2B 10329deaac64fb5e03bf673c806ad691fb00579d16c77b05aa73662b5e187a31c25da38afb3be853434900ad65103bef3b9d1d9c3b24e0f241a98e4c9b6696b8 SHA512 1637316833db6e2a7c2d531deb4d68d647948bc03da8aecf0c6a34dd2f0c58d58d8473270e6096cf232e98c07946bac265161d4a8577def6cb72a4e8c9778c31
-AUX pmacctd-init.d 837 BLAKE2B b69be34106833a4c9674b0e300fbd91193a3856a87b4cc268d210e8031dab8a1df8250363b756b63c8c01f052ce89bef993c971906c74e1cdcf172dfce3f5dd0 SHA512 fb86c909708281401cc2e0cc275ec1fd2370697e196b5d16feee9bab42b313b80b9d2b08e12a4fe08237ae401d3b3bd50c9f38293be170dd315cd0b8b2fa19ff
+AUX pmacctd-init.d 834 BLAKE2B 15b66c0495690bd42069abed21962db93edc798650cd23944206eddebe1f4baa3086537620c58fa0e63f83336bf2956318eb5ac7521235555ce3f67b2d54eca8 SHA512 eb87cafae945c13a5eff12c1140e0943bed59d46ca91d46a9fe71e1269549064d04980b04ce78f6a87eeacb7253d1d59f32461ee68734e7cac6510d187fb7f3c
DIST pmacct-1.6.2.tar.gz 1311678 BLAKE2B 123629ca2e5e58bb4e684001b1c6d2d510e18450eed1c6e45bbe79ec7bb37072ba9b844fe0d8826a7923d0b09cf6923ea87d4e22fb2f251e7ebb9744d1c59b93 SHA512 8495f97752ae586fd842eed49ce91db3e4753133f7d380d067e7df153abeea469e5126800074e9071cb7227a3f1df64d4642dfece624fbbfa39b4537fde38b46
DIST pmacct-1.7.1.tar.gz 1392360 BLAKE2B 75a4dda461c2fe643c24a901c19efacf325d1922bcda503a1ff41fe0b6c4178732d476b479875e9e0ba34872dbd86b8d8b2087471148f10e202f57c4a212f2fd SHA512 6a5d75522b9197b324907598ee4ba22bbda96b45e10f62df2ae507e23faac927af5468f587deab08d1e0f3f6422c609d106dcf30fa7bf16eb215bb35ea6aa08c
DIST pmacct-1.7.2.tar.gz 1416302 BLAKE2B 5d6f9c5849c07c7bdd3b6251b2611935ff558ca393d2cc0d21e5e681b0069b3a5bb4a985a9dc59b62b8b4ed697ecbd4cbb71f0aba42ce8d1527187b98d2e90d3 SHA512 ffdc63e96fc6af6f5d531243bc0aec0925663d8e91e83ada275f8e9a969dcf85cebd06b17ae2c796722bb209602d5b2bc487757ec736a740a8f33698d93a8675
diff --git a/net-analyzer/pmacct/files/pmacctd-init.d b/net-analyzer/pmacct/files/pmacctd-init.d
index bfc59c07abb8..fad4b49ccbe3 100644
--- a/net-analyzer/pmacct/files/pmacctd-init.d
+++ b/net-analyzer/pmacct/files/pmacctd-init.d
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
PMACCTDDIR=${PMACCTDDIR:-/etc/pmacctd}
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index 565dcf845fac..d6a2b0a54cff 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -1,6 +1,4 @@
-DIST scapy-2.4.3.tar.gz 2969754 BLAKE2B 83ab6500dbc0424b728253661f03391d450f77b19c0059b8a605a19f48b4ddd7344743310a5cb7c741fcf750876ba125daf883d04714981ff81ef4db97519ae0 SHA512 579e3f326f90e10b2839aee805949e14ecab9431f360ef75e60080a971653e1f48a240d812b8ace77754b01b07a2ddb8533d1e6b18ee8804280bf9b2c237cede
DIST scapy-2.4.4.tar.gz 3240890 BLAKE2B 38b4fc0c34f229bb33f4d488ae9ba20905db572e3dd3caa15a92e8a33ba7305ba86a2b32a2664779c5085e53d44b4c55336d7afa8d65b90ffa3babcdc94bff25 SHA512 b8ad138ae2563967af07d123339ac73468fadb8f7687123aed364ad6d45198e9039314e17a155c37d01ef084e25571c587330dfd21777527110342c01821a389
-EBUILD scapy-2.4.3.ebuild 1005 BLAKE2B 43241ada322289f7fb8a7f987241dd4115aa0b5a30c575a84b990f2931ea30ede71f4bf2052403e4da4136b6a0a89bd7f1e0c05a351f2714570ede8f0bdd9255 SHA512 429aaeddb0535f18904c064bbd4e08ffba1a8d6519813cae285ab4917fbb78bafc24337eeb30384be8e4da205d5c1a041fb8b30db9075ac09921f4d5a15a7c78
EBUILD scapy-2.4.4.ebuild 1060 BLAKE2B 7e069b3d74fda950c54f80df95847629af78386509467afcc3f387962eefa2eb1a41c386eb6d6d2e35b336d46f29e2840c26b5c8fe99802e8ba1dfd779e92629 SHA512 d80bec0aab72a90f7cdfac918e87e85d8ebc42c730d67e7a1700343b42624d2a19d51722e9eec78695dc4316ab6649c3f3974b98ac570c63f084a1a7a52b15aa
EBUILD scapy-9999.ebuild 987 BLAKE2B 07bc33cd80fc39c47d49e181ccee40df7e93f895c73a97166c31922b941bff4cd4ef98baa5141aa4fdadef4260eb31570371eef5c99a2c4e39120779441439da SHA512 806261e8e3fc3407e6849c20106732d8f7e34bcfc979b8c88f4b76b9dd45a072c730ff37d48d5be23b1f18551aff3bfb266196339b7ce9e7330c04f603f6f729
MISC metadata.xml 584 BLAKE2B a5b6c42179b511881bdc9c7946bb059f38a67e7e56edb76a81d021674badb4fca4a0ef51302d71adf64b6ce06b165d05d9cf43c3fefdd6127469736e6e37efee SHA512 a3193634b17020af3d35454f160ac6fc5289d5cadcc7a50c95e44d9ee98d26f102489334a750bb806f98e2e978dafe25718ef7468bf7159499ff33f5064da89d
diff --git a/net-analyzer/scapy/scapy-2.4.3.ebuild b/net-analyzer/scapy/scapy-2.4.3.ebuild
deleted file mode 100644
index 2b9cea9f0d1f..000000000000
--- a/net-analyzer/scapy/scapy-2.4.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
-HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy"
-SRC_URI="https://github.com/secdev/${PN}/archive/v${PV/_/}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RDEPEND="
- net-analyzer/tcpdump
-"
-S=${WORKDIR}/${P/_/}
-DOC_CONTENTS="
-Scapy has optional support for the following packages:
-
- dev-python/cryptography
- dev-python/ipython
- dev-python/matplotlib
- dev-python/pyx
- media-gfx/graphviz
- net-analyzer/tcpreplay
- virtual/imagemagick-tools
-
- See also ""${EPREFIX}/usr/share/doc/${PF}/installation.rst""
-"
-
-src_prepare() {
- echo ${PV/_/} > ${PN}/VERSION
- distutils-r1_src_prepare
-}
-
-src_install() {
- distutils-r1_src_install
- dodoc -r doc/${PN}/*
- DISABLE_AUTOFORMATTING=plz readme.gentoo_create_doc
-}
diff --git a/net-analyzer/tcptraceroute/Manifest b/net-analyzer/tcptraceroute/Manifest
index 3a15f2accad5..70007eb55149 100644
--- a/net-analyzer/tcptraceroute/Manifest
+++ b/net-analyzer/tcptraceroute/Manifest
@@ -1,5 +1,4 @@
AUX tcptraceroute-1.5_beta7-cross-compile-checks.patch 1228 BLAKE2B f18640804c946225fed7324203c928062b37001053ac87a8f78c500b1bb6c65f3263650484f51ccf20b09bb8d1ce95f871b2ad53f8752154e0134b5e26b2e01a SHA512 a994d9d0dfd633fd9f091c77a0ca96b0b73dc9a7373631feece29fef3f3daeb38dddf7fc6fc829c64cb8eb3809d7e25d22f3c18d2202188df9d94ca237601815
DIST tcptraceroute-1.5_beta7.tar.gz 119059 BLAKE2B e2d627c7fa96439e77be7d2fb5d57e0b92451367c95022876895fcbebdc0adf8c78b262e41ecb8a2696e8377e9862b45f2139cb8ca9d92a696d9a0dc319d4a64 SHA512 ad5588e62a56f1b5fa851b68280a88e66a900777fe4fd67587262245cd9da17b536b7dc972abe540fc124a93ac76abcabbc55bc32f9f8ee872d5df57b08f7222
-EBUILD tcptraceroute-1.5_beta7-r2.ebuild 932 BLAKE2B 27bdd1f9cdf1a458adaa96b26a4dac6cf005b6b2d0014bbd116afb59770dc129c7ce5705491a4ef06d10c4977a3e9e1be8f2f31775a2a4f1df8f961f3f82d340 SHA512 e71e63651dea0d1eb69ae3c3d0e5fc4b265c4b4cf0f57616541e443c34a517a2a9b3ea2b46cfcb67038c2a9e4bad91efed24b8f23266568828f3f2d0fe33697d
-EBUILD tcptraceroute-1.5_beta7-r3.ebuild 880 BLAKE2B 36134fa45277ae34998f7dc9c8670e306d1a1ffd71ec036682aa2f7b2117b9225c1369a33108fef63392dcbffb64c4460fbe606e17fb192583fc60ea80016b70 SHA512 29153fadcec39febd3976118d2aec6f052babf67eaae7e44747b2e8574bfa72e8ba82f0243fbb0622a8afcb8404a11cbe87a8fd98ae83ee84e6e8c80aca4a7ac
+EBUILD tcptraceroute-1.5_beta7-r3.ebuild 879 BLAKE2B e6cc5df639c5d096207f3240e5755aaae8522a5e8a91b2fe84fb8f7d05128e5908f00e2ec15881ddc657469ebbe983609b5ff009bfcf20672008db57e80ed144 SHA512 f161a9244fcec7442983857641506e8a517e127ba9c0918fa23c424c95cb7acd15a0e9d1a18edc2ab39424ed0366b871e599565562181df17d1d729a4e66b7d2
MISC metadata.xml 362 BLAKE2B 7e5066833673e1881f77a10c92f8ff281c050140a6a77154fedb4f469b99d6c53abbdb0a35702d5325e294f7acfe8b050254be7ffac4c3832455777c65a98cd5 SHA512 783a1867b40907e8704e19ec6d423f4db8a97ba683f64efc72ea7bf4e4157e9bf630470fcf8a0410d6fa9bc5cf63f810f1f577828bdfe1203f2f56e55458c7cf
diff --git a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r2.ebuild b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r2.ebuild
deleted file mode 100644
index f5b06925a972..000000000000
--- a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-MY_P=${P/_beta/beta}
-
-DESCRIPTION="tcptraceroute is a traceroute implementation using TCP packets"
-HOMEPAGE="https://github.com/mct/tcptraceroute"
-SRC_URI="https://codeload.github.com/mct/${PN}/tar.gz/${MY_P} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
- net-libs/libnet:1.1
- net-libs/libpcap
-"
-RDEPEND="${DEPEND}"
-
-# michael.toren.net is no longer available
-RESTRICT="test"
-
-S=${WORKDIR}/${PN}-${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-cross-compile-checks.patch
- eautoreconf
-}
-
-src_install() {
- dosbin tcptraceroute
- fowners root:wheel /usr/sbin/tcptraceroute
- fperms 4710 /usr/sbin/tcptraceroute
- doman tcptraceroute.1
- dodoc examples.txt README ChangeLog
- dohtml tcptraceroute.1.html
-}
diff --git a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild
index bfb827e2b245..274ac82275e0 100644
--- a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild
+++ b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mct/${PN}/archive/${P/_}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
DEPEND="
net-libs/libnet:1.1
diff --git a/net-analyzer/tracebox/Manifest b/net-analyzer/tracebox/Manifest
index a5aaf39b4ae4..348feb79b2aa 100644
--- a/net-analyzer/tracebox/Manifest
+++ b/net-analyzer/tracebox/Manifest
@@ -1,4 +1,5 @@
AUX tracebox-0.4.4-deps.patch 5159 BLAKE2B cea5cfb75b407c7e9a88062abc931ae27b7f5022e586ee7f811129ac2b5c5a54a61b6a0ce71961ebf6102d1b53087e91260cfe4d8f6622d78e98e87408c2d64b SHA512 a87ff6ef0079f99241dd975d1fcb1bb3d1c2a0a623af1932d9a00b45b6d70b403e34f8dbc07551cda55707d5eea5e48a7bb7ac931474efe6186937942a769761
DIST tracebox-0.4.4.tar.gz 76828 BLAKE2B 0c3fbe9ea3fd5a967c85cf7b175900d899885f6c43ca8ffa32ba98256490b5bc23e8f80618208df6ec05f0484e5ce27599528aa5d84e331ac71eca960b6b1fd0 SHA512 2113d6ed4543b0c3a9b44bc92c4eb8ab2a860b4409a5eba374b9960ddb4ba299a33c0dea49595c94bc725eda36633d8bb698236d662ea9cc1027070b597c52f6
+EBUILD tracebox-0.4.4-r100.ebuild 1250 BLAKE2B bebc05ecba31e0b71f2e3548e490227a0552d9235c491ef5d2568aa83b2ef5eee88a0c969104d8202098c047f1e9db5f0386fe768c75edf8dd67b51f51cb6a84 SHA512 ec6c1125325177e9e1f15afaadfbf557072d54ddff5b9f01f0f8a0a658a24d46d76f120aa28b86fead73c54e66f1311f3d6139685a734a4e07f86e40faff677c
EBUILD tracebox-0.4.4.ebuild 1173 BLAKE2B 9e9791dc276fe0f4cbd3361e9a7de4b38340a8baeeb552bb86b1870b255043da11e6df12f01164217cecdb7067a6f90da83ca284ff4ffb7901193682c4c5e89a SHA512 3664196077455fa168ff3c8e0d5ec215ccd6e7b03c58bc73a333e2811fcac031718ba9766e516c243044e1cd84c4ec12e66ba10af42034fb0f39eb11054aff9e
MISC metadata.xml 575 BLAKE2B 0de780b436640051b1fbcf49505d8975d39b3a4fa0d45a408718b9ca284e7f7f2609cffcda406c84fdc5b6fe2116d579e5624d8557751e3888c5a45ebdf95d54 SHA512 9cfa13bf788534c7bfd4edf945efa310e24229e9d777eecb1ad371ed99c13f39c63af14bf41e441ef94bd75ba53f318f23d48fd4fccd2d49e8d64b9d8fa2d83a
diff --git a/net-analyzer/tracebox/tracebox-0.4.4-r100.ebuild b/net-analyzer/tracebox/tracebox-0.4.4-r100.ebuild
new file mode 100644
index 000000000000..63a8ba122cbd
--- /dev/null
+++ b/net-analyzer/tracebox/tracebox-0.4.4-r100.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit autotools lua-single
+
+DESCRIPTION="A Middlebox Detection Tool"
+HOMEPAGE="http://www.tracebox.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl sniffer"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="${LUA_DEPS}
+ >=net-libs/libcrafter-0.3_p20171019
+ dev-libs/json-c
+ net-libs/libpcap
+ curl? ( net-misc/curl )
+ sniffer? ( net-libs/libnetfilter_queue )
+"
+DEPEND="
+ ${RDEPEND}
+"
+BDEPEND="
+ virtual/pkgconfig
+"
+RESTRICT="test"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.4.4-deps.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i -e '/SUBDIRS/s|noinst||g' Makefile.am || die
+ sed -i -e '/DIST_SUBDIRS.*libcrafter/d' noinst/Makefile.am || die
+
+ sed -i \
+ -e '/[[:graph:]]*libcrafter[[:graph:]]*/d' \
+ -e '/dist_bin_SCRIPTS/d' \
+ src/${PN}/Makefile.am \
+ || die
+
+ sed -i \
+ -e 's|"crafter.h"|<crafter.h>|g' \
+ src/${PN}/PacketModification.h \
+ src/${PN}/PartialHeader.h \
+ src/${PN}/script.h \
+ src/${PN}/${PN}.h \
+ || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable curl) \
+ $(use_enable sniffer)
+}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index bd5c819475be..59feae587d7b 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,8 +1,8 @@
AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66
+AUX wireshark-3.4.2-cmake-lua-version.patch 304 BLAKE2B 438bd2ee1e0e0121cc673709385ccda88664131d50fb63d48147c83798e9f541efa270c56d30ad4345ef77d59fb16554b0d8de8c19bafd8181c0c96e3c7b1ba9 SHA512 ab4a7f3d64cc402fcf6b1c9b54aad75dbb1104b19282078947a6c4315f48b5a2c0eeff9918e42d98196976d2e1d26ef2e439a1d2811de1a326a4954d54a08bff
AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
-DIST wireshark-3.4.0.tar.xz 32502760 BLAKE2B 5d8106f36cc3a1425fd472f7ba645b2a07bfb93c96178a98f90676f39cad38089b625d7d6725ecfaf67bfc78aba3476567b9bf390d6f0dd838537eb81bc4aaa7 SHA512 02070db23c64e1efe42b83cdcd7b52fb9b247e653da0aa12dc21a4283272fea0a135f4b0c5641197840bef88e52785d64a860c9fcfe1bcbaceb016c5258c9649
-DIST wireshark-3.4.1.tar.xz 32470004 BLAKE2B aa2c3e56df4232b087d09a52209eec1e91a10ab125f6fb973171771d86d349ddf76bef3da089f0d6740c67883009fb77c5760c1141c99a056e7a36fe8ae5c088 SHA512 a968158a5a22d04a9bf3b060246f7579210a8106e06184411fd00dad69e030c10aecfa579c09dcca11fb659e0a1de4773951578cb3697dd2dc8e5153d3892728
-EBUILD wireshark-3.4.0.ebuild 6898 BLAKE2B 3bdaa80868d870e2a5fc8f71cb53431e865a3f9f28bb893651e11b04d1ccab30dd4bb29dba30129000dc3b401ab5ab2d4a22a6e7c4d7c603a309206f42b310b0 SHA512 bc0c37dfc811d0f425079aad51a86cf793d7c8eca6e083a674e2df9f321c87c45d386dc5ba8153dbe999a2ee89140939dffa5fe660b858534f1cb48159e3f531
-EBUILD wireshark-3.4.1.ebuild 6901 BLAKE2B 9d380e47c2cfe7d3f14a842e802baf99b200ca01999ce46d090bd32ee941a205838120885aa157d40ca0d89ddfbfa1733aabb285e03ae8e3a87118374981d7e8 SHA512 d930a68747eaa2b4c4350ce2274b7377e56f71b8c010e4fdd73944f3e44e8f0ed3643804de0e547cb4cd150954e82ab51ebe55357e75b198a2901b6e3a65b869
-EBUILD wireshark-99999999.ebuild 6788 BLAKE2B 7d04031c8fb62d7dcb7ea915205bd7d00dc1d3cad0066a2a0443fe26d6af2400ef85552211c110eaec7c411e00bc4fa7634dc2a6456eaecb7959363c83ab2a1c SHA512 b59f2d1e5e4bd82a280d2ed7ce546ee9d43ed09251f71ff01efb5be38ca524bd8fbbf061a4ba4f823e829a92f6891e2180e01dbfee8bba659ab08764d9a737ff
+DIST wireshark-3.4.2.tar.xz 32465900 BLAKE2B dab7e871c798a6e0f03f45eaa49ba5cbabc18afabd6a5675a3241e4f1e6d86ef21b56b4cee5d561da2f2ec2b274ac6c5a52ed7b8ad50cbf02949a3a7f68d4f09 SHA512 38dc62d306dafe1a25db16ca28e1f4181a83673700a0b4c6dd98c8cb27df51ad0c6414db0370c443250aeb2521eceefb183178fe7d23a11b697cbf3f5b06f53a
+EBUILD wireshark-3.4.2-r100.ebuild 7053 BLAKE2B 0ce54139d5ee587734b38fa9f8c70517cee1444db20617e52b3c03d0d3559a929a5f5e9cc1002944ea7b0bad893b5518aad3de4eb298bf649ce6e8855891cc53 SHA512 1cc9876807637eedda39d6c0f0300393e4fbb26344452338e3fb29bb1d64fc9f6181a47be80996d2c1bb25379e571301e3ef576c4e1b0e313864e3ab1099263e
+EBUILD wireshark-3.4.2.ebuild 6898 BLAKE2B 3bdaa80868d870e2a5fc8f71cb53431e865a3f9f28bb893651e11b04d1ccab30dd4bb29dba30129000dc3b401ab5ab2d4a22a6e7c4d7c603a309206f42b310b0 SHA512 bc0c37dfc811d0f425079aad51a86cf793d7c8eca6e083a674e2df9f321c87c45d386dc5ba8153dbe999a2ee89140939dffa5fe660b858534f1cb48159e3f531
+EBUILD wireshark-99999999.ebuild 7000 BLAKE2B 9d40f8d222273bab993e3cea331bbf8c326dfe85c23ab1630188468ba8c2ef261886a642e9f5865ee0969330a51c1b658f95eb063b98d0e9b300de70b0579448 SHA512 ad1a3e7bf9c668e294bff31c6618ce93d7e38af8c47195c95a9ad8d405e6287d9403bb2c92c3b1b9f58c842c114d1841ea1cce87d31a4cc209f82e2884a9f2e8
MISC metadata.xml 5327 BLAKE2B f3e047c03a849bfdfded710eccb1e05fbcf00407bbe3eb2a2b63b562e7d583a3ca66de214c17350bec56451f69453fc819921119c7954ef6ea01cfe134ac4783 SHA512 9e514634a6017be1e5c2752c107c33f231e019ce9ffd239042d8f3d426263aea88052748749b7359a9c4c2e591d379c8faf895192358cea20601887b784529ba
diff --git a/net-analyzer/wireshark/files/wireshark-3.4.2-cmake-lua-version.patch b/net-analyzer/wireshark/files/wireshark-3.4.2-cmake-lua-version.patch
new file mode 100644
index 000000000000..18f663b7d814
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-3.4.2-cmake-lua-version.patch
@@ -0,0 +1,11 @@
+--- a/cmake/modules/FindLUA.cmake
++++ b/cmake/modules/FindLUA.cmake
+@@ -19,7 +19,7 @@
+
+ if(NOT WIN32)
+ find_package(PkgConfig)
+- pkg_search_module(LUA lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51)
++ pkg_search_module(LUA lua)
+ if(NOT LUA_FOUND)
+ pkg_search_module(LUA "lua<=5.2.99")
+ endif()
diff --git a/net-analyzer/wireshark/wireshark-3.4.1.ebuild b/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
index b72304eb72c8..8a5f5b3e6dff 100644
--- a/net-analyzer/wireshark/wireshark-3.4.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
@@ -3,9 +3,10 @@
EAPI=7
+LUA_COMPAT=( lua5-{1..2} )
PYTHON_COMPAT=( python3_{6..9} )
-inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils xdg-utils cmake
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
DESCRIPTION="A network protocol analyzer formerly known as ethereal"
HOMEPAGE="https://www.wireshark.org/"
@@ -13,7 +14,7 @@ SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
LICENSE="GPL-2"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
@@ -36,7 +37,7 @@ CDEPEND="
ilbc? ( media-libs/libilbc )
kerberos? ( virtual/krb5 )
libxml2? ( dev-libs/libxml2 )
- lua? ( >=dev-lang/lua-5.1:0= )
+ lua? ( ${LUA_DEPS} )
lz4? ( app-arch/lz4 )
maxminddb? ( dev-libs/libmaxminddb )
minizip? ( sys-libs/zlib[minizip] )
@@ -90,14 +91,20 @@ RDEPEND="
selinux? ( sec-policy/selinux-wireshark )
"
REQUIRED_USE="
+ lua? ( ${LUA_REQUIRED_USE} )
plugin-ifdemo? ( plugins )
"
RESTRICT="test"
PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+ "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
)
+pkg_setup() {
+ use lua && lua-single_pkg_setup
+}
+
src_configure() {
local mycmakeargs
diff --git a/net-analyzer/wireshark/wireshark-3.4.0.ebuild b/net-analyzer/wireshark/wireshark-3.4.2.ebuild
index ddabdfd5f7b5..ddabdfd5f7b5 100644
--- a/net-analyzer/wireshark/wireshark-3.4.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.2.ebuild
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 25d08cbda033..61860be16a1b 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -2,8 +2,11 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit fcaps flag-o-matic git-r3 multilib python-any-r1 qmake-utils xdg-utils cmake
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit fcaps flag-o-matic git-r3 lua-single python-any-r1 qmake-utils xdg-utils cmake
DESCRIPTION="A network protocol analyzer formerly known as ethereal"
HOMEPAGE="https://www.wireshark.org/"
@@ -15,11 +18,10 @@ KEYWORDS=""
IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
- +mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt
+ +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt
+randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl
sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
"
-RESTRICT="!test? ( test )"
S=${WORKDIR}/${P/_/}
CDEPEND="
@@ -35,11 +37,12 @@ CDEPEND="
ilbc? ( media-libs/libilbc )
kerberos? ( virtual/krb5 )
libxml2? ( dev-libs/libxml2 )
- lua? ( >=dev-lang/lua-5.1:0= )
+ lua? ( ${LUA_DEPS} )
lz4? ( app-arch/lz4 )
maxminddb? ( dev-libs/libmaxminddb )
minizip? ( sys-libs/zlib[minizip] )
netlink? ( dev-libs/libnl:3 )
+ opus? ( media-libs/opus )
pcap? ( net-libs/libpcap )
qt5? (
dev-qt/qtcore:5
@@ -88,13 +91,20 @@ RDEPEND="
selinux? ( sec-policy/selinux-wireshark )
"
REQUIRED_USE="
+ lua? ( ${LUA_REQUIRED_USE} )
plugin-ifdemo? ( plugins )
"
+RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+ "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
)
+pkg_setup() {
+ use lua && lua-single_pkg_setup
+}
+
src_configure() {
local mycmakeargs
@@ -159,6 +169,7 @@ src_configure() {
-DENABLE_MINIZIP=$(usex minizip)
-DENABLE_NETLINK=$(usex netlink)
-DENABLE_NGHTTP2=$(usex http2)
+ -DENABLE_OPUS=$(usex opus)
-DENABLE_PCAP=$(usex pcap)
-DENABLE_PLUGINS=$(usex plugins)
-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)