summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/arp-scan/arp-scan-1.9.7.ebuild4
-rw-r--r--net-analyzer/arping/arping-2.21.ebuild21
-rw-r--r--net-analyzer/arping/files/arping-tests.patch190
-rw-r--r--net-analyzer/authforce/authforce-0.9.9-r3.ebuild4
-rw-r--r--net-analyzer/bwping/bwping-2.2.ebuild2
-rw-r--r--net-analyzer/cacti-spine/cacti-spine-1.2.16.ebuild2
-rw-r--r--net-analyzer/cacti/Manifest1
-rw-r--r--net-analyzer/cacti/cacti-1.2.14.ebuild48
-rw-r--r--net-analyzer/cacti/cacti-1.2.16-r1.ebuild2
-rw-r--r--net-analyzer/cacti/cacti-1.2.16.ebuild49
-rw-r--r--net-analyzer/carl/carl-0.9-r3.ebuild2
-rw-r--r--net-analyzer/carl/carl-0.9-r4.ebuild2
-rw-r--r--net-analyzer/driftnet/files/driftnet-0.1.6-giflib-5.patch50
-rw-r--r--net-analyzer/fail2ban/fail2ban-0.11.2.ebuild2
-rw-r--r--net-analyzer/fail2ban/fail2ban-9999.ebuild2
-rw-r--r--net-analyzer/flent/flent-1.3.2.ebuild2
-rw-r--r--net-analyzer/gensink/gensink-4.1-r2.ebuild10
-rw-r--r--net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild4
-rw-r--r--net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild4
-rw-r--r--net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild2
-rw-r--r--net-analyzer/graphite-web/graphite-web-1.1.7.ebuild2
-rw-r--r--net-analyzer/greenbone-security-assistant/Manifest2
-rw-r--r--net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-cmakelist.patch30
-rw-r--r--net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-pid.patch11
-rw-r--r--net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-reactjs.patch20
-rw-r--r--net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-sbin.patch12
-rw-r--r--net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-uninstall-snippet.patch12
-rw-r--r--net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-9.0.1-glibc_siglist.patch14
-rw-r--r--net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild125
-rw-r--r--net-analyzer/greenbone-security-assistant/greenbone-security-assistant-9.0.1.ebuild4
-rw-r--r--net-analyzer/gvm-tools/gvm-tools-2.0.0-r1.ebuild2
-rw-r--r--net-analyzer/gvmd/Manifest1
-rw-r--r--net-analyzer/gvmd/files/gvmd-8.0.1-sbin.patch56
-rw-r--r--net-analyzer/gvmd/files/gvmd-8.0.1-tmplock.patch34
-rw-r--r--net-analyzer/gvmd/gvmd-8.0.1.ebuild118
-rw-r--r--net-analyzer/hping/files/bytesex.h.patch18
-rw-r--r--net-analyzer/icinga2/Manifest2
-rw-r--r--net-analyzer/icinga2/icinga2-2.11.6.ebuild170
-rw-r--r--net-analyzer/icinga2/icinga2-2.12.1.ebuild149
-rw-r--r--net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch11
-rw-r--r--net-analyzer/jffnms/Manifest1
-rw-r--r--net-analyzer/jffnms/jffnms-0.9.4-r1.ebuild56
-rw-r--r--net-analyzer/linkchecker/Manifest1
-rw-r--r--net-analyzer/linkchecker/linkchecker-10.0.0_pre20200729.ebuild2
-rw-r--r--net-analyzer/linkchecker/linkchecker-10.0.1.ebuild54
-rw-r--r--net-analyzer/linkchecker/linkchecker-9999.ebuild2
-rw-r--r--net-analyzer/masscan/Manifest3
-rw-r--r--net-analyzer/masscan/masscan-1.0.4.ebuild41
-rw-r--r--net-analyzer/masscan/masscan-1.3.2.ebuild (renamed from net-analyzer/masscan/masscan-1.3.0.ebuild)0
-rw-r--r--net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild7
-rw-r--r--net-analyzer/monitoring-plugins/Manifest1
-rw-r--r--net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild104
-rw-r--r--net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild (renamed from net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild)31
-rw-r--r--net-analyzer/multimon-ng/Manifest2
-rw-r--r--net-analyzer/multimon-ng/multimon-ng-1.1.9.ebuild (renamed from net-analyzer/multimon-ng/multimon-ng-1.1.8.ebuild)8
-rw-r--r--net-analyzer/multimon-ng/multimon-ng-9999.ebuild8
-rw-r--r--net-analyzer/munin/Manifest6
-rw-r--r--net-analyzer/munin/munin-2.0.65.ebuild417
-rw-r--r--net-analyzer/munin/munin-2.0.66.ebuild2
-rw-r--r--net-analyzer/munin/munin-2.0.67.ebuild (renamed from net-analyzer/munin/munin-2.0.64.ebuild)2
-rw-r--r--net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1.ebuild2
-rw-r--r--net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild (renamed from net-analyzer/nagios-core/nagios-core-4.4.6-r1.ebuild)16
-rw-r--r--net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r1.ebuild2
-rw-r--r--net-analyzer/nagstamon/nagstamon-3.4.1-r1.ebuild2
-rw-r--r--net-analyzer/nbtscan/files/nbtscan-1.5.1-gentoo.patch15
-rw-r--r--net-analyzer/nbtscan/files/nbtscan-1.5.1-includes-declarations.patch42
-rw-r--r--net-analyzer/nbtscan/files/nbtscan-1.5.1-script-whitespace.patch119
-rw-r--r--net-analyzer/net-snmp/files/net-snmp-5.9-r3-f2fs.patch40
-rw-r--r--net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild4
-rw-r--r--net-analyzer/net-snmp/net-snmp-5.9-r3.ebuild213
-rw-r--r--net-analyzer/net-snmp/net-snmp-99999999.ebuild31
-rw-r--r--net-analyzer/netdata/Manifest5
-rw-r--r--net-analyzer/netdata/netdata-1.29.0.ebuild (renamed from net-analyzer/netdata/netdata-1.28.0.ebuild)4
-rw-r--r--net-analyzer/netdata/netdata-1.29.1.ebuild138
-rw-r--r--net-analyzer/netdata/netdata-1.29.2.ebuild138
-rw-r--r--net-analyzer/netdata/netdata-1.29.3.ebuild138
-rw-r--r--net-analyzer/netdata/netdata-9999.ebuild2
-rw-r--r--net-analyzer/netwag/netwag-5.39.0.ebuild8
-rw-r--r--net-analyzer/nmap/metadata.xml6
-rw-r--r--net-analyzer/nmap/nmap-7.80-r1.ebuild129
-rw-r--r--net-analyzer/nmap/nmap-7.80-r2.ebuild2
-rw-r--r--net-analyzer/nmap/nmap-7.91-r1.ebuild2
-rw-r--r--net-analyzer/nmap/nmap-7.91.ebuild108
-rw-r--r--net-analyzer/nstats/nstats-0.4-r2.ebuild34
-rw-r--r--net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch17
-rw-r--r--net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild4
-rw-r--r--net-analyzer/ostinato/Manifest2
-rw-r--r--net-analyzer/ostinato/files/ostinato-0.9_p20180522-buildfix.patch17
-rw-r--r--net-analyzer/ostinato/metadata.xml2
-rw-r--r--net-analyzer/ostinato/ostinato-1.1.ebuild (renamed from net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild)12
-rw-r--r--net-analyzer/pmacct/Manifest2
-rw-r--r--net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch28
-rw-r--r--net-analyzer/pmacct/files/pmacct-1.7.4-nDPI-3.2.patch47
-rw-r--r--net-analyzer/pmacct/metadata.xml40
-rw-r--r--net-analyzer/pmacct/pmacct-1.7.4.ebuild101
-rw-r--r--net-analyzer/pmacct/pmacct-1.7.4_p1.ebuild103
-rw-r--r--net-analyzer/pmacct/pmacct-1.7.5.ebuild7
-rw-r--r--net-analyzer/pmacct/pmacct-999999.ebuild21
-rw-r--r--net-analyzer/prelude-correlator/prelude-correlator-5.1.0.ebuild2
-rw-r--r--net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild2
-rw-r--r--net-analyzer/pypacker/pypacker-4.8.ebuild2
-rw-r--r--net-analyzer/pypacker/pypacker-4.9.ebuild2
-rw-r--r--net-analyzer/python-gvm/python-gvm-1.1.0.ebuild2
-rw-r--r--net-analyzer/python-gvm/python-gvm-1.2.0.ebuild2
-rw-r--r--net-analyzer/python-gvm/python-gvm-1.5.0.ebuild2
-rw-r--r--net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild2
-rw-r--r--net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild4
-rw-r--r--net-analyzer/rrdtool/rrdtool-1.7.2.ebuild2
-rw-r--r--net-analyzer/scapy/files/scapy-2.4.4-libc.patch13
-rw-r--r--net-analyzer/scapy/scapy-2.4.4-r1.ebuild (renamed from net-analyzer/scapy/scapy-2.4.4.ebuild)6
-rw-r--r--net-analyzer/scapy/scapy-9999.ebuild2
-rw-r--r--net-analyzer/slurm/files/slurm-0.4.3-fix-includes.patch22
-rw-r--r--net-analyzer/slurm/slurm-0.4.3.ebuild38
-rw-r--r--net-analyzer/snallygaster/snallygaster-0.0.6.ebuild2
-rw-r--r--net-analyzer/snallygaster/snallygaster-0.0.8.ebuild2
-rw-r--r--net-analyzer/snallygaster/snallygaster-0.0.9.ebuild2
-rw-r--r--net-analyzer/snmpclitools/metadata.xml15
-rw-r--r--net-analyzer/snmpclitools/snmpclitools-0.6.4.ebuild11
-rw-r--r--net-analyzer/softflowd/files/softflowd-0.9.9-_GNU_SOURCE.patch13
-rw-r--r--net-analyzer/softflowd/files/softflowd-0.9.9-no-strip.patch12
-rw-r--r--net-analyzer/speedtest-cli/speedtest-cli-2.1.2-r1.ebuild (renamed from net-analyzer/speedtest-cli/speedtest-cli-2.1.2.ebuild)5
-rw-r--r--net-analyzer/sslscan/Manifest10
-rw-r--r--net-analyzer/sslscan/sslscan-2.0.1.ebuild50
-rw-r--r--net-analyzer/sslscan/sslscan-2.0.2-r1.ebuild47
-rw-r--r--net-analyzer/sslscan/sslscan-2.0.2.ebuild50
-rw-r--r--net-analyzer/sslscan/sslscan-2.0.3.ebuild47
-rw-r--r--net-analyzer/sslscan/sslscan-2.0.6.ebuild4
-rw-r--r--net-analyzer/sslscan/sslscan-2.0.7.ebuild (renamed from net-analyzer/sslscan/sslscan-2.0.5.ebuild)4
-rw-r--r--net-analyzer/sslscan/sslscan-2.0.8.ebuild (renamed from net-analyzer/sslscan/sslscan-2.0.4.ebuild)7
-rw-r--r--net-analyzer/suricata/Manifest6
-rw-r--r--net-analyzer/suricata/suricata-5.0.5.ebuild197
-rw-r--r--net-analyzer/suricata/suricata-5.0.6.ebuild (renamed from net-analyzer/suricata/suricata-5.0.4.ebuild)49
-rw-r--r--net-analyzer/suricata/suricata-6.0.0.ebuild203
-rw-r--r--net-analyzer/suricata/suricata-6.0.1.ebuild203
-rw-r--r--net-analyzer/suricata/suricata-6.0.2.ebuild (renamed from net-analyzer/suricata/suricata-6.0.1-r100.ebuild)8
-rw-r--r--net-analyzer/tcpdump/tcpdump-4.99.0.ebuild7
-rw-r--r--net-analyzer/tcpdump/tcpdump-9999.ebuild5
-rw-r--r--net-analyzer/tcpflow/Manifest3
-rw-r--r--net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-libcapng.patch13
-rw-r--r--net-analyzer/tcpflow/files/tcpflow-1.5.2-gentoo.patch64
-rw-r--r--net-analyzer/tcpflow/metadata.xml (renamed from net-analyzer/jffnms/metadata.xml)2
-rw-r--r--net-analyzer/tcpflow/tcpflow-1.6.1.ebuild63
-rw-r--r--net-analyzer/testssl/Manifest1
-rw-r--r--net-analyzer/testssl/testssl-3.0.2.ebuild74
-rw-r--r--net-analyzer/testssl/testssl-3.0.4.ebuild4
-rw-r--r--net-analyzer/upnpscan/upnpscan-0.4-r3.ebuild24
-rw-r--r--net-analyzer/wapiti/wapiti-3.0.3.ebuild2
-rw-r--r--net-analyzer/wapiti/wapiti-9999.ebuild2
-rw-r--r--net-analyzer/wireshark/Manifest2
-rw-r--r--net-analyzer/wireshark/files/wireshark-9999-ui-needs-wiretap.patch (renamed from net-analyzer/wireshark/files/wireshark-99999999-ui-needs-wiretap.patch)0
-rw-r--r--net-analyzer/wireshark/wireshark-3.4.2.ebuild259
-rw-r--r--net-analyzer/wireshark/wireshark-3.4.3.ebuild (renamed from net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild)29
-rw-r--r--net-analyzer/wireshark/wireshark-9999.ebuild (renamed from net-analyzer/wireshark/wireshark-99999999.ebuild)6
-rw-r--r--net-analyzer/zabbix/Manifest11
-rw-r--r--net-analyzer/zabbix/metadata.xml4
-rw-r--r--net-analyzer/zabbix/zabbix-3.0.31-r2.ebuild6
-rw-r--r--net-analyzer/zabbix/zabbix-4.0.28.ebuild (renamed from net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild)4
-rw-r--r--net-analyzer/zabbix/zabbix-4.0.29.ebuild353
-rw-r--r--net-analyzer/zabbix/zabbix-5.0.8.ebuild (renamed from net-analyzer/zabbix/zabbix-5.2.2-r1.ebuild)4
-rw-r--r--net-analyzer/zabbix/zabbix-5.0.9.ebuild (renamed from net-analyzer/zabbix/zabbix-5.0.7.ebuild)6
-rw-r--r--net-analyzer/zabbix/zabbix-5.2.4.ebuild (renamed from net-analyzer/zabbix/zabbix-5.0.6-r1.ebuild)4
-rw-r--r--net-analyzer/zabbix/zabbix-5.2.5.ebuild (renamed from net-analyzer/zabbix/zabbix-5.2.3.ebuild)6
162 files changed, 1804 insertions, 3751 deletions
diff --git a/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild b/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild
index 96432c7a989..2278aa10e0d 100644
--- a/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild
+++ b/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/royhills/arp-scan/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~ppc64"
DEPEND="
net-libs/libpcap
diff --git a/net-analyzer/arping/arping-2.21.ebuild b/net-analyzer/arping/arping-2.21.ebuild
index 889b70b2de4..1572d488bb9 100644
--- a/net-analyzer/arping/arping-2.21.ebuild
+++ b/net-analyzer/arping/arping-2.21.ebuild
@@ -2,33 +2,38 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit autotools fcaps
-DESCRIPTION="A utility to see if a specific IP address is taken and what MAC address owns it"
+DESCRIPTION="A utility to see if a specific IP is taken and what MAC owns it"
HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping"
SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
CDEPEND="
net-libs/libpcap
- net-libs/libnet:1.1
-"
+ net-libs/libnet:1.1"
DEPEND="
${CDEPEND}
- test? ( dev-libs/check )
-"
+ test? (
+ dev-libs/check
+ dev-python/subunit )"
RDEPEND="
${CDEPEND}
- !net-misc/iputils[arping(+)]
-"
+ !net-misc/iputils[arping(+)]"
+
FILECAPS=( cap_net_raw /usr/sbin/arping )
+
S=${WORKDIR}/${PN}-${P}
+# patch is in upstream master
+PATCHES=( "${FILESDIR}/arping-tests.patch" )
+
src_prepare() {
default
eautoreconf
diff --git a/net-analyzer/arping/files/arping-tests.patch b/net-analyzer/arping/files/arping-tests.patch
new file mode 100644
index 00000000000..fb8592df372
--- /dev/null
+++ b/net-analyzer/arping/files/arping-tests.patch
@@ -0,0 +1,190 @@
+diff --git a/src/arping_test.c b/src/arping_test.c
+index 438670b..0133fe7 100644
+--- a/src/arping_test.c
++++ b/src/arping_test.c
+@@ -40,35 +40,10 @@ extern libnet_t* libnet;
+ extern int mock_libnet_lo_ok;
+ extern int mock_libnet_null_ok;
+
+-struct registered_test {
+- void* fn;
+- const char* name;
+-};
+-
+-static int numtests = 0;
+-static struct registered_test test_registry[1024];
+-
+-static int num_exit_tests = 0;
+-static struct registered_test test_exit_registry[1024];
+-
+ int get_mac_addr(const char *in, char *out);
+ void strip_newline(char* s);
+
+
+-#define MYTEST(a) static void a(int);__attribute__((constructor)) \
+-static void cons_##a() { \
+- test_registry[numtests].fn = a; \
+- test_registry[numtests].name = #a; \
+- numtests++; \
+-} START_TEST(a)
+-
+-#define MY_EXIT_TEST(a) static void a(int);__attribute__((constructor)) \
+-static void cons_##a() { \
+- test_exit_registry[num_exit_tests].fn = a; \
+- test_exit_registry[num_exit_tests].name = #a; \
+- num_exit_tests++; \
+-} START_TEST(a)
+-
+ /**
+ *
+ */
+@@ -236,7 +211,7 @@ dump_packet(uint8_t* packet, int len)
+ fprintf(stderr, "\n");
+ }
+
+-MYTEST(test_mkpacket)
++START_TEST(test_mkpacket)
+ {
+ uint8_t correct_packet[] = {
+ 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa,
+@@ -261,7 +236,7 @@ MYTEST(test_mkpacket)
+
+
+ // Received uninteresting packet, should not record anything.
+-MYTEST(pingip_uninteresting_packet)
++START_TEST(pingip_uninteresting_packet)
+ {
+ struct pcap_pkthdr pkthdr;
+ uint8_t* packet;
+@@ -389,7 +364,7 @@ MYTEST(pingip_uninteresting_packet)
+ } END_TEST
+
+ // Received reply that actually matches. Things should happen.
+-MYTEST(pingip_interesting_packet)
++START_TEST(pingip_interesting_packet)
+ {
+ struct pcap_pkthdr pkthdr;
+ extern uint8_t srcmac[ETH_ALEN];
+@@ -449,7 +424,7 @@ MYTEST(pingip_interesting_packet)
+ "numrecvd not incremented second time");
+ } END_TEST
+
+-MYTEST(strip_newline_test)
++START_TEST(strip_newline_test)
+ {
+ const char *tests[][2] = {
+ {"", ""},
+@@ -469,7 +444,7 @@ MYTEST(strip_newline_test)
+ }
+ } END_TEST
+
+-MYTEST(get_mac_addr_success)
++START_TEST(get_mac_addr_success)
+ {
+ const char *tests[][2] = {
+ // Null.
+@@ -501,7 +476,7 @@ MYTEST(get_mac_addr_success)
+ }
+ } END_TEST
+
+-MYTEST(get_mac_addr_fail)
++START_TEST(get_mac_addr_fail)
+ {
+ const char *tests[] = {
+ "",
+@@ -517,7 +492,7 @@ MYTEST(get_mac_addr_fail)
+ }
+ } END_TEST
+
+-MY_EXIT_TEST(libnet_init_bad_nolo)
++START_TEST(libnet_init_bad_nolo)
+ {
+ // It'll only try lo if named interface fails.
+ // So by accepting lo, we make sure it doesn't try lo.
+@@ -525,27 +500,28 @@ MY_EXIT_TEST(libnet_init_bad_nolo)
+ do_libnet_init("bad", 0);
+ } END_TEST
+
+-MY_EXIT_TEST(libnet_init_null_nolo_nonull)
++START_TEST(libnet_init_null_nolo_nonull)
+ {
+ mock_libnet_lo_ok = 0;
+ mock_libnet_null_ok = 0;
+ do_libnet_init(NULL, 0);
+ } END_TEST
+
+-MYTEST(libnet_init_good)
++START_TEST(libnet_init_good)
+ {
+ mock_libnet_lo_ok = 0; // Don't even try falling back to lo.
+ do_libnet_init("good", 0);
+ fail_if(libnet == NULL);
+ } END_TEST
+
+-MYTEST(libnet_init_null_nolo)
++START_TEST(libnet_init_null_nolo)
+ {
+ mock_libnet_lo_ok = 0;
+ mock_libnet_null_ok = 1;
+ do_libnet_init(NULL, 0);
+ fail_if(libnet == NULL);
+-} END_TEST
++}
++END_TEST
+
+ static Suite*
+ arping_suite(void)
+@@ -553,17 +529,34 @@ arping_suite(void)
+ int c;
+ Suite* s = suite_create("Arping");
+
+- //tcase_add_checked_fixture (tc_core, setup, teardown);
+- for (c = 0; c < numtests; c++) {
+- TCase *tc_core = tcase_create(test_registry[c].name);
+- tcase_add_test(tc_core, test_registry[c].fn);
+- suite_add_tcase(s, tc_core);
+- }
+- for (c = 0; c < num_exit_tests; c++) {
+- TCase *tc_core = tcase_create(test_exit_registry[c].name);
+- tcase_add_exit_test(tc_core, test_exit_registry[c].fn, 1);
+- suite_add_tcase(s, tc_core);
+- }
++
++ TCase *tc_core;
++
++ // libcheck broke test registries, so have to resort to code duplication. :-(
++ // https://github.com/libcheck/check/pull/158/files
++#define SIGH_LIBCHECK(tn) \
++ tc_core = tcase_create(#tn); \
++ tcase_add_test(tc_core, tn); \
++ suite_add_tcase(s, tc_core);
++
++ SIGH_LIBCHECK(libnet_init_null_nolo);
++ SIGH_LIBCHECK(test_mkpacket);
++ SIGH_LIBCHECK(pingip_uninteresting_packet);
++ SIGH_LIBCHECK(pingip_interesting_packet);
++ SIGH_LIBCHECK(strip_newline_test);
++ SIGH_LIBCHECK(get_mac_addr_success);
++ SIGH_LIBCHECK(get_mac_addr_fail);
++ SIGH_LIBCHECK(libnet_init_good);
++
++
++#define SIGH_LIBCHECK_EXIT(tn) \
++ tc_core = tcase_create(#tn); \
++ tcase_add_exit_test(tc_core, tn, 1); \
++ suite_add_tcase(s, tc_core);
++
++ SIGH_LIBCHECK_EXIT(libnet_init_bad_nolo);
++ SIGH_LIBCHECK_EXIT(libnet_init_null_nolo_nonull);
++
+ return s;
+ }
+
+@@ -577,6 +570,7 @@ main()
+ number_failed = srunner_ntests_failed (sr);
+ srunner_free (sr);
+ return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
++ return 0;
+ }
+ /* ---- Emacs Variables ----
+ * Local Variables:
diff --git a/net-analyzer/authforce/authforce-0.9.9-r3.ebuild b/net-analyzer/authforce/authforce-0.9.9-r3.ebuild
index 183912b43ca..556c3128dad 100644
--- a/net-analyzer/authforce/authforce-0.9.9-r3.ebuild
+++ b/net-analyzer/authforce/authforce-0.9.9-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://www.divineinvasion.net/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="curl nls"
RDEPEND="sys-libs/readline:0=
diff --git a/net-analyzer/bwping/bwping-2.2.ebuild b/net-analyzer/bwping/bwping-2.2.ebuild
index 34866c961db..63580768616 100644
--- a/net-analyzer/bwping/bwping-2.2.ebuild
+++ b/net-analyzer/bwping/bwping-2.2.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/${PN}-RELEASE_${PV}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc x86"
src_test() {
[[ ${UID} = 0 ]] && default
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.16.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.16.ebuild
index 86a76185c47..8bce1cc74d0 100644
--- a/net-analyzer/cacti-spine/cacti-spine-1.2.16.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-1.2.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
IUSE="libressl"
BDEPEND="sys-apps/help2man"
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index ef0ed74ed51..1d34b23f3ee 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,2 +1 @@
-DIST cacti-1.2.14.tar.gz 25182521 BLAKE2B 555c30ebd06ac71df608a1564892ecd176cf46fa079fd3615dc59fd984bc8bedd4512d971dc3c2731848107da728724ef459d84f0308bef8b0b6ab943b8bc3cf SHA512 734d8e059ea47630072269d92ad79e773268c5dd1cd9c565d23c41b2a74c8892bdc5190f7de6bb9ed281a67ade9c8ef6d723a9d4f486a4ba9aca99182d6ad056
DIST cacti-1.2.16.tar.gz 29197220 BLAKE2B 19939d0ff79c895b481aeb7ffec8331d8b9c10a6b7e0dbda6532e06ef0322f21cf02f4bf53a9522e1f672dd04b343f5550e2f34f08b3af2050e1f72465cffc43 SHA512 fe22acf4dea8ab6ec79825d66a84ad4c43fdce2815e7327536d182bc04400ed7b1d268209bbbca8b307c4779ee5bf7369a617ec1f052d8805757c2ca9b30cc35
diff --git a/net-analyzer/cacti/cacti-1.2.14.ebuild b/net-analyzer/cacti/cacti-1.2.14.ebuild
deleted file mode 100644
index 2ec9213257a..00000000000
--- a/net-analyzer/cacti/cacti-1.2.14.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils webapp
-
-# Support for _p* in version.
-MY_P=${P/_p*/}
-
-DESCRIPTION="Cacti is a complete frontend to rrdtool"
-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"
-IUSE="snmp doc"
-
-need_httpd
-
-RDEPEND="
- dev-lang/php[cli,mysql,pdo,session,sockets,xml]
- dev-php/adodb
- net-analyzer/rrdtool[graph]
- virtual/cron
- snmp? ( >=net-analyzer/net-snmp-5.2.0 )
-"
-
-src_compile() { :; }
-
-src_install() {
- dodoc CHANGELOG
- dodoc -r docs
- mv docs .. || die
-
- webapp_src_preinst
-
- edos2unix `find -type f -name '*.php'`
-
- dodir ${MY_HTDOCSDIR}
- cp -r . "${D}"${MY_HTDOCSDIR}
-
- webapp_serverowned ${MY_HTDOCSDIR}/rra
- webapp_serverowned ${MY_HTDOCSDIR}/log
- webapp_configfile ${MY_HTDOCSDIR}/include/config.php
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
- webapp_src_install
-}
diff --git a/net-analyzer/cacti/cacti-1.2.16-r1.ebuild b/net-analyzer/cacti/cacti-1.2.16-r1.ebuild
index 0113bd81074..78185ebd73d 100644
--- a/net-analyzer/cacti/cacti-1.2.16-r1.ebuild
+++ b/net-analyzer/cacti/cacti-1.2.16-r1.ebuild
@@ -13,7 +13,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/cacti/cacti-1.2.16.ebuild b/net-analyzer/cacti/cacti-1.2.16.ebuild
deleted file mode 100644
index 1dfa8747632..00000000000
--- a/net-analyzer/cacti/cacti-1.2.16.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit edos2unix webapp
-
-# Support for _p* in version.
-MY_P=${P/_p*/}
-
-DESCRIPTION="Cacti is a complete frontend to rrdtool"
-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"
-IUSE="snmp doc"
-
-need_httpd
-
-RDEPEND="
- dev-lang/php[cli,mysql,pdo,session,sockets,xml]
- dev-php/adodb
- net-analyzer/rrdtool[graph]
- virtual/cron
- snmp? ( >=net-analyzer/net-snmp-5.2.0 )
-"
-
-src_compile() { :; }
-
-src_install() {
- dodoc CHANGELOG
- dodoc -r docs
- mv docs .. || die
-
- webapp_src_preinst
-
- edos2unix `find -type f -name '*.php'`
-
- dodir ${MY_HTDOCSDIR}
- cp -r . "${ED}"${MY_HTDOCSDIR}
-
- webapp_serverowned ${MY_HTDOCSDIR}/rra
- webapp_serverowned ${MY_HTDOCSDIR}/log
- webapp_configfile ${MY_HTDOCSDIR}/include/config.php
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
- webapp_src_install
-}
diff --git a/net-analyzer/carl/carl-0.9-r3.ebuild b/net-analyzer/carl/carl-0.9-r3.ebuild
index 8c4ba2d113c..2a41dd6667a 100644
--- a/net-analyzer/carl/carl-0.9-r3.ebuild
+++ b/net-analyzer/carl/carl-0.9-r3.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python3_6 python3_7 python3_8 pypy3)
+PYTHON_COMPAT=( python3_7 python3_8 pypy3)
inherit distutils-r1
diff --git a/net-analyzer/carl/carl-0.9-r4.ebuild b/net-analyzer/carl/carl-0.9-r4.ebuild
index a69735f5b3b..00fe1c36dbd 100644
--- a/net-analyzer/carl/carl-0.9-r4.ebuild
+++ b/net-analyzer/carl/carl-0.9-r4.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python3_6 python3_7 python3_8 pypy3)
+PYTHON_COMPAT=( python3_7 python3_8 pypy3)
inherit distutils-r1
diff --git a/net-analyzer/driftnet/files/driftnet-0.1.6-giflib-5.patch b/net-analyzer/driftnet/files/driftnet-0.1.6-giflib-5.patch
deleted file mode 100644
index 30ad62c38f4..00000000000
--- a/net-analyzer/driftnet/files/driftnet-0.1.6-giflib-5.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/gif.c
-+++ b/gif.c
-@@ -20,7 +20,12 @@
- */
- int gif_load_hdr(img I) {
- GifFileType *g;
-+#if GIFLIB_MAJOR > 4
-+ int *GifError = NULL;
-+ g = I->us = DGifOpenFileHandle(fileno(I->fp), GifError);
-+#else
- g = I->us = DGifOpenFileHandle(fileno(I->fp));
-+#endif /* GIFLIB_MAJOR */
- if (!I->us) {
- I->err = IE_HDRFORMAT;
- return 0;
-@@ -36,7 +41,12 @@
- * Abort loading a GIF file after the header is done.
- */
- int gif_abort_load(img I) {
-+#if GIFLIB_MAJOR > 4
-+ int *GifError = NULL;
-+ DGifCloseFile((GifFileType*)I->us, GifError);
-+#else
- DGifCloseFile((GifFileType*)I->us);
-+#endif /* GIFLIB_MAJOR */
- return 1;
- }
-
-@@ -44,6 +54,9 @@
- * Load GIF image.
- */
- int gif_load_img(img I) {
-+#if GIFLIB_MAJOR > 4
-+ int *GifError = NULL;
-+#endif /* GIFLIB_MAJOR */
- GifFileType *g = I->us;
- struct SavedImage *si;
- int ret = 0;
-@@ -114,7 +127,11 @@
- ret = 1;
- fail:
-
-+#if GIFLIB_MAJOR > 4
-+ DGifCloseFile(g, GifError);
-+#else
- DGifCloseFile(g);
-+#endif /* GIFLIB_MAJOR */
-
- return ret;
- }
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
index ebb59e058f0..bd350a8ac57 100644
--- a/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
DISTUTILS_SINGLE_IMPL=1
inherit bash-completion-r1 distutils-r1 systemd
diff --git a/net-analyzer/fail2ban/fail2ban-9999.ebuild b/net-analyzer/fail2ban/fail2ban-9999.ebuild
index 75cf1cc7136..ee45ceced90 100644
--- a/net-analyzer/fail2ban/fail2ban-9999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
DISTUTILS_SINGLE_IMPL=1
inherit bash-completion-r1 distutils-r1 git-r3 systemd
diff --git a/net-analyzer/flent/flent-1.3.2.ebuild b/net-analyzer/flent/flent-1.3.2.ebuild
index efc8e7382ee..265d9cefe20 100644
--- a/net-analyzer/flent/flent-1.3.2.ebuild
+++ b/net-analyzer/flent/flent-1.3.2.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
inherit distutils-r1 xdg
diff --git a/net-analyzer/gensink/gensink-4.1-r2.ebuild b/net-analyzer/gensink/gensink-4.1-r2.ebuild
index 5a99e658ec6..808eea74cb2 100644
--- a/net-analyzer/gensink/gensink-4.1-r2.ebuild
+++ b/net-analyzer/gensink/gensink-4.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit base toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="A simple TCP benchmark suite"
HOMEPAGE="http://jes.home.cern.ch/jes/gensink/"
@@ -12,7 +12,9 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc x86"
-PATCHES=( "${FILESDIR}/${P}-make.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-make.patch"
+)
src_compile() {
tc-export CC
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild
index 73f6863f9df..e3c5413176f 100644
--- a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild
+++ b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit cmake-utils python-single-r1
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
index 73f6863f9df..e3c5413176f 100644
--- a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
+++ b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit cmake-utils python-single-r1
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
index 4eb15c40b8c..dfdaeff5c5b 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
inherit distutils-r1 prefix
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
index 96b7920163d..8e52c1895dc 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
# 1.1.7 supports up to 3.9, so it's a matter of deps
DISTUTILS_USE_SETUPTOOLS=no # export USE_SETUPTOOLS to activate
diff --git a/net-analyzer/greenbone-security-assistant/Manifest b/net-analyzer/greenbone-security-assistant/Manifest
index 16c11eb444d..d46d8a5a635 100644
--- a/net-analyzer/greenbone-security-assistant/Manifest
+++ b/net-analyzer/greenbone-security-assistant/Manifest
@@ -1,4 +1,2 @@
-DIST greenbone-security-assistant-8.0.1-node_modules.tar.gz 34084175 BLAKE2B 17c9e24961b63b957f932e4c5970113499ad65655b42e624284fb22a495d50c12e5f8289da4e17db717885b65909a6e18213fa312052c9c06c9bdc37816204f1 SHA512 552ea55fe218ae2345fa45b43af349825f255ccd86137dd245679efe6abc805d16c4ced3599f644d9b9f2686047b486d5e0c8aa4eaa0cbbf13157b9e2dbc8cc2
-DIST greenbone-security-assistant-8.0.1.tar.gz 1558918 BLAKE2B 75287784ed215300cfb30101d39b06b134092ca2d4311bcca976be23cc289529c6a8d661b99cb28e890c68f27e93a9259681add067749a772b7e3aea28761f3b SHA512 b91c1c4b8073c3ad3d3d636abbaa7881393f1448eae7366636ff618391c199c240e6bc4c848740a4267b4142aa872fb91c0798b8034d152d16016e650fbda2b8
DIST greenbone-security-assistant-9.0.1-node_modules.tar.gz 44176347 BLAKE2B c8d1195ddc8167ff7a228a4e013c6139524e8527310c65529d37de8fe5e984379ba783e10544caf81ac801ceb1199ad7249c96a0e6032ade8a519068e6cefb42 SHA512 1718f97d330f7868afe34bf172699b8aa8ce795dc2e4a6f20b28135434623a68022c36310e381bd55bacbb621fd9bf5c8595c8030f5d3dc32bb427cc2febd028
DIST greenbone-security-assistant-9.0.1.tar.gz 1936391 BLAKE2B 22b9020a97e79b31555d66826740ca49d1eba5d55324f0e80349dc571a7b45bcf2c6403ac311e78f742c51900921f3e61ef0740f11fd794069242e2ab21b1c3e SHA512 688bde97722f31416406e43230253c05dc8d05eb9fea6d8fd084ec4e748b67bab238f78cc11534e4fc948d911e468d43b5be0b224f17959db5e59faae7f5d086
diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-cmakelist.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-cmakelist.patch
deleted file mode 100644
index d0fc7963a50..00000000000
--- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-cmakelist.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/gsad/config/CMakeLists.txt 2019-07-18 20:39:10.331949702 +0300
-+++ b/gsad/config/CMakeLists.txt 2019-07-18 20:40:18.946830294 +0300
-@@ -16,27 +16,3 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
--if (NOT SYSTEMD_SERVICE_DIR)
-- set (SYSTEMD_SERVICE_DIR "${CMAKE_INSTALL_PREFIX}/lib/systemd/system")
--endif (NOT SYSTEMD_SERVICE_DIR)
--
--if (NOT DEFAULT_CONFIG_DIR)
-- set (DEFAULT_CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/etc/default")
--endif (NOT DEFAULT_CONFIG_DIR)
--
--if (NOT LOGROTATE_DIR)
-- set (LOGROTATE_DIR "${CMAKE_INSTALL_PREFIX}/etc/logrotate.d")
--endif (NOT LOGROTATE_DIR)
--
--configure_file (gsad.service.in gsad.service)
--configure_file (gsad.logrotate.in gsad.logrotate)
--
--install (FILES ${CMAKE_CURRENT_BINARY_DIR}/gsad.service
-- DESTINATION ${SYSTEMD_SERVICE_DIR}/)
--
--install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/gsad.default
-- DESTINATION ${DEFAULT_CONFIG_DIR}/ RENAME gsad)
--
--install (FILES ${CMAKE_CURRENT_BINARY_DIR}/gsad.logrotate
-- DESTINATION ${LOGROTATE_DIR}/ RENAME gsad)
--
diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-pid.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-pid.patch
deleted file mode 100644
index a318c87225e..00000000000
--- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-pid.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -222,7 +222,7 @@ if (NOT DATADIR)
- endif (NOT DATADIR)
-
- if (NOT GSAD_PID_DIR)
-- set (GSAD_PID_DIR "${LOCALSTATEDIR}/run")
-+ set (GSAD_PID_DIR "/run")
- endif (NOT GSAD_PID_DIR)
-
- set (OPENVAS_STATE_DIR "${LOCALSTATEDIR}/lib/openvas")
diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-reactjs.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-reactjs.patch
deleted file mode 100644
index 19a4731db75..00000000000
--- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-reactjs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/gsa/package.json 2019-07-17 16:45:39.000000000 +0300
-+++ b/gsa/package.json 2019-07-17 22:40:31.371899489 +0300
-@@ -66,12 +66,12 @@
- "x2js": "^3.2.6"
- },
- "scripts": {
-- "test": "react-scripts test",
-- "test:coverage": "react-scripts test --coverage --maxWorkers 2",
-+ "test": "NODE_ENV=production node_modules/react-scripts/bin/react-scripts.js test",
-+ "test:coverage": "NODE_ENV=production node_modules/react-scripts/bin/react-scripts.js test --coverage --maxWorkers 2",
- "lint": "eslint --max-warnings 0 src",
-- "start": "react-scripts start",
-- "build": "react-scripts build",
-- "eject": "react-scripts eject"
-+ "start": "NODE_ENV=production node_modules/react-scripts/bin/react-scripts.js start",
-+ "build": "NODE_ENV=production node_modules/react-scripts/bin/react-scripts.js build",
-+ "eject": "NODE_ENV=production node_modules/react-scripts/bin/react-scripts.js eject"
- },
- "devDependencies": {
- "@types/jest": "^24.0.12",
diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-sbin.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-sbin.patch
deleted file mode 100644
index c1825ba3f5d..00000000000
--- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-sbin.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/gsad/src/CMakeLists.txt 2019-07-21 23:07:38.375683800 +0300
-+++ a/gsad/src/CMakeLists.txt 2019-07-21 23:08:17.301651451 +0300
-@@ -175,7 +175,7 @@
- ## Install
-
- install (TARGETS gsad
-- RUNTIME DESTINATION ${SBINDIR}
-+ RUNTIME DESTINATION ${BINDIR}
- LIBRARY DESTINATION ${LIBDIR}
- ARCHIVE DESTINATION ${LIBDIR}/static)
-
-
diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-uninstall-snippet.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-uninstall-snippet.patch
deleted file mode 100644
index 3b075951aba..00000000000
--- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-uninstall-snippet.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/gsa/CMakeLists.txt 2019-07-18 23:14:04.639202986 +0300
-+++ b/gsa/CMakeLists.txt 2019-07-18 23:21:54.568052589 +0300
-@@ -1116,9 +1116,6 @@
- install (FILES public/robots.txt
- DESTINATION ${GSA_DEST_DIR})
-
--# remove old generated files
--install (CODE "file(REMOVE_RECURSE ${GSA_DEST_DIR}/static)")
--
- install (DIRECTORY
- ${GSA_BUILD_DIR}/static
- ${GSA_BUILD_DIR}/img
diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-9.0.1-glibc_siglist.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-9.0.1-glibc_siglist.patch
new file mode 100644
index 00000000000..f9f587c96c8
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-9.0.1-glibc_siglist.patch
@@ -0,0 +1,14 @@
+#-------------------------------------------------------------------
+# compatibility with glibc 2.32 version #751592
+#-------------------------------------------------------------------
+--- ./gsad/src/gsad.c 2020-05-13 09:22:13.000000000 +0200
++++ ./gsad/src/gsad.c 2020-10-28 13:07:25.127222254 +0100
+@@ -3318,7 +3318,7 @@
+ {
+ if (termination_signal)
+ {
+- g_debug ("Received %s signal.\n", sys_siglist[termination_signal]);
++ g_debug ("Received %s signal.\n", strsignal(termination_signal));
+ gsad_cleanup ();
+ /* Raise signal again, to exit with the correct return value. */
+ signal (termination_signal, SIG_DFL);
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild
deleted file mode 100644
index d616891de50..00000000000
--- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake flag-o-matic systemd toolchain-funcs
-
-MY_PN="gsa"
-MY_DN="gsad"
-MY_NODE_N="node_modules"
-
-DESCRIPTION="Greenbone Security Assistant"
-HOMEPAGE="https://www.greenbone.net/en/"
-SRC_URI="https://github.com/greenbone/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/greenbone/gsa/releases/download/v8.0.1/gsa-node-modules-8.0.1.tar.gz -> ${P}-${MY_NODE_N}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="extras"
-
-DEPEND="
- dev-libs/libgcrypt:0=
- dev-libs/libxslt
- >=net-analyzer/gvm-libs-10.0.1
- net-libs/gnutls:=
- net-libs/libmicrohttpd"
-
-RDEPEND="
- ${DEPEND}
- ~net-analyzer/openvas-scanner-6.0.1
- >=net-analyzer/gvmd-8.0.1"
-
-BDEPEND="
- >=net-libs/nodejs-8.12.0
- >=sys-apps/yarn-1.15.2
- virtual/pkgconfig
- extras? ( app-doc/doxygen[dot]
- app-doc/xmltoman
- app-text/htmldoc
- dev-python/polib
- sys-devel/gettext
- )"
-
-BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build"
-S="${WORKDIR}/${MY_PN}-${PV}"
-MY_NODE_DIR="${S}/${MY_PN}/"
-
-PATCHES=(
- # QA fix for 8.0.0.
- "${FILESDIR}/${P}-pid.patch"
- # Disable yarn-fetch during compile.
- "${FILESDIR}/${P}-node.patch"
- # Fix react-env path for react.js.
- "${FILESDIR}/${P}-reactjs.patch"
- # Remove ugly uninstall-snippet that causes failing re-emerge.
- "${FILESDIR}/${P}-uninstall-snippet.patch"
- # Remove unnecessary install paths/files.
- "${FILESDIR}/${P}-cmakelist.patch"
- # Install exec. to /usr/bin instead of /usr/sbin
- "${FILESDIR}/${P}-sbin.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
- # We will use pre-generated npm stuff.
- mv "${WORKDIR}/${MY_NODE_N}" "${MY_NODE_DIR}" || die "couldn't move node_modules"
- # Update .yarnrc accordingly.
- echo "--modules-folder ${MY_NODE_DIR}" >> "${S}/${MY_PN}/.yarnrc" || die "echo failed"
- # QA-Fix | Remove !CLANG doxygen warnings for 8.0.1
- if use extras; then
- if ! tc-is-clang; then
- local f
- for f in gsad/doc/*.in
- do
- sed -i \
- -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \
- -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \
- "${f}" || die "couldn't disable CLANG parsing"
- done
- fi
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- "-DLOCALSTATEDIR=${EPREFIX}/var"
- "-DSYSCONFDIR=${EPREFIX}/etc"
- )
- # Add release hardening flags for 8.0.1
- append-cflags -D_FORTIFY_SOURCE=2 -fstack-protector
- append-ldflags -Wl,-z,relro -Wl,-z,now
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- if use extras; then
- cmake_build -C "${BUILD_DIR}" doc
- cmake_build doc-full -C "${BUILD_DIR}" doc
- HTML_DOCS=( "${BUILD_DIR}/${MY_DN}/doc/generated/html/." )
- fi
- cmake_build rebuild_cache
-}
-
-src_install() {
- cmake_src_install
-
- insinto /etc/gvm/sysconfig
- doins "${FILESDIR}/${MY_DN}-daemon.conf"
-
- dodir /etc/gvm/reverse-proxy
- insinto /etc/gvm/reverse-proxy
- doins "${FILESDIR}/${MY_PN}.nginx.reverse.proxy.example"
- fowners -R gvm:gvm /etc/gvm
-
- newinitd "${FILESDIR}/${MY_DN}.init" "${MY_DN}"
- newconfd "${FILESDIR}/${MY_DN}-daemon.conf" "${MY_DN}"
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}"
-
- systemd_dounit "${FILESDIR}/${MY_DN}.service"
-}
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-9.0.1.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-9.0.1.ebuild
index 552948dc9d4..a0621ef2652 100644
--- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-9.0.1.ebuild
+++ b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-9.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -54,6 +54,8 @@ PATCHES=(
"${FILESDIR}/${PN}-8.0.1-node.patch"
# Remove ugly uninstall-snippet that causes failing re-emerge.
"${FILESDIR}/${P}-uninstall-snippet.patch"
+ # Replace deprecated glibc sys_siglist with strsignal
+ "${FILESDIR}/${P}-glibc_siglist.patch"
)
src_prepare() {
diff --git a/net-analyzer/gvm-tools/gvm-tools-2.0.0-r1.ebuild b/net-analyzer/gvm-tools/gvm-tools-2.0.0-r1.ebuild
index d7688b80766..742976f5c61 100644
--- a/net-analyzer/gvm-tools/gvm-tools-2.0.0-r1.ebuild
+++ b/net-analyzer/gvm-tools/gvm-tools-2.0.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index 04581ca8a8b..de6f6ae1f9b 100644
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@@ -1,2 +1 @@
-DIST gvmd-8.0.1.tar.gz 1495311 BLAKE2B 17419f5fecf7cce07536a5e12f17a61a31d45add185e0e1635515834eca6abd8a6babeb89b8f879ff8cb90b60f3682a19a62403142f4901be3f932b8a44cac68 SHA512 5490b902ad42499657eca9031b396c70a82d3c523985601067e697758f2472d123c4e99b085b963e58888d99224fa2a441a140772c702d7cd60d6424b126bfc8
DIST gvmd-9.0.1.tar.gz 1446748 BLAKE2B 7b7b4e8e4224e7a24964f39157bd0535fb4e6405b2813da7c827f4705c4b5df4d953783a3e21950c9196aa5878a09ce6eec7b4d906cc13730e508b0aa5d4be61 SHA512 4c4f0e1fdd2255be1a96967d61d9066d8860aecc5959f04c559b1a248bcc54d9cb75facd0156e223d674f038718f1e8ba0ee6b36cdc8ed88efe480acd1aa54cf
diff --git a/net-analyzer/gvmd/files/gvmd-8.0.1-sbin.patch b/net-analyzer/gvmd/files/gvmd-8.0.1-sbin.patch
deleted file mode 100644
index bf21acb7b01..00000000000
--- a/net-analyzer/gvmd/files/gvmd-8.0.1-sbin.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/src/CMakeLists.txt 2019-07-17 17:11:52.000000000 +0300
-+++ b/src/CMakeLists.txt 2019-07-21 22:43:17.299106863 +0300
-@@ -248,12 +248,12 @@
- ## Install
-
- install (TARGETS ${BINARY_NAME}
-- RUNTIME DESTINATION ${SBINDIR}
-+ RUNTIME DESTINATION ${BINDIR}
- LIBRARY DESTINATION ${LIBDIR}
- ARCHIVE DESTINATION ${LIBDIR}/static)
-
- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/gvmd
-- DESTINATION ${SBINDIR})
-+ DESTINATION ${BINDIR})
-
- if (BACKEND STREQUAL POSTGRESQL)
- install (TARGETS gvm-pg-server
---- a/CMakeLists.txt 2019-07-22 11:31:13.430827400 +0300
-+++ b/CMakeLists.txt 2019-07-22 11:32:29.034765809 +0300
-@@ -571,17 +571,17 @@
- PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
-
- install (FILES ${CMAKE_BINARY_DIR}/tools/gvm-portnames-update
-- DESTINATION ${SBINDIR}
-+ DESTINATION ${BINDIR}
- PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
- GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-
- install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-scapdata-sync
-- DESTINATION ${SBINDIR}
-+ DESTINATION ${BINDIR}
- PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
- GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-
- install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-certdata-sync
-- DESTINATION ${SBINDIR}
-+ DESTINATION ${BINDIR}
- PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
- GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-
-@@ -593,13 +593,13 @@
- WORLD_READ WORLD_EXECUTE)
-
- install (FILES ${CMAKE_BINARY_DIR}/tools/gvm-migrate-to-postgres
-- DESTINATION ${SBINDIR}
-+ DESTINATION ${BINDIR}
- PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
- GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-
- if (BACKEND STREQUAL SQLITE3)
- install (FILES ${CMAKE_SOURCE_DIR}/tools/database-statistics-sqlite
-- DESTINATION ${SBINDIR}
-+ DESTINATION ${BINDIR}
- PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
- GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- endif (BACKEND STREQUAL SQLITE3)
diff --git a/net-analyzer/gvmd/files/gvmd-8.0.1-tmplock.patch b/net-analyzer/gvmd/files/gvmd-8.0.1-tmplock.patch
deleted file mode 100644
index 40b1e009557..00000000000
--- a/net-analyzer/gvmd/files/gvmd-8.0.1-tmplock.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/tools/greenbone-certdata-sync.in 2019-07-17 17:11:52.000000000 +0300
-+++ b/tools/greenbone-certdata-sync.in 2019-07-22 21:11:36.173099530 +0300
-@@ -494,13 +494,11 @@
- fi
- (
- flock -n 9
-- date > $LOCK_FILE
- if [ $? -eq 1 ] ; then
- log_notice "Sync in progress, exiting."
- exit 1
- fi
- sync_certdata
-- echo -n > $LOCK_FILE
--) 9>$LOCK_FILE
-+)
-
- exit 0
---- a/tools/greenbone-scapdata-sync.in 2019-07-17 17:11:52.000000000 +0300
-+++ b/tools/greenbone-scapdata-sync.in 2019-07-22 21:12:49.193161531 +0300
-@@ -517,13 +517,11 @@
- fi
- (
- flock -n 9
-- date > $LOCK_FILE
- if [ $? -eq 1 ] ; then
- log_notice "Sync in progress, exiting."
- exit 1
- fi
- sync_scapdata
-- echo -n > $LOCK_FILE
--) 9>$LOCK_FILE
-+)
-
- exit 0
diff --git a/net-analyzer/gvmd/gvmd-8.0.1.ebuild b/net-analyzer/gvmd/gvmd-8.0.1.ebuild
deleted file mode 100644
index 7289dcd5f82..00000000000
--- a/net-analyzer/gvmd/gvmd-8.0.1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager"
-HOMEPAGE="https://www.greenbone.net/en/"
-SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="extras postgres sqlite"
-REQUIRED_USE="|| ( postgres sqlite )"
-
-DEPEND="
- dev-libs/libgcrypt:0=
- dev-libs/libical
- >=net-analyzer/gvm-libs-10.0.1
- net-libs/gnutls:=[tools]
- extras? ( app-text/xmlstarlet
- dev-texlive/texlive-latexextra )
- postgres? ( dev-db/postgresql:* )
- sqlite? ( dev-db/sqlite:3 )"
-
-RDEPEND="
- ${DEPEND}
- ~net-analyzer/openvas-scanner-6.0.1"
-
-BDEPEND="
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- extras? ( app-doc/doxygen[dot]
- app-doc/xmltoman
- app-text/htmldoc
- dev-libs/libxslt
- )"
-
-PATCHES=(
- # Install exec. to /usr/bin instead of /usr/sbin
- "${FILESDIR}/${P}-sbin.patch"
- # Fix permissions for user gvm.
- "${FILESDIR}/${P}-tmplock.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
- # QA-Fix | Use correct FHS/Gentoo policy paths for 8.0.1
- sed -i -e "s*share/doc/gvm/html/*share/doc/gvmd-${PV}/html/*g" "$S"/doc/CMakeLists.txt || die
- sed -i -e "s*/doc/gvm/*/doc/gvmd-${PV}/*g" "$S"/CMakeLists.txt || die
- # QA-Fix | Remove !CLANG Doxygen warnings for 8.0.1
- if use extras; then
- if ! tc-is-clang; then
- local f
- for f in doc/*.in
- do
- sed -i \
- -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \
- -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \
- "${f}" || die "couldn't disable CLANG parsing"
- done
- fi
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- "-DLOCALSTATEDIR=${EPREFIX}/var"
- "-DSYSCONFDIR=${EPREFIX}/etc"
- )
- # Add release hardening flags for 8.0.1
- append-cflags -Wno-nonnull -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fstack-protector
- append-ldflags -Wl,-z,relro -Wl,-z,now
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- if use extras; then
- cmake_build -C "${BUILD_DIR}" doc
- cmake_build doc-full -C "${BUILD_DIR}" doc
- HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
- fi
- cmake_build rebuild_cache
-}
-
-src_install() {
- cmake_src_install
-
- dodir /etc/gvm
- insinto /etc/gvm
- doins -r "${FILESDIR}"/*sync*
-
- dodir /etc/gvm/sysconfig
- insinto /etc/gvm/sysconfig
- doins "${FILESDIR}/${PN}-daemon.conf"
-
- exeinto /etc/gvm
- doexe "${FILESDIR}"/gvmd-startpre.sh
-
- fowners -R gvm:gvm /etc/gvm
-
- newinitd "${FILESDIR}/${PN}.init" "${PN}"
- newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}"
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotate" "${PN}"
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-
- # Set proper permissions on required files/directories
- keepdir /var/lib/gvm/gvmd
- fowners -R gvm:gvm /var/lib/gvm
-}
diff --git a/net-analyzer/hping/files/bytesex.h.patch b/net-analyzer/hping/files/bytesex.h.patch
deleted file mode 100644
index 872321d41bf..00000000000
--- a/net-analyzer/hping/files/bytesex.h.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/bytesex.h
-+++ b/bytesex.h
-@@ -9,11 +9,15 @@
-
- #if defined(__i386__) \
- || defined(__alpha__) \
-+ || defined(__arm__) \
-+ || defined(__x86_64__) \
-+ || defined(__ia64__) \
- || (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__)))
- #define BYTE_ORDER_LITTLE_ENDIAN
- #elif defined(__mc68000__) \
- || defined (__sparc__) \
- || defined (__sparc) \
-+ || defined (__hppa__) \
- || defined (__PPC__) \
- || defined (__BIG_ENDIAN__) \
- || (defined(__mips__) && (defined(MIPSEB) || defined (__MIPSEB__)))
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index a70f7885063..e92368b9b6f 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1 @@
-DIST icinga2-2.11.6.tar.gz 7480970 BLAKE2B d247a4c0272227e0dfa2df46f91d84c7630c56df8d77d7de30aea715509b68fddbe74ef58c9b50acb4965e7108c3f9c23cf4e9c0f1a572763c34dd87cfaae1ec SHA512 e455d10612721ef6090256618c5a87e2f06e6284c2b2d137b85058bb5cdc30f3524fbcab5559acbe891e37d90f862c1b117115451bb3b59b8a2f67bb9d027e6e
-DIST icinga2-2.12.1.tar.gz 7532104 BLAKE2B addb3bb6f81cb41e1ec23e989d6151af6f39fdded5a76a791806114cc2ba46c786b5d6674e9e0e86eb701cb5132f766cdf3cbdfbbcc0f9263db3a7ba844705c6 SHA512 8c266db67fb7aa27dc86e9dc28fa0e1ff7b11260ed529d3963c5cf25a5230fc9f02d7d44076948fbde6e39e2cb02f2d99c2c5b72396154baf95aaa5eba461529
DIST icinga2-2.12.3.tar.gz 7534454 BLAKE2B 021f940b3885c90cc43b4708c83430685fdb692d5ce95ed0f667a95b7dd2f4817b30fb7b05f1e214ba3aa31cef806af0f83e68447ece94916d806fb95f66526e SHA512 28b87e03a8ffeb7a1d19ddf9555151b826f7bf1fd33b0139c2fc8abe7c89d66d96089d5b32d0aaccc3876040514b2bfbde9970416d5ec4ea3b023b17c0fb1799
diff --git a/net-analyzer/icinga2/icinga2-2.11.6.ebuild b/net-analyzer/icinga2/icinga2-2.11.6.ebuild
deleted file mode 100644
index bb0f2605e73..00000000000
--- a/net-analyzer/icinga2/icinga2-2.11.6.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.1.ebuild b/net-analyzer/icinga2/icinga2-2.12.1.ebuild
deleted file mode 100644
index ad2f31c9b0f..00000000000
--- a/net-analyzer/icinga2/icinga2-2.12.1.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/iptraf-ng/files/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch b/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch
deleted file mode 100644
index 8e01989fe6f..00000000000
--- a/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/tcptable.c
-+++ b/src/tcptable.c
-@@ -437,6 +437,8 @@ static char *tcplog_flowrate_msg(struct tcptableent *entry, char *buf,
- size_t bufsize)
- {
- time_t interval = time(NULL) - entry->conn_starttime;
-+ if (interval < 1)
-+ interval = 1;
-
- char rbuf[64];
- rate_print(entry->bcount / interval, rbuf, sizeof(rbuf));
diff --git a/net-analyzer/jffnms/Manifest b/net-analyzer/jffnms/Manifest
deleted file mode 100644
index e5923487549..00000000000
--- a/net-analyzer/jffnms/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jffnms-0.9.4.tgz 610758 BLAKE2B 2bbe122bae3d358e710895ebd1c38f28644260744d97f5ab88301dc5549c099c9af0931156d47ce0e616c0f6f84b04f2e7ae04f4d0efc8cc3ff72b01dc51e22c SHA512 4d0c4ed1fbf0107029d92b2ea8f0f02c46d532810dc58bf048c5ffaf79f7f24630101be8319876db1aee3356ced32e7cba2f2494bc8a92a635b0a4e6897c6fe7
diff --git a/net-analyzer/jffnms/jffnms-0.9.4-r1.ebuild b/net-analyzer/jffnms/jffnms-0.9.4-r1.ebuild
deleted file mode 100644
index c0957c2f5e8..00000000000
--- a/net-analyzer/jffnms/jffnms-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user
-
-DESCRIPTION="Network Management and Monitoring System"
-HOMEPAGE="http://www.jffnms.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mysql postgres snmp"
-
-RDEPEND="
- dev-lang/php[apache2,cli,gd,mysql?,postgres?,session,snmp,sockets,wddx]
- dev-php/PEAR-PEAR
- media-gfx/graphviz
- media-libs/gd
- net-analyzer/fping
- net-analyzer/net-snmp
- net-analyzer/nmap
- net-analyzer/rrdtool[graph]
- sys-apps/diffutils
-"
-
-pkg_setup() {
- enewgroup jffnms
- enewuser jffnms -1 /bin/bash -1 jffnms,apache
-}
-
-src_install() {
- local INSTALL_DIR="/opt/${PN}"
- local IMAGE_DIR="${D}${INSTALL_DIR}"
-
- insinto "${INSTALL_DIR}"
- doins -r *
-
- rm -f "${IMAGE_DIR}/LICENSE"
-
- # Clean up Windows related stuff
- rm -f "${IMAGE_DIR}"/*.win32.txt
- rm -rf "${IMAGE_DIR}"/docs/windows
- rm -rf "${IMAGE_DIR}"/engine/windows
-
- fowners -R jffnms:apache "${INSTALL_DIR}"
- fperms -R ug+rw "${INSTALL_DIR}"
-}
-
-pkg_postinst() {
- elog "${PN} has been partialy installed on your system. However you"
- elog "still need proceed with final installation and configuration."
- elog "You can visit https://wiki.gentoo.org/wiki/Jffnms in order"
- elog "to get detailed information on how to get jffnms up and running."
-}
diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest
index ed397cd02a2..2e7f18ffea1 100644
--- a/net-analyzer/linkchecker/Manifest
+++ b/net-analyzer/linkchecker/Manifest
@@ -1 +1,2 @@
DIST linkchecker-10.0.0_pre20200729.tar.gz 401694 BLAKE2B f1a0918c30b292e569fd3168eee152e63ba7266f0ef848a55601e0205d8b0521cb653db77c8dc7b5d1140b493c95e50d76acba44e961586159f2b691e6898353 SHA512 35c49ca5de06688667e39f4eb0d8a048e565fe460a4aff125a484e3966c62cbea95fd95154cb2b544c0f4987f66012793726cf890d604321ed83970654a318f6
+DIST linkchecker-10.0.1.tar.gz 512649 BLAKE2B f0373da6c1b4c18394500f32936065dca8b4a92532f5da6f15a4470c2e458df147009599939a41fc36f5ae4941c0fdd97aa9bf77a7237544f3df3bf5772ed884 SHA512 2d57092591187f62f7ae685b867ab02d08108ce3a687ea7da444e57cbe5e9f74220747beee322ccfec0ce4319c95cc37ba0908ba8fae6a8d88bdb0928d099099
diff --git a/net-analyzer/linkchecker/linkchecker-10.0.0_pre20200729.ebuild b/net-analyzer/linkchecker/linkchecker-10.0.0_pre20200729.ebuild
index 69dd0169165..bfeb0f9c4f7 100644
--- a/net-analyzer/linkchecker/linkchecker-10.0.0_pre20200729.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-10.0.0_pre20200729.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
PYTHON_REQ_USE="sqlite?"
inherit bash-completion-r1 distutils-r1 optfeature
diff --git a/net-analyzer/linkchecker/linkchecker-10.0.1.ebuild b/net-analyzer/linkchecker/linkchecker-10.0.1.ebuild
new file mode 100644
index 00000000000..ed64f325657
--- /dev/null
+++ b/net-analyzer/linkchecker/linkchecker-10.0.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit bash-completion-r1 distutils-r1 optfeature
+
+DESCRIPTION="Check websites for broken links"
+HOMEPAGE="https://github.com/linkcheck/linkchecker"
+
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/linkcheck/linkchecker.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/linkchecker/linkchecker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="sqlite"
+# requires libs not present in portage yet
+RESTRICT="test"
+
+RDEPEND="
+ dev-python/beautifulsoup[${PYTHON_USEDEP}]
+ dev-python/dnspython[${PYTHON_USEDEP}]
+ dev-python/pyxdg[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-9.3-bash-completion.patch"
+)
+
+DOCS=(
+ doc/changelog.txt
+ doc/upgrading.txt
+)
+
+python_install_all() {
+ distutils-r1_python_install_all
+ newbashcomp config/linkchecker-completion ${PN}
+}
+
+pkg_postinst() {
+ optfeature "bash-completion support" dev-python/argcomplete[${PYTHON_USEDEP}]
+ optfeature "Virus scanning" app-antivirus/clamav
+ optfeature "Geo IP support" dev-python/geoip-python[${PYTHON_USEDEP}]
+ optfeature "GNOME proxy settings support" dev-python/pygobject[${PYTHON_USEDEP}]
+}
diff --git a/net-analyzer/linkchecker/linkchecker-9999.ebuild b/net-analyzer/linkchecker/linkchecker-9999.ebuild
index a476b327ae9..79e7b5e8c15 100644
--- a/net-analyzer/linkchecker/linkchecker-9999.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
PYTHON_REQ_USE="sqlite?"
inherit bash-completion-r1 distutils-r1 optfeature
diff --git a/net-analyzer/masscan/Manifest b/net-analyzer/masscan/Manifest
index 29f988e17eb..244042d493e 100644
--- a/net-analyzer/masscan/Manifest
+++ b/net-analyzer/masscan/Manifest
@@ -1,3 +1,2 @@
-DIST masscan-1.0.4.tar.gz 343513 BLAKE2B e50789c8a2246c4109990e93c9c53cf68b2b555955f675e1a9acd4074c2b85773aba58f3644db1f98a88c4cff85cff5a9035f2fbc56978103458dc34e6dc353a SHA512 eb82d8ad4d6a5c77cf79197e18470a68f7c361f0785180d631e9625578e90af6ffdaa45b728349da5a1cb945a8f902541b8f708be8a4075737ccb06e948d6e2b
DIST masscan-1.0.5.tar.gz 353901 BLAKE2B 83145955b42f660788fdd7687b0a88ad84d6f31a4f99fc1fe4691f266f3c3492882334d9f0b4acf3c31d33950daedda56b6623cd3ba6ef9a27914613f09d485b SHA512 55d58234994ebea10bcb3f45a24cdb51b020350faa116aee3a48861a119f66c339d1f533c978f52e37ccf5266be6fd2802765f13461d94eb28ec8d18c68e2f88
-DIST masscan-1.3.0.tar.gz 451097 BLAKE2B 1d64a80345aa18cc0fdd00b5fca6708bcabded62571887e7171f6ac9e9f77f6d9f5bcca9c0ee04f67fcdf3ead1d6b242dc5129c6c9a94e560ac5380904a5a02a SHA512 dbf489d1fb1c882873071073ef8e65723bf3b805c794a5d13dfdcea539558f049845b5bc02ada1e313729954fe7ba29be727a777937b8e4d41778c9175d13824
+DIST masscan-1.3.2.tar.gz 463449 BLAKE2B 5509027c00871b2242e419ab7cf3f775d7ee46e1882a27c52447ca442432712d742c686acbf4daa7307b791da06effa23b8790fc0561a42a4e8ed4c2f0be7713 SHA512 b0709f6f937a0e86c6913407c3bc60187074395ffff7a7a2bb54b23824d72982510e44fb1b1e7dcba85c4ad25ab1a623597661db43d9046165ba865cd9bd5b27
diff --git a/net-analyzer/masscan/masscan-1.0.4.ebuild b/net-analyzer/masscan/masscan-1.0.4.ebuild
deleted file mode 100644
index fda9eec4132..00000000000
--- a/net-analyzer/masscan/masscan-1.0.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Mass IP port scanner"
-HOMEPAGE="https://github.com/robertdavidgraham/masscan"
-SRC_URI="https://github.com/robertdavidgraham/masscan/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="AGPL-3"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="net-libs/libpcap"
-
-src_prepare() {
- default
-
- sed -i \
- -e '/$(CC)/s!$(CFLAGS)!$(LDFLAGS) $(CFLAGS)!g' \
- -e '/^GITVER :=/s!= .(.*!=!g' \
- -e '/^SYS/s|gcc|$(CC)|g' \
- -e '/^CFLAGS =/{s,=,+=,;s,-g -ggdb,,;s,-O3,,;}' \
- Makefile || die
-
- tc-export CC
-}
-
-src_install() {
- dobin bin/masscan
-
- insinto /etc/masscan
- doins data/exclude.conf
- doins "${FILESDIR}"/masscan.conf
-
- mv doc/bot.{hml,html} || die
- dodoc doc/bot.html *.md
-
- doman doc/masscan.8
-}
diff --git a/net-analyzer/masscan/masscan-1.3.0.ebuild b/net-analyzer/masscan/masscan-1.3.2.ebuild
index 6a290f96f45..6a290f96f45 100644
--- a/net-analyzer/masscan/masscan-1.3.0.ebuild
+++ b/net-analyzer/masscan/masscan-1.3.2.ebuild
diff --git a/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild b/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild
index e19a12d4181..4c72d7daca6 100644
--- a/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild
+++ b/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit autotools
DESCRIPTION="MBrowse is a graphical MIB browser"
@@ -21,6 +22,7 @@ DEPEND="
RDEPEND="${DEPEND}"
DOCS=( AUTHORS README ChangeLog )
+
PATCHES=(
"${FILESDIR}"/${PN}-0.4.3-flags.patch
"${FILESDIR}"/${PN}-0.4.3-fno-common.patch
@@ -32,6 +34,5 @@ src_prepare() {
}
src_configure() {
- econf \
- --with-snmp-lib="${EPREFIX}/usr/$(get_libdir)"
+ econf --with-snmp-lib="${EPREFIX}/usr/$(get_libdir)"
}
diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
index 8576df0da90..81a3504ff20 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1 +1,2 @@
DIST monitoring-plugins-2.2.tar.gz 2461548 BLAKE2B 0f68b492e089c6dfd09db6aab78ab4490f2e8983677c70dda4c3800a06380c066865587536a44f135d0e314006ed81a757cbfbd918f53e009f9d2c50b8e58db0 SHA512 5f8cfa132891d6d96e69bee3f2c26f7d4546f572be6a18f25ea5d9069f162cb2e424361289a5c26bec60d7b63d28a269437fd6f25645903a1c142fdcbbf77f27
+DIST monitoring-plugins-2.3.tar.gz 2528556 BLAKE2B d8c8886aea900a172e5693de766edb6b7ef7aac5ee94fec1f5c14cb0e9873623b14a965cc8852abb4ed44934d5111a86e130e7c37201a03de42bc996797302de SHA512 926065667dff6c608ae5b7da39f6416bfc2443b9e1cdef68cd5d19be99da1b6fc6f23ef87b05731312b5d7ad76d01f0242fc9e544dbb4dd00dbafa0e27434d2e
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
deleted file mode 100644
index 3670a8df928..00000000000
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic multilib user
-
-DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu"
-HOMEPAGE="https://www.monitoring-plugins.org/"
-SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~sparc x86"
-IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba snmp ssh +ssl"
-
-# Most of the plugins use automagic dependencies, i.e. the plugin will
-# get built if the binary it uses is installed. For example, check_snmp
-# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
-# installed. End result: most of our runtime dependencies are required
-# at build time as well.
-#
-# REAL_DEPEND contains the dependencies that are actually needed to
-# build. DEPEND contains those plus the automagic dependencies.
-#
-REAL_DEPEND="dev-lang/perl
- ldap? ( net-nds/openldap )
- mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql:= )
- ssl? (
- !gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
- gnutls? ( net-libs/gnutls )
- )
- radius? ( net-dialup/freeradius-client )"
-
-DEPEND="${REAL_DEPEND}
- dns? ( net-dns/bind-tools )
- game? ( games-util/qstat )
- fping? ( net-analyzer/fping )
- samba? ( net-fs/samba )
- ssh? ( net-misc/openssh )
- snmp? ( dev-perl/Net-SNMP
- net-analyzer/net-snmp[-minimal] )"
-
-# Basically everything collides with nagios-plugins.
-RDEPEND="${DEPEND}
- !net-analyzer/nagios-plugins"
-
-# At least one test is interactive.
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" )
-
-src_configure() {
- append-flags -fno-strict-aliasing
-
- # Use an array to prevent econf from mangling the ping args.
- local myconf=()
-
- if use ssl; then
- myconf+=( $(use_with !gnutls openssl /usr)
- $(use_with gnutls gnutls /usr) )
- else
- myconf+=( --without-openssl )
- myconf+=( --without-gnutls )
- fi
-
- # The autodetection for these two commands can hang if localhost is
- # down or ICMP traffic is filtered. Bug #468296.
- myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" )
-
- if use ipv6; then
- myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" )
- fi
-
- econf \
- $(use_with mysql) \
- $(use_with ipv6) \
- $(use_with ldap) \
- $(use_with postgres pgsql /usr) \
- $(use_with radius) \
- "${myconf[@]}" \
- --libexecdir="/usr/$(get_libdir)/nagios/plugins" \
- --sysconfdir="/etc/nagios"
-}
-
-DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
- NEWS README REQUIREMENTS SUPPORT THANKS )
-
-pkg_preinst() {
- enewgroup nagios
- enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-pkg_postinst() {
- elog "This ebuild has a number of USE flags that determine what you"
- elog "are able to monitor. Depending on what you want to monitor, some"
- elog "or all of these USE flags need to be set."
- elog
- elog "The plugins are installed in ${EROOT%/}/usr/$(get_libdir)/nagios/plugins"
-}
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild
index cf357d910b2..b91919ddf88 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit eutils flag-o-matic multilib user
+inherit eutils flag-o-matic multilib
DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu"
HOMEPAGE="https://www.monitoring-plugins.org/"
@@ -11,8 +11,8 @@ SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 sparc x86"
-IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba snmp ssh +ssl"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+IUSE="curl gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba snmp ssh +ssl"
# Most of the plugins use automagic dependencies, i.e. the plugin will
# get built if the binary it uses is installed. For example, check_snmp
@@ -24,8 +24,12 @@ IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba snmp
# build. DEPEND contains those plus the automagic dependencies.
#
REAL_DEPEND="dev-lang/perl
+ curl? (
+ dev-libs/uriparser
+ net-misc/curl
+ )
ldap? ( net-nds/openldap )
- mysql? ( dev-db/mysql-connector-c:= )
+ mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
postgres? ( dev-db/postgresql:= )
ssl? (
!gnutls? (
@@ -47,6 +51,8 @@ DEPEND="${REAL_DEPEND}
# Basically everything collides with nagios-plugins.
RDEPEND="${DEPEND}
+ acct-group/nagios
+ acct-user/nagios
!net-analyzer/nagios-plugins"
# At least one test is interactive.
@@ -70,13 +76,15 @@ src_configure() {
# The autodetection for these two commands can hang if localhost is
# down or ICMP traffic is filtered. Bug #468296.
- myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" )
+ myconf+=( --with-ping-command="/bin/ping -4 -n -U -w %d -c %d %s" )
if use ipv6; then
- myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" )
+ myconf+=( --with-ping6-command="/bin/ping -6 -n -U -w %d -c %d %s" )
fi
econf \
+ $(use_with curl libcurl) \
+ $(use_with curl uriparser) \
$(use_with mysql) \
$(use_with ipv6) \
$(use_with ldap) \
@@ -90,15 +98,10 @@ src_configure() {
DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
NEWS README REQUIREMENTS SUPPORT THANKS )
-pkg_preinst() {
- enewgroup nagios
- enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
pkg_postinst() {
elog "This ebuild has a number of USE flags that determine what you"
elog "are able to monitor. Depending on what you want to monitor, some"
elog "or all of these USE flags need to be set."
elog
- elog "The plugins are installed in ${EROOT%/}/usr/$(get_libdir)/nagios/plugins"
+ elog "The plugins are installed in ${EROOT}/usr/$(get_libdir)/nagios/plugins"
}
diff --git a/net-analyzer/multimon-ng/Manifest b/net-analyzer/multimon-ng/Manifest
index 59bc5904a3f..cea5f08e846 100644
--- a/net-analyzer/multimon-ng/Manifest
+++ b/net-analyzer/multimon-ng/Manifest
@@ -1 +1 @@
-DIST multimon-ng-1.1.8.tar.gz 2430488 BLAKE2B 82bc0be58e2f7d596363fc916c11584cbd1335e7984194af22955587877ad1cba2a0cca819467061bb18b97ca70f5c2adfd73ccbf159fbc27348d59429959ada SHA512 9cf93362555e5dc465a9ec60dff27b9875879afd954e810069022b3c003eca4c3ab2a833f1c00fef877175bc72e2d378bbb53380ada54542ae29d257a7d2bd1b
+DIST multimon-ng-1.1.9.tar.gz 2433964 BLAKE2B c2d72ba3b19ba162cb6fa9b8c1a66d950f3ed0acb36117ce070fbb9ede1837225b7349f473477020eea0ba727b6ea088688dbfaa50257702f337f1270ff5a233 SHA512 a30d8933b6cd0150a24a70544c03fa418bb5bdb00ab5531692f7153b59593455a915078a7417fb08c815b140f4c25786a9c412503dc50bead54f9dda304c053e
diff --git a/net-analyzer/multimon-ng/multimon-ng-1.1.8.ebuild b/net-analyzer/multimon-ng/multimon-ng-1.1.9.ebuild
index da7b10babdb..f2011e9ff0d 100644
--- a/net-analyzer/multimon-ng/multimon-ng-1.1.8.ebuild
+++ b/net-analyzer/multimon-ng/multimon-ng-1.1.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake-utils
+inherit cmake
DESCRIPTION="a fork of multimon, decodes multiple digital transmission modes"
HOMEPAGE="https://github.com/EliasOenal/multimon-ng"
@@ -11,7 +11,6 @@ HOMEPAGE="https://github.com/EliasOenal/multimon-ng"
if [[ ${PV} == 9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/EliasOenal/multimon-ng.git"
- KEYWORDS=""
else
SRC_URI="https://github.com/EliasOenal/multimonNG/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~x86"
@@ -24,9 +23,10 @@ IUSE="pulseaudio X"
DEPEND="pulseaudio? ( media-sound/pulseaudio )
X? ( x11-libs/libX11 )"
RDEPEND="${DEPEND}"
+PDEPEND="media-sound/sox"
src_prepare() {
use pulseaudio || sed -i '/find_package( PulseAudio )/d' CMakeLists.txt
use X || sed -i '/find_package( X11 )/d' CMakeLists.txt
- cmake-utils_src_prepare
+ cmake_src_prepare
}
diff --git a/net-analyzer/multimon-ng/multimon-ng-9999.ebuild b/net-analyzer/multimon-ng/multimon-ng-9999.ebuild
index da7b10babdb..f2011e9ff0d 100644
--- a/net-analyzer/multimon-ng/multimon-ng-9999.ebuild
+++ b/net-analyzer/multimon-ng/multimon-ng-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake-utils
+inherit cmake
DESCRIPTION="a fork of multimon, decodes multiple digital transmission modes"
HOMEPAGE="https://github.com/EliasOenal/multimon-ng"
@@ -11,7 +11,6 @@ HOMEPAGE="https://github.com/EliasOenal/multimon-ng"
if [[ ${PV} == 9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/EliasOenal/multimon-ng.git"
- KEYWORDS=""
else
SRC_URI="https://github.com/EliasOenal/multimonNG/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~x86"
@@ -24,9 +23,10 @@ IUSE="pulseaudio X"
DEPEND="pulseaudio? ( media-sound/pulseaudio )
X? ( x11-libs/libX11 )"
RDEPEND="${DEPEND}"
+PDEPEND="media-sound/sox"
src_prepare() {
use pulseaudio || sed -i '/find_package( PulseAudio )/d' CMakeLists.txt
use X || sed -i '/find_package( X11 )/d' CMakeLists.txt
- cmake-utils_src_prepare
+ cmake_src_prepare
}
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 3f9d2969e35..760efd7fc83 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -1,8 +1,6 @@
DIST munin-2.0.59-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
DIST munin-2.0.59.tar.gz 2276011 BLAKE2B 0681cd838daaa056418258d473825642e2aa6b7a3ac7a435859033a467351145be73df327d3149b46c53f5a04c602bea57bc5af428cafb7b5bf1e9c780915ddf SHA512 5597db797f7a0de3581a17be13b079a3fd1e50903014d67d81a262e921fdfca84eee8ec65e3927438db0e01525d16faaabc7e3f7d4cad1a73e7e14002b10478f
-DIST munin-2.0.64-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
-DIST munin-2.0.64.tar.gz 2256519 BLAKE2B 6a48327672ab7cf20be7a47d489467d0b888e00c01ca0ce8b0bc47a03b63087cf61de4aaf8ae0f18d8e5ef95c49f85092d719ae7de6fe51bcb5e60d138caa519 SHA512 d5f8fb04a601b053844b04850416f09b9f682b83298e35b973ee495cc60477720dc0483f73809db5ca24ba6b9fa1520f026a3f187db01b0c946cce756e4e401f
-DIST munin-2.0.65-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
-DIST munin-2.0.65.tar.gz 2255611 BLAKE2B b506dd12e527bd42f7f8cd9766f260b68bdd08114261b6e1e35316d12d501ac86d1aa7f4c461ab4f3f73490bafde870420e69fbed68f2b663e5e1e011b7bb4ca SHA512 8a0dc93de878e1d502467f4e8589a0af2b809ec7282033534de2fd17b842bbf864d900136516a668a8e3f80e99215062620a503c5f664c799892f77950b4859a
DIST munin-2.0.66-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
DIST munin-2.0.66.tar.gz 2257034 BLAKE2B b0c5412f32a54857acbe4baa5cf1447c7cf7053cad79ac09216ddc1aa8696ced813c3ad373517a8a48c5a08fae76154a0dda069efc036b7773e0557f078f8ff2 SHA512 928f727c558db6699524f3f3c2822404638e10e95678f4f211ec445ad6fbbdb7685a3d28343dbce616f60ced3cabff3b44e21a0a0e84b1d05032d295b81afab0
+DIST munin-2.0.67-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
+DIST munin-2.0.67.tar.gz 2258670 BLAKE2B 374b336403433d612b7998c77e6eb4f0eb68ffda4204ae6bc3c303f7667154c2ce606ffa27226c5644f3e6f71655c939b749da925136f59be4762891af49e2b1 SHA512 a8381491dfa15572438d9acda7a09feb0c3918ebe49e7bcfce5c172b36b4a5a0472bd6d06f5fad41270af0510b3fe115509d146f372df7fa47ed4aa1ec5f95d4
diff --git a/net-analyzer/munin/munin-2.0.65.ebuild b/net-analyzer/munin/munin-2.0.65.ebuild
deleted file mode 100644
index acaf9f6d9f0..00000000000
--- a/net-analyzer/munin/munin-2.0.65.ebuild
+++ /dev/null
@@ -1,417 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PATCHSET=1
-
-inherit java-pkg-opt-2 systemd
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin-monitoring.org/"
-SRC_URI="
- https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
-REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
-RESTRICT="!test? ( test )"
-
-# Upstream's listing of required modules is NOT correct!
-# Some of the postgres plugins use DBD::Pg, while others call psql directly.
-# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
-# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
-DEPEND_COM="
- acct-user/munin
- acct-user/munin-async
- acct-group/munin
- dev-lang/perl:=[berkdb]
- dev-perl/DBI
- dev-perl/Date-Manip
- dev-perl/File-Copy-Recursive
- dev-perl/List-MoreUtils
- dev-perl/Log-Log4perl
- dev-perl/Net-CIDR
- dev-perl/Net-DNS
- dev-perl/Net-Netmask
- dev-perl/Net-SNMP
- dev-perl/Net-Server[ipv6(-)?]
- virtual/perl-Digest-MD5
- virtual/perl-Getopt-Long
- virtual/perl-MIME-Base64
- virtual/perl-Storable
- virtual/perl-Text-Balanced
- virtual/perl-Time-HiRes
- apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
- asterisk? ( dev-perl/Net-Telnet )
- cgi? (
- dev-perl/FCGI
- dev-perl/CGI-Fast
- )
- dhcpd? (
- >=net-misc/dhcp-3[server]
- dev-perl/Net-IP
- dev-perl/HTTP-Date
- )
- doc? ( dev-python/sphinx )
- http? ( dev-perl/libwww-perl )
- irc? ( dev-perl/Net-IRC )
- ldap? ( dev-perl/perl-ldap )
- kernel_linux? ( sys-process/procps )
- memcached? ( dev-perl/Cache-Memcached )
- mysql? (
- virtual/mysql
- dev-perl/Cache-Cache
- dev-perl/DBD-mysql
- )
- postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
- ssl? ( dev-perl/Net-SSLeay )
- syslog? ( virtual/perl-Sys-Syslog )
- !minimal? (
- dev-perl/HTML-Template
- dev-perl/IO-Socket-INET6
- dev-perl/URI
- >=net-analyzer/rrdtool-1.3[graph,perl]
- virtual/ssh
- )
- "
-
-# Keep this seperate, as previous versions have had other deps here
-DEPEND="${DEPEND_COM}
- dev-perl/Module-Build
- java? ( >=virtual/jdk-1.5 )
- test? (
- dev-perl/Test-Deep
- dev-perl/Test-Exception
- dev-perl/Test-LongString
- dev-perl/Test-Differences
- dev-perl/Test-MockModule
- dev-perl/Test-MockObject
- dev-perl/File-Slurp
- dev-perl/IO-stringy
- dev-perl/IO-Socket-INET6
- )"
-RDEPEND="${DEPEND_COM}
- virtual/awk
- ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
- java? (
- >=virtual/jre-1.5
- || ( net-analyzer/netcat net-analyzer/openbsd-netcat )
- )
- !minimal? (
- virtual/cron
- media-fonts/dejavu
- )
- selinux? ( sec-policy/selinux-munin )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- echo ${PV} > RELEASE || die
-
- eapply "${WORKDIR}"/patches/*.patch
-
- eapply_user
-
- java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
- local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
- use cgi || cgidir="${T}/useless/cgi-bin"
-
- local cgiuser=$(usex apache2 apache munin)
-
- cat >> "${S}"/Makefile.config <<- EOF
- PREFIX=\$(DESTDIR)/usr
- CONFDIR=\$(DESTDIR)/etc/munin
- DOCDIR=${T}/useless/doc
- MANDIR=\$(PREFIX)/share/man
- LIBDIR=\$(PREFIX)/libexec/munin
- HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
- CGIDIR=${cgidir}
- CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
- CGIUSER=${cgiuser}
- DBDIR=\$(DESTDIR)/var/lib/munin
- DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
- SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
- LOGDIR=\$(DESTDIR)/var/log/munin
- PERLLIB=\$(DESTDIR)$(perl -V:vendorlib | cut -d"'" -f2)
- JCVALID=$(usex java yes no)
- STATEDIR=\$(DESTDIR)/run/munin
- EOF
-}
-
-# parallel make and install need to be fixed before, and I haven't
-# gotten around to do so yet.
-src_compile() {
- emake -j1
- use doc && emake -C doc html
-}
-
-src_test() {
- if [[ ${EUID} == 0 ]]; then
- eerror "You cannot run tests as root."
- eerror "Please enable FEATURES=userpriv before proceeding."
- return 1
- fi
-
- local testtargets="test-common test-node test-plugins"
- use minimal || testtargets+=" test-master"
-
- LC_ALL=C emake -j1 ${testtargets}
-}
-
-src_install() {
- local dirs="
- /var/log/munin
- /var/lib/munin/plugin-state
- /var/lib/munin-node/plugin-state
- /var/www/localhost/htdocs/munin
- /etc/munin/plugin-conf.d
- /etc/munin/plugins"
- use minimal || dirs+=" /etc/munin/munin-conf.d/"
-
- keepdir ${dirs}
- fowners munin:munin ${dirs}
-
- # parallel install doesn't work and it's also pointless to have this
- # run in parallel for now (because it uses internal loops).
- emake -j1 CHOWN=true DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
-
- # we remove /run from the install, as it's not the package's to deal
- # with.
- rm -rf "${D}"/run || die
-
- # remove the plugins for non-Gentoo package managers; use -f so that
- # it doesn't fail when installing on non-Linux platforms.
- rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
-
- insinto /etc/munin/plugin-conf.d/
- newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
-
- newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
- newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
-
- newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
-
- dodir /usr/lib/tmpfiles.d
- cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF
- d /run/munin 0700 munin munin - -
- EOF
-
- systemd_dounit "${FILESDIR}"/munin-async.service
- systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
- systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
- systemd_dounit "${FILESDIR}"/munin-node.service
-
- cat >> "${T}"/munin.env <<- EOF
- CONFIG_PROTECT=/var/spool/munin-async/.ssh
- EOF
- newenvd "${T}"/munin.env 50munin
-
- dodoc README ChangeLog INSTALL
- if use doc; then
- cd "${S}"/doc/_build/html || die
- docinto html
- dodoc -r *
- cd "${S}" || die
- fi
-
- dodir /etc/logrotate.d/
- sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \
- "${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
-
- dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
-
- if use syslog; then
- sed -i -e '/log_file/s| .*| Sys::Syslog|' \
- "${D}"/etc/munin/munin-node.conf || die
- fi
-
- # Use a simpler pid file to avoid trouble with /run in tmpfs. The
- # munin-node service is ran as user root, and only later drops
- # privileges.
- sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
- "${D}"/etc/munin/munin-node.conf || die
-
- keepdir /var/spool/munin-async/.ssh
- touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
- fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
- fperms 0750 /var/spool/munin-async{,/.ssh}
- fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
-
- if use minimal; then
- # This requires the presence of munin-update, which is part of
- # the non-minimal install...
- rm "${D}"/usr/libexec/munin/plugins/munin_stats
- else
- # remove font files so that we don't have to keep them around
- rm "${D}"/usr/libexec/${PN}/*.ttf || die
-
- if use cgi; then
- sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
-
- keepdir /var/cache/munin-cgi
- touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
- fowners $(usex apache2 apache munin) \
- /var/cache/munin-cgi \
- /var/log/munin/munin-cgi-{graph,html}.log
-
- if use apache2; then
- insinto /etc/apache2/vhosts.d
- newins "${FILESDIR}"/munin.apache.include munin.include
- newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
- fi
- else
- sed \
- -e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
- -i "${D}"/etc/munin/munin.conf || die
- fi
-
- keepdir /var/lib/munin/.ssh
- cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
- IdentityFile /var/lib/munin/.ssh/id_ecdsa
- IdentityFile /var/lib/munin/.ssh/id_rsa
- EOF
-
- fowners munin:munin /var/lib/munin/.ssh/{,config}
- fperms go-rwx /var/lib/munin/.ssh/{,config}
-
- dodir /usr/share/${PN}
- cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
- # Force the shell to bash
- SHELL=/bin/bash
- # Mail reports to root@, not munin@
- MAILTO=root
-
- # This runs the munin task every 5 minutes.
- */5 * * * * /usr/bin/munin-cron
-
- # Alternatively, this route works differently
- # Update once a minute (for busy sites)
- #*/1 * * * * /usr/libexec/munin/munin-update
- ## Check for limit excess every 2 minutes
- #*/2 * * * * /usr/libexec/munin/munin-limits
- ## Update graphs every 5 minutes
- #*/5 * * * * nice /usr/libexec/munin/munin-graph
- ## Update HTML pages every 15 minutes
- #*/15 * * * * nice /usr/libexec/munin/munin-html
- EOF
-
- cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
- # Mail reports to root@, not munin@, only execute one at a time
- !mailto(root),serial(true)
-
- # This runs the munin task every 5 minutes.
- @ 5 /usr/bin/munin-cron
-
- # Alternatively, this route works differently
- # Update once a minute (for busy sites)
- #@ 1 /usr/libexec/munin/munin-update
- ## Check for limit excess every 2 minutes
- #@ 2 /usr/libexec/munin/munin-limits
- ## Update graphs every 5 minutes
- #@ 5 nice /usr/libexec/munin/munin-graph
- ## Update HTML pages every 15 minutes
- #@ 15 nice /usr/libexec/munin/munin-html
- EOF
-
- # remove .htaccess file
- find "${D}" -name .htaccess -delete || die
- fi
-}
-
-pkg_config() {
- if use minimal; then
- einfo "Nothing to do."
- return 0
- fi
-
- einfo "Press enter to install the default crontab for the munin master"
- einfo "installation from /usr/share/${PN}/f?crontab"
- einfo "If you have a large site, you may wish to customize it."
- read
-
- ebegin "Setting up cron ..."
- if has_version sys-process/fcron; then
- fcrontab - -u munin < /usr/share/${PN}/fcrontab
- else
- # dcron is very fussy about syntax
- # the following is the only form that works in BOTH dcron and vixie-cron
- crontab - -u munin < /usr/share/${PN}/crontab
- fi
- eend $?
-
- einfo "Press enter to set up the SSH keys used for SSH transport"
- read
-
- # generate one rsa (for legacy) and one ecdsa (for new systems)
- ssh-keygen -t rsa \
- -f /var/lib/munin/.ssh/id_rsa -N '' \
- -C "created by portage for ${CATEGORY}/${PN}" || die
- ssh-keygen -t ecdsa \
- -f /var/lib/munin/.ssh/id_ecdsa -N '' \
- -C "created by portage for ${CATEGORY}/${PN}" || die
- chown -R munin:munin /var/lib/munin/.ssh || die
- chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
-
- einfo "Your public keys are available in "
- einfo " /var/lib/munin/.ssh/id_rsa.pub"
- einfo " /var/lib/munin/.ssh/id_ecdsa.pub"
- einfo "and follows for convenience"
- echo
- cat /var/lib/munin/.ssh/id_*.pub
-}
-
-pkg_postinst() {
- elog "Please follow the munin documentation to set up the plugins you"
- elog "need, afterwards start munin-node."
- elog ""
- elog "To make use of munin-async, make sure to set up the corresponding"
- elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
- elog ""
- if ! use minimal; then
- elog "Please run"
- elog " emerge --config net-analyzer/munin"
- elog "to automatically configure munin's cronjobs as well as generate"
- elog "passwordless SSH keys to be used with munin-async."
- fi
- elog ""
- elog "Further information about setting up Munin in Gentoo can be found"
- elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
-
- if use cgi; then
- chown $(usex apache2 apache munin) \
- "${ROOT}"/var/cache/munin-cgi \
- "${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
-
- if use apache2; then
- elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
- elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
- elog "host you want it to be served."
- elog "If you want to enable CGI-based HTML as well, you have to add to"
- elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
- else
- elog "Effective CGI support has just been added in 2.0.7-r6."
- elog "Documentation on how to use it is still sparse."
- fi
- fi
-
- # we create this here as we don't want Portage to check /run
- # symlinks but we still need this to be present before the reboot.
- if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
- mkdir "${ROOT}"/run/munin
- chown munin:munin "${ROOT}"/run/munin
- chmod 0700 "${ROOT}"/run/munin
- fi
-}
diff --git a/net-analyzer/munin/munin-2.0.66.ebuild b/net-analyzer/munin/munin-2.0.66.ebuild
index d589b34da0d..7a5621b5deb 100644
--- a/net-analyzer/munin/munin-2.0.66.ebuild
+++ b/net-analyzer/munin/munin-2.0.66.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
RESTRICT="!test? ( test )"
diff --git a/net-analyzer/munin/munin-2.0.64.ebuild b/net-analyzer/munin/munin-2.0.67.ebuild
index acaf9f6d9f0..d589b34da0d 100644
--- a/net-analyzer/munin/munin-2.0.64.ebuild
+++ b/net-analyzer/munin/munin-2.0.67.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1.ebuild b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1.ebuild
index 52195f5d261..a509978abdb 100644
--- a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1.ebuild
+++ b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_7,3_8} )
DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r1.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
index b345507323e..90f596a5cc8 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.6-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit toolchain-funcs
+inherit systemd toolchain-funcs
MY_P="${PN/-core}-${PV}"
DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
@@ -108,6 +108,9 @@ src_configure() {
fi
fi
+ # We pass "unknown" as the init type because we don't want it to
+ # guess. Later on, we'll manually install both OpenRC and systemd
+ # services.
econf ${myconf} \
--prefix="${EPREFIX}/usr" \
--bindir="${EPREFIX}/usr/sbin" \
@@ -115,7 +118,8 @@ src_configure() {
--sysconfdir="${EPREFIX}/etc/nagios" \
--libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins" \
--with-cgibindir="${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin" \
- --with-webdir="${EPREFIX}/usr/share/nagios/htdocs"
+ --with-webdir="${EPREFIX}/usr/share/nagios/htdocs" \
+ --with-init-type="unknown"
# The paths in the web server configuration files need to match
# those passed to econf above.
@@ -198,7 +202,13 @@ src_install() {
doins "${WORKDIR}/${GENTOO_ICONS}"/*.*
fi
+ # The ./configure script for nagios detects the init system on the
+ # build host, which is wrong for all sorts of reasons. We've gone
+ # to great lengths above to avoid running "install-init" -- even
+ # indirectly -- and so now we must install whatever service files
+ # we need by hand.
newinitd startup/openrc-init nagios
+ systemd_newunit startup/default-service nagios.service
if use web ; then
if use apache2 ; then
diff --git a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r1.ebuild b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r1.ebuild
index 48966a0e20d..24f73888462 100644
--- a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r1.ebuild
+++ b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+PYTHON_COMPAT=( python3_7 python3_8 )
DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1
diff --git a/net-analyzer/nagstamon/nagstamon-3.4.1-r1.ebuild b/net-analyzer/nagstamon/nagstamon-3.4.1-r1.ebuild
index 93f2833540e..6ec6a499d7a 100644
--- a/net-analyzer/nagstamon/nagstamon-3.4.1-r1.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-3.4.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
inherit python-r1 distutils-r1
diff --git a/net-analyzer/nbtscan/files/nbtscan-1.5.1-gentoo.patch b/net-analyzer/nbtscan/files/nbtscan-1.5.1-gentoo.patch
deleted file mode 100644
index dbf2457bc29..00000000000
--- a/net-analyzer/nbtscan/files/nbtscan-1.5.1-gentoo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -11,10 +11,10 @@
- BINDIR = @bindir@
-
- nbtscan: $(OBJECTS)
-- $(CC) $(CFLAGS) -o nbtscan $(OBJECTS) $(LIBS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o nbtscan $(OBJECTS) $(LIBS)
-
- install:
-- $(INSTALL) $(TARGET) $(BINDIR)/$(TARGET)
-+ $(INSTALL) $(TARGET) $(DESTDIR)/$(BINDIR)/$(TARGET)
-
- nbtscan.o: nbtscan.c statusq.h range.h list.h
- $(CC) $(CFLAGS) $(DEFS) -c nbtscan.c
diff --git a/net-analyzer/nbtscan/files/nbtscan-1.5.1-includes-declarations.patch b/net-analyzer/nbtscan/files/nbtscan-1.5.1-includes-declarations.patch
deleted file mode 100644
index a585d4495fb..00000000000
--- a/net-analyzer/nbtscan/files/nbtscan-1.5.1-includes-declarations.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/list.h
-+++ b/list.h
-@@ -19,3 +19,5 @@
- int compare(struct list_item* item1, struct list_item* item2);
-
- int insert(struct list* lst, unsigned long content);
-+
-+int in_list(struct list* lst, unsigned long content);
---- a/nbtscan.c
-+++ b/nbtscan.c
-@@ -5,6 +5,8 @@
- #include <stdlib.h>
- #include <sys/time.h>
- #include <string.h>
-+#include <ctype.h>
-+#include <unistd.h>
- #if HAVE_STDINT_H
- #include <stdint.h>
- #endif
---- a/statusq.h
-+++ b/statusq.h
-@@ -103,4 +103,10 @@
- char* service_name;
- } nb_service_t ;
-
-+char* getnbservicename(my_uint8_t service, int unique, char* name);
-+
-+struct nb_host_info* parse_response(char* buff, int buffsize);
-+
-+int send_query(int sock, struct in_addr dest_addr, my_uint32_t rtt_base);
-+
- #endif /* STATUSQ_H */
---- a/statusq.c
-+++ b/statusq.c
-@@ -29,6 +29,7 @@
- #include <sys/time.h>
- #include "statusq.h"
- #include <string.h>
-+#include <ctype.h>
- #include <stdio.h>
- #include <stddef.h>
- #include "errors.h"
diff --git a/net-analyzer/nbtscan/files/nbtscan-1.5.1-script-whitespace.patch b/net-analyzer/nbtscan/files/nbtscan-1.5.1-script-whitespace.patch
deleted file mode 100644
index 4aca976dcd3..00000000000
--- a/net-analyzer/nbtscan/files/nbtscan-1.5.1-script-whitespace.patch
+++ /dev/null
@@ -1,119 +0,0 @@
---- a/nbtscan.c
-+++ b/nbtscan.c
-@@ -86,7 +86,7 @@
- int d_print_hostinfo(struct in_addr addr, const struct nb_host_info* hostinfo) {
- int i;
- unsigned char service; /* 16th byte of NetBIOS name */
-- char name[16];
-+ char comp_name[16];
-
- printf("\nPacket dump for Host %s:\n\n", inet_ntoa(addr));
- if(hostinfo->is_broken) printf("Incomplete packet, %d bytes long.\n", hostinfo->is_broken);
-@@ -110,9 +110,9 @@
- printf("Names received:\n");
- for(i=0; i< hostinfo->header->number_of_names; i++) {
- service = hostinfo->names[i].ascii_name[15];
-- strncpy(name, hostinfo->names[i].ascii_name, 15);
-- name[16]=0;
-- printf("%-17s Service: 0x%02x Flags: 0x%04x\n", name, service, hostinfo->names[i].rr_flags);
-+ strncpy(comp_name, hostinfo->names[i].ascii_name, 15);
-+ comp_name[15]=0;
-+ printf("%-17s Service: 0x%02x Flags: 0x%04x\n", comp_name, service, hostinfo->names[i].rr_flags);
- }
- };
-
-@@ -147,9 +147,9 @@
-
-
- int v_print_hostinfo(struct in_addr addr, const struct nb_host_info* hostinfo, char* sf, int hr) {
-- int i, unique;
-+ int i, j, unique;
- my_uint8_t service; /* 16th byte of NetBIOS name */
-- char name[16];
-+ char comp_name[16];
- char* sname;
-
- if(!sf) {
-@@ -163,20 +163,27 @@
- if(hostinfo->header && hostinfo->names) {
- for(i=0; i< hostinfo->header->number_of_names; i++) {
- service = hostinfo->names[i].ascii_name[15];
-- strncpy(name, hostinfo->names[i].ascii_name, 15);
-- name[16]=0;
-+ strncpy(comp_name, hostinfo->names[i].ascii_name, 15);
-+
-+ // Eliminate trailing spaces
-+ for(j=0; j < 15; j++) {
-+ if (comp_name[j] == ' ')
-+ break;
-+ }
-+ comp_name[j] = 0;
-+
- unique = !(hostinfo->names[i].rr_flags & 0x0080);
- if(sf) {
-- printf("%s%s%s%s", inet_ntoa(addr), sf, name, sf);
-- if(hr) printf("%s\n", (char*)getnbservicename(service, unique, name));
-+ printf("%s%s%s%s", inet_ntoa(addr), sf, comp_name, sf);
-+ if(hr) printf("%s\n", (char*)getnbservicename(service, unique, comp_name));
- else {
- printf("%02x", service);
- if(unique) printf("U\n");
- else printf("G\n");
- }
- } else {
-- printf("%-17s", name);
-- if(hr) printf("%s\n", (char*)getnbservicename(service, unique, name));
-+ printf("%-17s", comp_name);
-+ if(hr) printf("%s\n", (char*)getnbservicename(service, unique, comp_name));
- else {
- printf("<%02x>", service);
- if(unique) printf(" UNIQUE\n");
-@@ -199,7 +206,7 @@
- };
-
- int print_hostinfo(struct in_addr addr, struct nb_host_info* hostinfo, char* sf) {
-- int i;
-+ int i,j;
- unsigned char service; /* 16th byte of NetBIOS name */
- char comp_name[16], user_name[16];
- int is_server=0;
-@@ -215,7 +222,13 @@
- if(service == 0 && unique && first_name) {
- /* Unique name, workstation service - this is computer name */
- strncpy(comp_name, hostinfo->names[i].ascii_name, 15);
-- comp_name[15] = 0;
-+
-+ // Eliminate trailing spaces
-+ for(j=0; j < 15; j++) {
-+ if (comp_name[j] == ' ')
-+ break;
-+ }
-+ comp_name[j] = 0;
- first_name = 0;
- };
- if(service == 0x20 && unique) {
-@@ -252,7 +265,7 @@
- /* If l is true adds #PRE to each line of output (for lmhosts) */
-
- int l_print_hostinfo(struct in_addr addr, struct nb_host_info* hostinfo, int l) {
-- int i;
-+ int i,j;
- unsigned char service; /* 16th byte of NetBIOS name */
- char comp_name[16];
- int is_server=0;
-@@ -268,7 +281,13 @@
- if(service == 0 && unique && first_name) {
- /* Unique name, workstation service - this is computer name */
- strncpy(comp_name, hostinfo->names[i].ascii_name, 15);
-- comp_name[15]=0;
-+
-+ // Eliminate trailing spaces
-+ for(j=0; j < 15; j++) {
-+ if (comp_name[j] == ' ')
-+ break;
-+ }
-+ comp_name[j] = 0;
- first_name = 0;
- };
- };
-
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9-r3-f2fs.patch b/net-analyzer/net-snmp/files/net-snmp-5.9-r3-f2fs.patch
new file mode 100644
index 00000000000..c06c94ff7ac
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.9-r3-f2fs.patch
@@ -0,0 +1,40 @@
+https://bugs.gentoo.org/729224
+https://github.com/net-snmp/net-snmp/commit/5a18e300bd085c6ba5967d7b00cc3f57fe83f665
+
+From 5a18e300bd085c6ba5967d7b00cc3f57fe83f665 Mon Sep 17 00:00:00 2001
+From: Bart Van Assche <bvanassche@acm.org>
+Date: Thu, 8 Oct 2020 20:12:44 -0700
+Subject: [PATCH] HOST-RESOURCES-MIB: Add support for f2fs
+
+See also https://github.com/net-snmp/net-snmp/issues/111 .
+---
+ agent/mibgroup/hardware/fsys/fsys_mntent.c | 1 +
+ agent/mibgroup/hardware/fsys/mnttypes.h | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/agent/mibgroup/hardware/fsys/fsys_mntent.c b/agent/mibgroup/hardware/fsys/fsys_mntent.c
+index abdc63ed6..75e2782f7 100644
+--- a/agent/mibgroup/hardware/fsys/fsys_mntent.c
++++ b/agent/mibgroup/hardware/fsys/fsys_mntent.c
+@@ -146,6 +146,7 @@ _fsys_type( char *typename )
+ !strcmp(typename, MNTTYPE_CVFS) ||
+ !strcmp(typename, MNTTYPE_SIMFS) ||
+ !strcmp(typename, MNTTYPE_BTRFS) ||
++ !strcmp(typename, MNTTYPE_F2FS) ||
+ !strcmp(typename, MNTTYPE_ZFS) ||
+ !strcmp(typename, MNTTYPE_NVMFS) ||
+ !strcmp(typename, MNTTYPE_ACFS) ||
+diff --git a/agent/mibgroup/hardware/fsys/mnttypes.h b/agent/mibgroup/hardware/fsys/mnttypes.h
+index cda42420d..3540cf31b 100644
+--- a/agent/mibgroup/hardware/fsys/mnttypes.h
++++ b/agent/mibgroup/hardware/fsys/mnttypes.h
+@@ -154,6 +154,9 @@
+ #ifndef MNTTYPE_BTRFS
+ #define MNTTYPE_BTRFS "btrfs"
+ #endif
++#ifndef MNTTYPE_F2FS
++#define MNTTYPE_F2FS "f2fs"
++#endif
+ #ifndef MNTTYPE_ZFS
+ #define MNTTYPE_ZFS "zfs"
+ #endif
diff --git a/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
index c83f4f58bfd..e7d8ef4f773 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,7 +6,7 @@ DISTUTILS_OPTIONAL=yesplz
DISTUTILS_SINGLE_IMPL=yesplz
GENTOO_DEPEND_ON_PERL=no
PATCHSET=3
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
WANT_AUTOMAKE=none
inherit autotools distutils-r1 perl-module systemd
diff --git a/net-analyzer/net-snmp/net-snmp-5.9-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.9-r3.ebuild
new file mode 100644
index 00000000000..2ded4369531
--- /dev/null
+++ b/net-analyzer/net-snmp/net-snmp-5.9-r3.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=yes
+DISTUTILS_SINGLE_IMPL=yes
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python3_{7,8,9} )
+WANT_AUTOMAKE=none
+
+inherit autotools distutils-r1 perl-module systemd
+
+DESCRIPTION="Software for generating and retrieving SNMP data"
+HOMEPAGE="http://www.net-snmp.org/"
+SRC_URI="
+ https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
+ https://dev.gentoo.org/~jer/${P}.tar.xz
+"
+
+# GPL-2 for the init scripts
+LICENSE="HPND BSD GPL-2"
+SLOT="0/40"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="
+ X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql
+ netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib
+"
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+ rpm? ( bzip2 zlib )
+"
+RESTRICT="test"
+
+COMMON_DEPEND="
+ bzip2? ( app-arch/bzip2 )
+ elf? ( dev-libs/elfutils )
+ lm-sensors? ( sys-apps/lm-sensors )
+ mysql? ( dev-db/mysql-connector-c:0= )
+ netlink? ( dev-libs/libnl:3 )
+ pcap? ( net-libs/libpcap )
+ pci? ( sys-apps/pciutils )
+ perl? ( dev-lang/perl:= )
+ python? (
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ')
+ ${PYTHON_DEPS}
+ )
+ rpm? (
+ app-arch/rpm
+ dev-libs/popt
+ )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6d:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+ zlib? ( >=sys-libs/zlib-1.1.4 )
+"
+BDEPEND="doc? ( app-doc/doxygen )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="
+ ${COMMON_DEPEND}
+ perl? (
+ X? ( dev-perl/Tk )
+ !minimal? ( dev-perl/TermReadKey )
+ )
+ selinux? ( sec-policy/selinux-snmp )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.7.3-include-limits.patch
+ "${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
+ "${FILESDIR}"/${PN}-5.8-pcap.patch
+ "${FILESDIR}"/${PN}-5.8.1-pkg-config.patch
+ "${FILESDIR}"/${PN}-5.8.1-net-snmp-config-libdir.patch
+ "${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch
+ "${FILESDIR}"/${PN}-5.9-MakeMaker.patch
+ "${FILESDIR}"/${PN}-5.9-r3-f2fs.patch
+ "${FILESDIR}"/${PN}-99999999-tinfo.patch
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # snmpconf generates config files with proper selinux context
+ use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
+
+ mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
+ mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
+ eapply "${WORKDIR}"/patches/*.patch
+
+ default
+
+ eautoconf
+}
+
+src_configure() {
+ # keep this in the same line, configure.ac arguments are passed down to config.h
+ local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
+ use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
+ use smux && mibs="${mibs} smux"
+
+ # Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
+ use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
+
+ econf \
+ $(use_enable !ssl internal-md5) \
+ $(use_enable ipv6) \
+ $(use_enable mfd-rewrites) \
+ $(use_enable perl embedded-perl) \
+ $(use_enable ucd-compat ucd-snmp-compatibility) \
+ $(use_with bzip2) \
+ $(use_with elf) \
+ $(use_with kmem kmem-usage) \
+ $(use_with mysql) \
+ $(use_with netlink nl) \
+ $(use_with pcap) \
+ $(use_with pci) \
+ $(use_with perl perl-modules INSTALLDIRS=vendor) \
+ $(use_with python python-modules) \
+ $(use_with rpm) \
+ $(use_with ssl openssl) \
+ $(use_with tcpd libwrap) \
+ $(use_with zlib) \
+ --disable-static \
+ --enable-shared \
+ --with-default-snmp-version="3" \
+ --with-install-prefix="${D}" \
+ --with-ldflags="${LDFLAGS}" \
+ --with-logfile="/var/log/net-snmpd.log" \
+ --with-mib-modules="${mibs}" \
+ --with-persistent-directory="/var/lib/net-snmp" \
+ --with-sys-contact="root@unknown" \
+ --with-sys-location="Unknown"
+}
+
+src_compile() {
+ emake sedscript
+
+ local subdir
+ for subdir in snmplib agent/mibgroup agent apps .; do
+ emake OTHERLDFLAGS="${LDFLAGS}" -C ${subdir} all
+ done
+
+ use doc && emake docsdox
+}
+
+src_install() {
+ # bug #317965
+ emake -j1 DESTDIR="${D}" install
+
+ use python && python_optimize
+
+ if use perl ; then
+ perl_delete_localpod
+ if ! use X; then
+ rm "${D}"/usr/bin/tkmib || die
+ fi
+ else
+ rm -f \
+ "${D}"/usr/bin/fixproc \
+ "${D}"/usr/bin/ipf-mod.pl \
+ "${D}"/usr/bin/mib2c \
+ "${D}"/usr/bin/net-snmp-cert \
+ "${D}"/usr/bin/snmp-bridge-mib \
+ "${D}"/usr/bin/snmpcheck \
+ "${D}"/usr/bin/snmpconf \
+ "${D}"/usr/bin/tkmib \
+ "${D}"/usr/bin/traptoemail \
+ "${D}"/usr/share/snmp/mib2c.perl.conf \
+ "${D}"/usr/share/snmp/snmp_perl_trapd.pl \
+ || die
+ fi
+
+ dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
+ newdoc EXAMPLE.conf.def EXAMPLE.conf
+
+ if use doc; then
+ docinto html
+ dodoc -r docs/html/*
+ fi
+
+ keepdir /var/lib/net-snmp
+
+ newinitd "${FILESDIR}"/snmpd.init.2 snmpd
+ newconfd "${FILESDIR}"/snmpd.conf snmpd
+
+ newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
+ newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
+
+ systemd_dounit "${FILESDIR}"/snmpd.service
+ systemd_dounit "${FILESDIR}"/snmptrapd.service
+
+ insinto /etc/snmp
+ newins "${S}"/EXAMPLE.conf snmpd.conf.example
+
+ # Remove everything not required for an agent.
+ # Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
+ if use minimal; then
+ rm -rf \
+ "${D}"/**/*.pl \
+ "${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
+ "${D}"/usr/share/snmp/*.conf \
+ "${D}"/usr/share/snmp/snmpconf-data \
+ || die
+ fi
+
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-analyzer/net-snmp/net-snmp-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
index 638e5357bb1..4a58da93c99 100644
--- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
@@ -1,35 +1,36 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-DISTUTILS_OPTIONAL=yesplz
-DISTUTILS_SINGLE_IMPL=yesplz
+
+DISTUTILS_OPTIONAL=yes
+DISTUTILS_SINGLE_IMPL=yes
GENTOO_DEPEND_ON_PERL=no
-PATCHSET=3
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
WANT_AUTOMAKE=none
+
inherit autotools distutils-r1 git-r3 perl-module systemd
DESCRIPTION="Software for generating and retrieving SNMP data"
HOMEPAGE="http://www.net-snmp.org/"
EGIT_REPO_URI="https://github.com/net-snmp/net-snmp"
-SRC_URI="
- https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
-"
+SRC_URI="https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz"
# GPL-2 for the init scripts
LICENSE="HPND BSD GPL-2"
SLOT="0/40"
-KEYWORDS=""
IUSE="
X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql
netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib
"
+
REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
rpm? ( bzip2 zlib )
"
+RESTRICT="test"
+
COMMON_DEPEND="
bzip2? ( app-arch/bzip2 )
elf? ( dev-libs/elfutils )
@@ -41,7 +42,7 @@ COMMON_DEPEND="
perl? ( dev-lang/perl:= )
python? (
$(python_gen_cond_dep '
- dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
')
${PYTHON_DEPS}
)
@@ -56,10 +57,8 @@ COMMON_DEPEND="
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
zlib? ( >=sys-libs/zlib-1.1.4 )
"
-DEPEND="
- ${COMMON_DEPEND}
- doc? ( app-doc/doxygen )
-"
+BDEPEND="doc? ( app-doc/doxygen )"
+DEPEND="${COMMON_DEPEND}"
RDEPEND="
${COMMON_DEPEND}
perl? (
@@ -68,7 +67,7 @@ RDEPEND="
)
selinux? ( sec-policy/selinux-snmp )
"
-RESTRICT=test
+
PATCHES=(
"${FILESDIR}"/${PN}-5.7.3-include-limits.patch
"${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
@@ -138,7 +137,7 @@ src_configure() {
--with-logfile="/var/log/net-snmpd.log" \
--with-mib-modules="${mibs}" \
--with-persistent-directory="/var/lib/net-snmp" \
- --with-sys-contact="root@Unknown" \
+ --with-sys-contact="root@unknown" \
--with-sys-location="Unknown"
}
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 0d812ef0968..7b5fbe5cff2 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1 +1,4 @@
-DIST netdata-1.28.0.tar.gz 6218048 BLAKE2B 9ee0eea1a17df207ffbc934b3c0dfe261fb3c3a51312947df0e287fc29c4dacf35e414593da0b3829999cea6bb03eab89fe7f1743fdcc3be39d532427a9239b2 SHA512 98048ebb10ff9db9cd273fb7b66e30aa14f6cd71e53a0c80c7ac5bd45c9f85b64b1d2d5fd12734921a11b584f67435563e26f0249aab61458b563405bbc54b17
+DIST netdata-1.29.0.tar.gz 6233326 BLAKE2B b177fba4d6560b289e5a9fbedffe7f3eae53074fea30483a54a682370ab5427bb1002392ea44efd1c7675dd8347116675d91ac47dbd3fb3d0c66d0391d63971c SHA512 adcc450492f769a1d6277b551d318479dac2150b2c92b9ab648bb3f30cfe3cd0717f2febbe5299093f1d0638a90523aad9f6a073fc34bd91990d2c90416d0fdc
+DIST netdata-1.29.1.tar.gz 6233282 BLAKE2B 53fd82c0b904b6d29eac1534e46d856c9b13460fec7b739cb5e93596961753d978dff0a5e08c88f10d974838809d4266b715e442b54e507ae744122d0345297f SHA512 252efece4501d9cd3c71536b96f9487c618f9a2a3445d0bf0d49f0bfd399b80115b0f57f22fddc5567763a9f41e95f24c8ed64b6e1c29f0d7d121d844d8d1176
+DIST netdata-1.29.2.tar.gz 6234502 BLAKE2B b34314114c41e1fd80cfb1c495f34b2dbcc5449189d12215c2af4a5c543fb0be9314842430da75547db0bc5f1027fec313703cbc98d21435807d2105d6761372 SHA512 3046fa99725c9ec9b5cac695d2ab66dbad999fc7b1242722592521b0e270fbb32756a7de4aac9ac8fa4ef5dbf455034f7fdbe84f8e281c12471de61e79a0eacd
+DIST netdata-1.29.3.tar.gz 6234406 BLAKE2B 975b27e8cb66c174d7cf01de0e5b76d57b0eac8005d5da19aa308df530edd8fcacc97b1ba5956ac38ffb9fcd55b2c58f4a1dec3bc691a5b898e886de19b365df SHA512 67e661328d76b3b9d4837e5acae16937300f1b91bc37bafc3ee606aeda88d2775c606126b9f072c682a1b24f5610b7993fedb808fd9032b240702d12cf063b54
diff --git a/net-analyzer/netdata/netdata-1.28.0.ebuild b/net-analyzer/netdata/netdata-1.29.0.ebuild
index 7690ff9704c..8d690b9c053 100644
--- a/net-analyzer/netdata/netdata-1.28.0.ebuild
+++ b/net-analyzer/netdata/netdata-1.29.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
inherit autotools fcaps linux-info python-single-r1 systemd
diff --git a/net-analyzer/netdata/netdata-1.29.1.ebuild b/net-analyzer/netdata/netdata-1.29.1.ebuild
new file mode 100644
index 00000000000..8d690b9c053
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.29.1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+
+inherit autotools fcaps linux-info python-single-r1 systemd
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+REQUIRED_USE="
+ mysql? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+ acct-group/netdata
+ acct-user/netdata
+ app-misc/jq
+ >=app-shells/bash-4:0
+ || (
+ net-analyzer/openbsd-netcat
+ net-analyzer/netcat
+ )
+ net-libs/libwebsockets
+ net-misc/curl
+ net-misc/wget
+ sys-apps/util-linux
+ virtual/awk
+ caps? ( sys-libs/libcap )
+ cups? ( net-print/cups )
+ dbengine? (
+ app-arch/lz4
+ dev-libs/judy
+ dev-libs/openssl:=
+ )
+ dev-libs/libuv
+ compression? ( sys-libs/zlib )
+ ipmi? ( sys-libs/freeipmi )
+ jsonc? ( dev-libs/json-c:= )
+ kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
+ mongodb? ( dev-libs/mongo-c-driver )
+ nfacct? (
+ net-firewall/nfacct
+ net-libs/libmnl
+ )
+ nodejs? ( net-libs/nodejs )
+ prometheus? (
+ dev-libs/protobuf:=
+ app-arch/snappy
+ )
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]')
+ mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]') )
+ postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') )
+ tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') )
+ )
+ xen? (
+ app-emulation/xen-tools
+ dev-libs/yajl
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+FILECAPS=(
+ 'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # --disable-cloud: https://github.com/netdata/netdata/issues/8961
+ econf \
+ --localstatedir="${EPREFIX}"/var \
+ --with-user=netdata \
+ --disable-cloud \
+ $(use_enable jsonc) \
+ $(use_enable cups plugin-cups) \
+ $(use_enable dbengine) \
+ $(use_enable nfacct plugin-nfacct) \
+ $(use_enable ipmi plugin-freeipmi) \
+ $(use_enable kinesis backend-kinesis) \
+ $(use_enable lto lto) \
+ $(use_enable mongodb backend-mongodb) \
+ $(use_enable prometheus backend-prometheus-remote-write) \
+ $(use_enable xen plugin-xenstat) \
+ $(use_enable cpu_flags_x86_sse2 x86-sse) \
+ $(use_with compression zlib)
+}
+
+src_install() {
+ default
+
+ rm -rf "${D}/var/cache" || die
+
+ keepdir /var/log/netdata
+ fowners -Rc netdata:netdata /var/log/netdata
+ keepdir /var/lib/netdata
+ keepdir /var/lib/netdata/registry
+ fowners -Rc netdata:netdata /var/lib/netdata
+
+ fowners -Rc root:netdata /usr/share/${PN}
+
+ newinitd system/netdata-openrc ${PN}
+ systemd_dounit system/netdata.service
+ insinto /etc/netdata
+ doins system/netdata.conf
+}
+
+pkg_postinst() {
+ fcaps_pkg_postinst
+
+ if use xen ; then
+ fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
+ fi
+}
diff --git a/net-analyzer/netdata/netdata-1.29.2.ebuild b/net-analyzer/netdata/netdata-1.29.2.ebuild
new file mode 100644
index 00000000000..8d690b9c053
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.29.2.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+
+inherit autotools fcaps linux-info python-single-r1 systemd
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+REQUIRED_USE="
+ mysql? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+ acct-group/netdata
+ acct-user/netdata
+ app-misc/jq
+ >=app-shells/bash-4:0
+ || (
+ net-analyzer/openbsd-netcat
+ net-analyzer/netcat
+ )
+ net-libs/libwebsockets
+ net-misc/curl
+ net-misc/wget
+ sys-apps/util-linux
+ virtual/awk
+ caps? ( sys-libs/libcap )
+ cups? ( net-print/cups )
+ dbengine? (
+ app-arch/lz4
+ dev-libs/judy
+ dev-libs/openssl:=
+ )
+ dev-libs/libuv
+ compression? ( sys-libs/zlib )
+ ipmi? ( sys-libs/freeipmi )
+ jsonc? ( dev-libs/json-c:= )
+ kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
+ mongodb? ( dev-libs/mongo-c-driver )
+ nfacct? (
+ net-firewall/nfacct
+ net-libs/libmnl
+ )
+ nodejs? ( net-libs/nodejs )
+ prometheus? (
+ dev-libs/protobuf:=
+ app-arch/snappy
+ )
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]')
+ mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]') )
+ postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') )
+ tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') )
+ )
+ xen? (
+ app-emulation/xen-tools
+ dev-libs/yajl
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+FILECAPS=(
+ 'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # --disable-cloud: https://github.com/netdata/netdata/issues/8961
+ econf \
+ --localstatedir="${EPREFIX}"/var \
+ --with-user=netdata \
+ --disable-cloud \
+ $(use_enable jsonc) \
+ $(use_enable cups plugin-cups) \
+ $(use_enable dbengine) \
+ $(use_enable nfacct plugin-nfacct) \
+ $(use_enable ipmi plugin-freeipmi) \
+ $(use_enable kinesis backend-kinesis) \
+ $(use_enable lto lto) \
+ $(use_enable mongodb backend-mongodb) \
+ $(use_enable prometheus backend-prometheus-remote-write) \
+ $(use_enable xen plugin-xenstat) \
+ $(use_enable cpu_flags_x86_sse2 x86-sse) \
+ $(use_with compression zlib)
+}
+
+src_install() {
+ default
+
+ rm -rf "${D}/var/cache" || die
+
+ keepdir /var/log/netdata
+ fowners -Rc netdata:netdata /var/log/netdata
+ keepdir /var/lib/netdata
+ keepdir /var/lib/netdata/registry
+ fowners -Rc netdata:netdata /var/lib/netdata
+
+ fowners -Rc root:netdata /usr/share/${PN}
+
+ newinitd system/netdata-openrc ${PN}
+ systemd_dounit system/netdata.service
+ insinto /etc/netdata
+ doins system/netdata.conf
+}
+
+pkg_postinst() {
+ fcaps_pkg_postinst
+
+ if use xen ; then
+ fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
+ fi
+}
diff --git a/net-analyzer/netdata/netdata-1.29.3.ebuild b/net-analyzer/netdata/netdata-1.29.3.ebuild
new file mode 100644
index 00000000000..8d690b9c053
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.29.3.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+
+inherit autotools fcaps linux-info python-single-r1 systemd
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+REQUIRED_USE="
+ mysql? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+ acct-group/netdata
+ acct-user/netdata
+ app-misc/jq
+ >=app-shells/bash-4:0
+ || (
+ net-analyzer/openbsd-netcat
+ net-analyzer/netcat
+ )
+ net-libs/libwebsockets
+ net-misc/curl
+ net-misc/wget
+ sys-apps/util-linux
+ virtual/awk
+ caps? ( sys-libs/libcap )
+ cups? ( net-print/cups )
+ dbengine? (
+ app-arch/lz4
+ dev-libs/judy
+ dev-libs/openssl:=
+ )
+ dev-libs/libuv
+ compression? ( sys-libs/zlib )
+ ipmi? ( sys-libs/freeipmi )
+ jsonc? ( dev-libs/json-c:= )
+ kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
+ mongodb? ( dev-libs/mongo-c-driver )
+ nfacct? (
+ net-firewall/nfacct
+ net-libs/libmnl
+ )
+ nodejs? ( net-libs/nodejs )
+ prometheus? (
+ dev-libs/protobuf:=
+ app-arch/snappy
+ )
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]')
+ mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]') )
+ postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') )
+ tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') )
+ )
+ xen? (
+ app-emulation/xen-tools
+ dev-libs/yajl
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+FILECAPS=(
+ 'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # --disable-cloud: https://github.com/netdata/netdata/issues/8961
+ econf \
+ --localstatedir="${EPREFIX}"/var \
+ --with-user=netdata \
+ --disable-cloud \
+ $(use_enable jsonc) \
+ $(use_enable cups plugin-cups) \
+ $(use_enable dbengine) \
+ $(use_enable nfacct plugin-nfacct) \
+ $(use_enable ipmi plugin-freeipmi) \
+ $(use_enable kinesis backend-kinesis) \
+ $(use_enable lto lto) \
+ $(use_enable mongodb backend-mongodb) \
+ $(use_enable prometheus backend-prometheus-remote-write) \
+ $(use_enable xen plugin-xenstat) \
+ $(use_enable cpu_flags_x86_sse2 x86-sse) \
+ $(use_with compression zlib)
+}
+
+src_install() {
+ default
+
+ rm -rf "${D}/var/cache" || die
+
+ keepdir /var/log/netdata
+ fowners -Rc netdata:netdata /var/log/netdata
+ keepdir /var/lib/netdata
+ keepdir /var/lib/netdata/registry
+ fowners -Rc netdata:netdata /var/lib/netdata
+
+ fowners -Rc root:netdata /usr/share/${PN}
+
+ newinitd system/netdata-openrc ${PN}
+ systemd_dounit system/netdata.service
+ insinto /etc/netdata
+ doins system/netdata.conf
+}
+
+pkg_postinst() {
+ fcaps_pkg_postinst
+
+ if use xen ; then
+ fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
+ fi
+}
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index 7690ff9704c..256ee9f3417 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
inherit autotools fcaps linux-info python-single-r1 systemd
diff --git a/net-analyzer/netwag/netwag-5.39.0.ebuild b/net-analyzer/netwag/netwag-5.39.0.ebuild
index 620bc9ee48b..1b719f96d99 100644
--- a/net-analyzer/netwag/netwag-5.39.0.ebuild
+++ b/net-analyzer/netwag/netwag-5.39.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# NOTE: netwib, netwox and netwag go together, bump all or bump none
EAPI=5
-DESCRIPTION="Tcl/tk interface to netwox (Toolbox of 222 utilities for testing Ethernet/IP networks)"
+DESCRIPTION="Tcl/tk interface to netwox (Toolbox of 222 utilities for testing networks)"
HOMEPAGE="
http://ntwag.sourceforge.net/
http://www.laurentconstantin.com/en/netw/netwag/
@@ -24,7 +24,6 @@ DEPEND="
|| (
x11-terms/xterm
kde-apps/konsole
- x11-terms/eterm
x11-terms/gnome-terminal
)
"
@@ -37,9 +36,6 @@ src_prepare() {
-e 's:/man$:/share/man:g' \
-e "s:/usr/local:/usr:" \
config.dat || die
- sed -i \
- -e 's|eterm|Eterm|g' \
- genemake || die
}
src_configure() {
diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index 668d67a59b2..0d1aaf91510 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -9,9 +9,9 @@
<email>dilfridge@gentoo.org</email>
<name>Andreas K. Hüttel</name>
</maintainer>
- <maintainer type="project">
- <email>netmon@gentoo.org</email>
- <name>Gentoo network monitoring and analysis project</name>
+ <maintainer type="person">
+ <email>zlogene@gentoo.org</email>
+ <name>Mikle Kolyada</name>
</maintainer>
<use>
<flag name="libssh2">Enable SSH support through <pkg>net-libs/libssh2</pkg></flag>
diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild
deleted file mode 100644
index 41fbe9aca70..00000000000
--- a/net-analyzer/nmap/nmap-7.80-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop flag-o-matic toolchain-funcs
-
-DESCRIPTION="Network exploration tool and security / port scanner"
-HOMEPAGE="https://nmap.org/"
-SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
-
-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"
-IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl system-lua"
-REQUIRED_USE="system-lua? ( nse )"
-
-RDEPEND="
- dev-libs/liblinear:=
- dev-libs/libpcre
- net-libs/libpcap
- libssh2? (
- net-libs/libssh2[zlib]
- sys-libs/zlib
- )
- nmap-update? (
- dev-libs/apr
- dev-vcs/subversion
- )
- nse? ( sys-libs/zlib )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
- system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.10_beta1-string.patch
- "${FILESDIR}"/${PN}-5.21-python.patch
- "${FILESDIR}"/${PN}-6.46-uninstaller.patch
- "${FILESDIR}"/${PN}-6.25-liblua-ar.patch
- "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
- "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
- "${FILESDIR}"/${PN}-7.25-libpcre.patch
- "${FILESDIR}"/${PN}-7.31-libnl.patch
- "${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
-)
-
-src_prepare() {
- rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
-
- cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
-
- default
-
- sed -i \
- -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
- Makefile.in || die
- # Fix desktop files wrt bug #432714
- sed -i \
- -e 's|^Categories=.*|Categories=Network;System;Security;|g' \
- zenmap/install_scripts/unix/zenmap-root.desktop \
- zenmap/install_scripts/unix/zenmap.desktop || die
-
- cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
-
- eautoreconf
-
- if [[ ${CHOST} == *-darwin* ]] ; then
- # we need the original for a Darwin-specific fix, bug #604432
- mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
- fi
-}
-
-src_configure() {
- # The bundled libdnet is incompatible with the version available in the
- # tree, so we cannot use the system library here.
- econf \
- $(use_enable ipv6) \
- $(use_with libssh2) \
- $(use_with ncat) \
- --without-ndiff \
- $(use_with nmap-update) \
- $(use_with nping) \
- $(use_with ssl openssl) \
- --without-zenmap \
- $(usex libssh2 --with-zlib) \
- $(usex nse --with-zlib) \
- $(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
- --cache-file="${S}"/config.cache \
- --with-libdnet=included \
- --with-pcre=/usr
- # Commented out because configure does weird things
- # --with-liblinear=/usr \
-}
-
-src_compile() {
- local directory
- for directory in . libnetutil nsock/src \
- $(usex ncat ncat '') \
- $(usex nmap-update nmap-update '') \
- $(usex nping nping '')
- do
- emake -C "${directory}" makefile.dep
- done
-
- emake \
- AR=$(tc-getAR) \
- RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
- LC_ALL=C emake -j1 \
- DESTDIR="${D}" \
- STRIP=: \
- nmapdatadir="${EPREFIX}"/usr/share/nmap \
- install
- if use nmap-update;then
- LC_ALL=C emake -j1 \
- -C nmap-update \
- DESTDIR="${D}" \
- STRIP=: \
- nmapdatadir="${EPREFIX}"/usr/share/nmap \
- install
- fi
-
- dodoc CHANGELOG HACKING docs/README docs/*.txt
-}
diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index 86253e24991..5f48909bca0 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl +system-lua"
REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild b/net-analyzer/nmap/nmap-7.91-r1.ebuild
index 29cae90c6f0..610bd50821a 100644
--- a/net-analyzer/nmap/nmap-7.91-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
LICENSE="NPSL"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
diff --git a/net-analyzer/nmap/nmap-7.91.ebuild b/net-analyzer/nmap/nmap-7.91.ebuild
deleted file mode 100644
index 006cbe5ee03..00000000000
--- a/net-analyzer/nmap/nmap-7.91.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Network exploration tool and security / port scanner"
-HOMEPAGE="https://nmap.org/"
-SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
-
-LICENSE="NPSL"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="ipv6 libressl libssh2 ncat nping +nse ssl system-lua"
-REQUIRED_USE="system-lua? ( nse )"
-
-RDEPEND="
- dev-libs/liblinear:=
- dev-libs/libpcre
- net-libs/libpcap
- libssh2? (
- net-libs/libssh2[zlib]
- sys-libs/zlib
- )
- nse? ( sys-libs/zlib )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
- system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.10_beta1-string.patch
- "${FILESDIR}"/${PN}-5.21-python.patch
- "${FILESDIR}"/${PN}-6.46-uninstaller.patch
- "${FILESDIR}"/${PN}-6.25-liblua-ar.patch
- "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
- "${FILESDIR}"/${PN}-7.25-libpcre.patch
- "${FILESDIR}"/${PN}-7.31-libnl.patch
- "${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
- "${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch
-)
-
-src_prepare() {
- rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
-
- cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
-
- default
-
- sed -i \
- -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
- Makefile.in || die
-
- cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
-
- eautoreconf
-
- if [[ ${CHOST} == *-darwin* ]] ; then
- # we need the original for a Darwin-specific fix, bug #604432
- mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
- fi
-}
-
-src_configure() {
- # The bundled libdnet is incompatible with the version available in the
- # tree, so we cannot use the system library here.
- econf \
- $(use_enable ipv6) \
- $(use_with libssh2) \
- $(use_with ncat) \
- $(use_with nping) \
- $(use_with ssl openssl) \
- $(usex libssh2 --with-zlib) \
- $(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
- $(usex nse --with-zlib) \
- --cache-file="${S}"/config.cache \
- --with-libdnet=included \
- --with-pcre=/usr \
- --without-ndiff \
- --without-zenmap
-}
-
-src_compile() {
- local directory
- for directory in . libnetutil nsock/src \
- $(usex ncat ncat '') \
- $(usex nping nping '')
- do
- emake -C "${directory}" makefile.dep
- done
-
- emake \
- AR=$(tc-getAR) \
- RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
- LC_ALL=C emake -j1 \
- DESTDIR="${D}" \
- STRIP=: \
- nmapdatadir="${EPREFIX}"/usr/share/nmap \
- install
-
- dodoc CHANGELOG HACKING docs/README docs/*.txt
-}
diff --git a/net-analyzer/nstats/nstats-0.4-r2.ebuild b/net-analyzer/nstats/nstats-0.4-r2.ebuild
deleted file mode 100644
index 18e85bd81fe..00000000000
--- a/net-analyzer/nstats/nstats-0.4-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="Displays statistics about ethernet traffic including protocol breakdown"
-SRC_URI="http://trash.net/~reeler/nstats/files/${P}.tar.gz"
-HOMEPAGE="http://trash.net/~reeler/nstats/"
-LICENSE="Artistic"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
- net-libs/libpcap
- sys-libs/ncurses
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-DOCS=( BUGS doc/TODO doc/ChangeLog )
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-glibc24.patch \
- "${FILESDIR}"/${P}-makefile.patch \
- "${FILESDIR}"/${P}-tinfo.patch
-
- eautoreconf
-}
diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch
index e1a462e746b..a8453c09067 100644
--- a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch
+++ b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch
@@ -4,7 +4,7 @@ diff --git a/netcat.c b/netcat.c
index a0fb51b..bbb5dd1 100644
--- a/netcat.c
+++ b/netcat.c
-@@ -51,11 +51,13 @@
+@@ -51,11 +51,16 @@
# include <bsd/readpassphrase.h>
#endif
@@ -18,6 +18,9 @@ index a0fb51b..bbb5dd1 100644
-# define IPTOS_LOWCOST 0x02
# define IPTOS_MINCOST IPTOS_LOWCOST
#endif /* IPTOS_LOWDELAY */
++#ifndef SOCK_CLOEXEC
++# define SOCK_CLOEXEC 0
++#endif
@@ -108,8 +110,9 @@
# include <tls.h>
@@ -87,17 +90,7 @@ index a0fb51b..bbb5dd1 100644
/* For now, all errnos are fatal */
err(1, "accept");
}
-@@ -1092,14 +1091,16 @@
- int s, save_errno;
-
- if (uflag) {
-- if ((s = unix_bind(unix_dg_tmp_socket, SOCK_CLOEXEC)) < 0)
-+ if ((s = unix_bind(unix_dg_tmp_socket, 0)) < 0)
- return -1;
- } else {
-- if ((s = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0)) < 0) {
-+ if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
- errx(1,"create unix socket failed");
+@@ -1100,6 +1099,8 @@
return -1;
}
}
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild
index 7994e7f7ba3..9e669ea4b2a 100644
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -30,7 +30,7 @@ src_prepare() {
done
if [[ ${CHOST} == *-darwin* ]] ; then
# this undoes some of the Debian/Linux changes
- eapply "${FILESDIR}"/${P}-darwin.patch
+ eapply "${FILESDIR}"/${PN}-1.190-darwin.patch
fi
default
}
diff --git a/net-analyzer/ostinato/Manifest b/net-analyzer/ostinato/Manifest
index 44c30549ab5..563c348f41f 100644
--- a/net-analyzer/ostinato/Manifest
+++ b/net-analyzer/ostinato/Manifest
@@ -1 +1 @@
-DIST ostinato-0.9_p20180522.tar.gz 424128 BLAKE2B 69a15e523986cd34f89669fab0ed64987f68ea7d82d481de418c2d86f3b325b5c1ff9081db8c77532b603b01f504c37c24a4f7f5b7244657cac8b2f707bc7bdf SHA512 7d8359b193c98165ea376ad0ad57e01b782e35a7b887465d74c67ae1cd434036e8beb67593c569e15a87d5d0c7f602c9f01acf068e9ffff0c0496ab4f889a83a
+DIST ostinato-1.1.tar.gz 612589 BLAKE2B 2244b3be5649e0623139b667c61a169a3e7f5dae6f022d6550cd825f1af8fa2c2d82210af1f381ae53af19fff9a56d58b30a406fc1f3d89c73bc7e3d0ab18fa4 SHA512 a45e157d155d4f2efe9a1594a140647b5cbd7264985b15a9ed47d86198c9df9d763170097dcfd40fae1317206e53c9155f08c48c747cce458e0cae7f3a841449
diff --git a/net-analyzer/ostinato/files/ostinato-0.9_p20180522-buildfix.patch b/net-analyzer/ostinato/files/ostinato-0.9_p20180522-buildfix.patch
deleted file mode 100644
index ff09d689ae5..00000000000
--- a/net-analyzer/ostinato/files/ostinato-0.9_p20180522-buildfix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/common/mld.cpp 2018-05-22 18:18:21.000000000 +0200
-+++ b/common/mld.cpp 2018-06-26 13:59:58.562569302 +0200
-@@ -24,6 +24,14 @@
- #include <QHostAddress>
- #include <QStringList>
-
-+template <> inline Q_DECL_CONSTEXPR unsigned long qbswap<unsigned long>(unsigned long source) {
-+ if (sizeof(unsigned long) == 8) {
-+ return qbswap<quint64>(quint64(source));
-+ } else {
-+ return qbswap<quint32>(quint32(source));
-+ }
-+}
-+
- MldProtocol::MldProtocol(StreamBase *stream, AbstractProtocol *parent)
- : GmpProtocol(stream, parent)
- {
diff --git a/net-analyzer/ostinato/metadata.xml b/net-analyzer/ostinato/metadata.xml
index fb90fd94be6..e63760e8492 100644
--- a/net-analyzer/ostinato/metadata.xml
+++ b/net-analyzer/ostinato/metadata.xml
@@ -6,6 +6,6 @@
<name>Rick Farina</name>
</maintainer>
<upstream>
- <remote-id type="google-code">ostinato</remote-id>
+ <remote-id type="github">pstavirs/ostinato</remote-id>
</upstream>
</pkgmetadata>
diff --git a/net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild b/net-analyzer/ostinato/ostinato-1.1.ebuild
index e2e38eaf051..9dba7331941 100644
--- a/net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild
+++ b/net-analyzer/ostinato/ostinato-1.1.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-COMMIT=9a4e7e7550c6b20a8f0f1393a55036492c1b7703
inherit qmake-utils
DESCRIPTION="Packet generator and analyzer"
HOMEPAGE="https://ostinato.org/"
-SRC_URI="https://github.com/pstavirs/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/pstavirs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-#KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
IUSE=""
#https://github.com/pstavirs/ostinato/issues/173
@@ -27,11 +26,8 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
PATCHES=(
- "${FILESDIR}/${P}-buildfix.patch"
- "${FILESDIR}/${P}-no-modeltest.patch"
+ "${FILESDIR}/${PN}-0.9_p20180522-no-modeltest.patch"
)
src_configure() {
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index 7bf0be7cbf2..2fc46c924bd 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,3 +1 @@
-DIST pmacct-1.7.4.tar.gz 1581213 BLAKE2B 3835abc91947af083932e01b828c2324f90595c973fdde9d9f4034dc7d03e12fad6bbe6e91e1462ec36963ccb41a5a740159f531d7e1929f4cd8d994b89a58a1 SHA512 780b6cc25562fb7b5a1f55b48ce9719b36c1ee0d9ee2b6db8d7f238cd5d9f204938313b13e3ff3f62c7b9b179279f18314eba38ad787ffc346a4b217da239ca1
-DIST pmacct-1.7.4_p1.tar.gz 3200089 BLAKE2B 638983a92df0a46441ddddaefa78dc0f61fee94264870979f46674e851e3bf111ae71550f7e6b677d425fa4c688d4ed7735d82aae85a2e77155c1bfa050d8e76 SHA512 03553128975ced54ce08a1a543c794377c2b7a3c800de600a7b5e8aa483b1c3123dee536a361a47053233d60070cacaf269f1a16ad17b563fa9fc0ec7af6a467
DIST pmacct-1.7.5.tar.gz 3219384 BLAKE2B 9a9feb8a11222e54a018b37eaa387cfa43efcb6aa3da175ea6c367bc7b42d816cbe106431c8b8f69b17c8d0286514a80250bf28b15fcaad12a2ac5fb7af6ff27 SHA512 d52e3d749cf0e8a412a82051531c63f37aa6cf4e7cc435ebd185195040819d65dc2cf4d4b1aa64bae620a9f8d3d1b1a505992044fe45d57b91ba056cfa67609c
diff --git a/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch b/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch
deleted file mode 100644
index 9e6c618fe44..00000000000
--- a/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -955,6 +955,7 @@
- CFLAGS="$_save_CFLAGS"
- ])
- PKG_CHECK_MODULES([NDPI26], [libndpi >= 2.6], [AC_DEFINE(WITH_NDPI26, 1)], [AC_DEFINE(WITH_NDPI, 1)])
-+ PKG_CHECK_MODULES([NDPI30], [libndpi >= 3.0], [AC_DEFINE(WITH_NDPI30, 1)], [AC_DEFINE(WITH_NDPI, 1)])
- ;;
- no)
- AC_MSG_RESULT(no)
---- a/src/ndpi/ndpi.c
-+++ b/src/ndpi/ndpi.c
-@@ -374,10 +374,14 @@
- if (flow->detection_completed || flow->tcp_finished) {
- if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN)
- #ifdef WITH_NDPI26
-+#ifdef WITH_NDPI30
-+ flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, 1, workflow->prefs.protocol_guess);
-+#else
- flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, workflow->prefs.protocol_guess);
-+#endif /* WITH_NDPI30 */
- #else
- flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow);
--#endif
-+#endif /* WITH_NDPI26 */
-
- if (workflow->prefs.protocol_guess) {
- if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN && !flow->guess_completed) {
diff --git a/net-analyzer/pmacct/files/pmacct-1.7.4-nDPI-3.2.patch b/net-analyzer/pmacct/files/pmacct-1.7.4-nDPI-3.2.patch
deleted file mode 100644
index bcbdbc834ca..00000000000
--- a/net-analyzer/pmacct/files/pmacct-1.7.4-nDPI-3.2.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -900,7 +900,7 @@
- [ case "$enableval" in
- yes)
- AC_MSG_RESULT(yes)
-- PKG_CHECK_MODULES([NDPI], [libndpi >= 2.4], [
-+ PKG_CHECK_MODULES([NDPI], [libndpi >= 3.2], [
- SUPPORTS="${SUPPORTS} ndpi"
- USING_NDPI="yes"
-
---- a/src/ndpi/ndpi_util.c
-+++ b/src/ndpi/ndpi_util.c
-@@ -29,7 +29,8 @@
-
- NDPI_PROTOCOL_BITMASK all;
-
-- struct ndpi_detection_module_struct *module = ndpi_init_detection_module();
-+ ndpi_init_prefs pm_ndpi_init_prefs = ndpi_no_prefs;
-+ struct ndpi_detection_module_struct *module = ndpi_init_detection_module(pm_ndpi_init_prefs);
- struct pm_ndpi_workflow *workflow = ndpi_calloc(1, sizeof(struct pm_ndpi_workflow));
-
- log_notification_init(&log_notifications.ndpi_cache_full);
-@@ -77,6 +78,8 @@
- NDPI_BITMASK_SET_ALL(all);
- ndpi_set_protocol_detection_bitmask2(workflow->ndpi_struct, &all);
-
-+ ndpi_finalize_initalization(workflow->ndpi_struct);
-+
- return workflow;
- }
-
---- a/src/ndpi/ndpi.c
-+++ b/src/ndpi/ndpi.c
-@@ -373,11 +373,7 @@
-
- if (flow->detection_completed || flow->tcp_finished) {
- if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN)
--#ifdef WITH_NDPI26
-- flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, workflow->prefs.protocol_guess);
--#else
-- flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow);
--#endif
-+ flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, 1, workflow->prefs.protocol_guess);
-
- if (workflow->prefs.protocol_guess) {
- if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN && !flow->guess_completed) {
diff --git a/net-analyzer/pmacct/metadata.xml b/net-analyzer/pmacct/metadata.xml
index a306c0fa503..ee7d2e55c72 100644
--- a/net-analyzer/pmacct/metadata.xml
+++ b/net-analyzer/pmacct/metadata.xml
@@ -1,25 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
-<email>netmon@gentoo.org</email>
-<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-<use>
-<flag name="64bit">Use 64bit counters instead of 32bit ones</flag>
-<flag name="bgp-bins">Link BGP daemon binaries</flag>
-<flag name="bmp-bins">Link BMP daemon binaries</flag>
-<flag name="geoipv2">Enable support for GeoIP2 through <pkg>dev-libs/libmaxminddb</pkg></flag>
-<flag name="jansson">Enable support for JSON through <pkg>dev-libs/jansson</pkg></flag>
-<flag name="kafka">Enable support for Apache Kafka through <pkg>dev-libs/librdkafka</pkg></flag>
-<flag name="l2">Enable Layer-2 features and support</flag>
-<flag name="mongodb">Enable support for MongoDB through <pkg>dev-libs/mongo-c-driver</pkg></flag>
-<flag name="ndpi">Enable support for nDPI through <pkg>net-libs/nDPI</pkg></flag>
-<flag name="nflog">Enable support for NFLOG through uacctd</flag>
-<flag name="plabel">Enable IP prefix labels</flag>
-<flag name="rabbitmq">Enable support for RabbitMQ through <pkg>net-libs/rabbitmq-c</pkg></flag>
-<flag name="st-bins">Link Streaming Telemetry daemon binaries</flag>
-<flag name="traffic-bins">Link IPv4/IPv6 traffic accounting binaries</flag>
-<flag name="zmq">Enable support for ZeroMQ through <pkg>net-libs/zeromq</pkg></flag>
-</use>
+ <maintainer type="project">
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
+ <use>
+ <flag name="bgp-bins">Link BGP daemon binaries</flag>
+ <flag name="bmp-bins">Link BMP daemon binaries</flag>
+ <flag name="geoipv2">Enable support for GeoIP2 through <pkg>dev-libs/libmaxminddb</pkg></flag>
+ <flag name="jansson">Enable support for JSON through <pkg>dev-libs/jansson</pkg></flag>
+ <flag name="kafka">Enable support for Apache Kafka through <pkg>dev-libs/librdkafka</pkg></flag>
+ <flag name="l2">Enable Layer-2 features and support</flag>
+ <flag name="ndpi">Enable support for nDPI through <pkg>net-libs/nDPI</pkg></flag>
+ <flag name="nflog">Enable support for NFLOG through uacctd</flag>
+ <flag name="plabel">Enable IP prefix labels</flag>
+ <flag name="rabbitmq">Enable support for RabbitMQ through <pkg>net-libs/rabbitmq-c</pkg></flag>
+ <flag name="st-bins">Link Streaming Telemetry daemon binaries</flag>
+ <flag name="traffic-bins">Link IPv4/IPv6 traffic accounting binaries</flag>
+ <flag name="zmq">Enable support for ZeroMQ through <pkg>net-libs/zeromq</pkg></flag>
+ </use>
</pkgmetadata>
diff --git a/net-analyzer/pmacct/pmacct-1.7.4.ebuild b/net-analyzer/pmacct/pmacct-1.7.4.ebuild
deleted file mode 100644
index 99560fad9a7..00000000000
--- a/net-analyzer/pmacct/pmacct-1.7.4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="A network tool to gather IP traffic information"
-HOMEPAGE="http://www.pmacct.net/"
-SRC_URI="http://www.pmacct.net/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="
- 64bit +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mongodb mysql
- ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq
-"
-REQUIRED_USE="
- ?? ( geoip geoipv2 )
- kafka? ( jansson )
- rabbitmq? ( jansson )
-"
-
-RDEPEND="
- net-libs/libpcap
- geoip? ( dev-libs/geoip )
- geoipv2? ( dev-libs/libmaxminddb )
- jansson? ( dev-libs/jansson )
- kafka? ( dev-libs/librdkafka )
- mongodb? (
- >=dev-libs/mongo-c-driver-0.8.1-r1
- <dev-libs/mongo-c-driver-0.98
- )
- mysql? ( dev-db/mysql-connector-c:0= )
- ndpi? ( >=net-libs/nDPI-2.4:= )
- nflog? ( net-libs/libnetfilter_log )
- postgres? ( dev-db/postgresql:* )
- rabbitmq? ( net-libs/rabbitmq-c )
- sqlite? ( =dev-db/sqlite-3* )
- zmq? ( >=net-libs/zeromq-4.2.0:= )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.7.3-nDPI-3.0.patch
- "${FILESDIR}"/${PN}-1.7.4--Werror.patch
-)
-
-DOCS=(
- CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE
- docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- tc-export CC AR RANLIB
- append-cflags -fcommon
-
- econf \
- $(use_enable 64bit) \
- $(use_enable bgp-bins) \
- $(use_enable bmp-bins) \
- $(use_enable geoip) \
- $(use_enable geoipv2) \
- $(use_enable jansson) \
- $(use_enable kafka) \
- $(use_enable l2) \
- $(use_enable plabel) \
- $(use_enable mongodb) \
- $(use_enable mysql) \
- $(use_enable ndpi) \
- $(use_enable nflog) \
- $(use_enable postgres pgsql) \
- $(use_enable rabbitmq) \
- $(use_enable sqlite sqlite3) \
- $(use_enable st-bins) \
- $(use_enable traffic-bins) \
- $(use_enable zmq) \
- --disable-debug
-}
-
-src_install() {
- default
-
- for dirname in examples sql telemetry; do
- docinto ${dirname}
- dodoc -r ${dirname}/*
- done
-
- newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
- newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
-
- insinto /etc/pmacctd
- newins examples/pmacctd-imt.conf.example pmacctd.conf
-}
diff --git a/net-analyzer/pmacct/pmacct-1.7.4_p1.ebuild b/net-analyzer/pmacct/pmacct-1.7.4_p1.ebuild
deleted file mode 100644
index 29e47d7219d..00000000000
--- a/net-analyzer/pmacct/pmacct-1.7.4_p1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="A network tool to gather IP traffic information"
-HOMEPAGE="http://www.pmacct.net/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="
- 64bit +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mongodb mysql
- ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq
-"
-REQUIRED_USE="
- ?? ( geoip geoipv2 )
- kafka? ( jansson )
- rabbitmq? ( jansson )
-"
-
-RDEPEND="
- net-libs/libpcap
- geoip? ( dev-libs/geoip )
- geoipv2? ( dev-libs/libmaxminddb )
- jansson? ( dev-libs/jansson )
- kafka? ( dev-libs/librdkafka )
- mongodb? (
- >=dev-libs/mongo-c-driver-0.8.1-r1
- <dev-libs/mongo-c-driver-0.98
- )
- mysql? ( dev-db/mysql-connector-c:0= )
- ndpi? ( >=net-libs/nDPI-3.2:= )
- nflog? ( net-libs/libnetfilter_log )
- postgres? ( dev-db/postgresql:* )
- rabbitmq? ( net-libs/rabbitmq-c )
- sqlite? ( =dev-db/sqlite-3* )
- zmq? ( >=net-libs/zeromq-4.2.0:= )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-PATCHES=(
-# "${FILESDIR}"/${PN}-1.7.3-nDPI-3.0.patch
- "${FILESDIR}"/${PN}-1.7.4--Werror.patch
- "${FILESDIR}"/${PN}-1.7.4-nDPI-3.2.patch
-)
-
-DOCS=(
- CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE
- docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-S=${WORKDIR}/${P/_}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- tc-export CC AR RANLIB
- append-cflags -fcommon
-
- econf \
- $(use_enable 64bit) \
- $(use_enable bgp-bins) \
- $(use_enable bmp-bins) \
- $(use_enable geoip) \
- $(use_enable geoipv2) \
- $(use_enable jansson) \
- $(use_enable kafka) \
- $(use_enable l2) \
- $(use_enable plabel) \
- $(use_enable mongodb) \
- $(use_enable mysql) \
- $(use_enable ndpi) \
- $(use_enable nflog) \
- $(use_enable postgres pgsql) \
- $(use_enable rabbitmq) \
- $(use_enable sqlite sqlite3) \
- $(use_enable st-bins) \
- $(use_enable traffic-bins) \
- $(use_enable zmq) \
- --disable-debug
-}
-
-src_install() {
- default
-
- for dirname in examples sql telemetry; do
- docinto ${dirname}
- dodoc -r ${dirname}/*
- done
-
- newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
- newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
-
- insinto /etc/pmacctd
- newins examples/pmacctd-imt.conf.example pmacctd.conf
-}
diff --git a/net-analyzer/pmacct/pmacct-1.7.5.ebuild b/net-analyzer/pmacct/pmacct-1.7.5.ebuild
index b40dc62cab7..b6cef6d81f8 100644
--- a/net-analyzer/pmacct/pmacct-1.7.5.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.7.5.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit autotools flag-o-matic toolchain-funcs
DESCRIPTION="A network tool to gather IP traffic information"
@@ -35,8 +36,8 @@ RDEPEND="
sqlite? ( =dev-db/sqlite-3* )
zmq? ( >=net-libs/zeromq-4.2.0:= )
"
-DEPEND="
- ${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig
"
PATCHES=(
diff --git a/net-analyzer/pmacct/pmacct-999999.ebuild b/net-analyzer/pmacct/pmacct-999999.ebuild
index 63073745a3d..88a7b0b03c6 100644
--- a/net-analyzer/pmacct/pmacct-999999.ebuild
+++ b/net-analyzer/pmacct/pmacct-999999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit autotools flag-o-matic git-r3 toolchain-funcs
DESCRIPTION="A network tool to gather IP traffic information"
@@ -12,8 +13,8 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
IUSE="
- +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mongodb mysql
- ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq
+ +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog plabel
+ postgres rabbitmq sqlite +st-bins +traffic-bins zmq
"
REQUIRED_USE="
?? ( geoip geoipv2 )
@@ -27,10 +28,6 @@ RDEPEND="
geoipv2? ( dev-libs/libmaxminddb )
jansson? ( dev-libs/jansson )
kafka? ( dev-libs/librdkafka )
- mongodb? (
- >=dev-libs/mongo-c-driver-0.8.1-r1
- <dev-libs/mongo-c-driver-0.98
- )
mysql? ( dev-db/mysql-connector-c:0= )
ndpi? ( >=net-libs/nDPI-3.2:= )
nflog? ( net-libs/libnetfilter_log )
@@ -39,8 +36,8 @@ RDEPEND="
sqlite? ( =dev-db/sqlite-3* )
zmq? ( >=net-libs/zeromq-4.2.0:= )
"
-DEPEND="
- ${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig
"
@@ -67,18 +64,18 @@ src_configure() {
$(use_enable jansson) \
$(use_enable kafka) \
$(use_enable l2) \
- $(use_enable plabel) \
- $(use_enable mongodb) \
$(use_enable mysql) \
$(use_enable ndpi) \
$(use_enable nflog) \
+ $(use_enable plabel) \
$(use_enable postgres pgsql) \
$(use_enable rabbitmq) \
$(use_enable sqlite sqlite3) \
$(use_enable st-bins) \
$(use_enable traffic-bins) \
$(use_enable zmq) \
- --disable-debug
+ --disable-debug \
+ --disable-mongodb
}
src_install() {
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-5.1.0.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-5.1.0.ebuild
index 43aef134354..de3be153944 100644
--- a/net-analyzer/prelude-correlator/prelude-correlator-5.1.0.ebuild
+++ b/net-analyzer/prelude-correlator/prelude-correlator-5.1.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
inherit distutils-r1 systemd
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild
index 8d5c2ca8a59..77266529278 100644
--- a/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild
+++ b/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
inherit distutils-r1 systemd
diff --git a/net-analyzer/pypacker/pypacker-4.8.ebuild b/net-analyzer/pypacker/pypacker-4.8.ebuild
index f10389269bc..6d7d0041fda 100644
--- a/net-analyzer/pypacker/pypacker-4.8.ebuild
+++ b/net-analyzer/pypacker/pypacker-4.8.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
inherit distutils-r1 vcs-snapshot
DESCRIPTION="Fast and simple packet creation and parsing library for Python"
diff --git a/net-analyzer/pypacker/pypacker-4.9.ebuild b/net-analyzer/pypacker/pypacker-4.9.ebuild
index 6de7cf5ad3c..8a53099ddd3 100644
--- a/net-analyzer/pypacker/pypacker-4.9.ebuild
+++ b/net-analyzer/pypacker/pypacker-4.9.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
inherit distutils-r1 vcs-snapshot
diff --git a/net-analyzer/python-gvm/python-gvm-1.1.0.ebuild b/net-analyzer/python-gvm/python-gvm-1.1.0.ebuild
index 9a52388287f..0fe7c72c9a9 100644
--- a/net-analyzer/python-gvm/python-gvm-1.1.0.ebuild
+++ b/net-analyzer/python-gvm/python-gvm-1.1.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
inherit distutils-r1
DESCRIPTION="Greenbone Vulnerability Management Python Library"
diff --git a/net-analyzer/python-gvm/python-gvm-1.2.0.ebuild b/net-analyzer/python-gvm/python-gvm-1.2.0.ebuild
index 8643fbe95e0..940c6ebd495 100644
--- a/net-analyzer/python-gvm/python-gvm-1.2.0.ebuild
+++ b/net-analyzer/python-gvm/python-gvm-1.2.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
inherit distutils-r1
DESCRIPTION="Greenbone Vulnerability Management Python Library"
diff --git a/net-analyzer/python-gvm/python-gvm-1.5.0.ebuild b/net-analyzer/python-gvm/python-gvm-1.5.0.ebuild
index 8f7d966921f..9bb049760a2 100644
--- a/net-analyzer/python-gvm/python-gvm-1.5.0.ebuild
+++ b/net-analyzer/python-gvm/python-gvm-1.5.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
DISTUTILS_USE_SETUPTOOLS=pyproject.toml
inherit distutils-r1
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild
index ddf3e474c0f..ba8b9c45ce9 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DISTUTILS_OPTIONAL=true
DISTUTILS_SINGLE_IMPL=true
GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
inherit autotools perl-module distutils-r1 flag-o-matic multilib
MY_P=${P/_/-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
index 247d9db3268..8e87060d737 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=true
DISTUTILS_SINGLE_IMPL=true
GENTOO_DEPEND_ON_PERL=no
LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit autotools lua perl-module distutils-r1 flag-o-matic multilib
@@ -19,7 +19,7 @@ SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/8.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test"
RESTRICT="!test? ( test )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
index 1335788aeb0..fb33d065e26 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DISTUTILS_OPTIONAL=true
DISTUTILS_SINGLE_IMPL=true
GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
inherit autotools perl-module distutils-r1 flag-o-matic multilib
MY_P=${P/_/-}
diff --git a/net-analyzer/scapy/files/scapy-2.4.4-libc.patch b/net-analyzer/scapy/files/scapy-2.4.4-libc.patch
new file mode 100644
index 00000000000..dd27896b565
--- /dev/null
+++ b/net-analyzer/scapy/files/scapy-2.4.4-libc.patch
@@ -0,0 +1,13 @@
+diff --git a/scapy/arch/bpf/core.py b/scapy/arch/bpf/core.py
+index 0ebdb53..c74902a 100644
+--- a/scapy/arch/bpf/core.py
++++ b/scapy/arch/bpf/core.py
+@@ -27,7 +27,7 @@ from scapy.modules.six.moves import range
+
+ # ctypes definitions
+
+-LIBC = cdll.LoadLibrary(find_library("libc"))
++LIBC = cdll.LoadLibrary(find_library("c"))
+ LIBC.ioctl.argtypes = [c_int, c_ulong, c_char_p]
+ LIBC.ioctl.restype = c_int
+
diff --git a/net-analyzer/scapy/scapy-2.4.4.ebuild b/net-analyzer/scapy/scapy-2.4.4-r1.ebuild
index 8e4a5ba64ef..ebda6205e3b 100644
--- a/net-analyzer/scapy/scapy-2.4.4.ebuild
+++ b/net-analyzer/scapy/scapy-2.4.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1 readme.gentoo-r1
@@ -29,6 +29,8 @@ Scapy has optional support for the following packages:
See also ""${EPREFIX}/usr/share/doc/${PF}/installation.rst""
"
+PATCHES=("${FILESDIR}/${P}-libc.patch")
+
src_prepare() {
if ! [[ -f ${PN}/VERSION ]]; then
echo ${PV} > ${PN}/VERSION || die
diff --git a/net-analyzer/scapy/scapy-9999.ebuild b/net-analyzer/scapy/scapy-9999.ebuild
index 3b658780d77..ec171fbddec 100644
--- a/net-analyzer/scapy/scapy-9999.ebuild
+++ b/net-analyzer/scapy/scapy-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1 git-r3 readme.gentoo-r1
diff --git a/net-analyzer/slurm/files/slurm-0.4.3-fix-includes.patch b/net-analyzer/slurm/files/slurm-0.4.3-fix-includes.patch
new file mode 100644
index 00000000000..9e933ffc509
--- /dev/null
+++ b/net-analyzer/slurm/files/slurm-0.4.3-fix-includes.patch
@@ -0,0 +1,22 @@
+--- a/os.h
++++ b/os.h
+@@ -177,7 +177,7 @@
+ #elif defined (__linux__) /* L I N U X */
+ #include <stdio.h>
+ #include <sys/param.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <unistd.h>
+@@ -195,8 +195,8 @@
+ #include <netinet/in.h>
+ #include <net/if.h>
+ #include <arpa/inet.h>
+-#include <net/ppp_defs.h>
+-#include <net/if_ppp.h>
++#include <linux/ppp_defs.h>
++#include <linux/if_ppp.h>
+ #elif defined (__Solaris__) /* S O L A R I S */
+ #include <stdio.h>
+ #define NO_CURSES_E 1
diff --git a/net-analyzer/slurm/slurm-0.4.3.ebuild b/net-analyzer/slurm/slurm-0.4.3.ebuild
index 95641beb1b2..5dd5798c2f8 100644
--- a/net-analyzer/slurm/slurm-0.4.3.ebuild
+++ b/net-analyzer/slurm/slurm-0.4.3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit cmake-utils
+EAPI=7
+
+inherit cmake
DESCRIPTION="Realtime network interface monitor based on FreeBSD's pppstatus"
HOMEPAGE="https://github.com/mattthias/slurm"
@@ -10,28 +11,21 @@ SRC_URI="https://github.com/mattthias/slurm/archive/upstream/${PN}.tar.gz -> ${P
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND="
- sys-libs/ncurses:*
-"
-DEPEND="
- ${RDEPEND}
-"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+
+RDEPEND="sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-upstream"
+
PATCHES=(
"${FILESDIR}"/${PN}-0.3.3-overflow.patch
"${FILESDIR}"/${P}-tinfo.patch
"${FILESDIR}"/${P}-version.patch
-)
-DOCS=(
- AUTHORS
- ChangeLog
- FAQ
- KEYS
- README
- THANKS
- THEMES.txt
- TODO
+ "${FILESDIR}"/${P}-fix-includes.patch
)
-S=${WORKDIR}/${PN}-upstream
+src_install() {
+ cmake_src_install
+ dodoc KEYS THEMES.txt
+}
diff --git a/net-analyzer/snallygaster/snallygaster-0.0.6.ebuild b/net-analyzer/snallygaster/snallygaster-0.0.6.ebuild
index 721aa438132..4558f9f7250 100644
--- a/net-analyzer/snallygaster/snallygaster-0.0.6.ebuild
+++ b/net-analyzer/snallygaster/snallygaster-0.0.6.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
DISTUTILS_SINGLE_IMPL=1
inherit distutils-r1
diff --git a/net-analyzer/snallygaster/snallygaster-0.0.8.ebuild b/net-analyzer/snallygaster/snallygaster-0.0.8.ebuild
index 721aa438132..4558f9f7250 100644
--- a/net-analyzer/snallygaster/snallygaster-0.0.8.ebuild
+++ b/net-analyzer/snallygaster/snallygaster-0.0.8.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
DISTUTILS_SINGLE_IMPL=1
inherit distutils-r1
diff --git a/net-analyzer/snallygaster/snallygaster-0.0.9.ebuild b/net-analyzer/snallygaster/snallygaster-0.0.9.ebuild
index 721aa438132..4558f9f7250 100644
--- a/net-analyzer/snallygaster/snallygaster-0.0.9.ebuild
+++ b/net-analyzer/snallygaster/snallygaster-0.0.9.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
DISTUTILS_SINGLE_IMPL=1
inherit distutils-r1
diff --git a/net-analyzer/snmpclitools/metadata.xml b/net-analyzer/snmpclitools/metadata.xml
index 57e2cb1d8be..e34f7d9e6af 100644
--- a/net-analyzer/snmpclitools/metadata.xml
+++ b/net-analyzer/snmpclitools/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
-<email>python@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-<email>netmon@gentoo.org</email>
-</maintainer>
+ <maintainer type="project">
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
+ <stabilize-allarches/>
</pkgmetadata>
diff --git a/net-analyzer/snmpclitools/snmpclitools-0.6.4.ebuild b/net-analyzer/snmpclitools/snmpclitools-0.6.4.ebuild
index 4e582795121..69405fd70de 100644
--- a/net-analyzer/snmpclitools/snmpclitools-0.6.4.ebuild
+++ b/net-analyzer/snmpclitools/snmpclitools-0.6.4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+
+PYTHON_COMPAT=( python3_{7..9} )
inherit distutils-r1
DESCRIPTION="Pure-Python SNMP management tools, formerly pysnmp-apps"
@@ -16,8 +17,4 @@ KEYWORDS="~amd64 ~x86"
RDEPEND="
!dev-python/pysnmp-apps
>=dev-python/pysnmp-4.2.2[${PYTHON_USEDEP}]
- dev-python/pysnmp-mibs[${PYTHON_USEDEP}]
-"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
+ dev-python/pysnmp-mibs[${PYTHON_USEDEP}]"
diff --git a/net-analyzer/softflowd/files/softflowd-0.9.9-_GNU_SOURCE.patch b/net-analyzer/softflowd/files/softflowd-0.9.9-_GNU_SOURCE.patch
deleted file mode 100644
index cb4844803e0..00000000000
--- a/net-analyzer/softflowd/files/softflowd-0.9.9-_GNU_SOURCE.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-setresuid and setresgid need _GNU_SOURCE which clashes with _BSD_SOURCE
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -87,7 +87,7 @@
- AC_SEARCH_LIBS(socket, socket)
- AC_CHECK_LIB(pcap, pcap_open_live)
-
--AC_CHECK_FUNCS(closefrom daemon setresuid setreuid setresgid setgid strlcpy strlcat)
-+AC_CHECK_FUNCS(closefrom daemon setreuid setgid strlcpy strlcat)
-
- AC_CHECK_TYPES([u_int64_t, int64_t, uint64_t, u_int32_t, int32_t, uint32_t])
- AC_CHECK_TYPES([u_int16_t, int16_t, uint16_t, u_int8_t, int8_t, uint8_t])
diff --git a/net-analyzer/softflowd/files/softflowd-0.9.9-no-strip.patch b/net-analyzer/softflowd/files/softflowd-0.9.9-no-strip.patch
deleted file mode 100644
index c48603a7f49..00000000000
--- a/net-analyzer/softflowd/files/softflowd-0.9.9-no-strip.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52,7 +52,7 @@
- $(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)
- [ -d $(DESTDIR)$(mandir)/man8 ] || \
- $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man8
-- $(INSTALL) -m 0755 -s softflowd $(DESTDIR)$(sbindir)/softflowd
-- $(INSTALL) -m 0755 -s softflowctl $(DESTDIR)$(sbindir)/softflowctl
-+ $(INSTALL) -m 0755 softflowd $(DESTDIR)$(sbindir)/softflowd
-+ $(INSTALL) -m 0755 softflowctl $(DESTDIR)$(sbindir)/softflowctl
- $(INSTALL) -m 0644 softflowd.8 $(DESTDIR)$(mandir)/man8/softflowd.8
- $(INSTALL) -m 0644 softflowctl.8 $(DESTDIR)$(mandir)/man8/softflowctl.8
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-2.1.2.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-2.1.2-r1.ebuild
index 8e0aa689083..adbeae7674b 100644
--- a/net-analyzer/speedtest-cli/speedtest-cli-2.1.2.ebuild
+++ b/net-analyzer/speedtest-cli/speedtest-cli-2.1.2-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest
index f1be247f750..e5ce540ce85 100644
--- a/net-analyzer/sslscan/Manifest
+++ b/net-analyzer/sslscan/Manifest
@@ -1,10 +1,8 @@
DIST sslscan-1.11.13-rbsec-openssl.tar.gz 5523256 BLAKE2B d8f5aa8bf748310fe1186ec9ab74ecc33425d6fa3db709d94516780d4efadbdd9cf6358798796704dfeb4032ec615298f3b67c8150e314f1e79a4d826c2589b7 SHA512 9bfdac0b6dcbb9e932ef41db9753f7298cf38ddc18731386968289114fd5ed10d81e95523d557b42b431377638d2f62fb710189e7d944ba89979fe5e3437fd3f
DIST sslscan-1.11.13-rbsec.tar.gz 57006 BLAKE2B ea5e2754f5a8218ee1f3aba26e7efe2394fa87b79137955705edc4600d67139f2641ac7b4e7a92f7273878f5b150e3e1b159114c833dc180049688563cf5095b SHA512 51477e5b29a2fc87e2d6c8d76430eeb2a6feb388d47392938b9e2c572acc5926534a19dc249080a066256a1a6cbfe08b162e9f3839386c86116352e5eb57c544
-DIST sslscan-2.0.1.tar.gz 109709 BLAKE2B d0aabebe208529122d9d4d63d39b13c3cc9128dce552cc773b32e02ade87fcb91d5ad7e13a5dfd4883f73153d3ec19b91b16166a756c38df92c96a2f9e8606bb SHA512 d8e9b66b110d7a76ffa7cc3b52f6f5614998ab08e91d12aa92d604ff3320dff6bec0e9a9017ab9c2dea204d9f51b5c729215836fd8f0dce0c5817e28b2eef63f
-DIST sslscan-2.0.2.tar.gz 109798 BLAKE2B 4ed599578a3ee1bd0296c237f8f751aa9f95b96ab7592d0d8f7d117879e7058a92f28d5361658e144eb461fd1bb11739e79e2ae030ac9fb0430924ecca53dfd6 SHA512 ffe12315942c9b9a5f28766768c2202ef09d82977a42c5d114ba2bb7354e694df6262377288ca788e185e0b9423a78c9ebe2fcc02923bd8522c0b9b98df43453
-DIST sslscan-2.0.3.tar.gz 109870 BLAKE2B e42b31eea50adb3f24627a0359d9896a1ed3e24f6f4316ff55ed1ea5e52a9d8d7db8c231e18e0e323b688e3b2cb15342b052529392bfa9b6be17e7c3401bf193 SHA512 3cc1e7b93f76c03afff054b74938fbc22a190f6231fc9623b70084d5488313e253d170532c58ec5d320cac2a0b451b2bf43199367f4f38ccecbfa904bb8424ec
-DIST sslscan-2.0.4.tar.gz 109501 BLAKE2B 45eccf9c2b7b235b30259dd77a7bdfcb77ee43517ec5619aef96a06aba9f145e105fc29410f4abf6d4c645c1aebd02156344d9ca88c629068ba00d6ee93d12e2 SHA512 1313020edc75abad12f1ea735d4c871d4bc605b7cb3be039904cb24dfbeae94580c812067b3ff304e9c4f612e22697dee02c6cfdc81066a7af46c95523399837
-DIST sslscan-2.0.5.tar.gz 109503 BLAKE2B bd1fd0c3a0eb9e00cd36dc30c3bc2cc052c0e842ef61e49830af57a7f6ebc4a683440c973193bd7ccd3a20b67c42a47c92480789bf3de0886d51827876626f64 SHA512 2d6db38d6df6bd3bd691381ad6f649283889bfcab06121d509db40ec080adff421962980cb7943eae83c23bcef91e57c5d2be1ad32560e8bdab2b200a080fb37
DIST sslscan-2.0.6.tar.gz 109597 BLAKE2B 30c0dc329d252fbb91800e470cad84214fbe30694c33fa388040838da24ca73b0857f19603ca7e71dc84fe4ca10977b2d4c0145a752718225f5225540184dee5 SHA512 2f7236f101e1ab75a6fb2efc8fed2949a410b4c67156e88865724e0f399a6e749218253d49c122f1e046022634ef62dcc2b4f97833fd33f90a3ba5a2b7e06c6c
-DIST sslscan-OpenSSL_1_1_1g.tar.gz 9975550 BLAKE2B 22efa4ffe5d56a861bc4e2e1bc9a558e79265a3789acd9ca65d0a1162a1808a089a92a234e88c951f2a3cdabd3b1908ac7fe6d5f2b5fe554f229a22c11ab185b SHA512 bc8d24d7fc93542a8d77e13a57768de242ef679ef4db93c1b6b981a15a60646a5c5d869d066248448f3eb1ab2012e3ddc80bf301f486c0574d469a3f7db7b8d4
+DIST sslscan-2.0.7.tar.gz 109639 BLAKE2B d4a8257943f0c07dfc4f59e3b71091466dfd9d0cea71dfd44f17487fd0254e0f6113acbd1ddf30659cebb60bca7609070ed5733af737dce11c7cd762d3dbdd30 SHA512 de5e27e75f9af4dadc6ae10388602f64a56a457fcd737b37a1a9da1f433969d19004c994b8f04c569aa40b8ade6176fa2752fbc0b52046174791cad119e07bd0
+DIST sslscan-2.0.8.tar.gz 109713 BLAKE2B 3c28eda337145556a968be66bb7924f95cd7ad8eb9bab04531cad7d3a274f5e337804d3223903369df63c97884b6373f0b207e3691857a6b65591e7d067f51dc SHA512 5260e8da881b7757d69b1f8a9640a9c1593c6537a9f66e9250c9183697e7768488d24bab1eef713a1907a773689587bd1b2856caebe6d8df3cf509273a2cf7fd
DIST sslscan-OpenSSL_1_1_1h.tar.gz 9985614 BLAKE2B 78f8bcf04a5a03636efe4ea2f82cfbbf6528ed1b02f64b7b7cf773809f5bed11974fd6d2f9f9bddb7fc31e986997f0987a0a773da2bd10b842f3ace977c5c56a SHA512 619dc7b28151571e4410844263a6727c9883701c11a064a2df55368659a63d548179165c9b96910b0e739cec1142f109eae9503b688cbade7abd6b4f3a7563aa
+DIST sslscan-OpenSSL_1_1_1i.tar.gz 9989266 BLAKE2B c0d48845457ba89a9ed4a6f4425a8556cc9c623bba5ecaa07911d19285ca32124c09294862c874afa61aadebb33f290028b14134d51f1823d1bbb63854d7c179 SHA512 7e2ae6f1ce75d39f330d79abc1d2c67418fa8609580a7550f39104e18e9278e859ec788f993186808d45363c43b3e731c3ec5d874d072f2c3e33adb0701db70a
+DIST sslscan-OpenSSL_1_1_1j.tar.gz 9994760 BLAKE2B 749886716739dcb909bd79b29cf714640b64039917f64f6cfc4bee9861e797380d0df9ff11d7f6bb084508b322cb0db4ef7a2f871ee304548ec919d387cdb2c5 SHA512 f94ef129514e69b70f800a599ae726eff6a2fac0dfa8e42982973d1328f6fac6b1da1124e1a7b8aa3d579b720ecf9c71a8bae45db6b1630c052b0c3a22b9360e
diff --git a/net-analyzer/sslscan/sslscan-2.0.1.ebuild b/net-analyzer/sslscan/sslscan-2.0.1.ebuild
deleted file mode 100644
index 874d6c6593b..00000000000
--- a/net-analyzer/sslscan/sslscan-2.0.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# sslscan builds against a static openssl library to allow weak ciphers
-# to be enabled so that they can be tested.
-OPENSSL_RELEASE_TAG="OpenSSL_1_1_1g"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Fast SSL configuration scanner"
-HOMEPAGE="https://github.com/rbsec/sslscan"
-#MY_FORK="rbsec"
-#SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz
-# https://github.com/PeterMosmans/openssl/archive/${MOSMANS_OPENSSL_COMMIT}.tar.gz -> ${P}-${MY_FORK}-openssl.tar.gz"
-SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/openssl:*"
-RDEPEND="${DEPEND}"
-
-# Requires a docker environment
-RESTRICT="test"
-
-# S="${WORKDIR}/${P}-${MY_FORK}"
-
-src_prepare() {
- ln -s ../openssl-${OPENSSL_RELEASE_TAG} openssl || die
- touch .openssl_is_fresh || die
- sed -i -e '/openssl\/.git/,/fi/d' \
- -e '/openssl test/d' Makefile || die
-
- default
-}
-
-src_compile() {
- emake static
-}
-
-src_install() {
- DESTDIR="${D}" emake install
-
- dodoc Changelog README.md
-}
diff --git a/net-analyzer/sslscan/sslscan-2.0.2-r1.ebuild b/net-analyzer/sslscan/sslscan-2.0.2-r1.ebuild
deleted file mode 100644
index b90f6d3563b..00000000000
--- a/net-analyzer/sslscan/sslscan-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# sslscan builds against a static openssl library to allow weak ciphers
-# to be enabled so that they can be tested.
-OPENSSL_RELEASE_TAG="OpenSSL_1_1_1h"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Fast SSL configuration scanner"
-HOMEPAGE="https://github.com/rbsec/sslscan"
-#MY_FORK="rbsec"
-#SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz
-# https://github.com/PeterMosmans/openssl/archive/${MOSMANS_OPENSSL_COMMIT}.tar.gz -> ${P}-${MY_FORK}-openssl.tar.gz"
-SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Requires a docker environment
-RESTRICT="test"
-
-# S="${WORKDIR}/${P}-${MY_FORK}"
-
-src_prepare() {
- ln -s ../openssl-${OPENSSL_RELEASE_TAG} openssl || die
- touch .openssl_is_fresh || die
- sed -i -e '/openssl\/.git/,/fi/d' \
- -e '/openssl test/d' Makefile || die
-
- default
-}
-
-src_compile() {
- emake static
-}
-
-src_install() {
- DESTDIR="${D}" emake install
-
- dodoc Changelog README.md
-}
diff --git a/net-analyzer/sslscan/sslscan-2.0.2.ebuild b/net-analyzer/sslscan/sslscan-2.0.2.ebuild
deleted file mode 100644
index 874d6c6593b..00000000000
--- a/net-analyzer/sslscan/sslscan-2.0.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# sslscan builds against a static openssl library to allow weak ciphers
-# to be enabled so that they can be tested.
-OPENSSL_RELEASE_TAG="OpenSSL_1_1_1g"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Fast SSL configuration scanner"
-HOMEPAGE="https://github.com/rbsec/sslscan"
-#MY_FORK="rbsec"
-#SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz
-# https://github.com/PeterMosmans/openssl/archive/${MOSMANS_OPENSSL_COMMIT}.tar.gz -> ${P}-${MY_FORK}-openssl.tar.gz"
-SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/openssl:*"
-RDEPEND="${DEPEND}"
-
-# Requires a docker environment
-RESTRICT="test"
-
-# S="${WORKDIR}/${P}-${MY_FORK}"
-
-src_prepare() {
- ln -s ../openssl-${OPENSSL_RELEASE_TAG} openssl || die
- touch .openssl_is_fresh || die
- sed -i -e '/openssl\/.git/,/fi/d' \
- -e '/openssl test/d' Makefile || die
-
- default
-}
-
-src_compile() {
- emake static
-}
-
-src_install() {
- DESTDIR="${D}" emake install
-
- dodoc Changelog README.md
-}
diff --git a/net-analyzer/sslscan/sslscan-2.0.3.ebuild b/net-analyzer/sslscan/sslscan-2.0.3.ebuild
deleted file mode 100644
index b90f6d3563b..00000000000
--- a/net-analyzer/sslscan/sslscan-2.0.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# sslscan builds against a static openssl library to allow weak ciphers
-# to be enabled so that they can be tested.
-OPENSSL_RELEASE_TAG="OpenSSL_1_1_1h"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Fast SSL configuration scanner"
-HOMEPAGE="https://github.com/rbsec/sslscan"
-#MY_FORK="rbsec"
-#SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz
-# https://github.com/PeterMosmans/openssl/archive/${MOSMANS_OPENSSL_COMMIT}.tar.gz -> ${P}-${MY_FORK}-openssl.tar.gz"
-SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Requires a docker environment
-RESTRICT="test"
-
-# S="${WORKDIR}/${P}-${MY_FORK}"
-
-src_prepare() {
- ln -s ../openssl-${OPENSSL_RELEASE_TAG} openssl || die
- touch .openssl_is_fresh || die
- sed -i -e '/openssl\/.git/,/fi/d' \
- -e '/openssl test/d' Makefile || die
-
- default
-}
-
-src_compile() {
- emake static
-}
-
-src_install() {
- DESTDIR="${D}" emake install
-
- dodoc Changelog README.md
-}
diff --git a/net-analyzer/sslscan/sslscan-2.0.6.ebuild b/net-analyzer/sslscan/sslscan-2.0.6.ebuild
index 8deaf7cd4f7..92a3a89625b 100644
--- a/net-analyzer/sslscan/sslscan-2.0.6.ebuild
+++ b/net-analyzer/sslscan/sslscan-2.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
# Requires a docker environment
diff --git a/net-analyzer/sslscan/sslscan-2.0.5.ebuild b/net-analyzer/sslscan/sslscan-2.0.7.ebuild
index 8deaf7cd4f7..7ad98a9056c 100644
--- a/net-analyzer/sslscan/sslscan-2.0.5.ebuild
+++ b/net-analyzer/sslscan/sslscan-2.0.7.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
# sslscan builds against a static openssl library to allow weak ciphers
# to be enabled so that they can be tested.
-OPENSSL_RELEASE_TAG="OpenSSL_1_1_1h"
+OPENSSL_RELEASE_TAG="OpenSSL_1_1_1i"
inherit toolchain-funcs
diff --git a/net-analyzer/sslscan/sslscan-2.0.4.ebuild b/net-analyzer/sslscan/sslscan-2.0.8.ebuild
index b90f6d3563b..5093e3ee48a 100644
--- a/net-analyzer/sslscan/sslscan-2.0.4.ebuild
+++ b/net-analyzer/sslscan/sslscan-2.0.8.ebuild
@@ -1,19 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
# sslscan builds against a static openssl library to allow weak ciphers
# to be enabled so that they can be tested.
-OPENSSL_RELEASE_TAG="OpenSSL_1_1_1h"
+OPENSSL_RELEASE_TAG="OpenSSL_1_1_1j"
inherit toolchain-funcs
DESCRIPTION="Fast SSL configuration scanner"
HOMEPAGE="https://github.com/rbsec/sslscan"
-#MY_FORK="rbsec"
-#SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz
-# https://github.com/PeterMosmans/openssl/archive/${MOSMANS_OPENSSL_COMMIT}.tar.gz -> ${P}-${MY_FORK}-openssl.tar.gz"
SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz"
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index 4393b479fd5..24be5f65d70 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -1,4 +1,2 @@
-DIST suricata-5.0.4.tar.gz 29091046 BLAKE2B 38526ca39d2460d630fdd9e804f36c74bfcde54a529748896779b549ed1b55174d6080ddad8933ddfd26004f4e78748a503832f47ee5f52d84a133643aef482b SHA512 e5da14f80b628968e146839b828971e888fd0158b2ecbbcc15c0f42fda2bdcc8ad89632ba05cc45c88d88e537452e77f8e2f3a5e09ecd038d0d38b1a8cf8cea6
-DIST suricata-5.0.5.tar.gz 29094537 BLAKE2B c2a5897836117abe9ca39b3a03de36c4d5667d3e64dc1befd77a7b777e4191439a497e3042e6d00b80ae31c8c4f18347cb2e6833e8db5f64b31c8ab1cf557ac5 SHA512 5f26731e0a0134fdecc8e76a68a69584bacb614ba4fd56b74f27abe62ab7d80135908eeaae38c9a03101f069d83597b3c7c69000bdd2a2e6bfe87f7a98de4e16
-DIST suricata-6.0.0.tar.gz 30832555 BLAKE2B 9cea05b07520924706e961efed6a45b9ba73388a25777f43c1a90497aa00ec200bad15863b7b17b84e622c79309365596853423776da9c3d103c2a8c1126a0d2 SHA512 3c30f6f57c0e8a24992ff2b4ce8ce166d3c0d4b28c8f5e79434d04de9f2016773be01a1689fedfc9e54ff1c8bc9838206bc28f3ff2e47d60102a7016f1062ec3
-DIST suricata-6.0.1.tar.gz 30460439 BLAKE2B 55a24fa2f653a0a80f51e1ab102bb7046bd1f67d60c64c139b485086f4d8e0f5db58906bc33a7b5bdb76ba37b8206ded99b08034c4c292cf16d595bcafc7acc0 SHA512 be57150afc238b6627731e4463297e67469b66241779f5af3d1bd93bfad4fde41a5371298b54a06c7c3ea324e5642753ca57900173989ac738d663a85e9c33f4
+DIST suricata-5.0.6.tar.gz 29136659 BLAKE2B 97d95cadd54d44bd82424322c08ad04be2122cdae5763995f7aefe4a75872091dd7d289e89e47a5ad9fbce570964f11331d848db7fe7ec4c2be9a0f8b62fadff SHA512 73580721683f929a90b6b59673842c051fe44ee7b8d8d890106aad09952d5b8a8f3716f168c41b33feb5c32e0106f5926125313cc11b27bc5a9c65e90b21888f
+DIST suricata-6.0.2.tar.gz 30514801 BLAKE2B 20604fa3332a9d99a1a30db55a0ccd689af0e08e686cd6739d6c4390456acc28d34702704f7e25537463b0c23600d123de361a227f9ef2420ee5c2b11df2866a SHA512 230a74a5442cfa066c56528036b64c173702238c5075161119eaad08d320e528d3510c51095297f120030177fed9c84076d00f567f7a3a4cbdb23d382966cf00
diff --git a/net-analyzer/suricata/suricata-5.0.5.ebuild b/net-analyzer/suricata/suricata-5.0.5.ebuild
deleted file mode 100644
index db9ee04aadb..00000000000
--- a/net-analyzer/suricata/suricata-5.0.5.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit autotools flag-o-matic linux-info python-single-r1 systemd
-
-DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
-HOMEPAGE="https://suricata-ids.org/"
-SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ?? ( lua luajit )
- bpf? ( af-packet )"
-
-RDEPEND="${PYTHON_DEPS}
- acct-group/suricata
- acct-user/suricata
- dev-libs/jansson
- dev-libs/libpcre
- dev-libs/libyaml
- net-libs/libnet:*
- net-libs/libnfnetlink
- dev-libs/nspr
- dev-libs/nss
- $(python_gen_cond_dep '
- dev-python/pyyaml[${PYTHON_USEDEP}]
- ')
- >=net-libs/libhtp-0.5.36
- net-libs/libpcap
- sys-apps/file
- sys-libs/libcap-ng
- bpf? ( >=dev-libs/libbpf-0.1.0 )
- cuda? ( dev-util/nvidia-cuda-toolkit )
- geoip? ( dev-libs/libmaxminddb )
- logrotate? ( app-admin/logrotate )
- lua? ( dev-lang/lua:0= )
- luajit? ( dev-lang/luajit:* )
- lz4? ( app-arch/lz4 )
- nflog? ( net-libs/libnetfilter_log )
- nfqueue? ( net-libs/libnetfilter_queue )
- redis? ( dev-libs/hiredis )"
-DEPEND="${RDEPEND}
- >=sys-devel/autoconf-2.69-r5
- virtual/rust"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch"
- "${FILESDIR}/${PN}-5.0.1_default-config.patch"
-)
-
-pkg_pretend() {
- if use bpf && use kernel_linux; then
- if kernel_is -lt 4 15; then
- ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map"
- fi
-
- CONFIG_CHECK="~XDP_SOCKETS"
- ERROR_XDP_SOCKETS="CONFIG_XDP_SOCKETS is not set, making it impossible for Suricata to load XDP programs. "
- ERROR_XDP_SOCKETS+="Other eBPF features should work normally."
- check_extra_config
- fi
-}
-
-src_prepare() {
- default
- sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am" || die
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- "--localstatedir=/var" \
- "--runstatedir=/run" \
- "--enable-non-bundled-htp" \
- "--enable-gccmarch-native=no" \
- "--enable-python" \
- $(use_enable af-packet) \
- $(use_enable bpf ebpf) \
- $(use_enable control-socket unix-socket) \
- $(use_enable cuda) \
- $(use_enable detection) \
- $(use_enable geoip) \
- $(use_enable hardened gccprotect) \
- $(use_enable hardened pie) \
- $(use_enable lua) \
- $(use_enable luajit) \
- $(use_enable lz4) \
- $(use_enable nflog) \
- $(use_enable nfqueue) \
- $(use_enable redis hiredis) \
- $(use_enable test unittests) \
- "--disable-coccinelle"
- )
-
- if use debug; then
- myeconfargs+=( $(use_enable debug) )
- # so we can get a backtrace according to "reporting bugs" on upstream web site
- CFLAGS="-ggdb -O0" econf ${myeconfargs[@]}
- else
- econf ${myeconfargs[@]}
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- python_optimize
-
- if use bpf; then
- rm -f ebpf/Makefile.{am,in}
- dodoc -r ebpf/
- keepdir /usr/libexec/suricata/ebpf
- fi
-
- insinto "/etc/${PN}"
- doins etc/{classification,reference}.config threshold.config suricata.yaml
-
- keepdir "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
- keepdir "/var/log/${PN}"
-
- fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
- fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
- fperms 2750 "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
-
- newinitd "${FILESDIR}/${PN}-5.0.1-init" ${PN}
- newconfd "${FILESDIR}/${PN}-5.0.1-conf" ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.service
- systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
-
- if use logrotate; then
- insopts -m0644
- insinto /etc/logrotate.d
- newins etc/${PN}.logrotate ${PN}
- fi
-}
-
-pkg_postinst() {
- elog ""
- if use systemd; then
- elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)"
- elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies"
- elog "on file configuration to specify interfaces, should you prefer to run it differently you will have to customise"
- elog "said unit. The simplest way of doing it is to override the Environment=OPTIONS='...' line using a .conf file"
- elog "placed in the directory ${EPREFIX}/etc/systemd/system/suricata.service.d/ ."
- elog "For details, see the section on drop-in directories in systemd.unit(5)."
- else
- elog "The ${PN} init script expects to find the path to the configuration"
- elog "file as well as extra options in /etc/conf.d."
- elog ""
- elog "To create more than one ${PN} service, simply create a new .yaml file for it"
- elog "then create a symlink to the init script from a link called"
- elog "${PN}.foo - like so"
- elog " cd /etc/${PN}"
- elog " ${EDITOR##*/} suricata-foo.yaml"
- elog " cd /etc/init.d"
- elog " ln -s ${PN} ${PN}.foo"
- elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo."
- elog ""
- elog "You can create as many ${PN}.foo* services as you wish."
- fi
-
- if use bpf; then
- elog ""
- elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use"
- elog "because their configuration is hard-coded. You can find the default ones in"
- elog " ${EPREFIX}/usr/share/doc/${PF}/ebpf"
- elog "and the common location for eBPF bytecode is"
- elog " ${EPREFIX}/usr/libexec/${PN}"
- elog "For more information, see https://${PN}.readthedocs.io/en/${P}/capture-hardware/ebpf-xdp.html"
- fi
-
- if use debug; then
- elog ""
- elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:"
- elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs"
- elog "You need to also ensure the FEATURES variable in make.conf contains the"
- elog "'nostrip' option to produce useful core dumps or back traces."
- fi
-
- elog ""
- elog "To download and install an initial set of rules, run:"
- elog " emerge --config =${CATEGORY}/${PF}"
- elog ""
-}
-
-pkg_config() {
- suricata-update
-}
diff --git a/net-analyzer/suricata/suricata-5.0.4.ebuild b/net-analyzer/suricata/suricata-5.0.6.ebuild
index 077c14ece6d..ef4c372ec11 100644
--- a/net-analyzer/suricata/suricata-5.0.4.ebuild
+++ b/net-analyzer/suricata/suricata-5.0.6.ebuild
@@ -1,26 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{7..9} )
-inherit autotools flag-o-matic linux-info python-single-r1 systemd
+inherit autotools flag-o-matic linux-info lua-single python-single-r1 systemd
DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
HOMEPAGE="https://suricata-ids.org/"
SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz"
LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/5"
KEYWORDS="~amd64 ~x86"
-IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test"
+IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua lz4 nflog +nfqueue redis systemd test"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ?? ( lua luajit )
- bpf? ( af-packet )"
+ bpf? ( af-packet )
+ lua? ( ${LUA_REQUIRED_USE} )"
RDEPEND="${PYTHON_DEPS}
acct-group/suricata
@@ -35,7 +36,7 @@ RDEPEND="${PYTHON_DEPS}
$(python_gen_cond_dep '
dev-python/pyyaml[${PYTHON_USEDEP}]
')
- >=net-libs/libhtp-0.5.35
+ >=net-libs/libhtp-0.5.37
net-libs/libpcap
sys-apps/file
sys-libs/libcap-ng
@@ -43,8 +44,7 @@ RDEPEND="${PYTHON_DEPS}
cuda? ( dev-util/nvidia-cuda-toolkit )
geoip? ( dev-libs/libmaxminddb )
logrotate? ( app-admin/logrotate )
- lua? ( dev-lang/lua:0= )
- luajit? ( dev-lang/luajit:* )
+ lua? ( ${LUA_DEPS} )
lz4? ( app-arch/lz4 )
nflog? ( net-libs/libnetfilter_log )
nfqueue? ( net-libs/libnetfilter_queue )
@@ -92,8 +92,6 @@ src_configure() {
$(use_enable geoip) \
$(use_enable hardened gccprotect) \
$(use_enable hardened pie) \
- $(use_enable lua) \
- $(use_enable luajit) \
$(use_enable lz4) \
$(use_enable nflog) \
$(use_enable nfqueue) \
@@ -101,6 +99,13 @@ src_configure() {
$(use_enable test unittests) \
"--disable-coccinelle"
)
+ if use lua; then
+ if use lua_single_target_luajit; then
+ myeconfargs+=( --enable-luajit )
+ else
+ myeconfargs+=( --enable-lua )
+ fi
+ fi
if use debug; then
myeconfargs+=( $(use_enable debug) )
@@ -144,7 +149,7 @@ src_install() {
}
pkg_postinst() {
- elog ""
+ elog
if use systemd; then
elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)"
elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies"
@@ -155,7 +160,7 @@ pkg_postinst() {
else
elog "The ${PN} init script expects to find the path to the configuration"
elog "file as well as extra options in /etc/conf.d."
- elog ""
+ elog
elog "To create more than one ${PN} service, simply create a new .yaml file for it"
elog "then create a symlink to the init script from a link called"
elog "${PN}.foo - like so"
@@ -164,12 +169,12 @@ pkg_postinst() {
elog " cd /etc/init.d"
elog " ln -s ${PN} ${PN}.foo"
elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo."
- elog ""
+ elog
elog "You can create as many ${PN}.foo* services as you wish."
fi
if use bpf; then
- elog ""
+ elog
elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use"
elog "because their configuration is hard-coded. You can find the default ones in"
elog " ${EPREFIX}/usr/share/doc/${PF}/ebpf"
@@ -179,17 +184,19 @@ pkg_postinst() {
fi
if use debug; then
- elog ""
+ elog
elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:"
elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs"
elog "You need to also ensure the FEATURES variable in make.conf contains the"
elog "'nostrip' option to produce useful core dumps or back traces."
fi
- elog ""
- elog "To download and install an initial set of rules, run:"
- elog " emerge --config =${CATEGORY}/${PF}"
- elog ""
+ elog
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "To download and install an initial set of rules, run:"
+ elog " emerge --config =${CATEGORY}/${PF}"
+ fi
+ elog
}
pkg_config() {
diff --git a/net-analyzer/suricata/suricata-6.0.0.ebuild b/net-analyzer/suricata/suricata-6.0.0.ebuild
deleted file mode 100644
index 6a00d0c18c9..00000000000
--- a/net-analyzer/suricata/suricata-6.0.0.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit autotools flag-o-matic linux-info python-single-r1 systemd
-
-DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
-HOMEPAGE="https://suricata-ids.org/"
-SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ?? ( lua luajit )
- bpf? ( af-packet )"
-
-RDEPEND="${PYTHON_DEPS}
- acct-group/suricata
- acct-user/suricata
- dev-libs/jansson
- dev-libs/libpcre
- dev-libs/libyaml
- net-libs/libnet:*
- net-libs/libnfnetlink
- dev-libs/nspr
- dev-libs/nss
- $(python_gen_cond_dep '
- dev-python/pyyaml[${PYTHON_USEDEP}]
- ')
- >=net-libs/libhtp-0.5.35
- net-libs/libpcap
- sys-apps/file
- sys-libs/libcap-ng
- bpf? ( >=dev-libs/libbpf-0.1.0 )
- cuda? ( dev-util/nvidia-cuda-toolkit )
- geoip? ( dev-libs/libmaxminddb )
- logrotate? ( app-admin/logrotate )
- lua? ( dev-lang/lua:0= )
- luajit? ( dev-lang/luajit:* )
- lz4? ( app-arch/lz4 )
- nflog? ( net-libs/libnetfilter_log )
- nfqueue? ( net-libs/libnetfilter_queue )
- redis? ( dev-libs/hiredis )"
-DEPEND="${RDEPEND}
- >=sys-devel/autoconf-2.69-r5
- virtual/rust"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch"
- "${FILESDIR}/${PN}-6.0.0_default-config.patch"
-)
-
-pkg_pretend() {
- if use bpf && use kernel_linux; then
- if kernel_is -lt 4 15; then
- ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map"
- fi
-
- CONFIG_CHECK="~XDP_SOCKETS"
- ERROR_XDP_SOCKETS="CONFIG_XDP_SOCKETS is not set, making it impossible for Suricata to load XDP programs. "
- ERROR_XDP_SOCKETS+="Other eBPF features should work normally."
- check_extra_config
- fi
-}
-
-src_prepare() {
- default
- sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am" || die
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- "--localstatedir=/var" \
- "--runstatedir=/run" \
- "--enable-non-bundled-htp" \
- "--enable-gccmarch-native=no" \
- "--enable-python" \
- $(use_enable af-packet) \
- $(use_enable bpf ebpf) \
- $(use_enable control-socket unix-socket) \
- $(use_enable cuda) \
- $(use_enable detection) \
- $(use_enable geoip) \
- $(use_enable hardened gccprotect) \
- $(use_enable hardened pie) \
- $(use_enable lua) \
- $(use_enable luajit) \
- $(use_enable lz4) \
- $(use_enable nflog) \
- $(use_enable nfqueue) \
- $(use_enable redis hiredis) \
- $(use_enable test unittests) \
- "--disable-coccinelle"
- )
-
- if use debug; then
- myeconfargs+=( $(use_enable debug) )
- # so we can get a backtrace according to "reporting bugs" on upstream web site
- CFLAGS="-ggdb -O0" econf ${myeconfargs[@]}
- else
- econf ${myeconfargs[@]}
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- python_optimize
-
- if use bpf; then
- rm -f ebpf/Makefile.{am,in}
- dodoc -r ebpf/
- keepdir /usr/libexec/suricata/ebpf
- fi
-
- insinto "/etc/${PN}"
- doins etc/{classification,reference}.config threshold.config suricata.yaml
-
- keepdir "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
- keepdir "/var/log/${PN}"
-
- fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
- fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
- fperms 2750 "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
-
- newinitd "${FILESDIR}/${PN}-5.0.1-init" ${PN}
- newconfd "${FILESDIR}/${PN}-5.0.1-conf" ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.service
- systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
-
- if use logrotate; then
- insopts -m0644
- insinto /etc/logrotate.d
- newins etc/${PN}.logrotate ${PN}
- fi
-}
-
-pkg_postinst() {
- elog
- if use systemd; then
- elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)"
- elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies"
- elog "on file configuration to specify interfaces, should you prefer to run it differently you will have to customise"
- elog "said unit. The simplest way of doing it is to override the Environment=OPTIONS='...' line using a .conf file"
- elog "placed in the directory ${EPREFIX}/etc/systemd/system/suricata.service.d/ ."
- elog "For details, see the section on drop-in directories in systemd.unit(5)."
- else
- elog "The ${PN} init script expects to find the path to the configuration"
- elog "file as well as extra options in /etc/conf.d."
- elog
- elog "To create more than one ${PN} service, simply create a new .yaml file for it"
- elog "then create a symlink to the init script from a link called"
- elog "${PN}.foo - like so"
- elog " cd /etc/${PN}"
- elog " ${EDITOR##*/} suricata-foo.yaml"
- elog " cd /etc/init.d"
- elog " ln -s ${PN} ${PN}.foo"
- elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo."
- elog
- elog "You can create as many ${PN}.foo* services as you wish."
- fi
-
- if use bpf; then
- elog
- elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use"
- elog "because their configuration is hard-coded. You can find the default ones in"
- elog " ${EPREFIX}/usr/share/doc/${PF}/ebpf"
- elog "and the common location for eBPF bytecode is"
- elog " ${EPREFIX}/usr/libexec/${PN}"
- elog "For more information, see https://${PN}.readthedocs.io/en/${P}/capture-hardware/ebpf-xdp.html"
- fi
-
- if use debug; then
- elog
- elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:"
- elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs"
- elog "You need to also ensure the FEATURES variable in make.conf contains the"
- elog "'nostrip' option to produce useful core dumps or back traces."
- fi
-
- elog
- if [[ -n "${REPLACING_VERSIONS}" ]]; then
- ewarn "Since version 6.0.0 Suricata no longer supports the unified2 output format commonly used"
- ewarn "in legacy, Snort-compatible IDS solutions, e.g. ones based on net-analyzer/barnyard2."
- ewarn "If you need unified2 support, please continue to use suricata-5."
- else
- elog "To download and install an initial set of rules, run:"
- elog " emerge --config =${CATEGORY}/${PF}"
- fi
- elog
-}
-
-pkg_config() {
- suricata-update
-}
diff --git a/net-analyzer/suricata/suricata-6.0.1.ebuild b/net-analyzer/suricata/suricata-6.0.1.ebuild
deleted file mode 100644
index 6602a4b80ad..00000000000
--- a/net-analyzer/suricata/suricata-6.0.1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit autotools flag-o-matic linux-info python-single-r1 systemd
-
-DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
-HOMEPAGE="https://suricata-ids.org/"
-SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ?? ( lua luajit )
- bpf? ( af-packet )"
-
-RDEPEND="${PYTHON_DEPS}
- acct-group/suricata
- acct-user/suricata
- dev-libs/jansson
- dev-libs/libpcre
- dev-libs/libyaml
- net-libs/libnet:*
- net-libs/libnfnetlink
- dev-libs/nspr
- dev-libs/nss
- $(python_gen_cond_dep '
- dev-python/pyyaml[${PYTHON_USEDEP}]
- ')
- >=net-libs/libhtp-0.5.36
- net-libs/libpcap
- sys-apps/file
- sys-libs/libcap-ng
- bpf? ( >=dev-libs/libbpf-0.1.0 )
- cuda? ( dev-util/nvidia-cuda-toolkit )
- geoip? ( dev-libs/libmaxminddb )
- logrotate? ( app-admin/logrotate )
- lua? ( dev-lang/lua:0= )
- luajit? ( dev-lang/luajit:* )
- lz4? ( app-arch/lz4 )
- nflog? ( net-libs/libnetfilter_log )
- nfqueue? ( net-libs/libnetfilter_queue )
- redis? ( dev-libs/hiredis )"
-DEPEND="${RDEPEND}
- >=sys-devel/autoconf-2.69-r5
- virtual/rust"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch"
- "${FILESDIR}/${PN}-6.0.0_default-config.patch"
-)
-
-pkg_pretend() {
- if use bpf && use kernel_linux; then
- if kernel_is -lt 4 15; then
- ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map"
- fi
-
- CONFIG_CHECK="~XDP_SOCKETS"
- ERROR_XDP_SOCKETS="CONFIG_XDP_SOCKETS is not set, making it impossible for Suricata to load XDP programs. "
- ERROR_XDP_SOCKETS+="Other eBPF features should work normally."
- check_extra_config
- fi
-}
-
-src_prepare() {
- default
- sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am" || die
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- "--localstatedir=/var" \
- "--runstatedir=/run" \
- "--enable-non-bundled-htp" \
- "--enable-gccmarch-native=no" \
- "--enable-python" \
- $(use_enable af-packet) \
- $(use_enable bpf ebpf) \
- $(use_enable control-socket unix-socket) \
- $(use_enable cuda) \
- $(use_enable detection) \
- $(use_enable geoip) \
- $(use_enable hardened gccprotect) \
- $(use_enable hardened pie) \
- $(use_enable lua) \
- $(use_enable luajit) \
- $(use_enable lz4) \
- $(use_enable nflog) \
- $(use_enable nfqueue) \
- $(use_enable redis hiredis) \
- $(use_enable test unittests) \
- "--disable-coccinelle"
- )
-
- if use debug; then
- myeconfargs+=( $(use_enable debug) )
- # so we can get a backtrace according to "reporting bugs" on upstream web site
- CFLAGS="-ggdb -O0" econf ${myeconfargs[@]}
- else
- econf ${myeconfargs[@]}
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- python_optimize
-
- if use bpf; then
- rm -f ebpf/Makefile.{am,in}
- dodoc -r ebpf/
- keepdir /usr/libexec/suricata/ebpf
- fi
-
- insinto "/etc/${PN}"
- doins etc/{classification,reference}.config threshold.config suricata.yaml
-
- keepdir "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
- keepdir "/var/log/${PN}"
-
- fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
- fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
- fperms 2750 "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
-
- newinitd "${FILESDIR}/${PN}-5.0.1-init" ${PN}
- newconfd "${FILESDIR}/${PN}-5.0.1-conf" ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.service
- systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
-
- if use logrotate; then
- insopts -m0644
- insinto /etc/logrotate.d
- newins etc/${PN}.logrotate ${PN}
- fi
-}
-
-pkg_postinst() {
- elog
- if use systemd; then
- elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)"
- elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies"
- elog "on file configuration to specify interfaces, should you prefer to run it differently you will have to customise"
- elog "said unit. The simplest way of doing it is to override the Environment=OPTIONS='...' line using a .conf file"
- elog "placed in the directory ${EPREFIX}/etc/systemd/system/suricata.service.d/ ."
- elog "For details, see the section on drop-in directories in systemd.unit(5)."
- else
- elog "The ${PN} init script expects to find the path to the configuration"
- elog "file as well as extra options in /etc/conf.d."
- elog
- elog "To create more than one ${PN} service, simply create a new .yaml file for it"
- elog "then create a symlink to the init script from a link called"
- elog "${PN}.foo - like so"
- elog " cd /etc/${PN}"
- elog " ${EDITOR##*/} suricata-foo.yaml"
- elog " cd /etc/init.d"
- elog " ln -s ${PN} ${PN}.foo"
- elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo."
- elog
- elog "You can create as many ${PN}.foo* services as you wish."
- fi
-
- if use bpf; then
- elog
- elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use"
- elog "because their configuration is hard-coded. You can find the default ones in"
- elog " ${EPREFIX}/usr/share/doc/${PF}/ebpf"
- elog "and the common location for eBPF bytecode is"
- elog " ${EPREFIX}/usr/libexec/${PN}"
- elog "For more information, see https://${PN}.readthedocs.io/en/${P}/capture-hardware/ebpf-xdp.html"
- fi
-
- if use debug; then
- elog
- elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:"
- elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs"
- elog "You need to also ensure the FEATURES variable in make.conf contains the"
- elog "'nostrip' option to produce useful core dumps or back traces."
- fi
-
- elog
- if [[ -n "${REPLACING_VERSIONS}" ]]; then
- ewarn "Since version 6.0.0 Suricata no longer supports the unified2 output format commonly used"
- ewarn "in legacy, Snort-compatible IDS solutions, e.g. ones based on net-analyzer/barnyard2."
- ewarn "If you need unified2 support, please continue to use suricata-5."
- else
- elog "To download and install an initial set of rules, run:"
- elog " emerge --config =${CATEGORY}/${PF}"
- fi
- elog
-}
-
-pkg_config() {
- suricata-update
-}
diff --git a/net-analyzer/suricata/suricata-6.0.1-r100.ebuild b/net-analyzer/suricata/suricata-6.0.2.ebuild
index 3d6679536b4..028ea37b43e 100644
--- a/net-analyzer/suricata/suricata-6.0.1-r100.ebuild
+++ b/net-analyzer/suricata/suricata-6.0.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
inherit autotools flag-o-matic linux-info lua-single python-single-r1 systemd
@@ -13,7 +13,7 @@ HOMEPAGE="https://suricata-ids.org/"
SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz"
LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/6"
KEYWORDS="~amd64 ~x86"
IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua lz4 nflog +nfqueue redis systemd test"
@@ -36,7 +36,7 @@ RDEPEND="${PYTHON_DEPS}
$(python_gen_cond_dep '
dev-python/pyyaml[${PYTHON_USEDEP}]
')
- >=net-libs/libhtp-0.5.36
+ >=net-libs/libhtp-0.5.37
net-libs/libpcap
sys-apps/file
sys-libs/libcap-ng
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
index 5d08f58a44e..848865ea5b7 100644
--- a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,9 +12,10 @@ S="${WORKDIR}/${PN}-${P/_}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="+drop-root libressl +smi +ssl +samba suid test"
-RESTRICT="!test? ( test )"
+# Assorted failures: bug #768498
+RESTRICT="test"
REQUIRED_USE="test? ( samba )"
BDEPEND="drop-root? ( virtual/pkgconfig )"
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index 6f074f38fb2..4765315651b 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit autotools git-r3
DESCRIPTION="A Tool for network monitoring and data acquisition"
@@ -87,5 +88,5 @@ src_install() {
}
pkg_postinst() {
- use suid && elog "To let normal users run tcpdump add them to the pcap group."
+ use suid && elog "To let normal users run tcpdump, add them to the pcap group."
}
diff --git a/net-analyzer/tcpflow/Manifest b/net-analyzer/tcpflow/Manifest
new file mode 100644
index 00000000000..2ca13347df5
--- /dev/null
+++ b/net-analyzer/tcpflow/Manifest
@@ -0,0 +1,3 @@
+DIST be13_api-20170924.tar.gz 75724 BLAKE2B a5257346b9c0740d9758543fe7772c960e1941735abefe4d24d347631b35d1511fde8eb5a58dbb2824c54e78ee0d686a2549ceea2c1dc91e05ef92899c8b3c2d SHA512 5bf0d28f23df9436304245ccbdbf4af5b0f65e62b92e3039cfb9a70fe2056aa90dcce906db02f3df83fcf2a415c8a46f0f75468d48e13b15673d11c447a4c9c4
+DIST dfxml-20170921.tar.gz 163616 BLAKE2B 17214d15596a136efb2afc7246ee0f5696620b5aac7c2d78e37764f51487ff816de5a7c0f59e7484d358a8cd8eab34841716970cd859f0ce868ac29c8532754c SHA512 0885947aaf8efe639c13324413ef0cca49750027b48b434f226fb9fbfba494e84e245da879dc0d77b46bddc27798f7f5df12590fce47b096683034bbc61280e1
+DIST tcpflow-1.6.1.tar.gz 915502 BLAKE2B 6560d11fe6a2b6bd77ddcffb47338e9af358a0f5ec07402ec81dae4cf87dd5cc26bf300df014927df8b8b6143e14553dd2a70cb63769dc4f2525cf9dd1967582 SHA512 ec5b9d5e5f0bc1d6582b9f2537c9ba6c8ae3d9c8f88fb0c67ef031146a515d19caa5ecd365492fb5daf8ddde77b58ea5190290b8e43b40abcdea5aaaef5e2e1c
diff --git a/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-libcapng.patch b/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-libcapng.patch
new file mode 100644
index 00000000000..b56144324c0
--- /dev/null
+++ b/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-libcapng.patch
@@ -0,0 +1,13 @@
+--- a/src/tcpflow.cpp
++++ b/src/tcpflow.cpp
+@@ -30,6 +30,10 @@
+ #include <grp.h>
+ #endif
+
++#ifdef HAVE_CAP_NG_H
++#include <cap-ng.h>
++#endif
++
+ /* bring in inet_ntop if it is not present */
+ #define ETH_ALEN 6
+ #ifndef HAVE_INET_NTOP
diff --git a/net-analyzer/tcpflow/files/tcpflow-1.5.2-gentoo.patch b/net-analyzer/tcpflow/files/tcpflow-1.5.2-gentoo.patch
new file mode 100644
index 00000000000..e6748c01968
--- /dev/null
+++ b/net-analyzer/tcpflow/files/tcpflow-1.5.2-gentoo.patch
@@ -0,0 +1,64 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,7 +30,6 @@
+ AC_PROG_INSTALL
+
+ m4_include([m4/slg_searchdirs.m4])
+-m4_include([m4/slg_gcc_all_warnings.m4])
+
+
+ # use C++11 mode if available; HAVE_CXX11 is defined in config.h if so. Don't
+@@ -402,7 +402,12 @@
+ AC_CHECK_HEADERS(cap-ng.h)
+ fi
+
+-
++################################################################
++# http-parser
++
++AC_CHECK_LIB(http_parser,http_parser_init,,
++ AC_MSG_ERROR([http-parser library not installed]))
++AC_CHECK_HEADERS(http_parser.h)
+
+ ################################################################
+ # Specify our other headers
+--- a/src/scan_http.cpp
++++ b/src/scan_http.cpp
+@@ -11,7 +11,11 @@
+ #include "tcpip.h"
+ #include "tcpdemux.h"
+
++#ifdef HAVE_HTTP_PARSER_H
++#include "http_parser.h"
++#else
+ #include "http-parser/http_parser.h"
++#endif
+
+ #include "mime_map.h"
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 793ec1a..ecac7a9 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -98,8 +98,6 @@ tcpflow_SOURCES = \
+ scan_netviz.cpp \
+ pcap_writer.h \
+ iptree.h \
+- http-parser/http_parser.c \
+- http-parser/http_parser.h \
+ mime_map.cpp \
+ mime_map.h
+
+@@ -110,12 +108,6 @@ tcpflow_SOURCES = \
+ EXTRA_DIST =\
+ inet_ntop.c \
+ inet_ntop.h \
+- http-parser/AUTHORS \
+- http-parser/CONTRIBUTIONS \
+- http-parser/LICENSE-MIT \
+- http-parser/Makefile \
+- http-parser/README.md \
+- http-parser/http_parser.gyp \
+ wifipcap/README.txt \
+ wifipcap/TimeVal.cpp \
+ wifipcap/TimeVal.h \
diff --git a/net-analyzer/jffnms/metadata.xml b/net-analyzer/tcpflow/metadata.xml
index a7910963dea..d0b78340e0f 100644
--- a/net-analyzer/jffnms/metadata.xml
+++ b/net-analyzer/tcpflow/metadata.xml
@@ -6,6 +6,6 @@
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
<upstream>
- <remote-id type="sourceforge">jffnms</remote-id>
+ <remote-id type="github">simsong/tcpflow</remote-id>
</upstream>
</pkgmetadata>
diff --git a/net-analyzer/tcpflow/tcpflow-1.6.1.ebuild b/net-analyzer/tcpflow/tcpflow-1.6.1.ebuild
new file mode 100644
index 00000000000..7bd4f40e888
--- /dev/null
+++ b/net-analyzer/tcpflow/tcpflow-1.6.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit autotools flag-o-matic python-single-r1
+
+# 1.6.1 wasn't tagged
+COMMIT="a5965b11a332fe908ab1ed136b14803920e8ecdb"
+DESCRIPTION="A tool for monitoring, capturing and storing TCP connections flows"
+HOMEPAGE="https://github.com/simsong/tcpflow"
+SRC_URI="
+ https://api.github.com/repos/simsong/be13_api/tarball/c81521d768bb78499c069fcd7c47adc8eee0350c -> be13_api-20170924.tar.gz
+ https://api.github.com/repos/simsong/dfxml/tarball/7d11eaa7da8d31f588ce8aecb4b4f5e7e8169ba6 -> dfxml-20170921.tar.gz
+ https://github.com/simsong/tcpflow/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
+ https://github.com/simsong/${PN}/archive/${P/_/}.tar.gz
+"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="cairo test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-db/sqlite
+ dev-libs/boost:=
+ dev-libs/openssl:=
+ net-libs/http-parser:=
+ net-libs/libpcap
+ sys-libs/libcap-ng
+ sys-libs/zlib:=
+ cairo? (
+ x11-libs/cairo
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( sys-apps/coreutils )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.5.0_alpha-libcapng.patch
+ "${FILESDIR}"/${PN}-1.5.2-gentoo.patch
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ append-cxxflags -fpermissive
+
+ econf \
+ $(usex cairo --enable-cairo=true --enable-cairo=false)
+}
diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
index 6559d0d0b0b..ff8760bd1ba 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1,2 +1 @@
-DIST testssl-3.0.2.tar.gz 9208016 BLAKE2B cacb21f34d769f3e255d1db01bf197c0dcb0dc619c09d8153b65ef1ce5daaddb0b43ba698c765de1993023992a101ca6a5cde66da098e3eba3e81df81b3cc824 SHA512 ad886d556d6682bc99d45a9719abf6ee00f4e0f763795a79e46e0495bc355ede56204b6f1fb0db19311e42913990b57016fb6a4adb7414bb7283d847c19e9fb2
DIST testssl-3.0.4.tar.gz 9223535 BLAKE2B 658947ca7afc2b080edeed724f8185a3292736df1c71bd0bffd5a6f7ecfef7c56a1589c29eff84f278b2b788e63a881139a62ac714684209ed0cb8425f9a749e SHA512 663dc71dcaa37fe969121980274489fc2cf91450122001e98b8e78e510b1e3741b801fd767f6fca2d0735a184ea919b1672b2ba154ef074b146b6d5d47adc277
diff --git a/net-analyzer/testssl/testssl-3.0.2.ebuild b/net-analyzer/testssl/testssl-3.0.2.ebuild
deleted file mode 100644
index f8845bdafb9..00000000000
--- a/net-analyzer/testssl/testssl-3.0.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN}.sh"
-MY_PV="${PV/_p/-}"
-
-DESCRIPTION="Tool to check TLS/SSL cipher support"
-HOMEPAGE="https://testssl.sh/"
-SRC_URI="https://github.com/drwetter/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 bundled-openssl? ( openssl )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bundled-openssl kerberos"
-
-RDEPEND="
- app-shells/bash[net]
- net-dns/bind-tools
- sys-apps/util-linux
- sys-libs/ncurses:0
- sys-process/procps
- bundled-openssl? (
- kerberos? (
- sys-libs/zlib
- virtual/krb5
- )
- )
- !bundled-openssl? ( dev-libs/openssl:0 )
-"
-
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-QA_PREBUILT="opt/${PN}/*"
-
-pkg_setup() {
- if use amd64; then
- if use kerberos; then
- BUNDLED_OPENSSL="openssl.Linux.x86_64.krb5"
- else
- BUNDLED_OPENSSL="openssl.Linux.x86_64"
- fi
- elif use x86; then
- BUNDLED_OPENSSL="openssl.Linux.i686"
- fi
-}
-
-src_prepare() {
- default
- sed -i ${PN}.sh \
- -e 's|TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"|TESTSSL_INSTALL_DIR="/"|' \
- -e 's|$TESTSSL_INSTALL_DIR/etc/|&testssl/|g' || die
-
- if use bundled-openssl; then
- sed -i ${PN}.sh \
- -e "/find_openssl_binary()/a OPENSSL=\"/opt/${PN}/${BUNDLED_OPENSSL}\"" || die
- fi
-}
-
-src_install() {
- dodoc CHANGELOG.md CREDITS.md Readme.md
- dodoc openssl-iana.mapping.html
-
- dobin ${PN}.sh
-
- insinto /etc/${PN}
- doins etc/*
-
- if use bundled-openssl; then
- exeinto /opt/${PN}
- use amd64 && doexe bin/${BUNDLED_OPENSSL}
- fi
-}
diff --git a/net-analyzer/testssl/testssl-3.0.4.ebuild b/net-analyzer/testssl/testssl-3.0.4.ebuild
index 8a2472e4e27..dc84aed1c82 100644
--- a/net-analyzer/testssl/testssl-3.0.4.ebuild
+++ b/net-analyzer/testssl/testssl-3.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/drwetter/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.ta
LICENSE="GPL-2 bundled-openssl? ( openssl )"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="bundled-openssl kerberos"
RDEPEND="
diff --git a/net-analyzer/upnpscan/upnpscan-0.4-r3.ebuild b/net-analyzer/upnpscan/upnpscan-0.4-r3.ebuild
index 91839f3352c..b92dcbfb396 100644
--- a/net-analyzer/upnpscan/upnpscan-0.4-r3.ebuild
+++ b/net-analyzer/upnpscan/upnpscan-0.4-r3.ebuild
@@ -1,23 +1,27 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
+inherit autotools
-inherit autotools-utils
-
-DESCRIPTION="Scans the network for UPNP capable devices"
+DESCRIPTION="Scans the network for UPnP capable devices"
HOMEPAGE="http://www.cqure.net/wp/upnpscan/"
SRC_URI="http://www.cqure.net/tools/${PN}-v${PV}-src.tgz"
+S="${WORKDIR}/${PN}"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
-S=${WORKDIR}/${PN}
-
DOCS=( AUTHORS ChangeLog NEWS README TODO )
-PATCHES=( "${FILESDIR}"/${P}-r2-cflags.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-r2-cflags.patch
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
diff --git a/net-analyzer/wapiti/wapiti-3.0.3.ebuild b/net-analyzer/wapiti/wapiti-3.0.3.ebuild
index 4537e62437a..6fb871db189 100644
--- a/net-analyzer/wapiti/wapiti-3.0.3.ebuild
+++ b/net-analyzer/wapiti/wapiti-3.0.3.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
PYTHON_REQ_USE='xml'
inherit distutils-r1
diff --git a/net-analyzer/wapiti/wapiti-9999.ebuild b/net-analyzer/wapiti/wapiti-9999.ebuild
index 95af12c83a0..1f375f8034b 100644
--- a/net-analyzer/wapiti/wapiti-9999.ebuild
+++ b/net-analyzer/wapiti/wapiti-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
PYTHON_REQ_USE='xml'
inherit distutils-r1 git-r3
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 1b280d0987c..e4fe2d2bfcd 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1 +1 @@
-DIST wireshark-3.4.2.tar.xz 32465900 BLAKE2B dab7e871c798a6e0f03f45eaa49ba5cbabc18afabd6a5675a3241e4f1e6d86ef21b56b4cee5d561da2f2ec2b274ac6c5a52ed7b8ad50cbf02949a3a7f68d4f09 SHA512 38dc62d306dafe1a25db16ca28e1f4181a83673700a0b4c6dd98c8cb27df51ad0c6414db0370c443250aeb2521eceefb183178fe7d23a11b697cbf3f5b06f53a
+DIST wireshark-3.4.3.tar.xz 32287304 BLAKE2B 076d681c5f980ba6a0f25076c4631a119fb72d2b59a0cd70062d3a4c997c8959162157e46a6f59b5474c07263c84e0e660f1fa33f9339cc6a1141425d394cde2 SHA512 6cfea9432cd6fcecbfc551e059ca60a0c38084074bf130b4cc5378aac2221c1233e2ddafa1ffd6bc6b76297c2303b931dadf6ec518f35595caf5229af4d93859
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-ui-needs-wiretap.patch b/net-analyzer/wireshark/files/wireshark-9999-ui-needs-wiretap.patch
index c0bfc3acd5a..c0bfc3acd5a 100644
--- a/net-analyzer/wireshark/files/wireshark-99999999-ui-needs-wiretap.patch
+++ b/net-analyzer/wireshark/files/wireshark-9999-ui-needs-wiretap.patch
diff --git a/net-analyzer/wireshark/wireshark-3.4.2.ebuild b/net-analyzer/wireshark/wireshark-3.4.2.ebuild
deleted file mode 100644
index ddabdfd5f7b..00000000000
--- a/net-analyzer/wireshark/wireshark-3.4.2.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils xdg-utils cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/"
-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"
-IUSE="
- androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
- +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
- +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
-"
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
- acct-group/pcap
- >=dev-libs/glib-2.32:2
- >=net-dns/c-ares-1.5
- dev-libs/libgcrypt:0
- bcg729? ( media-libs/bcg729 )
- brotli? ( app-arch/brotli )
- ciscodump? ( >=net-libs/libssh-0.6 )
- filecaps? ( sys-libs/libcap )
- http2? ( net-libs/nghttp2 )
- ilbc? ( media-libs/libilbc )
- kerberos? ( virtual/krb5 )
- libxml2? ( dev-libs/libxml2 )
- lua? ( >=dev-lang/lua-5.1:0= )
- 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
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- x11-misc/xdg-utils
- )
- sbc? ( media-libs/sbc )
- sdjournal? ( sys-apps/systemd )
- smi? ( net-libs/libsmi )
- snappy? ( app-arch/snappy )
- spandsp? ( media-libs/spandsp )
- sshdump? ( >=net-libs/libssh-0.6 )
- ssl? ( net-libs/gnutls:= )
- zlib? ( sys-libs/zlib )
- zstd? ( app-arch/zstd )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
- ${CDEPEND}
- ${PYTHON_DEPS}
-"
-BDEPEND="
- dev-lang/perl
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- doc? (
- app-doc/doxygen
- dev-ruby/asciidoctor
- )
- qt5? (
- dev-qt/linguist-tools:5
- )
- test? (
- dev-python/pytest
- dev-python/pytest-xdist
- )
-"
-RDEPEND="
- ${CDEPEND}
- qt5? ( virtual/freedesktop-icon-theme )
- selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
- plugin-ifdemo? ( plugins )
-"
-RESTRICT="test"
-PATCHES=(
- "${FILESDIR}"/${PN}-2.6.0-redhat.patch
- "${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
-)
-
-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
-
- python_setup
-
- 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_dpauxmon=$(usex dpauxmon)
- -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_sdjournal=$(usex sdjournal)
- -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)
- -DDISABLE_WERROR=yes
- -DENABLE_BCG729=$(usex bcg729)
- -DENABLE_BROTLI=$(usex brotli)
- -DENABLE_CAP=$(usex filecaps caps)
- -DENABLE_GNUTLS=$(usex ssl)
- -DENABLE_ILBC=$(usex ilbc)
- -DENABLE_KERBEROS=$(usex kerberos)
- -DENABLE_LIBXML2=$(usex libxml2)
- -DENABLE_LTO=$(usex lto)
- -DENABLE_LUA=$(usex lua)
- -DENABLE_LZ4=$(usex lz4)
- -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)
- -DENABLE_SBC=$(usex sbc)
- -DENABLE_SMI=$(usex smi)
- -DENABLE_SNAPPY=$(usex snappy)
- -DENABLE_SPANDSP=$(usex spandsp)
- -DENABLE_ZLIB=$(usex zlib)
- -DENABLE_ZSTD=$(usex zstd)
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cmake_build test-programs
-
- myctestargs=( --disable-capture --skip-missing-programs=all --verbose )
- cmake_src_test
-}
-
-src_install() {
- cmake_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 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
-
- if [[ -d "${D}"/usr/share/appdata ]]; then
- rm -r "${D}"/usr/share/appdata || die
- fi
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-
- # Add group for users allowed to sniff.
- chgrp pcap "${EROOT}"/usr/bin/dumpcap
-
- if use dumpcap && use pcap; then
- fcaps -o 0 -g pcap -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 pcap group. This security measure ensures"
- ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
diff --git a/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
index 8a5f5b3e6df..7ff5005db92 100644
--- a/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
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/"
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
-LICENSE="GPL-2"
+S="${WORKDIR}/${P/_/}"
+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
@@ -22,7 +23,6 @@ IUSE="
+randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl
sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
"
-S=${WORKDIR}/${P/_/}
CDEPEND="
acct-group/pcap
@@ -94,11 +94,13 @@ 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
+ "${FILESDIR}"/${PN}-9999-ui-needs-wiretap.patch
)
pkg_setup() {
@@ -187,7 +189,12 @@ src_configure() {
src_test() {
cmake_build test-programs
- myctestargs=( --disable-capture --skip-missing-programs=all --verbose )
+ myctestargs=(
+ --disable-capture
+ --skip-missing-programs=all
+ --verbose
+ )
+
cmake_src_test
}
@@ -212,8 +219,8 @@ src_install() {
wiretap
wsutil
)
- for dir in "${dirs[@]}"
- do
+
+ for dir in "${dirs[@]}" ; do
insinto /usr/include/wireshark/${dir}
doins ${dir}/*.h
done
@@ -235,8 +242,8 @@ src_install() {
done
fi
- if [[ -d "${D}"/usr/share/appdata ]]; then
- rm -r "${D}"/usr/share/appdata || die
+ if [[ -d "${ED}"/usr/share/appdata ]]; then
+ rm -r "${ED}"/usr/share/appdata || die
fi
}
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild
index 61860be16a1..0854e2e8254 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
inherit fcaps flag-o-matic git-r3 lua-single python-any-r1 qmake-utils xdg-utils cmake
@@ -98,7 +98,7 @@ 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
+ "${FILESDIR}"/${PN}-9999-ui-needs-wiretap.patch
)
pkg_setup() {
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 5d89de66c67..cab46acb639 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -1,6 +1,7 @@
DIST zabbix-3.0.31.tar.gz 14698394 BLAKE2B b8b5f94fe7fe08385b1b358c628b2047b437e6068dab8c3dbdab03e55e95e27f1b77ede4a1a57c4f79bf4a629d9dc5671bd144c002ace7c915f2fed382ac13b2 SHA512 35fec45667cdf217c2be21a164181f92f8f11ef9bcfb0c8dad914726e7c436bae5f8a97aebc3af82499e37125f4d1896ef74ad061a1ee3cbb674562c22a832b1
-DIST zabbix-4.0.27.tar.gz 17426383 BLAKE2B 33381d3705bc7cb9d451b1a536fbb4f92a9e7e321afbe9363a7879cbea3cc5977a4866a5f4d1fb70120804edaffaf869ba8c4321a67898c42c9abe2341ee118b SHA512 54690dd778d09d7309c2e2ea3f0bfc6053ef097888bfccd140484e4677766ded829757eb4dfde7da8ce19335307ddbfbb1c132feabc13cc6727a6d28c1591cfa
-DIST zabbix-5.0.6.tar.gz 19359566 BLAKE2B 375fcbed08be46c1f17c7979763dcdfb8a51a25c2523037a1992dbb7ceb798a665f5d01e97e2e6ef023d5170e3e71df933e0fc41d27fd905ba190497d6bcd28d SHA512 c136536eab3c0e3527e8db8528656776de8849554e0a85a1644000e51c66b09044b176985de1c6d1dcc1d4ec03fc2456111c4df8d896ca276eeed2744cdd48be
-DIST zabbix-5.0.7.tar.gz 19382483 BLAKE2B fa0864ba1ac77659e9a18b0c22cee8be1078fad1e76017d01754b626151366bfeb67aa2a5b29ac1c0ac92ebaff53f7ca273a763158f7a37566dd41efe4dee7ff SHA512 8916ff44a2b3ad16e40d37b43ed540b4eefb91423ecbcc4ab9463477f6a29ed8417c79b0951a36e2798df1166a95ee5ed150bd61448b657df694498c2a274403
-DIST zabbix-5.2.2.tar.gz 19745101 BLAKE2B 651184d4645ff4cfac1317326bd846b4707d8556a30c64dd0b5ac923fb2bb4439b120a4c2bf43c1f73b57a919d5f3bfba28e3d9efde6a3f48587c5b7d0b1d7db SHA512 7bb79111ff809a90a5911d7f94f86eddec3a3fa4f91fdfbf013178442de81d22dc13359679570b8d62fe41b664c764c42cbe98936fd195521951aab507933d9b
-DIST zabbix-5.2.3.tar.gz 19791383 BLAKE2B ad0c2306f05d1d664068d9dbc6983c79e1e4d13e605a4683076da51968d2ca2dd6330ca16ad5e24fcabca95565ff1c3e4246ce7352f23a32d419ba207869f8c2 SHA512 207d522ab728bb89f6aaf793af94848469210fb257ead34b93e0f7ba7b2a22b4cce65d516dfbb549a36ae873fe6b6d3486c47f11efff8950d3c81570c673ff9e
+DIST zabbix-4.0.28.tar.gz 17424006 BLAKE2B f45af54d1e54ff6945f13cc684fbe0506dab4d554f65018fc30758d7b8be6814ca3661655778abb7c24dcbb241b8e6c21f0ea72a01a886392cadc917e699a957 SHA512 1f40c7316f92474beecc9470d4ad6c093a3a005180514307eb3d7aa206fa36d1a8decc20628b1fc0e62bc7a2ff0e508d694da0fe05911314de6f6d7aa726f425
+DIST zabbix-4.0.29.tar.gz 17411987 BLAKE2B 187b6de17403c656c2faa93c8e0952be06ca4fc60e8fe62c48dd9f96371bd26b53f333b93de5805d7333b849f93ff7db6cf1f0cf256cea438afeea5d314e0e83 SHA512 778fe43c2394c572b0f1a6d426897bf24391ebda25cce5bfa0dad63827f5d3457776ecd8186c0b783d400a0d87778d9243fdfedd875136383282e56f542eafca
+DIST zabbix-5.0.8.tar.gz 19474050 BLAKE2B 1043efca2f373553728206837949bce5f5ea32328c6289e4028f65e6f1ed76560c1ffbd610eec9855f050d0330bcd3b364a983db896285729f30a693d5ae6c6f SHA512 19601ace704c8a887ffc9b57da8825d8a28a5d064aac3e59480994bee4156db186d37ecf4bee2208bbafc0cb76c0c7f47de964f99953ce78d0187457255d92e9
+DIST zabbix-5.0.9.tar.gz 19513312 BLAKE2B e60fcf300c3fcd9595e9fa8465403e906672fdc908d9a15646e2ac9e88684999184acb3a0b8226dff1966554769930b0ae6d692ee4569441714912c2eb93540f SHA512 7306afce482b8b8222d46c25d91cdd8df2d5bbbeb755bd54b4bf747dc78031cc24167a954e4de5933f33f59772838ff0b4c66d0bf19c28dc1a27276da9bb0b38
+DIST zabbix-5.2.4.tar.gz 19916307 BLAKE2B 17d0f5dc1d4a8b79d2a5e741a0fa18ecf584ddfb45afbe816721d0e69bae4b5e11b44fe5031c8a34562c30fd2818f7b4a8bfb1442489be3ec23a27a70e789f56 SHA512 e218de9a8b9445401e769c14a9efd0b3d1b7e9610ce021cdbfc9db159801a4033b8f1c1a808c853bfa3aeb66db8a6dd0cbb5b44fc1421fa0f54c28589d7314b4
+DIST zabbix-5.2.5.tar.gz 20039761 BLAKE2B 27510c462947a7dedb16d029799aa1c7b38d68199aae47b4b3e5a757120bd74ddf87c7dade0bf339ff2165111345d79119718ade2fe39fd088971be6dcef2bda SHA512 5014a5a510e9ea4a39aa30bdbe3ee82dc1d0a139f32151bb7739df7442ea707b91446ce1cefb61007b603ccedfb0353c628b043db3e90cfe8fc3d67588f2dfd5
diff --git a/net-analyzer/zabbix/metadata.xml b/net-analyzer/zabbix/metadata.xml
index 05a299b3033..7c3fa566bc8 100644
--- a/net-analyzer/zabbix/metadata.xml
+++ b/net-analyzer/zabbix/metadata.xml
@@ -9,10 +9,6 @@
<email>patrick@gentoo.org</email>
<name>Patrick Lauer</name>
</maintainer>
- <maintainer type="person">
- <email>alicef@gentoo.org</email>
- <name>Alice Ferrazzi</name>
- </maintainer>
<longdescription>
ZABBIX is software for monitoring of your applications, network and servers.
ZABBIX supports both polling and trapping techniques to collect data from
diff --git a/net-analyzer/zabbix/zabbix-3.0.31-r2.ebuild b/net-analyzer/zabbix/zabbix-3.0.31-r2.ebuild
index a0c92d82004..aa1e1274031 100644
--- a/net-analyzer/zabbix/zabbix-3.0.31-r2.ebuild
+++ b/net-analyzer/zabbix/zabbix-3.0.31-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -348,3 +348,7 @@ pkg_postinst() {
esac
fi
}
+
+pkg_prerm() {
+ (use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild b/net-analyzer/zabbix/zabbix-4.0.28.ebuild
index b13d6cef746..b20bafc87ab 100644
--- a/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.28.ebuild
@@ -347,3 +347,7 @@ pkg_postinst() {
esac
fi
}
+
+pkg_prerm() {
+ (use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-analyzer/zabbix/zabbix-4.0.29.ebuild b/net-analyzer/zabbix/zabbix-4.0.29.ebuild
new file mode 100644
index 00000000000..6eb470b33c5
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-4.0.29.ebuild
@@ -0,0 +1,353 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+ proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+ server? ( ^^ ( mysql oracle postgres odbc ) )
+ static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+ curl? ( net-misc/curl )
+ java? ( >=virtual/jdk-1.8:* )
+ ldap? (
+ =dev-libs/cyrus-sasl-2*
+ net-libs/gnutls
+ net-nds/openldap
+ )
+ libxml2? ( dev-libs/libxml2 )
+ mysql? ( dev-db/mysql-connector-c )
+ odbc? ( dev-db/unixODBC )
+ openipmi? ( sys-libs/openipmi )
+ oracle? ( dev-db/oracle-instantclient-basic )
+ postgres? ( dev-db/postgresql:* )
+ proxy? ( sys-libs/zlib )
+ server? (
+ dev-libs/libevent
+ sys-libs/zlib
+ )
+ snmp? ( net-analyzer/net-snmp )
+ sqlite? ( dev-db/sqlite )
+ ssh? ( net-libs/libssh2 )
+ ssl? ( dev-libs/openssl:=[-bindist] )
+ xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ acct-group/zabbix
+ acct-user/zabbix
+ java? ( >=virtual/jre-1.8:* )
+ mysql? ( virtual/mysql )
+ proxy? ( net-analyzer/fping[suid] )
+ server? (
+ app-admin/webapp-config
+ dev-libs/libevent
+ dev-libs/libpcre
+ net-analyzer/fping[suid]
+ )
+ frontend? (
+ app-admin/webapp-config
+ dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+ media-libs/gd[png]
+ virtual/httpd-php:*
+ mysql? ( dev-lang/php[mysqli] )
+ odbc? ( dev-lang/php[odbc] )
+ oracle? ( dev-lang/php[oci8-instant-client] )
+ postgres? ( dev-lang/php[postgres] )
+ sqlite? ( dev-lang/php[sqlite] )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ static? (
+ curl? ( net-misc/curl[static-libs] )
+ ldap? (
+ =dev-libs/cyrus-sasl-2*[static-libs]
+ net-libs/gnutls[static-libs]
+ net-nds/openldap[static-libs]
+ )
+ libxml2? ( dev-libs/libxml2[static-libs] )
+ mysql? ( dev-db/mysql-connector-c[static-libs] )
+ odbc? ( dev-db/unixODBC[static-libs] )
+ postgres? ( dev-db/postgresql:*[static-libs] )
+ sqlite? ( dev-db/sqlite[static-libs] )
+ ssh? ( net-libs/libssh2 )
+ )
+"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+ "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+ if use oracle; then
+ if [ -z "${ORACLE_HOME}" ]; then
+ eerror
+ eerror "The environment variable ORACLE_HOME must be set"
+ eerror "and point to the correct location."
+ eerror "It looks like you don't have Oracle installed."
+ eerror
+ die "Environment variable ORACLE_HOME is not set"
+ fi
+ if has_version 'dev-db/oracle-instantclient-basic'; then
+ ewarn
+ ewarn "Please ensure you have a full install of the Oracle client."
+ ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+ ewarn
+ fi
+ fi
+
+ if use frontend; then
+ webapp_pkg_setup
+ fi
+
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ default
+}
+
+src_configure() {
+ econf \
+ $(use_enable agent) \
+ $(use_enable ipv6) \
+ $(use_enable java) \
+ $(use_enable proxy) \
+ $(use_enable server) \
+ $(use_enable static) \
+ $(use_with curl libcurl) \
+ $(use_with ldap) \
+ $(use_with libxml2) \
+ $(use_with mysql) \
+ $(use_with odbc unixodbc) \
+ $(use_with openipmi openipmi) \
+ $(use_with oracle) \
+ $(use_with postgres postgresql) \
+ $(use_with snmp net-snmp) \
+ $(use_with sqlite sqlite3) \
+ $(use_with ssh ssh2) \
+ $(use_with ssl openssl) \
+ $(use_with xmpp jabber)
+}
+
+src_compile() {
+ if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+ emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+ fi
+}
+
+src_install() {
+ local dirs=(
+ /etc/zabbix
+ /var/lib/zabbix
+ /var/lib/zabbix/home
+ /var/lib/zabbix/scripts
+ /var/lib/zabbix/alertscripts
+ /var/lib/zabbix/externalscripts
+ /var/log/zabbix
+ )
+
+ for dir in "${dirs[@]}"; do
+ dodir "${dir}"
+ keepdir "${dir}"
+ done
+
+ if use server; then
+ insinto /etc/zabbix
+ doins "${S}"/conf/zabbix_server.conf
+ fperms 0640 /etc/zabbix/zabbix_server.conf
+ fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+ newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
+
+ dosbin src/zabbix_server/zabbix_server
+
+ insinto /usr/share/zabbix
+ doins -r "${S}"/database/
+
+ systemd_dounit "${FILESDIR}"/zabbix-server.service
+ systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+ fi
+
+ if use proxy; then
+ insinto /etc/zabbix
+ doins "${S}"/conf/zabbix_proxy.conf
+ fperms 0640 /etc/zabbix/zabbix_proxy.conf
+ fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+ newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+ dosbin src/zabbix_proxy/zabbix_proxy
+
+ insinto /usr/share/zabbix
+ doins -r "${S}"/database/
+
+ systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+ systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+ fi
+
+ if use agent; then
+ insinto /etc/zabbix
+ doins "${S}"/conf/zabbix_agentd.conf
+ fperms 0640 /etc/zabbix/zabbix_agentd.conf
+ fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+ newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+ dosbin src/zabbix_agent/zabbix_agentd
+ dobin \
+ src/zabbix_sender/zabbix_sender \
+ src/zabbix_get/zabbix_get
+
+ systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+ systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+ fi
+
+ fowners root:zabbix /etc/zabbix
+ fowners zabbix:zabbix \
+ /var/lib/zabbix \
+ /var/lib/zabbix/home \
+ /var/lib/zabbix/scripts \
+ /var/lib/zabbix/alertscripts \
+ /var/lib/zabbix/externalscripts \
+ /var/log/zabbix
+ fperms 0750 \
+ /etc/zabbix \
+ /var/lib/zabbix \
+ /var/lib/zabbix/home \
+ /var/lib/zabbix/scripts \
+ /var/lib/zabbix/alertscripts \
+ /var/lib/zabbix/externalscripts \
+ /var/log/zabbix
+
+ dodoc README INSTALL NEWS ChangeLog \
+ conf/zabbix_agentd.conf \
+ conf/zabbix_proxy.conf \
+ conf/zabbix_agentd/userparameter_examples.conf \
+ conf/zabbix_agentd/userparameter_mysql.conf \
+ conf/zabbix_server.conf
+
+ if use frontend; then
+ webapp_src_preinst
+ cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+ webapp_configfile \
+ "${MY_HTDOCSDIR}"/include/db.inc.php \
+ "${MY_HTDOCSDIR}"/include/config.inc.php
+ webapp_src_install
+ fi
+
+ if use java; then
+ dodir \
+ /${ZABBIXJAVA_BASE} \
+ /${ZABBIXJAVA_BASE}/bin \
+ /${ZABBIXJAVA_BASE}/lib
+ keepdir /${ZABBIXJAVA_BASE}
+ exeinto /${ZABBIXJAVA_BASE}/bin
+ doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+ exeinto /${ZABBIXJAVA_BASE}/lib
+ doexe \
+ src/zabbix_java/lib/logback-classic-0.9.27.jar \
+ src/zabbix_java/lib/logback-console.xml \
+ src/zabbix_java/lib/logback-core-0.9.27.jar \
+ src/zabbix_java/lib/logback.xml \
+ src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+ src/zabbix_java/lib/slf4j-api-1.6.1.jar
+ newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+ newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+ fi
+}
+
+pkg_postinst() {
+ if use server || use proxy ; then
+ elog
+ elog "You may need to configure your database for Zabbix"
+ elog "if you have not already done so."
+ elog
+
+ zabbix_homedir=$(egethome zabbix)
+ if [ -n "${zabbix_homedir}" ] && \
+ [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+ ewarn
+ ewarn "The user 'zabbix' should have his homedir changed"
+ ewarn "to /var/lib/zabbix/home if you want to use"
+ ewarn "custom alert scripts."
+ ewarn
+ ewarn "A real homedir might be needed for configfiles"
+ ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+ ewarn "using sendxmpp for Jabber alerts)."
+ ewarn
+ ewarn "To change the homedir use:"
+ ewarn " usermod -d /var/lib/zabbix/home zabbix"
+ ewarn
+ fi
+ fi
+
+ if use server; then
+ elog
+ elog "For distributed monitoring you have to run:"
+ elog
+ elog "zabbix_server -n <nodeid>"
+ elog
+ elog "This will convert database data for use with Node ID"
+ elog "and also adds a local node."
+ elog
+ fi
+
+ elog "--"
+ elog
+ elog "You may need to add these lines to /etc/services:"
+ elog
+ elog "zabbix-agent 10050/tcp Zabbix Agent"
+ elog "zabbix-agent 10050/udp Zabbix Agent"
+ elog "zabbix-trapper 10051/tcp Zabbix Trapper"
+ elog "zabbix-trapper 10051/udp Zabbix Trapper"
+ elog
+
+ if use server || use proxy ; then
+ # check for fping
+ fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+ case "${fping_perms}" in
+ 4[157][157][157])
+ ;;
+ *)
+ ewarn
+ ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+ ewarn "you have to make /usr/sbin/fping setuid root and executable"
+ ewarn "by everyone. Run the following command to fix it:"
+ ewarn
+ ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+ ewarn
+ ewarn "Please be aware that this might impose a security risk,"
+ ewarn "depending on the code quality of fping."
+ ewarn
+ ;;
+ esac
+ fi
+}
+
+pkg_prerm() {
+ (use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-analyzer/zabbix/zabbix-5.2.2-r1.ebuild b/net-analyzer/zabbix/zabbix-5.0.8.ebuild
index 688147d3fb1..90a6d16b59e 100644
--- a/net-analyzer/zabbix/zabbix-5.2.2-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.8.ebuild
@@ -344,3 +344,7 @@ pkg_postinst() {
esac
fi
}
+
+pkg_prerm() {
+ (use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-analyzer/zabbix/zabbix-5.0.7.ebuild b/net-analyzer/zabbix/zabbix-5.0.9.ebuild
index 8f6e9556236..37470326b6d 100644
--- a/net-analyzer/zabbix/zabbix-5.0.7.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -344,3 +344,7 @@ pkg_postinst() {
esac
fi
}
+
+pkg_prerm() {
+ (use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-analyzer/zabbix/zabbix-5.0.6-r1.ebuild b/net-analyzer/zabbix/zabbix-5.2.4.ebuild
index 688147d3fb1..90a6d16b59e 100644
--- a/net-analyzer/zabbix/zabbix-5.0.6-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.2.4.ebuild
@@ -344,3 +344,7 @@ pkg_postinst() {
esac
fi
}
+
+pkg_prerm() {
+ (use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-analyzer/zabbix/zabbix-5.2.3.ebuild b/net-analyzer/zabbix/zabbix-5.2.5.ebuild
index 8f6e9556236..37470326b6d 100644
--- a/net-analyzer/zabbix/zabbix-5.2.3.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -344,3 +344,7 @@ pkg_postinst() {
esac
fi
}
+
+pkg_prerm() {
+ (use frontend || use server) && webapp_pkg_prerm
+}