summaryrefslogtreecommitdiff
path: root/net-analyzer
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-02-16 12:59:29 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-02-16 12:59:29 +0000
commit79599515788b85b18aa655e7b7f8cc05c1bbddd8 (patch)
treeade7cb031f363fad64c77139dea7aa3d81908537 /net-analyzer
parent6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (diff)
gentoo resync : 16.02.1018
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/Manifest.gzbin49662 -> 49481 bytes
-rw-r--r--net-analyzer/argus-clients/Manifest2
-rw-r--r--net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild (renamed from net-analyzer/argus-clients/argus-clients-3.0.8.2-r1.ebuild)6
-rw-r--r--net-analyzer/cacti-spine/Manifest4
-rw-r--r--net-analyzer/cacti-spine/cacti-spine-1.1.28-r1.ebuild (renamed from net-analyzer/cacti-spine/cacti-spine-1.1.28.ebuild)6
-rw-r--r--net-analyzer/cacti-spine/cacti-spine-1.1.38-r1.ebuild (renamed from net-analyzer/cacti-spine/cacti-spine-1.1.38.ebuild)6
-rw-r--r--net-analyzer/flow-tools/Manifest2
-rw-r--r--net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch47
-rw-r--r--net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild78
-rw-r--r--net-analyzer/hydra/Manifest4
-rw-r--r--net-analyzer/hydra/hydra-8.5-r1.ebuild (renamed from net-analyzer/hydra/hydra-8.5.ebuild)8
-rw-r--r--net-analyzer/hydra/hydra-8.6-r1.ebuild (renamed from net-analyzer/hydra/hydra-8.6.ebuild)8
-rw-r--r--net-analyzer/ipaudit/Manifest1
-rw-r--r--net-analyzer/ipaudit/ipaudit-1.0_beta2-r1.ebuild23
-rw-r--r--net-analyzer/linkchecker/Manifest2
-rw-r--r--net-analyzer/linkchecker/linkchecker-9.4.0.ebuild2
-rw-r--r--net-analyzer/mate-netspeed/Manifest3
-rw-r--r--net-analyzer/mate-netspeed/mate-netspeed-1.12.0.ebuild34
-rw-r--r--net-analyzer/mate-netspeed/metadata.xml14
-rw-r--r--net-analyzer/net-snmp/Manifest6
-rw-r--r--net-analyzer/net-snmp/net-snmp-5.7.3_p3-r1.ebuild (renamed from net-analyzer/net-snmp/net-snmp-5.7.3_p3.ebuild)4
-rw-r--r--net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild (renamed from net-analyzer/net-snmp/net-snmp-5.8.ebuild)2
-rw-r--r--net-analyzer/net-snmp/net-snmp-99999999.ebuild2
-rw-r--r--net-analyzer/pmacct/Manifest4
-rw-r--r--net-analyzer/pmacct/pmacct-1.7.1-r1.ebuild (renamed from net-analyzer/pmacct/pmacct-1.7.1.ebuild)4
-rw-r--r--net-analyzer/pmacct/pmacct-1.7.2-r1.ebuild (renamed from net-analyzer/pmacct/pmacct-1.7.2.ebuild)4
-rw-r--r--net-analyzer/tcpreplay/Manifest2
-rw-r--r--net-analyzer/tcpreplay/files/tcpreplay-4.1.0-enable-pcap_findalldevs.patch19
-rw-r--r--net-analyzer/tcpreplay/files/tcpreplay-4.1.2-CVE-2017-6429.patch27
-rw-r--r--net-analyzer/wireshark/Manifest8
-rw-r--r--net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch23
-rw-r--r--net-analyzer/wireshark/wireshark-2.6.5.ebuild240
-rw-r--r--net-analyzer/wireshark/wireshark-3.0.0_rc1.ebuild (renamed from net-analyzer/wireshark/wireshark-2.9.0-r1.ebuild)5
33 files changed, 197 insertions, 403 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index d64761085b89..3b990b8a5c1d 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
Binary files differ
diff --git a/net-analyzer/argus-clients/Manifest b/net-analyzer/argus-clients/Manifest
index 03d6520c7662..5191e4acb058 100644
--- a/net-analyzer/argus-clients/Manifest
+++ b/net-analyzer/argus-clients/Manifest
@@ -4,7 +4,7 @@ AUX argus-clients-3.0.8.2-ar.patch 767 BLAKE2B b13abee07d0d11319890e36d0dd3f4469
AUX argus-clients-3.0.8.2-rpc.patch 967 BLAKE2B b59450ad0a21eeb1e37d84f518e0e5417ab82f9e6afe5bca078e3dc14f8b52a0a07abc42040569d4d665145794187cf8f554310acd4f98cfab17f0046f381ad6 SHA512 3292d71b78be693901cd8fca3712d5f866185968e30747278d793b9c280091ecbd1f6e61390b48338b07dfa760efda96e1cbf15d279137a4f85991d69b7526cc
DIST argus-clients-3.0.8.2.tar.gz 2776072 BLAKE2B 429a12d63f38ce1c5dae343be28543f3c8b6dd746661a893a0108db100762d60dec619cdccfff525b84c0843f0bb61c7e5d96df561a369e6df0d1e6a821d938a SHA512 20aac16bd6474b8f98c8fc86b21ad0b43aca62264c6de2f7f26eea876a90f7276cdaf2241a510a19ae445f40f5d0d05ec6a5869980b6889e6eb5937dbff0f855
DIST argus-clients-3.0.8.tar.gz 2627515 BLAKE2B e7753ce1a65f24639c0c36d694033b038abb7cf835b89a1020edf72829f9196cad2a1be5958a28a51884c169ff7b4e295381501e61cf1e1eb1ee1557fccb6d8f SHA512 79022b3c3e472ebc526b27c20c25ae97abdb9a363a91ebbe3baf405f2aba9bdd80fbc0250b444d3d7ab4488e3c1325389a4719e92d9aded7598a91c3309369c2
-EBUILD argus-clients-3.0.8.2-r1.ebuild 1444 BLAKE2B 2d51bf4b6b8e255a1a5a94f6de100f31f4121c433aab8eaf2106f54b472c27bf90a49eea1ef7bfd98a045baa9892b1e799e501e21a4b5fe0325b286a2ea8bc3e SHA512 71019c1b0b3c8db335c8cefd2ee1f4699c47c15a1dab3b6b07db749918b88c160fcd245076e35530f7857ed33624906b0208334042d49c9332bff16c6fc60847
+EBUILD argus-clients-3.0.8.2-r2.ebuild 1466 BLAKE2B 7d31b9db95c02fa48431db81af1605ed9991745e31f22ad06509a554317cd0e23802d5cb5eee39621ed1766d97b3656ddee3bc89f75bda0d54df6923aef98fb5 SHA512 25ae6dd3d2c5a5e7ed34b4243074b24ed1871c643098fe1363d7738e3d23ebd980229ca00a62068604544c5fb499624d4e6c2e709cb0911e84a3085082c1fdaa
EBUILD argus-clients-3.0.8.2.ebuild 1453 BLAKE2B f18f8d5c4e85d441b72e6490730dd6b6f9e0c04e433caa58b9fe297d2a40ba3f811f113a7739a8b7df67aafd07d254c7561703ff5bd5fad523879502567eade1 SHA512 b5fd648853deb3a81982a462da9e6ac1c8cbcc453fb6144e5afa303a6465f33daf846212e47d781c33b9e5a0737fa8fcc6dcb0edc4ebf4a1f59583606382851b
EBUILD argus-clients-3.0.8.ebuild 1446 BLAKE2B aeb8501a05352c57c5cf5338ee19f598549d96df3d39da2864da8eefa32d3d59e48b0e8f89de39970524bba1a861a3dbf7b50110c815eecdd54258d1fa1f98cb SHA512 90119ef5268e3afafb73b97d4eab3b55d761609064b1d1f371f908715d49f81992d35d6f86466f312e106b014410b1afe4b6815d5b626a2e0485f74cd968f147
MISC metadata.xml 383 BLAKE2B f19de1514d40bf02fc21d447b5d5eed6cf1917fff41a0462a993b0d7572d5d75ca80c6a2e7a0b1de83e9c167d5b5046e96a11ddc3d99595b79079cc4c76e5a54 SHA512 16728e62acf8d17d105ce0d0c0bd32197a9157544aeee9c9601ffc716ccd70cb126086b732c2814d5c4124f3546bb1fe7efddd27b7f686ae2c1960cbf7f90780
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r1.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild
index 4abbc598cf21..34882be08c07 100644
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r1.ebuild
+++ b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -22,7 +22,7 @@ ARGUS_CDEPEND="
sys-libs/zlib
ft? ( net-analyzer/flow-tools )
geoip? ( dev-libs/geoip )
- mysql? ( virtual/mysql )
+ mysql? ( dev-db/mysql-connector-c:0= )
sasl? ( dev-libs/cyrus-sasl )
"
RDEPEND="
@@ -56,7 +56,7 @@ src_configure() {
$(use_with geoip GeoIP /usr/) \
$(use_with sasl) \
$(use_with tcpd wrappers) \
- $(use_with mysql)
+ $(use_with mysql mysql /usr)
}
src_compile() {
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index 02691dd0c32b..47908d9a3ad9 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -6,6 +6,6 @@ DIST cacti-spine-1.1.28.tar.gz 802006 BLAKE2B 79e833b6afb619a1d2361bad38c3a52dc1
DIST cacti-spine-1.1.38.tar.gz 805437 BLAKE2B 32d934f54e00d83e9807dd194a7cacf8d5526c8e5b84c44ffad201c07edcb117f862266843552299fe04cc780575b9b2dc7129a106a20bd709cb82844ade7812 SHA512 5409a690e89fcc74e1e87e34e1918cab27d1243825955eb8256a92f8e9658f312345c66b338a4a07a0e38c94e3275131cb4e58fb70e7b59837c0e6c47746e45e
EBUILD cacti-spine-1.1.20.ebuild 859 BLAKE2B 4ce5b34307c2c365b9e70f523f888c0deb41b4bc0d853590c8394af59cf81045e78b5c653ece72a72f053eef6112d9095eb31e0a5563f1f968d179c891b4b4d0 SHA512 60668a2b2c306e9d12707e2e5cce908522019d58e0742b39ef0a1b5a63bc91d3ca35829842e22aeda0adbabaa200f954cffc6cd8427d1fab801078ceca6b90c2
EBUILD cacti-spine-1.1.21.ebuild 862 BLAKE2B 7165f0d06307e442cdcbc3160f0fc1548188fd0ad7f3f6dd9a16dc0322e616c1c38dc85a7382c59b4a7809e9cd46ee83684cbbbc2a9dc398f493a3d83123bcb8 SHA512 2c241b9da06c6e069736d7f517f56cd2690e2a89a4c1d11c148761d0d8cae05aee0a48d74d264ec166c8d74477b7d3738170a37577119c2bc3a8ef2d697811c2
-EBUILD cacti-spine-1.1.28.ebuild 863 BLAKE2B 0a28fb4df62540d9c43068c169b3e56d8de7cbd550cd845b1dcfd87ac6b1188513e48a02209d308e27b315d3b44dedc8529a57c477ad868e8f8bfeb8a8b25da6 SHA512 0520ba0fdaa6dee66803ac9567c2e49060e48dcad9d9eae868e3c063e601f45686cd1d46897e26a1843fbd2c854df05b3fa68659eda95b391a321777eefe59fa
-EBUILD cacti-spine-1.1.38.ebuild 865 BLAKE2B faf5724054f9555169bdb952c83baf8a548bfa101126fee49b495091d916333de63f72c8fd56154f7c4858bef7f48a3e54ea28d6cfe6422b9c7e25f06855f61e SHA512 60193f3d552db43ee5c410b9888f31aeacfccabef87e4a73ab31828c11e43383ec8d858d1a3451835f34110e4a959dd916c09465e4b1ca84aa3ae4da213f0a16
+EBUILD cacti-spine-1.1.28-r1.ebuild 867 BLAKE2B 7574ed48c6b1d8f949d1627729c4d37057412a30d1835efc86dadb4a9f7b8d48d8b556cc5dc65fc2c3485d9b2fd1c0752dd7e2f5a4cf10e96d2bc643ea231916 SHA512 b77d21b719683f433fa60730bb8b553d576c5798b924b61ff65083d1da5d2e5e471fdaf3db690d4a05282327dc443c19f5c1f7a2fef29a6fd618fd18d83453c1
+EBUILD cacti-spine-1.1.38-r1.ebuild 869 BLAKE2B 6d698fd70065156c1f761e3fc3f4af0a29d0fb26b2132472e7d10e769a7d33cd4ee4c60eee38557a337abb30475f439f2dbcc90a65a19f6c29830c40edeb9677 SHA512 052996a1184e175043faf4d200e0ea1a95b28edcd04363aa3e8123198686414360948199d22a7e214ddb57fa773c500d32475727a513f88ff1426473763fdf9c
MISC metadata.xml 728 BLAKE2B 5e36aa5717b3f0f72d1d5116e9df6223fe4d99040b970fd86baebbc6835fa0c673327114dd867a2e52822fa71731b3e1fc3e93b77344be89de8fe0b9b648286d SHA512 a8aef67f6761ecf0ac98771a82908e67fb9aead1a32f7ececb8c80ae46c1a431abcfc1165ed471dd428bd6c0a5d4bdc2ddbea1c86ae5c917ff9786bacd6d0f38
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.1.28.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.1.28-r1.ebuild
index d148f4544d01..3cfbf20feb3e 100644
--- a/net-analyzer/cacti-spine/cacti-spine-1.1.28.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-1.1.28-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit autotools eutils
+inherit autotools
MY_P=${PN}-${PV/_p/-}
@@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
CDEPEND="
dev-libs/openssl:*
net-analyzer/net-snmp
- virtual/mysql
+ dev-db/mysql-connector-c:0=
"
DEPEND="
${CDEPEND}
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.1.38.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.1.38-r1.ebuild
index b950ca8e1798..d429bb4c6ac9 100644
--- a/net-analyzer/cacti-spine/cacti-spine-1.1.38.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-1.1.38-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit autotools eutils
+inherit autotools
MY_P=${PN}-${PV/_p/-}
@@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
CDEPEND="
dev-libs/openssl:*
net-analyzer/net-snmp:=
- virtual/mysql
+ dev-db/mysql-connector-c:0=
"
DEPEND="
${CDEPEND}
diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest
index 109c0671f052..d48fe90e6d26 100644
--- a/net-analyzer/flow-tools/Manifest
+++ b/net-analyzer/flow-tools/Manifest
@@ -1,9 +1,11 @@
+AUX flow-tools-0.68.5.1-openssl11.patch 1251 BLAKE2B 682c34b207517fc74e090c6aa04ba9acd7b4aa7bb2ea7b8cae45d608777b1a8760d6e22759dd10fcb4d5f3a9e258b34d07454efd2cc93134125d195b36714cd5 SHA512 c43cc2de4243b0567c07f66f0b674cb6974dee5689bbea50716ebc5cd49f4d66a739c39ff4ccadef23c7f84e26fe3a3cc4999b7db0bdda77035dbd5cfc678861
AUX flow-tools-0.68.5.1-run.patch 493 BLAKE2B dc1ab3e5abd6a7d502aa2bc1150c97a569c0d6e55bdb96e2a3404966487f637fef064191a00ba1cfb63c62ecbbb9c0359e231381e193ae13340820418908b371 SHA512 90c9f8bc6aba4c31315294ba80ebc3f7a8b86796d6fc108ef9ebf7619df73474e1a97524b709964ba899f4569a0158d0cc0a2d5bb00e8b185186cf765b87ce9d
AUX flow-tools-0.68.5.1-syslog.patch 979 BLAKE2B c3ae5017c5f2f7c6c69cbce88b38f95a8def62fb5e14a769262f3f62a32df50d5831d883935ec26e01ece35388855fce3855cfba44f72064e3115a46b4ea8920 SHA512 d2d37816f437c5546916ca53bd460707366b3675ac9e9105a9611ed436d322afd6ee56fa29b1d6e68f3a02c97a62ca009d392fdb63fca411ace851dc29419537
AUX flowcapture.confd 1928 BLAKE2B db22630c3741867466c1292651364e41028dafeeaf10d1d18403fbd0bb95ec3a58faf04e164d97e6eefe4c1b2f526ed96ce44b7a410cd6e3efb0c3b98e15b3b0 SHA512 e9dcc5d66833e9bf2905273efcb6b7cab69050da50425256629bf12203c7bd9fed87ac33a772903d78f5fbab69045bc4e0f09d26ea1442cdc5c5bd0102a09c05
AUX flowcapture.initd 816 BLAKE2B 6e27085fa0b8048f1b6f2d449d154a0fe9f2d7b8fa511de53d7eca684ef716b8ceeaaa3fedf9e0a01e76b1723e6646b6727bc76c3e9b2168060fe3bd7b363af7 SHA512 c3f62821efc94fb6305ba3c54415319c42a624a3c604c96497af0fdd7b4076e618a070006146346eb3de0549bc2bc36e3e3ffd9f7aba832dd18c29da0370463a
AUX linkme 283 BLAKE2B 1c1e84a29f8fccc62dc84ba8ffbd182255a5bda7979132ff721fc537bb523e221b3963e3dce4f5700f53586ef4c4acccbab605099edf7e068bf6dd2e71882721 SHA512 a9db8dec8b6f2a83b8896951bf1711ec7c58dd18d2da7db7015c0a000114b3d1da9bee4dd64842c074b332a06a890b2eea1b8ffc0399ce0efa39bf6527466359
DIST flow-tools-0.68.5.1.tar.bz2 914062 BLAKE2B 8a987c1aac53a1370045ab118888c51ce2de7b8db4074432e86e701153469163870cf1cf9da9e2267ed934d240de4b4bf2391b4681012b82db7e4205207b7fa4 SHA512 ae17ba39854daa8ef3deecd3a554bb6d1fa47648cb791d8225a40bec13f65bf0692871660b2c3490d133b1251875c323d066bb0c0483eceb0707cec9b7714c57
+EBUILD flow-tools-0.68.5.1-r10.ebuild 1640 BLAKE2B 1d7b5e006cea30d8bd874ac57e770622d6f7b94d3bd3d7c2f7e5891d77265919abf46fbf84dd4947b16d92d98857f01ab18e49d62591783431b52cb5708dab5b SHA512 76d38aeaa85a409926c51bcd3c8bb7c603f0f24507013fe70ca3ef919af72c9240a3d11e72068e983e7dce9e91f7709972feb489ed0b790b1d01b8fc2234bf41
EBUILD flow-tools-0.68.5.1-r2.ebuild 1687 BLAKE2B 360f0d59242c3b4a9dd89fe6ce8282ef53f1ce168ced1e32660a87bb3de4576b1cfdf08c5be56f7b70f3f97bf0115bd345c4c434ce051d1ebfd81b577d1fde22 SHA512 19fab6d40f16607410ab530c2624e36a40e806bab2bcd9e336bbb03164020e9a84b376adaa9a3cabaca6441982b1effe4c4f5ccfa4f9c134888990aba6600293
EBUILD flow-tools-0.68.5.1-r9.ebuild 1615 BLAKE2B f041ee019a4d4d70f4612f25c5904112a2c08e4868d727dcea9c370bb9461acc5d1eadbe2f452fec3d5f319e38ebcf0910a8217eef8ebcbc4b7ed9f7af2dc36d SHA512 c7d85fc7c617008977f8e9d151eb1765a416d8ad7edc011b870b9b1f6727dbc80b26f1a3ce527b661d5f4da68047c4910e007e467d006796523a6135689003d8
MISC metadata.xml 902 BLAKE2B 16f4780c8fc2a803580d1ad9321e1db662c1c720f744f544b57a2eb65f9859c02dced677f3ea1732b05afe70abb55b4a9c349fb375ee24abf083b8376d521fb1 SHA512 45f900d25bc2b968ce9a04fd143106962c1a242b776840eb2c1b51f0e02d71000f9a2fdf19286f7873e07c25aa9d528597f1b1fe0e7e083c29de5304b87aeab3
diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch
new file mode 100644
index 000000000000..c6b17743ce91
--- /dev/null
+++ b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch
@@ -0,0 +1,47 @@
+diff -Nuar --exclude '*~' flow-tools-0.68.5.1.orig/lib/ftxlate.c flow-tools-0.68.5.1/lib/ftxlate.c
+--- flow-tools-0.68.5.1.orig/lib/ftxlate.c 2008-01-27 12:48:49.000000000 -0800
++++ flow-tools-0.68.5.1/lib/ftxlate.c 2018-12-29 15:18:33.739062317 -0800
+@@ -34,6 +34,14 @@
+ #include <openssl/ssl.h>
+ #include <openssl/evp.h>
+ #undef free_func
++
++/* fixup LibreSSL OpenSSL version numbering */
++#include <openssl/opensslv.h>
++#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L)
++#undef OPENSSL_VERSION_NUMBER
++#define OPENSSL_VERSION_NUMBER 0x1000107fL
++#endif
++
+ #endif /* HAVE_OPENSSL */
+
+ #include <sys/time.h>
+@@ -2040,11 +2048,13 @@
+
+
+ /* init crypto */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ if (!(cp->cipher_ctx = (EVP_CIPHER_CTX*) malloc(sizeof(EVP_CIPHER_CTX)))) {
+ return -1;
+ }
+
+ EVP_CIPHER_CTX_init(cp->cipher_ctx);
++#endif
+
+ /* disable padding */
+ if (!(EVP_CIPHER_CTX_set_padding(cp->cipher_ctx, 0))) {
+@@ -2083,10 +2093,14 @@
+ {
+
+ #ifdef HAVE_OPENSSL
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ EVP_CIPHER_CTX_cleanup(cp->cipher_ctx);
+
+ if (cp->cipher_ctx)
+ free (cp->cipher_ctx);
++#else
++ EVP_CIPHER_CTX_free(cp->cipher_ctx);
++#endif
+ #endif /* HAVE_OPENSSL */
+
+ return 0;
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild
new file mode 100644
index 000000000000..9d62c33981ae
--- /dev/null
+++ b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit user
+
+DESCRIPTION="library and programs to process reports from NetFlow data"
+HOMEPAGE="https://code.google.com/p/flow-tools/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug libressl mysql postgres ssl static-libs"
+
+RDEPEND="sys-apps/tcp-wrappers
+ sys-libs/zlib
+ mysql? ( dev-db/mysql-connector-c:0= )
+ postgres? ( dev-db/postgresql:* )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+
+DEPEND="${RDEPEND}
+ sys-devel/flex
+ sys-devel/bison"
+
+DOCS=( ChangeLog README SECURITY TODO )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-run.patch
+ "${FILESDIR}"/${P}-syslog.patch
+ "${FILESDIR}"/${P}-openssl11.patch
+)
+
+pkg_setup() {
+ pkg_douser
+}
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(usex mysql --with-mysql '') \
+ $(usex postgres --with-postgresql=yes --with-postgresql=no) \
+ $(usex ssl --with-openssl '') \
+ --sysconfdir=/etc/flow-tools
+}
+
+src_install() {
+ default
+
+ find "${D}" -name '*.la' -delete || die
+
+ exeinto /var/lib/flows/bin
+ doexe "${FILESDIR}"/linkme
+
+ keepdir /var/lib/flows/ft
+
+ newinitd "${FILESDIR}/flowcapture.initd" flowcapture
+ newconfd "${FILESDIR}/flowcapture.confd" flowcapture
+
+ fowners flows:flows /var/lib/flows
+ fowners flows:flows /var/lib/flows/bin
+ fowners flows:flows /var/lib/flows/ft
+
+ fperms 0755 /var/lib/flows
+ fperms 0755 /var/lib/flows/bin
+}
+
+pkg_preinst() {
+ pkg_douser
+}
+
+pkg_douser() {
+ enewgroup flows
+ enewuser flows -1 -1 /var/lib/flows flows
+}
diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index 6fa1830ab4c2..6bfbbecdaeb7 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -4,6 +4,6 @@ DIST hydra-8.1.tar.gz 559031 BLAKE2B a3d2b52508a1d03a2f3d6cecf7100543487b5a0f621
DIST hydra-8.5.tar.gz 1193694 BLAKE2B bf202ccf58f64e2b57a15b5aaf8d4357b8d37d0a634179d2b4fe0c7d63da1e363b02e8578de7d984c75f1e764fc95477aecac9643954c05acbcc63865e066b0a SHA512 67fd92bd5983a94314334471c526b71ca77dec6e359e55f4fb2fc78160e2065957b6c9af1ff694bcc5334893a8b5e0fe1b39d984248bde4e55dc2a9f9a8b1271
DIST hydra-8.6.tar.gz 1200238 BLAKE2B d9470be5280ec51dfcb701cc3dd87ffaef7076c990a30e833c3fe7bc0f2b951f40eae26dab28ebbb1116f3d5e884a3c0819a5913c68e714a3b8597af75140829 SHA512 d5d70b5df54fbc556c6db9e9e44b869f29e54aca03dc3cc9e1777d310fcf604b9602ba08250c5bb0d009963dc0ca5c169e61d3f64d7ec2383760fc819d6b6c61
EBUILD hydra-8.1.ebuild 2233 BLAKE2B bfab4cabfd270198cebef133e46f02c0d37f31c6fe25e2328bea8afad5d1a6245e91935e241a7ebf641e2a6494c8ee375e51e095a38a1a133c2d3e7c1079b411 SHA512 ec97e4046bba01f8bb5e42c2524e88ede9dbb92d92d13cf02218ccabb8cbf94372af4b55e87cb64c73b745138f16cd63b2fef552304289db6761d5f1568ebd3c
-EBUILD hydra-8.5.ebuild 2377 BLAKE2B ba8540d4e7e0bbbe36d3a47c99a68fb27788ea7bf51680af4de045bad6f676f3f0f7d918c9b93949e4b636f5138eac992eecf860d39ac6799019fdbd9d94a58c SHA512 fa623c7e18cdf7db4c699d8ca56caf19b5da3c87f3e1711c3f47630ba441a695f466d71a439af40ffa455abdd74f95b583f97bca8182050c27b8f34a758fc817
-EBUILD hydra-8.6.ebuild 2376 BLAKE2B 309896e9eef68e4e8a199e68026a30b4febd4319c145889ad462a0174efe6cc8e937b87617e8b93da33badff643d58f86d4c87eaf8918ce421f1ee64a54e7a4d SHA512 4a8bfabd386b802a5e8dd425f91526bc2217111953460221eef39a09964554de2f5692c8a3018150b3a467274e6008d69dab8041b11664f00ab579d932c49c31
+EBUILD hydra-8.5-r1.ebuild 2384 BLAKE2B 5baadb7ef9b87ad01b91cb1cb72bc5494b7d5dae8e3af2b2f5942bf2b49c8bbfdcd56c8b106fe8ceb466c35319bb7bc22e5341277e103a0b6fba24a5df9865b6 SHA512 9f1420cf1752c897c81e94f28c745d29d28d5d2a398e13e1d54f60089c8ab9d7fb40ca48836a1cad8714ce2066bd1ac2908749b2e162841830f8ca74c0f68ea7
+EBUILD hydra-8.6-r1.ebuild 2383 BLAKE2B 8632d894bc07e6f8a6582d062e6e2313771c468b47313634962388250d1a375b9ebb54d9c1a25ca57d246a825fc1b479868afa572813bfa6d6f11e09fc6cc927 SHA512 80a5bdf8bbd61d899c90c8b54e2a8a072ffcd8cc64e68479581c5895f6600b6ffd461b124e6ea0f406788ded984f4463c563bd2a73d2d0fed65b7553e70763e0
MISC metadata.xml 440 BLAKE2B e3d225870d374fef1dfc92508a273aa3be760b20b994d9f0d0060be29c39411fefa865fd812a3979fbf7f338dd850d7d22a2947caf6cafbb66b4209bdd73090e SHA512 7ea011416c0de77c47fb7d8276cdcbefe0a11a9f9bb9b9a1d763f7f0c1bae705aea7db6252ba3284e3141c257216c845b8353c4a944c67ba3c8881467d827afa
diff --git a/net-analyzer/hydra/hydra-8.5.ebuild b/net-analyzer/hydra/hydra-8.5-r1.ebuild
index 70d970dfe574..79aa16aa49ea 100644
--- a/net-analyzer/hydra/hydra-8.5.ebuild
+++ b/net-analyzer/hydra/hydra-8.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="Advanced parallized login hacker"
HOMEPAGE="https://www.thc.org/thc-hydra/"
@@ -26,8 +26,8 @@ RDEPEND="
x11-libs/gdk-pixbuf:2
x11-libs/gtk+:2
)
- idn? ( net-dns/libidn )
- mysql? ( virtual/mysql )
+ idn? ( net-dns/libidn:0= )
+ mysql? ( dev-db/mysql-connector-c:0= )
ncp? ( net-fs/ncpfs )
oracle? ( dev-db/oracle-instantclient-basic )
pcre? ( dev-libs/libpcre )
diff --git a/net-analyzer/hydra/hydra-8.6.ebuild b/net-analyzer/hydra/hydra-8.6-r1.ebuild
index bed5fc36e987..741256b459a2 100644
--- a/net-analyzer/hydra/hydra-8.6.ebuild
+++ b/net-analyzer/hydra/hydra-8.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="Advanced parallized login hacker"
HOMEPAGE="https://www.thc.org/thc-hydra/"
@@ -26,8 +26,8 @@ RDEPEND="
x11-libs/gdk-pixbuf:2
x11-libs/gtk+:2
)
- idn? ( net-dns/libidn )
- mysql? ( virtual/mysql )
+ idn? ( net-dns/libidn:0= )
+ mysql? ( dev-db/mysql-connector-c:0= )
ncp? ( net-fs/ncpfs )
oracle? ( dev-db/oracle-instantclient-basic )
pcre? ( dev-libs/libpcre )
diff --git a/net-analyzer/ipaudit/Manifest b/net-analyzer/ipaudit/Manifest
index 2b9b61a7e0e5..f10a8bd10923 100644
--- a/net-analyzer/ipaudit/Manifest
+++ b/net-analyzer/ipaudit/Manifest
@@ -1,3 +1,4 @@
DIST ipaudit-1.0BETA2.tar.gz 135680 BLAKE2B 2a8e7754251c743758d6e0d7008d904a3a237c26a660f5c07661c632dd75ecda6cf3b04253eb76f64c72ed278da00030cf64231bdc4760a6b04df1497f628ec2 SHA512 3a8890821c515aea95762eeb2cc7a649533ff739984c944bcb26acb72434e1f2b453a98365719fce9e062d6262b9d76ac389f149ad2a19361422783bc0b55e09
+EBUILD ipaudit-1.0_beta2-r1.ebuild 573 BLAKE2B e75ebc9f1e3fd00a9bf3f4d7f84507cad55d5a513505c0ac0287a14f8921eaa64834784165677eac79123ea3742409728d92288a13071cda567f2afb29aa734e SHA512 7a2dc0294158302386fe49c2d54c95051d5aee8fdcfb22a467cf737691352a1d1c07e9dbf2eac34980c7370cb18ee4e307f451ab61838f0361326bb7ec983742
EBUILD ipaudit-1.0_beta2.ebuild 650 BLAKE2B decd9daad1c7fa41d1a1dbbfb40fb55a85b7568ab0aea1ee80303628f4014330bcb92ed5f62c0f4d7c3a4fcdfe5dd4eb1ec84051b9819de3ceb9c8f08d14d6d3 SHA512 49e97ca5e9c70de10032632ac136dfd6bff516a86ef5d8321c132a5d02cd8633bbd3b25c0c22c2eac830bc863da255fd5ce3772f2af66d7e82027f21325ed07b
MISC metadata.xml 337 BLAKE2B f6f2a1c579130f2d97b5d9885623824110a7ab7faf876fe8cdd3cea7202628d7176dd74ee8263174bfdb89125b5f58424c23af50f472806f89b3c398598e0900 SHA512 58c8b84ff4dc9e733926d97333c6bee74a769c4e08e6505ff72c317bd55099536e8cba81361d173d501f9b53efdb8d9f3c8c5e60ab79f5b03a63c4cc2ab9ca34
diff --git a/net-analyzer/ipaudit/ipaudit-1.0_beta2-r1.ebuild b/net-analyzer/ipaudit/ipaudit-1.0_beta2-r1.ebuild
new file mode 100644
index 000000000000..0fc67f6ca6a3
--- /dev/null
+++ b/net-analyzer/ipaudit/ipaudit-1.0_beta2-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="IPAudit monitors network activity on a network by host, protocol and port"
+HOMEPAGE="http://ipaudit.sourceforge.net/"
+MY_P="${PN}-${PV/_beta/BETA}"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="mysql"
+DEPEND="net-libs/libpcap
+ mysql? ( dev-db/mysql-connector-c:0= )"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS README )
+
+src_configure() {
+ econf $(use_with mysql)
+}
diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest
index d0d495333183..e8234dfd25c1 100644
--- a/net-analyzer/linkchecker/Manifest
+++ b/net-analyzer/linkchecker/Manifest
@@ -5,6 +5,6 @@ AUX linkchecker-9.3.1-requests.patch 1870 BLAKE2B 6ac551b151b805f373b2bccf6d47e0
DIST linkchecker-9.3.1.tar.gz 779286 BLAKE2B eec374a3455b5348533b29b03ab14558dd19a20e1058947eed9d8027a8b1705b63525e6b8fcf2c4feb59a782ca0e0ad8567e321ca4679320e9d6f256e14df990 SHA512 355c9d262502e123732807b5aaabc17060d267de44a6dc1fee9dd6655c56320ded0c1ff638d985c2dbec366d15803cfb78fae4c1a9943de11c5b4292f5a99305
DIST linkchecker-9.4.0.tar.gz 489909 BLAKE2B 1c9d9af96778f9d2b542a078ba9da8751d6f7bc170809d5eefef6e8e2d5587e969f1cba3d6ae116b6de981949dd638b0d78fc416ce5055b3156da308b5a95d67 SHA512 3423f710a46d921c4387ffcfe1a8632cb889bcfdb4d56cbabcae87ca41547221e854546efd6e440e798ea85531c34a35f3ab779cd6bc2b6e63095015ad0537ba
EBUILD linkchecker-9.3.1-r1.ebuild 1635 BLAKE2B ffe1b02ded5cacb0a1906696634220f69a61d3a426a1cd1d592f88c11a0ac1bcfd2cbd44a6ad61bbd0f4b896bcde56be6ec277181cdde85da84bc18bbd306e36 SHA512 b91819cb02a957f9a3ae3e891e66a27305834983b92384430c24cdf82e2e1b744b17df16b60ffd80d70923de5f6fa1f83a02e27f747044a2b7753c0bcc9478b0
-EBUILD linkchecker-9.4.0.ebuild 1419 BLAKE2B f32d87a0a8e33e7d9f2f4d95ca82878ebcb42ad819f0fa16c9de677270c2bc19aee6769c156f339368eeba061ec4aba1f755cc746c4bc58b0d580736425d6c79 SHA512 6a07c71e0224e95c8c0bcd77c5b5444b645770efb0a090daa08e9752fc266227105518eeffff88db925d65b6761c68bcd99af9b079d9a88e6db3448ab81bf8a5
+EBUILD linkchecker-9.4.0.ebuild 1418 BLAKE2B 82f3c2ec15f63aab72a5eb364f00ab3c1146f30201ab05633d27eae985cd4d1f1f80580b21b050d8cde6b4746702f4b3e9e4105f8f1061a370ac65cc2d5193ad SHA512 ca2877a5c0df9fd851497f6fae47c42a6182f93f9e9197e66f41a4282e5f07601a69aff64b9323c8f9078f6f25aba4236527e28cce8e6d68d37730c7286d3388
EBUILD linkchecker-9999.ebuild 1221 BLAKE2B 0193a2f063e41a641b2b008e4b84abce2aa41826d9a84f51582b21dcafaa5633bbeb6c771f232f9cafcc49c1d3c9f2ca50c3b473b9d208839e2d3b6153ef3abe SHA512 970acb72a0edc5fd6792b6d06bfc2807682ee9e7c275187b6b80248322e575363db3b485828845abbb58ed3e1dacdbce3fe98d0b6a8538df96dc2f1237e2c92d
MISC metadata.xml 319 BLAKE2B dbf67b67a9a9a65ff108e9ee4c5881023a53533d9bbeee71e9ba1a55658f2a746b408859515f593ce2ef0fd93f938fbb17c5c7a70fa48eda4be977634d11e7c5 SHA512 2fbc3b85bcfd178e2614ef73d55c633e6e3b5ee59d39ca0a6099ffd7e8067e890f69252666d8d6d9a173371d95c4b1fbb8157cb94fd307ee20672fb9ff4182fb
diff --git a/net-analyzer/linkchecker/linkchecker-9.4.0.ebuild b/net-analyzer/linkchecker/linkchecker-9.4.0.ebuild
index 18909f2d05d6..ea79afb87f71 100644
--- a/net-analyzer/linkchecker/linkchecker-9.4.0.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linkcheck/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-solaris"
+KEYWORDS="~amd64 x86 ~ppc-macos ~x64-solaris"
IUSE="sqlite"
RDEPEND="
diff --git a/net-analyzer/mate-netspeed/Manifest b/net-analyzer/mate-netspeed/Manifest
deleted file mode 100644
index 3a67728db382..000000000000
--- a/net-analyzer/mate-netspeed/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mate-netspeed-1.12.0.tar.xz 563888 BLAKE2B cdf36c86281c33f31210cb1386ede2ae618a1b4cc3c710e9b62c1689ee66d20b675abbd49f7593f4e93a518deddedeeae16bef4a6e363e97cabf0cfb75fc680d SHA512 1c6570ff4aac3b2e19c90e5805d8169a31a92289a39c6075b114a0c13e5d89f69b5fec48f549ce0c4d92b323034a18d4a26292c9a88a6995ccbf4d595e908e34
-EBUILD mate-netspeed-1.12.0.ebuild 737 BLAKE2B 473180a990b7a6c8ac929c2b59493427c1cb8c0663e5623dd70c5f407f747cef909a6c9582074a8ddb92a355ff18dc4af6fa9ef9abc298a0c403e35d96c98e24 SHA512 da682d9a1ce8304c8f2a1d772f9ba9e4125475aec80340bf8c0ba2930e7eeae2bb7e6511a2d9b5fafaefcd4a4b7c7f49d35d64e3ff26858dc9904dfbf53762c0
-MISC metadata.xml 418 BLAKE2B cd7e1937dd7f075cba1cf6760c8b7a7df2d098dea3a84472e2c5ab493f42da4a2f0676471632312b8654a237555c77cd3da67bf9104f4f541179e381c8115c54 SHA512 e267216d7130cc0837aefd1de5c1f3361fc6f27569c56d63a4794f5cb85c912464a7d90f7514607670a8f6e362f3a6c9cb6dafa5be525f1a3c9b51a707eec4b4
diff --git a/net-analyzer/mate-netspeed/mate-netspeed-1.12.0.ebuild b/net-analyzer/mate-netspeed/mate-netspeed-1.12.0.ebuild
deleted file mode 100644
index 751e0a110e07..000000000000
--- a/net-analyzer/mate-netspeed/mate-netspeed-1.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Applet showing network traffic for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3"
-
-# FIXME: wireless-tools >= 28pre9 is automagic
-RDEPEND="dev-libs/glib:2
- >=gnome-base/libgtop-2.14.2:2
- >=mate-base/mate-desktop-1.9[gtk3(-)=]
- >=mate-base/mate-panel-1.7[gtk3(-)=]
- >=net-wireless/wireless-tools-28_pre9:0
- x11-libs/gdk-pixbuf:2
- x11-libs/pango:0
- virtual/libintl:0
- !gtk3? ( x11-libs/gtk+:2 )
- gtk3? ( x11-libs/gtk+:3 )"
-
-DEPEND="${RDEPEND}
- app-text/yelp-tools:0
- >=dev-util/intltool-0.50.1:*
- sys-devel/gettext:*
- virtual/pkgconfig:*"
diff --git a/net-analyzer/mate-netspeed/metadata.xml b/net-analyzer/mate-netspeed/metadata.xml
deleted file mode 100644
index 677f9a8598cf..000000000000
--- a/net-analyzer/mate-netspeed/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>mate@gentoo.org</email>
- <name>Gentoo MATE Desktop</name>
- </maintainer>
- <use>
- <flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
- </use>
- <upstream>
- <remote-id type="github">mate-desktop/mate-netspeed</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index d1fa846a781c..54de15ac5f37 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -17,7 +17,7 @@ DIST net-snmp-5.7.3.tar.gz 6382428 BLAKE2B df036da09658fdb4c52a99696fb6374cd582b
DIST net-snmp-5.8.tar.gz 6591680 BLAKE2B ac1bff4152310da57818a00d752a08a7fc61d697b02479d9952ca12d024d3d68dc8bfa674571e93d6f3597605b2fe91513fb6839057a80f2c3dd8d0cce0077f2 SHA512 27895a583b23f3e14c48562bc32f3ba83513d81aa848e878be9a3650f0458d45950635c937ef627135f80b757b663e71fab9a3bde4fd91889153998ae3468fe7
EBUILD net-snmp-5.7.3-r5.ebuild 5123 BLAKE2B 4b131228917ab3884ca81e2777e1de6f8a73fa8b5ca5bfb15aa3224e00a6f7aa0d750ff18339c5abfcb26c01c592c7f182a47bca26728e0e620971c846bb4838 SHA512 a0aa82e9b35f0e2e8f33fe4abe55b706ddb7e6918da85916189e54c1a7273f121a42d802ff0a13ab53e4ed382b398f0fc6834cf9686aedabf850a7fb55230c9a
EBUILD net-snmp-5.7.3-r6.ebuild 5156 BLAKE2B 29fbde65309d3169b9b9ce45aef271d70d583b859e27362c5c4c5185da1922abf5075f577b046c5e46042f2f1d335633cd81a56dd7e0fa99487f74797f91eb55 SHA512 e80156676b3b4841c24c6aa20af042ef6ea7c21fbf0ea08bb37af95ae4966a0a80f2bcede1e0231fa8065a21b4d97b12ce1828b012a8d887fe808898523405fa
-EBUILD net-snmp-5.7.3_p3.ebuild 5221 BLAKE2B 56b888d44e58c363ba39c15dcea4c967ed70af0c5deb13be737519398d4d3275b5040ddc2c45a5b2a24ac6815c2afbc439c17b20b4830ca462239229f8f89b75 SHA512 6eb247118aa005abc9cadf696c05c533348d836e1d9c7563ef75df7f790f7e5a99998753a55022ff2f0654583b25bd2f4a598fc293e536e3d227ad6adda0b43b
-EBUILD net-snmp-5.8.ebuild 5224 BLAKE2B 7af65230b8efc2bd453e9613ddbfa55c9ca874a149422c2717ec47cf8ee5ad7a9c499942569d53eac5b551bc112678574caa791aca74f57308b319e8e742a3a5 SHA512 d5484fc58d4f86539d9361e31a4c89afab888693b93952133a8cb4386c133c1084660e3ccb69447dd92e8d3a2dcdaa3d7e606434d4dd30cee3b902bb954bdaee
-EBUILD net-snmp-99999999.ebuild 5176 BLAKE2B 47cd90724bf062aaa53b2918fa0a18497ecc5809df41de77273410de40c619584cf2b712b9107ec21e81b9da78cc01bc926203614464059971bf06c5f7fca14d SHA512 c5352e903769f39d7253d95c2729afac458ebe98951b6569b115439ed9c0f7544aa3633004d26f2e7abfd5fa08bcf126f39688e4a45bfc60d1b868965c9dc561
+EBUILD net-snmp-5.7.3_p3-r1.ebuild 5235 BLAKE2B 20975c562ad43c1a20d4116aa2d422285adbad4df23f7f975357668fbbed6951705fffcec1008498374c42f14ecc6dc96e471970fba95cc592b862019bf23c18 SHA512 c058c0f7351da016936c454830887510a204bc9ae7d798f81323a4a4228fa51ad52551a68e95125c88ed2f511b3d0ee6860cd09bce70ae9d8719ad9673e3f9cd
+EBUILD net-snmp-5.8-r1.ebuild 5238 BLAKE2B c81ee055e0f8c08b7d212cdfde040c70ca6e44f8b9e3f30e525ba55f4eaf6471e0407decb306e2e9d6bd4b249574c931c4e9713771ba9b573187bdb0ae72a1e2 SHA512 c67d9d362d217b74f688dffce217399b2395104e8512786ad906353441f8822e13f1283ae16d576aa5f513d58009239dc3362635e478ca954b7eb40c6f75cfa7
+EBUILD net-snmp-99999999.ebuild 5190 BLAKE2B 49c9bf18d335cdeace6e94a6046c74a3241ec66100d625e6ef5967e86cfed06417d44bfb80940e49d67cf67fd021962bba5eb4c8be007390dc40c3fccf625e73 SHA512 c771920f9db1560b23f43fb3689af3b36deb691d94912d324f09f513a744eafbdfe2f24ce09c4bf33b8d5cb6b330853835a5297e27003ece8b3c32dd4d023e98
MISC metadata.xml 1142 BLAKE2B d026289018d327a888079b9c3cb7cf65dff58dd87735f7317d15d78698fe307d4dad2dfed10adab428eee0eb3abf357c82554b0861029a70fb60b82537601d84 SHA512 76efbc8444b344164960e671df273afaadbb4b64e73b136f559d4f039ee4b145f8ae989d271a8cc025edc917e4213828e0c77f6e5b0258b4c0eb9653c98c58c0
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3_p3.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3_p3-r1.ebuild
index 41871ecc1ea8..4add1e5486bb 100644
--- a/net-analyzer/net-snmp/net-snmp-5.7.3_p3.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.7.3_p3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -47,7 +47,7 @@ COMMON_DEPEND="
pci? ( sys-apps/pciutils )
lm_sensors? ( sys-apps/lm_sensors )
netlink? ( dev-libs/libnl:3 )
- mysql? ( virtual/mysql )
+ mysql? ( dev-db/mysql-connector-c:0= )
perl? ( dev-lang/perl:= )
"
DEPEND="
diff --git a/net-analyzer/net-snmp/net-snmp-5.8.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild
index fbcef8694f10..4f53c1fa2dde 100644
--- a/net-analyzer/net-snmp/net-snmp-5.8.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild
@@ -46,7 +46,7 @@ COMMON_DEPEND="
pci? ( sys-apps/pciutils )
lm_sensors? ( sys-apps/lm_sensors )
netlink? ( dev-libs/libnl:3 )
- mysql? ( virtual/mysql )
+ mysql? ( dev-db/mysql-connector-c:0= )
perl? ( dev-lang/perl:= )
"
DEPEND="
diff --git a/net-analyzer/net-snmp/net-snmp-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
index 7fde04eba0e7..e8b1943ed1e1 100644
--- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
@@ -48,7 +48,7 @@ COMMON_DEPEND="
pci? ( sys-apps/pciutils )
lm_sensors? ( sys-apps/lm_sensors )
netlink? ( dev-libs/libnl:3 )
- mysql? ( virtual/mysql )
+ mysql? ( dev-db/mysql-connector-c:0= )
perl? ( dev-lang/perl:= )
"
DEPEND="
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index 08ef46d7cb3b..5dcf097ca85c 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -4,6 +4,6 @@ DIST pmacct-1.6.2.tar.gz 1311678 BLAKE2B 123629ca2e5e58bb4e684001b1c6d2d510e1845
DIST pmacct-1.7.1.tar.gz 1392360 BLAKE2B 75a4dda461c2fe643c24a901c19efacf325d1922bcda503a1ff41fe0b6c4178732d476b479875e9e0ba34872dbd86b8d8b2087471148f10e202f57c4a212f2fd SHA512 6a5d75522b9197b324907598ee4ba22bbda96b45e10f62df2ae507e23faac927af5468f587deab08d1e0f3f6422c609d106dcf30fa7bf16eb215bb35ea6aa08c
DIST pmacct-1.7.2.tar.gz 1416302 BLAKE2B 5d6f9c5849c07c7bdd3b6251b2611935ff558ca393d2cc0d21e5e681b0069b3a5bb4a985a9dc59b62b8b4ed697ecbd4cbb71f0aba42ce8d1527187b98d2e90d3 SHA512 ffdc63e96fc6af6f5d531243bc0aec0925663d8e91e83ada275f8e9a969dcf85cebd06b17ae2c796722bb209602d5b2bc487757ec736a740a8f33698d93a8675
EBUILD pmacct-1.6.2.ebuild 1790 BLAKE2B be2fe64588677200a54a4866e2946cb5516fb65d4f1ac0bef07287796321d3832c4acba1284f8bc285bbacf6513493a297880bccca350e6d7286ef6569e1d6e6 SHA512 6db9673c145cec1da55e4cd18428f64fb334066eb0a5794adc6127a0ba27144301237aa6e30e1c4a93ce892ad4306369da46e9572b41430df7a776080b7edcc0
-EBUILD pmacct-1.7.1.ebuild 2120 BLAKE2B 3c93a931372991ca9f82a3793b48b28d3a4a899d9fcc680028ca5ca164373ebabbabc9430c9ccf5dc69d5ec1bd4af86583e6b10984e7cacbd4323c2e4faf5900 SHA512 cbf0c8e7a7b26e8b8a6c6ca8fa1a8f6f7742100c3cf738f064e1313342013cb51f5f9454385fe3f0b8c093465a73808c714294edb48a1d3de95ce59aa41610e9
-EBUILD pmacct-1.7.2.ebuild 2111 BLAKE2B 598253321d0a34d836b076042af6a9d9e9718264ea951924997cedc47ce57defb25bbee6c115af55109401454f5b437105e8c09f35e9a6386ab8f4c5118401b3 SHA512 c6d375731194b7dde9850d77b058ded0bc1623b4ee59475c1ebde39fe525726d94a4f1c1490b37570e15351aec42468c19a9f1561c9bf01a72bbad51365f8770
+EBUILD pmacct-1.7.1-r1.ebuild 2131 BLAKE2B 93f73d535296d1c3634968a262a1d4aea8b7e27150310ed051a5e7a0bd42c95f09452b7bd0116521763b8acf890a71742ce0772c0468eadfb5dd17717ff5750c SHA512 e2cb9688373c62963391d989f99b909ae246d5b890333d7352871abe9f8feda20bcc046e29777bf0002fee5e6952f1ec49b6ea0decd927b240c919d8c4b2f5cf
+EBUILD pmacct-1.7.2-r1.ebuild 2125 BLAKE2B 8a2d62e19cf7e5c6f2de12956cbdda845825648b18c19c4d37190e1cbdd4cc0dd926e8c2330b5bc5acbaee2c989cbbb8f928d31fbe1566fa049549972a9f5828 SHA512 55d6e8b369a0f734e81175829472b2312cf7e24a23acfb3609a76adcbe3f72e2df4ff6460b87fc4c381ea78cd95f446ce26f956b35e4a46d9ebce8ec1ac597e1
MISC metadata.xml 1424 BLAKE2B 75ce1e74993587289adbef0841807d758f0a587bc5b0429cb03a86be690d49479a2cf37211006ae905473528f3f4714ec2827e5bc556a4bcaf368215f97db7b8 SHA512 ddfd0eaac09d66640660baffe80ca83911000632416602eb258b2c01e630ada343ebeff7191c53fe71e4d5e658c94eac9a95bf4527a9ba40ee674ffa9442d856
diff --git a/net-analyzer/pmacct/pmacct-1.7.1.ebuild b/net-analyzer/pmacct/pmacct-1.7.1-r1.ebuild
index 4fa04368686e..15ef9922c121 100644
--- a/net-analyzer/pmacct/pmacct-1.7.1.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -31,7 +31,7 @@ RDEPEND="
>=dev-libs/mongo-c-driver-0.8.1-r1
<dev-libs/mongo-c-driver-0.98
)
- mysql? ( virtual/mysql )
+ mysql? ( dev-db/mysql-connector-c:0= )
ndpi? ( net-libs/nDPI )
nflog? ( net-libs/libnetfilter_log )
postgres? ( dev-db/postgresql:* )
diff --git a/net-analyzer/pmacct/pmacct-1.7.2.ebuild b/net-analyzer/pmacct/pmacct-1.7.2-r1.ebuild
index 816cc388c10c..ec5a692ea2e9 100644
--- a/net-analyzer/pmacct/pmacct-1.7.2.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -31,7 +31,7 @@ RDEPEND="
>=dev-libs/mongo-c-driver-0.8.1-r1
<dev-libs/mongo-c-driver-0.98
)
- mysql? ( virtual/mysql )
+ mysql? ( dev-db/mysql-connector-c:0= )
ndpi? ( net-libs/nDPI )
nflog? ( net-libs/libnetfilter_log )
postgres? ( dev-db/postgresql:* )
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index 609433000a42..dcbbe9826cc7 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -1,5 +1,3 @@
-AUX tcpreplay-4.1.0-enable-pcap_findalldevs.patch 601 BLAKE2B 33c38be287593dfeb2693bf6ce9fb259db42bcce63ce05904fb510aa8775c9acad045ce974cd1c4aea01975e053b7fc2e5794a3f0b2f21d2a910e4f08d1f29cf SHA512 6aa44d082e068de90a431071d94e4351257e5074f1b36617c1d7226ed18c5a6e76f06a0e9f20f41772e1d33af72ea23cbaa29a4dcf3018a567412a0d0fac72de
-AUX tcpreplay-4.1.2-CVE-2017-6429.patch 858 BLAKE2B 988facdce3f6264edbd4712548248ee52db5347361d8dbece0a691d941f77d5e7751cd43def5dddf85c8028935b65e945e1adbab2966197ba6e38233bd73bfcf SHA512 934a42f9b70c882780a4a2fe3c9621b8a8380199ea63056291d27cbce006afcddc7331f9b73c8c244e89229c8526c55d2f534bedba50fb3d28ec3b873f700e3f
AUX tcpreplay-4.3.0-enable-pcap_findalldevs.patch 333 BLAKE2B 1beb39a7263bf8491998760e4a62ac8908300e28c43500812d37d2512f9d63fcd175b93c1b384e03e9570e741dd95dea09ead017a014a4b62b3449833fe9b248 SHA512 3d035736c0656f6ace85b45af595866e06c8464641023e9d1606c288e598cde18eb96b1be8300514f6f31bc83756ae76b436402666036456571201ca38fe5026
DIST tcpreplay-4.3.1.tar.xz 746804 BLAKE2B c1feb541b8243b00b2fa6ee9742ced4ef47c58a58d3a95be88faa0fa4301da0cb962a620df724cd4526ea31e74a0e7d7161eb44afea37467a19976a20855e0e0 SHA512 2dbad1a88ed19db897cc1222883c02eb7f0808f64cafb3c3ef8f21c0cfcb14d3ebb92a8a01ea203ca128ed675d2e7dcdb30d0bce30eb79e729d9d45d309f9220
EBUILD tcpreplay-4.3.1.ebuild 1921 BLAKE2B 901852df7b7c0ef75796e2313c1940a595f3c40fc9a62cf27caeffe45708e1e11a9d16c5e9bd01e3880b1b9391b728164347e21caf2168ad1c4414d825cfa42b SHA512 3ad59027e0d85ee1230cc79e3b05024b979e9fc49bae10aad3a83e21cb5684847105264df4c354959561b593a39937f851f8dc87176b53fcef3694c4d3997da4
diff --git a/net-analyzer/tcpreplay/files/tcpreplay-4.1.0-enable-pcap_findalldevs.patch b/net-analyzer/tcpreplay/files/tcpreplay-4.1.0-enable-pcap_findalldevs.patch
deleted file mode 100644
index f45d14cd1da1..000000000000
--- a/net-analyzer/tcpreplay/files/tcpreplay-4.1.0-enable-pcap_findalldevs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1499,6 +1499,8 @@
- AC_MSG_WARN(Unable to do tests when cross-compiling)
- fi
-
-+disable_pcap_findalldevs=no
-+
- dnl Allows user to choose which nic to use for testing purposes
- AC_ARG_WITH(testnic,
- AC_HELP_STRING([--with-testnic=NIC], [Select which network card to use for testing]),
-@@ -1509,7 +1511,6 @@
-
- dnl There's a bug in OS X which causes pcap_findalldevs() to make the wifi NIC to disassociate
- dnl so under OSX we disable the interface list feature
--disable_pcap_findalldevs=no
-
- osx_frameworks=no
- dnl these need to be dynamic based on OS
diff --git a/net-analyzer/tcpreplay/files/tcpreplay-4.1.2-CVE-2017-6429.patch b/net-analyzer/tcpreplay/files/tcpreplay-4.1.2-CVE-2017-6429.patch
deleted file mode 100644
index 42c74d650712..000000000000
--- a/net-analyzer/tcpreplay/files/tcpreplay-4.1.2-CVE-2017-6429.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/src/tcpcapinfo.c
-+++ b/src/tcpcapinfo.c
-@@ -281,6 +281,15 @@ main(int argc, char *argv[])
- caplen = pcap_ph.caplen;
- }
-
-+ if (caplentoobig) {
-+ printf("\n\nCapture file appears to be damaged or corrupt.\n"
-+ "Contains packet of size %u, bigger than snap length %u\n",
-+ caplen, pcap_fh.snaplen);
-+
-+ close(fd);
-+ break;
-+ }
-+
- /* check to make sure timestamps don't go backwards */
- if (last_sec > 0 && last_usec > 0) {
- if ((pcap_ph.ts.tv_sec == last_sec) ?
-@@ -306,7 +315,7 @@ main(int argc, char *argv[])
- }
-
- close(fd);
-- continue;
-+ break;
- }
-
- /* print the frame checksum */
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 1f119c06c439..6f762ab778a5 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -10,19 +10,17 @@ AUX wireshark-2.6.6-androiddump-wsutil.patch 324 BLAKE2B f72415948a15cdfa2eae24b
AUX wireshark-2.9.0-tfshark-libm.patch 134 BLAKE2B 364acc14eaf74d134b9905c240a3a6074138a259ce6a0a4a08496884d34961cbcbcba6204a47c62e015207d551abe5c5b30430333f185773347157162a027d4d SHA512 5cbbe6fc9aef5f26216ede7e5ece4fa8b5e2aeebc478c761a8b5ee5310f24fef8b2588fc04938fa9bfc4875d6df2835f82b4d15c4b818f9ac500d2fc2465d362
AUX wireshark-99999999-androiddump-wsutil.patch 343 BLAKE2B 665e3329615524fa145b0b6f996aa950f0337ef4fd6a53d26887453744f8f3dcbcd499654f679edd07d2e07224e542247583233a8c0be1d130bc9196dc56ee01 SHA512 9f013bb9fd7d0dad834c2079210a1b15adbd5650a7fc320e7dfab7c9c6d0fa9f0b4e3fd3b1972f91ec47484933244c6b91dfbf4eb62409391562bc7ee4ee7f5e
AUX wireshark-99999999-androiddump.patch 202 BLAKE2B 31548a778c4a3b799bad8f920221ca7ccf774702e8018f982e00318afbaac174d4e7ae961fefd448cc56dca6b7d0448a2ac99d1e5afacb61a37de0546ee3557e SHA512 a9794c5bcb1d288c113e84b03ac4f185e6fb7bccc16aefa3311ebd37aab7e9d5c715022f5b54032812ac2ab1244c65d9fd716c826ee27e677b011976f218f9da
-AUX wireshark-99999999-qtsvg.patch 900 BLAKE2B 309fa6d8f64962c2d255d6325b062e3adcbd8bdd98d25bd7d49d017375e4bd8a1d75cb4fe941f1f6f2785ef3b4a012309a59d12b562103a1d875e4d9d3f409a4 SHA512 a9df139cd58d8ddb84c019f1839087ccad63152102734e00191e2ab2191ae93c7b830121e5b3ad6efca5c26cd215f48f9e152045b37c17362adf2d7807af632b
+AUX wireshark-99999999-qtsvg.patch 160 BLAKE2B f282867fc9cf3d770fb6abb5e6e9b471e3a117e216d3b0e1ba370e1bda3346fc041bedb8d14813dd17fea72441c5cd49a192ecd5fa864dedde88154e729d73fb SHA512 d5e78204767db49b5da6295418cdbb242f91181348fea8042e6ed7fd4b82b19ddef91f0ac10e1f3b7a0f9316a0a8dc7ba0a9b5fb3550dcd7c8814c92989d902e
AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
DIST wireshark-2.4.5.tar.xz 28836740 BLAKE2B 797540daca259a2d5d7dc6e637f2b504b6d14191af4040e6b344c95db6c776b7de80c25c59c98ab84d0337cc96c7313b42c13103a3c3944768a793130deae258 SHA512 2f2c201d6b8a37dcbe03bc9affbf97d632d8e40e4fe5b3a3e79cbd5cfbeb5b9111919850546ccae355fcb042def3456438eb1c4d73f7d56d373e7898311b42f3
DIST wireshark-2.6.3.tar.xz 28384004 BLAKE2B f275c73173fbaf3f819c58f28859362e9c53ae50cf2649ac42c8d172362241eb00d7f43d0aead184ec67cb8da34d405124be10c5bf31226c2cb4800b8a01955b SHA512 87e5335840baa401a1064ee83e3f0ee859c059dd37a09f63f19eb5d91ad273e84f1c0e7a8fdd63fe8a7076abff5e79593827544c5796d921cf7dc7682c7c3f80
DIST wireshark-2.6.4.tar.xz 28218232 BLAKE2B d54d7661801667f78f0c3248f4099c77ef016222ae942dc7a5776af2c5c18f7b00305556ac84df6afd19cf3d2bd59e78365067dd9402f978ae0a7db76c1730ca SHA512 bc740548901b30f2e44c2b0933717288615fa38edc5e092607a8b12c60ecfacaa5aa7c59d7644cf29238d0d636fbe03d85559a0f2de81a3bf8ceac55fcf9ff07
-DIST wireshark-2.6.5.tar.xz 28390292 BLAKE2B f9847ef113b0c63e739be305603b42c5112da2e94b3110b9b104325af97801bd2b3d9d89cd334b59d460433520069cc2ba726e96aa9f22af112a28a653b9e29c SHA512 fed2d08bb0ba06496c22a5d45946faf2ff4ca19c59faf758c668c583193faeec3c4379b64750478469fede91562891e9b6991591a09a3da8d2193cb64718d02f
DIST wireshark-2.6.6.tar.xz 28407404 BLAKE2B 5135789d345b675814a6394d5ba1469585b9eab917885730125b8a007aecd9cb48a510fc9e7479148cadf625807bac9017b854797e4bb2e562d7dc7f76140826 SHA512 b781c3b34dc76a3d8e60dc2b9b4e46a11994440b8df7b56134521ea9a77b27b0719a600db60d7f3d65f15972a5db2a7e85a8bf60d7217fce498fb5668de8fe56
-DIST wireshark-2.9.0.tar.xz 29438416 BLAKE2B 17bbffe6e079133c4319a49a3672a4359b9e8eed1493b7440a2924c4bd57c45a1cbeee2ee50d4f3d96cbda436fa48eb6ba66bc61061f5fdbf71d1711c5467b43 SHA512 f24d873d75510488e0e60f75abce5820457786ff540ede3fb19fd45fea269527323ef5b5157ff83d2aaeabd60d03bac0a3dfc14495468d9478a8e5d7a30ad47b
+DIST wireshark-3.0.0rc1.tar.xz 30933416 BLAKE2B b9b421ecbcff8766d45f370a8ba6e0c03b02caaca09f5af90a5df0cd9a1a9093fab0b931c0cc001df31e0da86b53e022e70353a617a6b66d9defe79a44e0c8a3 SHA512 8cc34ee107f73cd19ca4bcfb05e0bfd237a53c7e0dcd07780200e423096566215cb55996e12cedbfdeaf31fc458c2a32b6d8038264060cdf677756148c404308
EBUILD wireshark-2.4.5.ebuild 7324 BLAKE2B 37579953238776d82c3887994830e72d6df6b928471f6d5ae955c53a58b0b70887c139c0962d5a27119da15ec6af0e416793d41ea3aa4ee18374f441abec0876 SHA512 f8fa063eff8b7c3e76fe2861b287a8c65368710b2cdbec670453a54e5d629a060dc368d05a6c6efb2ad8031174613026c79a3d8eea9fe9e43caa3953e5a72d74
EBUILD wireshark-2.6.3.ebuild 6603 BLAKE2B b9406cf5e104ab342ff8b9eaedd2b0a01b79b6f0bd6a79657c2860d53fcb648cb5868b97ec559b9cce5cdd9ed0ef5cb985edcfd093e60da16dbb42035cabec23 SHA512 95f5f555a393ce995c55a8dee07189fac90fc3032642dcecbf0f50e777d3bc919321d048c68e9bda3553ded1c92383235804cd47f6e0c9aa3303d116684e60d3
EBUILD wireshark-2.6.4-r1.ebuild 6514 BLAKE2B 0203f94f5919cf7ee0d9434cdaea93383cc816568886fe050da346cd6bf285967214c3d75d579b76c130b9d41bcfaae81b02fb1b5865a46a3dccac81818371be SHA512 57b01b0093b4cb9cf083df51451c198fe740e34bc08e3709ae546df696681813c1dd89d582e68af72a41ca7318adec1ebe4d027ddb464ced5cab13622b239400
-EBUILD wireshark-2.6.5.ebuild 6517 BLAKE2B 61bacb528d11a3312b1f9a5208ef8b59674f1174ec4d66c880ab0fe40a6a77f499e315c8ff81e37d6e543a0ea45444195c789965d9776d797def00b1b7bf6434 SHA512 b897b6bbc389fb81ae54ea6556974007824e639fdd958e2478607dc45610ce0177032421cffaf1b3fdf18ad3b03d90f70c6696b1fb225a86d213bb13cb3f2369
EBUILD wireshark-2.6.6.ebuild 6517 BLAKE2B b902d514a145b9f2e055df3b08470c31e7ac9b13ac436ace41396620b0bc63b8642b4059e03aa0080b8025ca0e94f939829fc5dcce8acceaa20db6628c530859 SHA512 dcc4b50c637af3a6020b2f3e3a17b586e37cb50f0028f95b5003f624e52f2191476ac6f606ee7a59fcf820d602231d5869675b22d3015f39fb38137428caa4e2
-EBUILD wireshark-2.9.0-r1.ebuild 6407 BLAKE2B 7d3335139c47b88c547903736cc03f4dfa6a09849fbe16725e622e1d3ecfc5b30790cabb12a30e6eb8465db4f651f4b52bf70ed5d9a2fefd7c23e63296980669 SHA512 cd11911051e20402ceee753682c88ce452f3c404666a8b9f65d14e58b5e4f243bce61f5b62ba50d56b3c863012fd6a53a097ff8bbf3776b279fc72b503e96a9b
+EBUILD wireshark-3.0.0_rc1.ebuild 6517 BLAKE2B 4b1bb1aa88d747792dbd3e582ce6b2f47849e6a70692417cd209c7c77a91d8129259b415af2559ba229278dfe19f06d8fe967ecff748df2c0ed977a8dd9940b1 SHA512 e07f03f06770c4971aa344b65b838a7b220e6bb4edc67852ddaec1f46e3b5f4ae76ff091de05a52ed5c6fc4258f34febdeebfb4ef89fa5139820de2db8aa12a1
EBUILD wireshark-99999999.ebuild 6370 BLAKE2B 0eb32ecf1f3fa6645af1c66f552e9971d4ef9b9b1697823551ab9158cd54c18f8b5b8d65ee379d0cfd7034d72c7afa0a6e8d1d474673ed13461eff9780b4a9d0 SHA512 3685a02a533e54bbe2117621c324d17c681286c9e33ac5e48eab502224494e1b9bfb181c372433cb19c4d7aa5b5e79d79b5004702d325356fe8cdfba3c345d8f
MISC metadata.xml 4787 BLAKE2B dcdb28c47094cfddc0effc4c16aa9132386f94d4d6e6cdb46f31a06ebb5dd7cd5c7bf967f50c6a002b7aeecddeb8aa8b86cb5961405a463c10389d6ec9b5cb7f SHA512 b683b159266bc37471ef26f6c0c4b2e94f72d2a77a2a7647e28b8b49e611973522af294c39050dbfa8aa5cca65bf2670f9d4c1e6a93d01b386e76f1ab75ff2e9
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch b/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch
index 231acd5a6faa..8cff4bdd0752 100644
--- a/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch
+++ b/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch
@@ -1,29 +1,10 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -910,14 +910,12 @@
+@@ -1058,7 +1058,6 @@
Qt5LinguistTools
Qt5Multimedia
Qt5PrintSupport
- Qt5Svg
Qt5Widgets
)
- set(Qt5Core_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
- set(Qt5LinguistTools_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
- set(Qt5Multimedia_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
- set(Qt5PrintSupport_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
-- set(Qt5Svg_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
- set(Qt5Widgets_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
- if (APPLE)
- set(PACKAGELIST ${PACKAGELIST} Qt5MacExtras)
-@@ -1187,11 +1185,6 @@
- # That's the name autotools used
- set(QT_MULTIMEDIA_LIB 1)
- endif()
-- if(Qt5Svg_FOUND)
-- set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5Svg_LIBRARIES})
-- # That's the name autotools used
-- set(QT_SVG_LIB 1)
-- endif()
- if(Qt5MacExtras_FOUND)
- set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES})
- # That's the name autotools used
+ if(APPLE)
diff --git a/net-analyzer/wireshark/wireshark-2.6.5.ebuild b/net-analyzer/wireshark/wireshark-2.6.5.ebuild
deleted file mode 100644
index 3850eda718fa..000000000000
--- a/net-analyzer/wireshark/wireshark-2.6.5.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils eutils fcaps flag-o-matic gnome2-utils ltprune multilib qmake-utils user xdg-utils
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/"
-SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
-IUSE="
- adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc
- +dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
- nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux
- +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump
- zlib
-"
-
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
- >=dev-libs/glib-2.14:2
- dev-libs/libgcrypt:0
- netlink? ( dev-libs/libnl:3 )
- adns? ( >=net-dns/c-ares-1.5 )
- bcg729? ( media-libs/bcg729 )
- filecaps? ( sys-libs/libcap )
- gtk? (
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:3
- x11-libs/pango
- x11-misc/xdg-utils
- )
- kerberos? ( virtual/krb5 )
- sshdump? ( >=net-libs/libssh-0.6 )
- ciscodump? ( >=net-libs/libssh-0.6 )
- libxml2? ( dev-libs/libxml2 )
- lua? ( >=dev-lang/lua-5.1:* )
- lz4? ( app-arch/lz4 )
- maxminddb? ( dev-libs/libmaxminddb )
- nghttp2? ( net-libs/nghttp2 )
- pcap? ( net-libs/libpcap )
- portaudio? ( media-libs/portaudio )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- x11-misc/xdg-utils
- )
- sbc? ( media-libs/sbc )
- smi? ( net-libs/libsmi )
- snappy? ( app-arch/snappy )
- spandsp? ( media-libs/spandsp )
- ssl? ( net-libs/gnutls:= )
- zlib? ( sys-libs/zlib )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
- ${CDEPEND}
- dev-lang/perl
- !<virtual/perl-Pod-Simple-3.170
- !<perl-core/Pod-Simple-3.170
- doc? (
- app-doc/doxygen
- dev-ruby/asciidoctor
- )
- qt5? (
- dev-qt/linguist-tools:5
- )
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
-"
-RDEPEND="
- ${CDEPEND}
- gtk? ( virtual/freedesktop-icon-theme )
- qt5? ( virtual/freedesktop-icon-theme )
- selinux? ( sec-policy/selinux-wireshark )
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
- "${FILESDIR}"/${PN}-2.4-androiddump.patch
- "${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch
- "${FILESDIR}"/${PN}-2.6.0-redhat.patch
- "${FILESDIR}"/${PN}-2.6.2-qtsvg.patch
- "${FILESDIR}"/${PN}-99999999-androiddump.patch
-)
-
-pkg_setup() {
- enewgroup wireshark
-}
-
-src_configure() {
- local mycmakeargs
-
- # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
- # --with-ssl to ./configure. (Mimics code from acinclude.m4).
- if use kerberos; then
- case $(krb5-config --libs) in
- *-lcrypto*)
- ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
- ewarn "Note there are annoying license incompatibilities between the OpenSSL"
- ewarn "license and the GPL, so do your check before distributing such package."
- mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
- ;;
- esac
- fi
-
- if use qt5; then
- export QT_MIN_VERSION=5.3.0
- append-cxxflags -fPIC -DPIC
- fi
-
- mycmakeargs+=(
- $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
- $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
- $(usex qt5 MOC=$(qt5_get_bindir)/moc '')
- $(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
- $(usex qt5 UIC=$(qt5_get_bindir)/uic '')
- -DBUILD_androiddump=$(usex androiddump)
- -DBUILD_capinfos=$(usex capinfos)
- -DBUILD_captype=$(usex captype)
- -DBUILD_ciscodump=$(usex ciscodump)
- -DBUILD_dftest=$(usex dftest)
- -DBUILD_dumpcap=$(usex dumpcap)
- -DBUILD_editcap=$(usex editcap)
- -DBUILD_mergecap=$(usex mergecap)
- -DBUILD_mmdbresolve=$(usex maxminddb)
- -DBUILD_randpkt=$(usex randpkt)
- -DBUILD_randpktdump=$(usex randpktdump)
- -DBUILD_reordercap=$(usex reordercap)
- -DBUILD_sharkd=$(usex sharkd)
- -DBUILD_sshdump=$(usex sshdump)
- -DBUILD_text2pcap=$(usex text2pcap)
- -DBUILD_tfshark=$(usex tfshark)
- -DBUILD_tshark=$(usex tshark)
- -DBUILD_udpdump=$(usex udpdump)
- -DBUILD_wireshark=$(usex qt5)
- -DBUILD_wireshark_gtk=$(usex gtk)
- -DDISABLE_WERROR=yes
- -DENABLE_BCG729=$(usex bcg729)
- -DENABLE_CAP=no
- -DENABLE_CARES=$(usex adns)
- -DENABLE_GNUTLS=$(usex ssl)
- -DENABLE_KERBEROS=$(usex kerberos)
- -DENABLE_LIBXML2=$(usex libxml2)
- -DENABLE_LUA=$(usex lua)
- -DENABLE_LZ4=$(usex lz4)
- -DENABLE_NETLINK=$(usex netlink)
- -DENABLE_NGHTTP2=$(usex nghttp2)
- -DENABLE_PCAP=$(usex pcap)
- -DENABLE_PORTAUDIO=$(usex portaudio)
- -DENABLE_SBC=$(usex sbc)
- -DENABLE_SMI=$(usex smi)
- -DENABLE_SNAPPY=$(usex snappy)
- -DENABLE_SPANDSP=$(usex spandsp)
- -DENABLE_ZLIB=$(usex zlib)
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- # FAQ is not required as is installed from help/faq.txt
- dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
- # install headers
- insinto /usr/include/wireshark
- doins ws_diag_control.h ws_symbol_export.h \
- "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
-
- local dir dirs=(
- epan
- epan/crypt
- epan/dfilter
- epan/dissectors
- epan/ftypes
- epan/wmem
- wiretap
- wsutil
- )
- for dir in "${dirs[@]}"
- do
- insinto /usr/include/wireshark/${dir}
- doins ${dir}/*.h
- done
-
- #with the above this really shouldn't be needed, but things may be looking
- # in wiretap/ instead of wireshark/wiretap/
- insinto /usr/include/wiretap
- doins wiretap/wtap.h
-
- if use gtk || use qt5; then
- local s
- for s in 16 32 48 64 128 256 512 1024; do
- insinto /usr/share/icons/hicolor/${s}x${s}/apps
- newins image/wsicon${s}.png wireshark.png
- done
- for s in 16 24 32 48 64 128 256 ; do
- insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
- newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
- done
- fi
-
- prune_libtool_files
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-
- # Add group for users allowed to sniff.
- enewgroup wireshark
- chgrp wireshark "${EROOT}"/usr/bin/dumpcap
-
- if use dumpcap && use pcap; then
- fcaps -o 0 -g wireshark -m 4710 -M 0710 \
- cap_dac_read_search,cap_net_raw,cap_net_admin \
- "${EROOT}"/usr/bin/dumpcap
- fi
-
- ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
- ewarn "add yourself to the wireshark group. This security measure ensures"
- ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/net-analyzer/wireshark/wireshark-2.9.0-r1.ebuild b/net-analyzer/wireshark/wireshark-3.0.0_rc1.ebuild
index ef9526baa665..e7f6b3df2dba 100644
--- a/net-analyzer/wireshark/wireshark-2.9.0-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.0_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -205,6 +205,9 @@ src_install() {
fi
prune_libtool_files
+
+ mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${PF}/ || die
+ rmdir "${D}"/usr/share/doc/${PN} || die
}
pkg_postinst() {