summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/2ping/2ping-4.5.1.ebuild4
-rw-r--r--net-analyzer/alive/Manifest2
-rw-r--r--net-analyzer/alive/alive-2.0.3.ebuild33
-rw-r--r--net-analyzer/alive/alive-2.0.4.ebuild30
-rw-r--r--net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild6
-rw-r--r--net-analyzer/arp-scan/arp-scan-1.9.7.ebuild4
-rw-r--r--net-analyzer/arping/Manifest1
-rw-r--r--net-analyzer/arping/arping-2.22.ebuild4
-rw-r--r--net-analyzer/arping/arping-2.23.ebuild60
-rw-r--r--net-analyzer/arping/arping-9999.ebuild48
-rw-r--r--net-analyzer/arping/files/arping-2.23-configure.ac-seccomp-disable.patch31
-rw-r--r--net-analyzer/bwping/Manifest1
-rw-r--r--net-analyzer/bwping/bwping-2.4.ebuild2
-rw-r--r--net-analyzer/bwping/bwping-2.5.ebuild16
-rw-r--r--net-analyzer/cacti-spine/Manifest2
-rw-r--r--net-analyzer/cacti-spine/cacti-spine-1.2.19.ebuild4
-rw-r--r--net-analyzer/cacti-spine/cacti-spine-1.2.20.ebuild (renamed from net-analyzer/cacti-spine/cacti-spine-1.2.16.ebuild)30
-rw-r--r--net-analyzer/cacti/Manifest2
-rw-r--r--net-analyzer/cacti/cacti-1.2.20.ebuild49
-rw-r--r--net-analyzer/cacti/cacti-1.2.21.ebuild49
-rw-r--r--net-analyzer/carl/carl-0.9-r5.ebuild4
-rw-r--r--net-analyzer/carl/metadata.xml3
-rw-r--r--net-analyzer/chronograf/Manifest6
-rw-r--r--net-analyzer/chronograf/chronograf-1.4.3.0.ebuild70
-rw-r--r--net-analyzer/chronograf/chronograf-1.6.2.ebuild70
-rw-r--r--net-analyzer/chronograf/chronograf-1.7.3.ebuild70
-rw-r--r--net-analyzer/darkstat/Manifest1
-rw-r--r--net-analyzer/darkstat/darkstat-3.0.719-r4.ebuild80
-rw-r--r--net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild72
-rw-r--r--net-analyzer/darkstat/darkstat-9999999.ebuild48
-rw-r--r--net-analyzer/darkstat/metadata.xml5
-rw-r--r--net-analyzer/driftnet/driftnet-1.3.0.ebuild3
-rw-r--r--net-analyzer/driftnet/files/driftnet-1.3.0-musl-stdint.patch113
-rw-r--r--net-analyzer/dsniff/metadata.xml2
-rw-r--r--net-analyzer/echoping/echoping-6.0.2_p434-r5.ebuild (renamed from net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild)6
-rw-r--r--net-analyzer/ethloop/ethloop-10-r4.ebuild7
-rw-r--r--net-analyzer/fail2ban/fail2ban-0.11.2-r1.ebuild133
-rw-r--r--net-analyzer/fail2ban/fail2ban-0.11.2-r2.ebuild134
-rw-r--r--net-analyzer/fail2ban/fail2ban-0.11.2-r4.ebuild (renamed from net-analyzer/fail2ban/fail2ban-0.11.2-r3.ebuild)5
-rw-r--r--net-analyzer/fail2ban/fail2ban-0.11.2.ebuild130
-rw-r--r--net-analyzer/fail2ban/fail2ban-9999.ebuild1
-rw-r--r--net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild4
-rw-r--r--net-analyzer/fping/Manifest1
-rw-r--r--net-analyzer/fping/fping-5.0.ebuild4
-rw-r--r--net-analyzer/fping/fping-5.1.ebuild31
-rw-r--r--net-analyzer/gnome-nettool/Manifest2
-rw-r--r--net-analyzer/gnome-nettool/files/42.0-meson-drop-unused-positional-arguments.patch38
-rw-r--r--net-analyzer/gnome-nettool/gnome-nettool-42.0.ebuild (renamed from net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild)39
-rw-r--r--net-analyzer/gr-fosphor/files/gr-fosphor-0.0_p20200131-htmldir.patch8
-rw-r--r--net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131-r1.ebuild (renamed from net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild)41
-rw-r--r--net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild41
-rw-r--r--net-analyzer/graphite-web/Manifest1
-rw-r--r--net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch63
-rw-r--r--net-analyzer/graphite-web/graphite-web-1.1.10.ebuild100
-rw-r--r--net-analyzer/graphite-web/graphite-web-1.1.8-r3.ebuild (renamed from net-analyzer/graphite-web/graphite-web-1.1.8-r2.ebuild)1
-rw-r--r--net-analyzer/greenbone-security-assistant/Manifest4
-rw-r--r--net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-20.8.1-node.patch47
-rw-r--r--net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-node.patch34
-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/files/greenbone-security-assistant-9.0.1-uninstall-snippet.patch12
-rw-r--r--net-analyzer/greenbone-security-assistant/files/gsa.nginx.reverse.proxy.example78
-rw-r--r--net-analyzer/greenbone-security-assistant/files/gsad.logrotate13
-rw-r--r--net-analyzer/greenbone-security-assistant/files/gsad.service18
-rw-r--r--net-analyzer/greenbone-security-assistant/greenbone-security-assistant-20.8.1.ebuild123
-rw-r--r--net-analyzer/greenbone-security-assistant/greenbone-security-assistant-9.0.1.ebuild124
-rw-r--r--net-analyzer/gsa/Manifest2
-rw-r--r--net-analyzer/gsa/gsa-21.4.4.ebuild42
-rw-r--r--net-analyzer/gsa/metadata.xml (renamed from net-analyzer/greenbone-security-assistant/metadata.xml)6
-rw-r--r--net-analyzer/gsad/Manifest1
-rw-r--r--net-analyzer/gsad/files/gsad-daemon.conf (renamed from net-analyzer/greenbone-security-assistant/files/gsad-daemon.conf)0
-rw-r--r--net-analyzer/gsad/files/gsad.init (renamed from net-analyzer/greenbone-security-assistant/files/gsad.init)4
-rw-r--r--net-analyzer/gsad/gsad-21.4.4.ebuild101
-rw-r--r--net-analyzer/gsad/metadata.xml15
-rw-r--r--net-analyzer/gvm-libs/Manifest3
-rw-r--r--net-analyzer/gvm-libs/files/gvm-libs-10.0.1-pid.patch11
-rw-r--r--net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild100
-rw-r--r--net-analyzer/gvm-libs/gvm-libs-20.8.1-r1.ebuild (renamed from net-analyzer/gvm-libs/gvm-libs-20.8.1.ebuild)6
-rw-r--r--net-analyzer/gvm-libs/gvm-libs-21.4.4-r3.ebuild (renamed from net-analyzer/gvm-libs/gvm-libs-11.0.1.ebuild)62
-rw-r--r--net-analyzer/gvm-tools/Manifest1
-rw-r--r--net-analyzer/gvm-tools/gvm-tools-21.10.0-r1.ebuild36
-rw-r--r--net-analyzer/gvm/gvm-10.0.1.ebuild31
-rw-r--r--net-analyzer/gvm/gvm-11.0.0.ebuild31
-rw-r--r--net-analyzer/gvm/gvm-20.8.0.ebuild31
-rw-r--r--net-analyzer/gvm/gvm-21.4.ebuild30
-rw-r--r--net-analyzer/gvm/metadata.xml9
-rw-r--r--net-analyzer/gvmd/Manifest4
-rw-r--r--net-analyzer/gvmd/files/greenbone-certdata-sync.conf1
-rw-r--r--net-analyzer/gvmd/files/greenbone-nvt-sync.conf1
-rw-r--r--net-analyzer/gvmd/files/greenbone-scapdata-sync.conf1
-rw-r--r--net-analyzer/gvmd/files/gvm-sync-all31
-rw-r--r--net-analyzer/gvmd/files/gvm-sync-all.service7
-rw-r--r--net-analyzer/gvmd/files/gvm-sync-all.timer9
-rw-r--r--net-analyzer/gvmd/files/gvmd-21.4.5.init30
-rw-r--r--net-analyzer/gvmd/files/gvmd-9.0.1-glibc_siglist.patch96
-rw-r--r--net-analyzer/gvmd/files/gvmd-startpre.sh7
-rw-r--r--net-analyzer/gvmd/files/gvmd.init24
-rw-r--r--net-analyzer/gvmd/files/gvmd.logrotate13
-rw-r--r--net-analyzer/gvmd/files/gvmd.service21
-rw-r--r--net-analyzer/gvmd/gvmd-20.8.1.ebuild125
-rw-r--r--net-analyzer/gvmd/gvmd-21.4.5-r5.ebuild (renamed from net-analyzer/gvmd/gvmd-9.0.1.ebuild)94
-rw-r--r--net-analyzer/gvmd/metadata.xml5
-rw-r--r--net-analyzer/hping/hping-3_pre20141226.ebuild4
-rw-r--r--net-analyzer/httping/httping-2.5.ebuild4
-rw-r--r--net-analyzer/httping/httping-9999999.ebuild72
-rw-r--r--net-analyzer/httping/metadata.xml3
-rw-r--r--net-analyzer/hunt/hunt-1.5_p6_p1.ebuild4
-rw-r--r--net-analyzer/hydra/Manifest1
-rw-r--r--net-analyzer/hydra/files/hydra-9.3-pcre2.patch113
-rw-r--r--net-analyzer/hydra/hydra-9.3-r1.ebuild127
-rw-r--r--net-analyzer/icinga2/Manifest4
-rw-r--r--net-analyzer/icinga2/icinga2-2.13.3.ebuild (renamed from net-analyzer/icinga2/icinga2-2.13.2-r3.ebuild)8
-rw-r--r--net-analyzer/icinga2/icinga2-2.13.4.ebuild145
-rw-r--r--net-analyzer/ifstat/ifstat-1.1-r2.ebuild4
-rw-r--r--net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild4
-rw-r--r--net-analyzer/ipaudit/ipaudit-1.0_beta2-r1.ebuild4
-rw-r--r--net-analyzer/ipguard/ipguard-1.04-r1.ebuild8
-rw-r--r--net-analyzer/iplog/iplog-2.2.3-r3.ebuild4
-rw-r--r--net-analyzer/iptstate/Manifest1
-rw-r--r--net-analyzer/iptstate/files/iptstate-2.2.5-gentoo.patch26
-rw-r--r--net-analyzer/iptstate/iptstate-2.2.6.ebuild35
-rw-r--r--net-analyzer/iptstate/iptstate-2.2.7.ebuild4
-rw-r--r--net-analyzer/jmx2munin/Manifest1
-rw-r--r--net-analyzer/jmx2munin/jmx2munin-1.0_p20120811-r1.ebuild54
-rw-r--r--net-analyzer/jmx2munin/metadata.xml15
-rw-r--r--net-analyzer/linkchecker/linkchecker-10.1.0.ebuild4
-rw-r--r--net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild4
-rw-r--r--net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-disk-on-btrfs.patch20
-rw-r--r--net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r2.ebuild (renamed from net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild)4
-rw-r--r--net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild108
-rw-r--r--net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0-r1.ebuild1
-rw-r--r--net-analyzer/mrtg/Manifest2
-rw-r--r--net-analyzer/mrtg/metadata.xml11
-rw-r--r--net-analyzer/mrtg/mrtg-2.17.10.ebuild (renamed from net-analyzer/mrtg/mrtg-2.17.7.ebuild)24
-rw-r--r--net-analyzer/mrtg/mrtg-2.17.8.ebuild4
-rw-r--r--net-analyzer/mtr/Manifest1
-rw-r--r--net-analyzer/mtr/mtr-0.94-r1.ebuild61
-rw-r--r--net-analyzer/mtr/mtr-0.95.ebuild2
-rw-r--r--net-analyzer/munin/files/munin-asyncd.init.22
-rw-r--r--net-analyzer/munin/munin-2.0.67-r6.ebuild418
-rw-r--r--net-analyzer/munin/munin-2.0.67-r7.ebuild4
-rw-r--r--net-analyzer/nagios-check_ipmi_sensor/Manifest1
-rw-r--r--net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.13.ebuild6
-rw-r--r--net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild32
-rw-r--r--net-analyzer/nagios-check_logfiles/Manifest1
-rw-r--r--net-analyzer/nagios-check_logfiles/nagios-check_logfiles-4.0.1.3.ebuild25
-rw-r--r--net-analyzer/nagios-check_rbl/Manifest1
-rw-r--r--net-analyzer/nagios-check_rbl/nagios-check_rbl-1.6.3.ebuild58
-rw-r--r--net-analyzer/nagios-core/Manifest1
-rw-r--r--net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild (renamed from net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild)18
-rw-r--r--net-analyzer/nagios-core/nagios-core-4.4.7.ebuild266
-rw-r--r--net-analyzer/nagios-plugin-check_raid/Manifest1
-rw-r--r--net-analyzer/nagios-plugin-check_raid/metadata.xml1
-rw-r--r--net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r3.ebuild (renamed from net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r1.ebuild)54
-rw-r--r--net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8-r1.ebuild66
-rw-r--r--net-analyzer/nagios-plugins-linux-madrisan/Manifest2
-rw-r--r--net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-30.ebuild (renamed from net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-28.ebuild)4
-rw-r--r--net-analyzer/nagios-plugins/Manifest1
-rw-r--r--net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r3.ebuild (renamed from net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r2.ebuild)8
-rw-r--r--net-analyzer/nagios-plugins/nagios-plugins-2.3.3-r3.ebuild (renamed from net-analyzer/nagios-plugins/nagios-plugins-2.3.3-r2.ebuild)6
-rw-r--r--net-analyzer/nagios-plugins/nagios-plugins-2.4.0.ebuild114
-rw-r--r--net-analyzer/nagios/nagios-4.4.6.ebuild4
-rw-r--r--net-analyzer/nagios/nagios-4.4.7.ebuild15
-rw-r--r--net-analyzer/nagstamon/nagstamon-3.8.0.ebuild6
-rw-r--r--net-analyzer/nbtscan/Manifest1
-rw-r--r--net-analyzer/nbtscan/nbtscan-1.7.2.ebuild22
-rw-r--r--net-analyzer/nessus-agent-bin/Manifest2
-rw-r--r--net-analyzer/nessus-agent-bin/nessus-agent-bin-10.1.4.ebuild (renamed from net-analyzer/nessus-agent-bin/nessus-agent-bin-10.0.1.ebuild)2
-rw-r--r--net-analyzer/nessus-bin/Manifest2
-rw-r--r--net-analyzer/nessus-bin/nessus-bin-10.2.0.ebuild (renamed from net-analyzer/nessus-bin/nessus-bin-10.0.2.ebuild)2
-rw-r--r--net-analyzer/net-snmp/Manifest1
-rw-r--r--net-analyzer/net-snmp/files/net-snmp-5.9-r3-f2fs.patch40
-rw-r--r--net-analyzer/net-snmp/files/net-snmp-5.9.2-fix-LDFLAGS.patch18
-rw-r--r--net-analyzer/net-snmp/net-snmp-5.9.2.ebuild (renamed from net-analyzer/net-snmp/net-snmp-99999999.ebuild)29
-rw-r--r--net-analyzer/net-snmp/net-snmp-9999.ebuild224
-rw-r--r--net-analyzer/netdata/Manifest2
-rw-r--r--net-analyzer/netdata/netdata-1.35.1.ebuild (renamed from net-analyzer/netdata/netdata-1.32.1.ebuild)15
-rw-r--r--net-analyzer/netdata/netdata-9999.ebuild17
-rw-r--r--net-analyzer/nethogs/Manifest1
-rw-r--r--net-analyzer/nethogs/nethogs-0.8.7.ebuild36
-rw-r--r--net-analyzer/netperf/files/netperf-2.7.0-fcommon.patch30
-rw-r--r--net-analyzer/netperf/netperf-2.7.0-r3.ebuild4
-rw-r--r--net-analyzer/netperf/netperf-2.7.0-r4.ebuild78
-rw-r--r--net-analyzer/netselect/netselect-0.4-r2.ebuild4
-rw-r--r--net-analyzer/nfdump/Manifest1
-rw-r--r--net-analyzer/nfdump/files/nfdump-1.6.23-autotools.patch216
-rw-r--r--net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir-automake.patch23
-rw-r--r--net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir.patch19
-rw-r--r--net-analyzer/nfdump/nfdump-1.6.23-r1.ebuild83
-rw-r--r--net-analyzer/nfdump/nfdump-1.6.23.ebuild3
-rw-r--r--net-analyzer/nfdump/nfdump-1.6.24.ebuild85
-rw-r--r--net-analyzer/nikto/Manifest1
-rw-r--r--net-analyzer/nikto/nikto-2.1.6_p20220602.ebuild47
-rw-r--r--net-analyzer/nmap/Manifest3
-rw-r--r--net-analyzer/nmap/files/nmap-7.25-no-FORTIFY_SOURCE.patch77
-rw-r--r--net-analyzer/nmap/files/nmap-7.91-ncat-proxy.patch37
-rw-r--r--net-analyzer/nmap/files/nmap-7.91-ncat-unix-sockets.patch30
-rw-r--r--net-analyzer/nmap/metadata.xml1
-rw-r--r--net-analyzer/nmap/nmap-7.80-r2.ebuild134
-rw-r--r--net-analyzer/nmap/nmap-7.91-r2.ebuild132
-rw-r--r--net-analyzer/nmap/nmap-7.92.ebuild8
-rw-r--r--net-analyzer/nmap/nmap-9999.ebuild8
-rw-r--r--net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild4
-rw-r--r--net-analyzer/nrpe/nrpe-4.0.0.ebuild4
-rw-r--r--net-analyzer/nrpe/nrpe-4.0.3.ebuild4
-rw-r--r--net-analyzer/nsca/nsca-2.7.2-r103.ebuild4
-rw-r--r--net-analyzer/ntopng/Manifest1
-rw-r--r--net-analyzer/ntopng/files/ntopng-5.2.1-build-system.patch89
-rw-r--r--net-analyzer/ntopng/files/ntopng-5.2.1-mysqltool.patch17
-rw-r--r--net-analyzer/ntopng/files/ntopng-5.2.1-ndpi-linking.patch13
-rw-r--r--net-analyzer/ntopng/ntopng-5.2.1.ebuild97
-rw-r--r--net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild2
-rw-r--r--net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild4
-rw-r--r--net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild2
-rw-r--r--net-analyzer/openvas-scanner/Manifest1
-rw-r--r--net-analyzer/openvas-scanner/openvas-scanner-21.4.4-r2.ebuild125
-rw-r--r--net-analyzer/ospd-openvas/Manifest3
-rw-r--r--net-analyzer/ospd-openvas/files/ospd-openvas.service18
-rw-r--r--net-analyzer/ospd-openvas/files/ospd.conf10
-rw-r--r--net-analyzer/ospd-openvas/files/redis.conf.example57
-rw-r--r--net-analyzer/ospd-openvas/ospd-openvas-1.0.1.ebuild46
-rw-r--r--net-analyzer/ospd-openvas/ospd-openvas-20.8.1.ebuild47
-rw-r--r--net-analyzer/ospd-openvas/ospd-openvas-21.4.4-r4.ebuild76
-rw-r--r--net-analyzer/ospd/Manifest2
-rw-r--r--net-analyzer/ospd/metadata.xml24
-rw-r--r--net-analyzer/ospd/ospd-2.0.1.ebuild34
-rw-r--r--net-analyzer/ospd/ospd-20.8.2.ebuild42
-rw-r--r--net-analyzer/ostinato/ostinato-1.1-r2.ebuild (renamed from net-analyzer/ostinato/ostinato-1.1-r1.ebuild)11
-rw-r--r--net-analyzer/packit/Manifest1
-rw-r--r--net-analyzer/packit/packit-1.8.ebuild30
-rw-r--r--net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r10.ebuild4
-rw-r--r--net-analyzer/prelude-correlator/metadata.xml9
-rw-r--r--net-analyzer/prelude-lml-rules/Manifest1
-rw-r--r--net-analyzer/prelude-lml-rules/metadata.xml11
-rw-r--r--net-analyzer/prelude-lml-rules/prelude-lml-rules-5.1.0.ebuild21
-rw-r--r--net-analyzer/prelude-lml/Manifest1
-rw-r--r--net-analyzer/prelude-lml/metadata.xml9
-rw-r--r--net-analyzer/prelude-lml/prelude-lml-5.1.0.ebuild63
-rw-r--r--net-analyzer/pypacker/Manifest1
-rw-r--r--net-analyzer/pypacker/metadata.xml2
-rw-r--r--net-analyzer/pypacker/pypacker-5.1.ebuild29
-rw-r--r--net-analyzer/python-gvm/Manifest1
-rw-r--r--net-analyzer/python-gvm/python-gvm-21.11.0.ebuild33
-rw-r--r--net-analyzer/rrdtool/Manifest2
-rw-r--r--net-analyzer/rrdtool/files/rrdcached.confd8
-rw-r--r--net-analyzer/rrdtool/files/rrdcached.confd-r113
-rw-r--r--net-analyzer/rrdtool/files/rrdcached.init13
-rw-r--r--net-analyzer/rrdtool/files/rrdcached.init-r123
-rw-r--r--net-analyzer/rrdtool/files/rrdtool-1.5.5-rrdrados.pod68
-rw-r--r--net-analyzer/rrdtool/metadata.xml5
-rw-r--r--net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild249
-rw-r--r--net-analyzer/rrdtool/rrdtool-1.8.0.ebuild247
-rw-r--r--net-analyzer/sancp/Manifest1
-rw-r--r--net-analyzer/sancp/sancp-1.6.1-r7.ebuild24
-rw-r--r--net-analyzer/sarg/sarg-2.4.0-r1.ebuild (renamed from net-analyzer/sarg/sarg-2.4.0.ebuild)4
-rw-r--r--net-analyzer/scanlogd/scanlogd-2.2.7-r1.ebuild4
-rw-r--r--net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild4
-rw-r--r--net-analyzer/sec/Manifest1
-rw-r--r--net-analyzer/sec/sec-2.9.1.ebuild28
-rw-r--r--net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r3.ebuild (renamed from net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r2.ebuild)4
-rw-r--r--net-analyzer/snallygaster/Manifest4
-rw-r--r--net-analyzer/snallygaster/snallygaster-0.0.12.ebuild (renamed from net-analyzer/snallygaster/snallygaster-0.0.6.ebuild)8
-rw-r--r--net-analyzer/snallygaster/snallygaster-0.0.8.ebuild21
-rw-r--r--net-analyzer/snallygaster/snallygaster-0.0.9.ebuild21
-rw-r--r--net-analyzer/snmpclitools/snmpclitools-0.6.4-r1.ebuild20
-rw-r--r--net-analyzer/snort/files/snort_at.service2
-rw-r--r--net-analyzer/snort/snort-2.9.17-r1.ebuild247
-rw-r--r--net-analyzer/snortsam/snortsam-2.70-r1.ebuild (renamed from net-analyzer/snortsam/snortsam-2.70.ebuild)17
-rw-r--r--net-analyzer/speedtest++/Manifest1
-rw-r--r--net-analyzer/speedtest++/metadata.xml11
-rw-r--r--net-analyzer/speedtest++/speedtest++-0.0.20210829.ebuild24
-rw-r--r--net-analyzer/speedtest-cli/metadata.xml4
-rw-r--r--net-analyzer/speedtest-cli/speedtest-cli-2.1.3-r1.ebuild (renamed from net-analyzer/speedtest-cli/speedtest-cli-2.1.3.ebuild)16
-rw-r--r--net-analyzer/squidsites/squidsites-1.01-r2.ebuild4
-rw-r--r--net-analyzer/ssh-audit/Manifest1
-rw-r--r--net-analyzer/ssh-audit/metadata.xml10
-rw-r--r--net-analyzer/ssh-audit/ssh-audit-2.5.0.ebuild26
-rw-r--r--net-analyzer/sshping/metadata.xml2
-rw-r--r--net-analyzer/ssldump/Manifest1
-rw-r--r--net-analyzer/ssldump/metadata.xml3
-rw-r--r--net-analyzer/ssldump/ssldump-1.5.ebuild32
-rw-r--r--net-analyzer/sslscan/Manifest6
-rw-r--r--net-analyzer/sslscan/files/gentoo.config-1.0.2171
-rw-r--r--net-analyzer/sslscan/sslscan-2.0.10.ebuild41
-rw-r--r--net-analyzer/sslscan/sslscan-2.0.11.ebuild4
-rw-r--r--net-analyzer/sslscan/sslscan-2.0.13-r1.ebuild82
-rw-r--r--net-analyzer/sslscan/sslscan-2.0.14.ebuild82
-rw-r--r--net-analyzer/sslsplit/files/sslsplit-0.5.5-openssl3.patch31
-rw-r--r--net-analyzer/sslsplit/sslsplit-0.5.5.ebuild4
-rw-r--r--net-analyzer/sslsplit/sslsplit-9999.ebuild2
-rw-r--r--net-analyzer/suricata/Manifest2
-rw-r--r--net-analyzer/suricata/suricata-5.0.8-r1.ebuild (renamed from net-analyzer/suricata/suricata-5.0.8.ebuild)4
-rw-r--r--net-analyzer/suricata/suricata-5.0.9.ebuild207
-rw-r--r--net-analyzer/suricata/suricata-6.0.4-r1.ebuild (renamed from net-analyzer/suricata/suricata-6.0.4.ebuild)6
-rw-r--r--net-analyzer/suricata/suricata-6.0.5.ebuild211
-rw-r--r--net-analyzer/tcpdump/Manifest3
-rw-r--r--net-analyzer/tcpdump/files/tcpdump-4.9.3-CVE-2020-8037.patch63
-rw-r--r--net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild85
-rw-r--r--net-analyzer/tcpdump/tcpdump-4.99.0.ebuild106
-rw-r--r--net-analyzer/tcpdump/tcpdump-4.99.1.ebuild5
-rw-r--r--net-analyzer/tcpdump/tcpdump-9999.ebuild5
-rw-r--r--net-analyzer/tcpflow/Manifest1
-rw-r--r--net-analyzer/tcpflow/files/tcpflow-1.6.1-wformat-security.patch24
-rw-r--r--net-analyzer/tcpflow/tcpflow-1.6.1-r1.ebuild56
-rw-r--r--net-analyzer/tcpreplay/Manifest1
-rw-r--r--net-analyzer/tcpreplay/files/tcpreplay-4.4.1-fix-bashism-configure.patch34
-rw-r--r--net-analyzer/tcpreplay/tcpreplay-4.4.1.ebuild (renamed from net-analyzer/tcpreplay/tcpreplay-999999.ebuild)31
-rw-r--r--net-analyzer/tcpreplay/tcpreplay-9999.ebuild87
-rw-r--r--net-analyzer/tcpslice/tcpslice-1.5.ebuild2
-rw-r--r--net-analyzer/telegraf/telegraf-1.18.3.ebuild4
-rw-r--r--net-analyzer/termshark/Manifest2
-rw-r--r--net-analyzer/termshark/metadata.xml15
-rw-r--r--net-analyzer/termshark/termshark-2.3.0.ebuild37
-rw-r--r--net-analyzer/testssl/Manifest2
-rw-r--r--net-analyzer/testssl/metadata.xml1
-rw-r--r--net-analyzer/testssl/testssl-3.0.7.ebuild (renamed from net-analyzer/testssl/testssl-3.0.6.ebuild)4
-rw-r--r--net-analyzer/thrulay/thrulay-0.9-r1.ebuild3
-rw-r--r--net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild4
-rw-r--r--net-analyzer/traceroute/traceroute-2.1.0-r2.ebuild (renamed from net-analyzer/traceroute/traceroute-2.1.0.ebuild)9
-rw-r--r--net-analyzer/vnstat/Manifest6
-rw-r--r--net-analyzer/vnstat/files/vnstat-2.2-conf.patch11
-rw-r--r--net-analyzer/vnstat/files/vnstat-2.2-drop-root.patch15
-rw-r--r--net-analyzer/vnstat/files/vnstat-2.2-run.patch11
-rw-r--r--net-analyzer/vnstat/files/vnstat-2.9-conf.patch39
-rw-r--r--net-analyzer/vnstat/files/vnstat.cron9
-rw-r--r--net-analyzer/vnstat/files/vnstatd.confd7
-rw-r--r--net-analyzer/vnstat/files/vnstatd.initd-r137
-rw-r--r--net-analyzer/vnstat/vnstat-1.17-r1.ebuild78
-rw-r--r--net-analyzer/vnstat/vnstat-2.9.ebuild (renamed from net-analyzer/vnstat/vnstat-2.8.ebuild)10
-rw-r--r--net-analyzer/vnstat/vnstat-9999.ebuild10
-rw-r--r--net-analyzer/wapiti/Manifest1
-rw-r--r--net-analyzer/wapiti/wapiti-3.1.2.ebuild51
-rw-r--r--net-analyzer/wapiti/wapiti-9999.ebuild26
-rw-r--r--net-analyzer/webfuzzer/webfuzzer-0.2.0-r2.ebuild4
-rw-r--r--net-analyzer/wireshark/Manifest7
-rw-r--r--net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch32
-rw-r--r--net-analyzer/wireshark/wireshark-3.4.11.ebuild2
-rw-r--r--net-analyzer/wireshark/wireshark-3.6.2.ebuild (renamed from net-analyzer/wireshark/wireshark-3.6.1.ebuild)4
-rw-r--r--net-analyzer/wireshark/wireshark-3.6.3.ebuild (renamed from net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild)23
-rw-r--r--net-analyzer/wireshark/wireshark-3.6.5.ebuild269
-rw-r--r--net-analyzer/wireshark/wireshark-3.6.6.ebuild (renamed from net-analyzer/wireshark/wireshark-3.4.10.ebuild)114
-rw-r--r--net-analyzer/wireshark/wireshark-9999.ebuild55
-rw-r--r--net-analyzer/xprobe/files/xprobe-0.3-gcc-12.patch21
-rw-r--r--net-analyzer/xprobe/xprobe-0.3-r1.ebuild9
-rw-r--r--net-analyzer/zabbix/Manifest259
-rw-r--r--net-analyzer/zabbix/files/zabbix-5.0.22-system.sw.packages.patch35
-rw-r--r--net-analyzer/zabbix/files/zabbix-6.0.3-system.sw.packages.patch35
-rw-r--r--net-analyzer/zabbix/metadata.xml1
-rw-r--r--net-analyzer/zabbix/zabbix-4.0.38-r2.ebuild (renamed from net-analyzer/zabbix/zabbix-4.0.37-r1.ebuild)41
-rw-r--r--net-analyzer/zabbix/zabbix-4.0.41.ebuild (renamed from net-analyzer/zabbix/zabbix-4.0.36-r1.ebuild)47
-rw-r--r--net-analyzer/zabbix/zabbix-4.0.42.ebuild367
-rw-r--r--net-analyzer/zabbix/zabbix-5.0.18-r2.ebuild608
-rw-r--r--net-analyzer/zabbix/zabbix-5.0.19-r1.ebuild608
-rw-r--r--net-analyzer/zabbix/zabbix-5.0.22.ebuild393
-rw-r--r--net-analyzer/zabbix/zabbix-5.0.24.ebuild398
-rw-r--r--net-analyzer/zabbix/zabbix-5.0.25.ebuild398
-rw-r--r--net-analyzer/zabbix/zabbix-5.4.8-r2.ebuild632
-rw-r--r--net-analyzer/zabbix/zabbix-5.4.9-r1.ebuild632
-rw-r--r--net-analyzer/zabbix/zabbix-6.0.3.ebuild410
-rw-r--r--net-analyzer/zabbix/zabbix-6.0.5.ebuild415
-rw-r--r--net-analyzer/zabbix/zabbix-6.0.6.ebuild415
-rw-r--r--net-analyzer/zmap/zmap-2.1.1-r4.ebuild (renamed from net-analyzer/zmap/zmap-2.1.1-r3.ebuild)6
-rw-r--r--net-analyzer/zmap/zmap-9999.ebuild6
-rw-r--r--net-analyzer/zniper/zniper-1.0-r3.ebuild4
363 files changed, 9107 insertions, 7634 deletions
diff --git a/net-analyzer/2ping/2ping-4.5.1.ebuild b/net-analyzer/2ping/2ping-4.5.1.ebuild
index 0c1b00c80e0..beba48f3681 100644
--- a/net-analyzer/2ping/2ping-4.5.1.ebuild
+++ b/net-analyzer/2ping/2ping-4.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -13,7 +13,7 @@ SRC_URI="https://www.finnie.org/software/2ping/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~riscv ~x86"
IUSE="server"
src_install() {
diff --git a/net-analyzer/alive/Manifest b/net-analyzer/alive/Manifest
index 87f824415e9..bb460f83ecf 100644
--- a/net-analyzer/alive/Manifest
+++ b/net-analyzer/alive/Manifest
@@ -1,3 +1 @@
-DIST alive-2.0.3.tar.xz 187396 BLAKE2B 0614ae8d0707abf59dd1500d986ce21221092d118a40ae92e838bd11b81a2b5fd261a531843f99992746a86a31bbb494a9f35f9fa0ad5c0ea896d68edec17205 SHA512 3b2f14d84682466e02fc6678ba26eb4c0b9378f1c938a7463cc5736501cbf144baaeb7dea2c8343a916891ce4e2d580bac946c913c01d7c25e12bfa611c89422
-DIST alive-2.0.4.tar.lz 185849 BLAKE2B 34d2a29ea084b4bed960169fbf3d20377e79b56c183f1a3c1a05b6eb0a45a388267354d1740b7a9d63ff87281213e424362acb0f74b6d9351dbfad209b427edc SHA512 64842286fbe1ccd4d44d20610443fc5f5a2aef2acaef4d79e56ed9b6064f87ddd8af4dfb96b4a425a6cc28f8c741dbcda6ae86adbc5be86cb5c5925d7897e3c6
DIST alive-2.0.5.tar.lz 186304 BLAKE2B 8528d7b86030ff0b54cd391a7cd7b42be974d5f605c66c6340468855959d2adf31940312d6693580839e9180813a3e96c2fe86a3842f3abd00af0e08b7f301ee SHA512 f760f9386019ddeac8690eec9119d557d4e288cc8698ce69adc8d9915eb0bc27fcf4015e9c4710411321d21c11731e61be754e9b827dceceab6463e531ed4240
diff --git a/net-analyzer/alive/alive-2.0.3.ebuild b/net-analyzer/alive/alive-2.0.3.ebuild
deleted file mode 100644
index 34cb398fe14..00000000000
--- a/net-analyzer/alive/alive-2.0.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A periodic ping program"
-HOMEPAGE="https://www.gnu.org/software/alive/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-
-BDEPEND="app-arch/xz-utils"
-DEPEND="
- dev-scheme/guile
-"
-RDEPEND="
- ${DEPEND}
- dev-scheme/xdgdirs
- net-misc/iputils
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.0.2-ping-test.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
diff --git a/net-analyzer/alive/alive-2.0.4.ebuild b/net-analyzer/alive/alive-2.0.4.ebuild
deleted file mode 100644
index 567f090930f..00000000000
--- a/net-analyzer/alive/alive-2.0.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools unpacker
-
-DESCRIPTION="A periodic ping program"
-HOMEPAGE="https://www.gnu.org/software/alive/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-
-DEPEND="dev-scheme/guile"
-RDEPEND="${DEPEND}
- dev-scheme/xdgdirs
- net-misc/iputils"
-BDEPEND="$(unpacker_src_uri_depends)"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.0.2-ping-test.patch
-)
-
-src_prepare() {
- default
-
- eautoreconf
-}
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild
index 382122ab0c5..55425715a1a 100644
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild
+++ b/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="debug ft geoip mysql sasl tcpd"
ARGUS_CDEPEND="
@@ -63,7 +63,7 @@ src_configure() {
src_compile() {
emake \
CCOPT="${CFLAGS} ${LDFLAGS}" \
- RANLIB=$(tc-getRANLIB) \
+ RANLIB="$(tc-getRANLIB)" \
CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)"
}
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 699942037b5..477073db97b 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-2021 Gentoo Authors
+# Copyright 1999-2022 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 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
DEPEND="
net-libs/libpcap
diff --git a/net-analyzer/arping/Manifest b/net-analyzer/arping/Manifest
index fb1a565d27c..a871acf0f72 100644
--- a/net-analyzer/arping/Manifest
+++ b/net-analyzer/arping/Manifest
@@ -1,2 +1,3 @@
DIST arping-2.21.tar.gz 50067 BLAKE2B 67b76cc48e9717117dbf43702df7f422634ed40196ec44d273a773610618922ddf7de47ffdf32cb7296db1dbce0a696c57b7992e6ad11f6fddf52a16212154fc SHA512 e976ce1a3ec0e4f57bbded09c6a07934e21df66ce7931422c420f5335dafcd88968f03ba6987d192dcdf51cca89180c86337aff50806713c7b04cb13e3e83504
DIST arping-2.22.tar.gz 50152 BLAKE2B 2215773b922219537339550e8034bb6eca82974469ebd0e399c73bd259ef4ff7a4510d9a5ff108cef3dac492477c54fc2517c2dfd4035158d0269f03c0e2a0b5 SHA512 0b36fff2c14c1ff89453ba63eea04de3343fcb19da7dbc1c8749bc926e441c54915cd628d54171d449e66e92663e31f12e057c30a80cd49c4412650e2cd00ef3
+DIST arping-2.23.tar.gz 51911 BLAKE2B 8b0d34522957a83d0a66b47576fa0ecbd1e4fc86537df6d2737510bdb1a4ea3d30feb664077790a8f70be9cf2cdcdc30a648261e9a6a30401ce85274c45ccf12 SHA512 45295fd68717379d18fcff4270c70e0d9df3cae175f0c2a9f1e8e88e3046f5109e7a95bb717be329af8d6002c9a2338efd39831a652c0b425b75058287fa35df
diff --git a/net-analyzer/arping/arping-2.22.ebuild b/net-analyzer/arping/arping-2.22.ebuild
index 55d11b15175..2c8ebabcabd 100644
--- a/net-analyzer/arping/arping-2.22.ebuild
+++ b/net-analyzer/arping/arping-2.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P}"
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 )"
diff --git a/net-analyzer/arping/arping-2.23.ebuild b/net-analyzer/arping/arping-2.23.ebuild
new file mode 100644
index 00000000000..f143eadf7e1
--- /dev/null
+++ b/net-analyzer/arping/arping-2.23.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools fcaps
+
+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"
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/ThomasHabets/arping"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+ S="${WORKDIR}/${PN}-${P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="+seccomp test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="net-libs/libpcap
+ net-libs/libnet:1.1
+ sys-libs/libcap
+ seccomp? ( sys-libs/libseccomp )
+ !net-misc/iputils[arping(+)]"
+DEPEND="${RDEPEND}
+ test? (
+ dev-libs/check
+ dev-python/subunit
+ )"
+
+FILECAPS=( cap_net_raw usr/sbin/arping )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.23-configure.ac-seccomp-disable.patch
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ # Controls whether seccomp is used by default
+ $(use_enable seccomp)
+ )
+
+ # Needed to actually make it optional and not automagic
+ # (and we want it optional for the non-seccomp arches, like sparc)
+ export ac_cv_lib_seccomp_seccomp_init=$(usex seccomp)
+ export ac_cv_header_seccomp_h=$(usex seccomp)
+
+ econf "${myeconfargs[@]}"
+}
diff --git a/net-analyzer/arping/arping-9999.ebuild b/net-analyzer/arping/arping-9999.ebuild
index 13d8502fc94..a706dc28684 100644
--- a/net-analyzer/arping/arping-9999.ebuild
+++ b/net-analyzer/arping/arping-9999.ebuild
@@ -1,36 +1,56 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit autotools git-r3 fcaps
+inherit autotools fcaps
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"
-EGIT_REPO_URI="https://github.com/ThomasHabets/arping"
-S="${WORKDIR}/${PN}-${P}"
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/ThomasHabets/arping"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+ S="${WORKDIR}/${PN}-${P}"
+fi
LICENSE="GPL-2"
SLOT="2"
-IUSE="test"
+IUSE="+seccomp test"
RESTRICT="!test? ( test )"
-RDEPEND="
- net-libs/libpcap
+RDEPEND="net-libs/libpcap
net-libs/libnet:1.1
- !net-misc/iputils[arping(+)]
-"
-DEPEND="
- ${RDEPEND}
+ sys-libs/libcap
+ seccomp? ( sys-libs/libseccomp )
+ !net-misc/iputils[arping(+)]"
+DEPEND="${RDEPEND}
test? (
dev-libs/check
dev-python/subunit
- )
-"
+ )"
FILECAPS=( cap_net_raw usr/sbin/arping )
src_prepare() {
default
+
eautoreconf
}
+
+src_configure() {
+ local myeconfargs=(
+ # Controls whether seccomp is used by default
+ $(use_enable seccomp)
+ )
+
+ # Needed to actually make it optional and not automagic
+ # (and we want it optional for the non-seccomp arches, like sparc)
+ export ac_cv_lib_seccomp_seccomp_init=$(usex seccomp)
+ export ac_cv_header_seccomp_h=$(usex seccomp)
+
+ econf "${myeconfargs[@]}"
+}
diff --git a/net-analyzer/arping/files/arping-2.23-configure.ac-seccomp-disable.patch b/net-analyzer/arping/files/arping-2.23-configure.ac-seccomp-disable.patch
new file mode 100644
index 00000000000..53b59da1a96
--- /dev/null
+++ b/net-analyzer/arping/files/arping-2.23-configure.ac-seccomp-disable.patch
@@ -0,0 +1,31 @@
+https://github.com/ThomasHabets/arping/pull/51
+
+From 47622ccc97591f55899f8fff325af241b89df09f Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 16 May 2022 06:24:27 +0000
+Subject: [PATCH] configure.ac: make --disable-seccomp work
+
+The first branch ("[action-if-given]") is taken even if --disable-seccomp
+is passed. So, in that branch, check whether the user disabled it or not.
+
+Without this, we'd get a failure when seccomp is detected but we want
+to disable it:
+```
+./configure --disable-seccomp
+[...]
+checking for library containing clock_gettime... none required
+configure: error: --enable-seccomp given but seccomp libraries not present
+```
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -35,7 +35,7 @@ AC_CHECK_LIB([pcap], [pcap_open_live], ,[AC_MSG_ERROR([libpcap not found])])
+ AC_SEARCH_LIBS([clock_gettime], [rt])
+
+ AC_ARG_ENABLE([seccomp], [Enable seccomp priv drops by default (-z to turn on, -Z for off)], [
+- if test "$ac_cv_lib_seccomp_seccomp_init" = "no"; then
++ if test x"$enableval" != x"no" && test "$ac_cv_lib_seccomp_seccomp_init" = "no"; then
+ AC_MSG_ERROR([--enable-seccomp given but seccomp libraries not present])
+ fi
+ AC_DEFINE([DEFAULT_SECCOMP], [1], [Enable seccomp by default])
diff --git a/net-analyzer/bwping/Manifest b/net-analyzer/bwping/Manifest
index 5ae583835fe..f8062264225 100644
--- a/net-analyzer/bwping/Manifest
+++ b/net-analyzer/bwping/Manifest
@@ -1,2 +1,3 @@
DIST bwping-2.3.tar.gz 119043 BLAKE2B 2780f22a2cb541821aae3ddf0eaa5f2cb662ec8f190c44f7e28a092f4e07f9b19d1388b9ddaec0133cedef894c6ff64a9e53035fd73e44a8f0aae518c8b9dc7c SHA512 e8afed0d4ff0ae668f1700e3c93e4b6298e4861568d4786630826bf0f3519089602b9562c92b2c3bb97904faea0da6a084fb60cc69bc3a0a931bd0f55af3ee49
DIST bwping-2.4.tar.gz 112687 BLAKE2B cbf2854ab5cf6e926db4e959e3e228b8dda6d5624898710de6bf0be4f7813ff85e088acba4b72e3f7d02ffec9f6feaf02720e915850e50daca2c7c3c5c775883 SHA512 e57bf644196a31acc845d4864d189595b1bca22b03ce7330581143ca369668f0dbccc23c936d985f334e03f9e5462a4298d714ceb56815a377ce1adec15364e6
+DIST bwping-2.5.tar.gz 113076 BLAKE2B c2a01b1d1d9fb83c2f0e40e2b1967d0e1e5a939d912372637558aa84cea0bca08f080cc8d980906d346ca44b39b7f37b54b0d6e18f834928bd59ddd056af43ac SHA512 2c271215476c8f1e0758aaae0e1730c526a326eeb3c7ffac3d8fac5783dbbe84d97fbb6732bfa7199ea8e4caf81a8dc9bd54ee36b63ece46dd2286880c734371
diff --git a/net-analyzer/bwping/bwping-2.4.ebuild b/net-analyzer/bwping/bwping-2.4.ebuild
index 1f3911414ca..0b6bec7fa5c 100644
--- a/net-analyzer/bwping/bwping-2.4.ebuild
+++ b/net-analyzer/bwping/bwping-2.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/oleg-derevenetz/bwping/releases/download/RELEASE_${P
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc x86"
src_test() {
[[ ${UID} = 0 ]] && default
diff --git a/net-analyzer/bwping/bwping-2.5.ebuild b/net-analyzer/bwping/bwping-2.5.ebuild
new file mode 100644
index 00000000000..310ecf23d0f
--- /dev/null
+++ b/net-analyzer/bwping/bwping-2.5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A tool to measure bandwidth and RTT between two hosts using ICMP"
+HOMEPAGE="https://bwping.sourceforge.io/"
+SRC_URI="https://github.com/oleg-derevenetz/bwping/releases/download/RELEASE_${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+
+src_test() {
+ [[ ${UID} = 0 ]] && default
+}
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index f0c5a377c34..80deba0f518 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,3 +1,3 @@
-DIST cacti-spine-1.2.16.tar.gz 108252 BLAKE2B ba0349cff7f4e82a5dc1d90c216cf7a4e0f939e28ab20d008b1725c948a85a00e2594f8997c8bbd69c305e3e58d944858c8439210956f45220b67229bc6df13d SHA512 0259084d70f9c8d20a8b19daf61e525228f99fba3eac4e2e5c9865114a5f1231b18389ca955fc4644c71c6c48cc45dda9b17e969a02c80552b84f98ad8945951
DIST cacti-spine-1.2.17.tar.gz 110371 BLAKE2B 1f9605d34fcff0e4e7921ccbb5a22eeb9e2f2e2f22cf56189790dcdec798db5bff681df11cd82006254cc270174248c07ce3d94dca8d3367add6b220f1599adf SHA512 4c616af041d2f08e18fd274409c98d3efce84b7cca2d6e23db3d6c2a0d4c9a77a2c52c0ef8e0ed0c6ad409f28b56fdf3160e27654522d8aeb1b88e3cb4128d4a
DIST cacti-spine-1.2.19.tar.gz 113974 BLAKE2B 6ec71e1480e9dfd2636c61bcea10c6581009908334fddbaab5cf4bf6948bc6f8ffb27b0325ab1f325b9ad0b0f2ba7e018373c34534ca5d4967f66100fba76934 SHA512 407a4e83aabaa62693c2f7c3d3952da9178bb28e2b8b914a5649e3eaccb9ea77d0c7db8e251a113a308bfaaa0674be941abfb2fc4f8e50d43fb73c8cd9deec63
+DIST cacti-spine-1.2.20.tar.gz 115258 BLAKE2B 78a9ed8a9e7e69e98bfa9971134dd6f34f540a93b0b1a2aababb66781f3c9787712d57d86b81d7f409487c4cc4447d4f84bd7292890b7eb70ec4137d97248793 SHA512 d7e129f7b42542d7ecc78d55cebc6d9ce481834342d3f3da1fce5538d8e42bc194a825795053d5e3a065b54574e2a3b9413725f1bc0562e55f1db213f9a94d0c
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.19.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.19.ebuild
index d70a52735b1..97df3de4d3d 100644
--- a/net-analyzer/cacti-spine/cacti-spine-1.2.19.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-1.2.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -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"
BDEPEND="sys-apps/help2man"
DEPEND="dev-libs/openssl:=
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.16.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.20.ebuild
index 6c9200ecdce..a8ac3093835 100644
--- a/net-analyzer/cacti-spine/cacti-spine-1.2.16.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-1.2.20.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools
@@ -13,28 +13,26 @@ 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"
+DEPEND="dev-db/mysql-connector-c:=
+ dev-libs/openssl:=
+ net-analyzer/net-snmp:="
+RDEPEND="${DEPEND}
+ >net-analyzer/cacti-0.8.8"
BDEPEND="sys-apps/help2man"
-DEPEND="
- dev-libs/openssl:0=
- net-analyzer/net-snmp:=
- dev-db/mysql-connector-c:0=
-"
-RDEPEND="
- ${DEPEND}
- >net-analyzer/cacti-0.8.8
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
-)
src_prepare() {
default
+
eautoreconf
}
+src_configure() {
+ # Drop CONFIG_SHELL after 1.2.x (fix is on develop branch)
+ CONFIG_SHELL="${BROOT}"/bin/bash econf
+}
+
src_install() {
dosbin spine
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index dc628e010fc..860499480ba 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,2 +1,4 @@
DIST cacti-1.2.17.tar.gz 38344112 BLAKE2B e555fc99560d10e94181c38b50e6f839532fb3dc66ff688b36a7efd10c15304e7636c9b4b483763fcea751317bcb283bb2bd8f813d5759c98aed6bbf02fd256a SHA512 94ae75b2494a91c536906c7bbeaa948d16c7ad96ed3a62c1eb21175f92c01787c6849960bbc791e04b3df46edbfd3cd787eb825bb423ce0814c0904edb2c915d
DIST cacti-1.2.19.tar.gz 38477886 BLAKE2B 7d72ecd376c633f1a4e46d3ed69977eb4d342deb900aabcbccbe6213368d67f75909f55c5e1bf21dcd8e422b4504dc1a25a63fe7cf26394d4b43a35db0cedce3 SHA512 076397f4cf048dac6e0c9bb8a4889ba94ca9e40c4d53c2c142ed9e19c7a0dc5c5aa8e2321563b914635a753b59b215926a1a73723fa41d1006473cc34667ad70
+DIST cacti-1.2.20.tar.gz 40715952 BLAKE2B 5cf85d075a69b3242d04df099fa5a48401d5f138bc71d71aa47bc6331b4db5b76a71c6c6a56ad4098efe7a064b7d75cd8998b13317b265afbf4238fe9d0b7f3a SHA512 b708f4431bc27baa839df6b00a4e582577a328e3aff2b55abfba38863de776371f9ba86b58582baf98db73e2b7cf1d68bbaf3a0996fa8fc91c4811fda637050c
+DIST cacti-1.2.21.tar.gz 40798454 BLAKE2B 86eae6743c07e45b4b06202cca072a385f45d2021159f0f5160a8c2a8eb8f3a2f9db63512515602d1c3eb6be4b53f5755c20d6da2194ff445c133a2bcdb33e27 SHA512 084ff9135dd0a92596a4d65f2fd461c8e84907ff87e467f6d144ee3b52ef7aeb44ffa5a8c25e74e5ff25588bc6c5b13b44ab2f24ef5e1c6652513b5c2a39f78d
diff --git a/net-analyzer/cacti/cacti-1.2.20.ebuild b/net-analyzer/cacti/cacti-1.2.20.ebuild
new file mode 100644
index 00000000000..831a6dd6858
--- /dev/null
+++ b/net-analyzer/cacti/cacti-1.2.20.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/cacti/cacti-1.2.21.ebuild b/net-analyzer/cacti/cacti-1.2.21.ebuild
new file mode 100644
index 00000000000..831a6dd6858
--- /dev/null
+++ b/net-analyzer/cacti/cacti-1.2.21.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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-r5.ebuild b/net-analyzer/carl/carl-0.9-r5.ebuild
index c0eab0820f0..a8d33e65770 100644
--- a/net-analyzer/carl/carl-0.9-r5.ebuild
+++ b/net-analyzer/carl/carl-0.9-r5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 pypy3)
+PYTHON_COMPAT=( python3_{8..9} pypy3 )
DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1
diff --git a/net-analyzer/carl/metadata.xml b/net-analyzer/carl/metadata.xml
index 6dd6a0ee7f3..e48a5ab0e03 100644
--- a/net-analyzer/carl/metadata.xml
+++ b/net-analyzer/carl/metadata.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
- <email>klausman@gentoo.org</email>
-</maintainer>
<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
diff --git a/net-analyzer/chronograf/Manifest b/net-analyzer/chronograf/Manifest
index 5a47abd1723..b37ecbcf363 100644
--- a/net-analyzer/chronograf/Manifest
+++ b/net-analyzer/chronograf/Manifest
@@ -1,11 +1,5 @@
-DIST chronograf-1.4.3.0.tar.gz 3979946 BLAKE2B 963511250e1d49ca92e9fde23b3c0899331ef22fe071c47c8d9d6a0ab0264e2dcb1dc083559424ff0b4bb59b0d4eb3121febe6f1ce828bac24598ae8be51cb6a SHA512 49a7565dc58f4f79ad1feb25bf6f74e9267630f6dab5f8767411d11f12dd7a76e9486b8f52c961c27dae6511286192585cee67363acf558287da436c39500ef9
-DIST chronograf-1.6.2.tar.gz 4585236 BLAKE2B a9861f84c1c862512fb1a5166f063a54d6a72f0eb3d175f7314ac50fd04b4f2529e18195cffa49b11a6b13483619ae7e579bc15479f8cea0698fd13cdc594677 SHA512 c4be1deed7ce4f0006cbf123faa0577909bf821581f5f263d3d474963f2541dca0092964a38626b80b5f32c11947f130aa97d37f3d673e304cea665c42bf2a32
-DIST chronograf-1.7.3.tar.gz 16319610 BLAKE2B 3d90ad33ce78b4bd939e5c016ea14b7986d8888707a8a68cd832e0826612aa984d65615301bee4d800343ecc38964103abcf72810c6390fd9cdd65542739e9ba SHA512 dd5e4805dcbe167a399b7927b976839bb99f805abc7caf0fbf9cba479647df1a681f175d7bfc48a2267312e7f89470935623f7bc5e6bcb7cf861928f3e0b2f1a
DIST chronograf-1.8.5-gen.tar.gz 3006503 BLAKE2B a7d8409d197df5c8a539ae0c0bf0a2fa557d5f56edc491cc9f75566e7dfa3eaea24955f7e36637dba87f9fb54aa6461b83e17c539599164100076e494d208465 SHA512 c7f28644d4143883b792448a62f03f733d7fbc1ea4fa77c29af9d5f7ee6982133c98cf995e13d76a4b43deda6ac30ecf9e8fedf7f0876beb2d9dc58dde3fea68
DIST chronograf-1.8.5.tar.gz 2208763 BLAKE2B fd5f12c5a3ed8f83016bcfb42afafc309acd642c7b6795ca43c265ee41824e9ee116238d0f56c010b3f3c777a67225c21da3179af763fc66e0f5ef87cb5cca59 SHA512 075f83f38fcfeff199ab7fc6d393cc6aafa95cd1bc7415602dc8bedb0d7203b5b70de386165ac6ba502fdd9503779016a616eb59b31a2e87a96b01ce66ecfa5c
-DIST chronograf-gen-1.4.3.0.tar.gz 2488979 BLAKE2B 47738629d25dd6b5c11f942bdcea089291bfd8ad1476f448985d35fd35fa4a59274e95b863f7055c34ac0047f584fc45c83e3143aceb8b13b6c4fd28c42039ec SHA512 0346c19f80bea597c87a54f2d5409854a30dfa020bb0326791a6387d81aafe0c6e5112b6d086b21f95dc4f68a269a8fb2e0113156122636c3a6281ba58df6b49
-DIST chronograf-gen-1.6.2.tar.gz 3263429 BLAKE2B 6b6202bfd216a7777c89f2329379df03226b0b212e720987357b66bc26c3d07212a26ed2c41991c7ee3c0eea9f3a731985697b7e4752eb3be906cbc8790a8290 SHA512 55cf76b6c33134a49deb605543ff49aeffaa3baf4262787b19afe1d3d42c2a6e66e88d031f07a2f13a214556c479daa6b40f8586b529730c924ae45bf0e85213
-DIST chronograf-gen-1.7.3.tar.gz 2893752 BLAKE2B bfbc680c3237522844b406504412dd6001eef3f93fc31df18660bb74b7e7561f44c5d3af039af62e000610f40c81e78fcde8a651a5198b4bd152fa04e93c51c7 SHA512 8120f563e0c5be8a7b8179016db72a1ff5eb7447c1124ffeb87d5c928275f3b0080f1f4d01cd9c5b0eef601852b2e3701e3b4cefda9a427bbaeaf9fc46a69ab1
DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
diff --git a/net-analyzer/chronograf/chronograf-1.4.3.0.ebuild b/net-analyzer/chronograf/chronograf-1.4.3.0.ebuild
deleted file mode 100644
index 2b2c7163f72..00000000000
--- a/net-analyzer/chronograf/chronograf-1.4.3.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN=github.com/influxdata/chronograf
-
-inherit golang-build golang-vcs-snapshot systemd user
-
-DESCRIPTION="Monitoring, processing and alerting on time series data"
-HOMEPAGE="https://www.influxdata.com"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~williamh/dist/${PN}-gen-${PV}.tar.gz"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-pkg_setup() {
- enewgroup chronograf
- enewuser chronograf -1 -1 /var/lib/chronograf chronograf
-}
-
-src_unpack() {
- local f
- golang-vcs-snapshot_src_unpack
- pushd "${S}/src/${EGO_PN}" > /dev/null || die
- for f in ${A}; do
- case $f in
- ${PN}-gen-*.tar.*)
- unpack ${f}
- ;;
- esac
- done
-}
-
-src_compile() {
- pushd "src/${EGO_PN}" > /dev/null || die
- set -- env GOPATH="${S}" go build -o chronograf cmd/chronograf/main.go
- echo "$@"
- "$@" || die "building chronograf failed"
- set -- env GOPATH="${S}" go build -o chronoctl cmd/chronoctl/main.go
- echo "$@"
- "$@" || die "building chronoctl failed"
- popd > /dev/null || die
-}
-
-src_install() {
- pushd "src/${EGO_PN}" > /dev/null || die
-dobin chronograf chronoctl
- dodoc CHANGELOG.md
- insinto /etc/logrotate.d
- newins etc/scripts/logrotate chronograf
- systemd_dounit etc/scripts/chronograf.service
- insinto /usr/share/chronograf/canned
-doins canned/*.json
-keepdir /usr/share/chronograf/resources
- keepdir /var/log/chronograf
- fowners chronograf:chronograf /var/log/chronograf
- newconfd "${FILESDIR}"/chronograf.confd chronograf
- newinitd "${FILESDIR}"/chronograf.rc chronograf
- popd > /dev/null || die
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- einfo "In order to use chronograf, you will need to configure"
- einfo "the appropriate options in ${EROOT}etc/conf.d/chronograf"
- fi
-}
diff --git a/net-analyzer/chronograf/chronograf-1.6.2.ebuild b/net-analyzer/chronograf/chronograf-1.6.2.ebuild
deleted file mode 100644
index ebae27747c6..00000000000
--- a/net-analyzer/chronograf/chronograf-1.6.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN=github.com/influxdata/chronograf
-
-inherit golang-build golang-vcs-snapshot systemd user
-
-DESCRIPTION="Monitoring, processing and alerting on time series data"
-HOMEPAGE="https://www.influxdata.com"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~williamh/dist/${PN}-gen-${PV}.tar.gz"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-pkg_setup() {
- enewgroup chronograf
- enewuser chronograf -1 -1 /var/lib/chronograf chronograf
-}
-
-src_unpack() {
- local f
- golang-vcs-snapshot_src_unpack
- pushd "${S}/src/${EGO_PN}" > /dev/null || die
- for f in ${A}; do
- case $f in
- ${PN}-gen-*.tar.*)
- unpack ${f}
- ;;
- esac
- done
-}
-
-src_compile() {
- pushd "src/${EGO_PN}" > /dev/null || die
- set -- env GOPATH="${S}" go build -o chronograf cmd/chronograf/main.go
- echo "$@"
- "$@" || die "building chronograf failed"
- set -- env GOPATH="${S}" go build -o chronoctl cmd/chronoctl/main.go
- echo "$@"
- "$@" || die "building chronoctl failed"
- popd > /dev/null || die
-}
-
-src_install() {
- pushd "src/${EGO_PN}" > /dev/null || die
-dobin chronograf chronoctl
- dodoc CHANGELOG.md
- insinto /etc/logrotate.d
- newins etc/scripts/logrotate chronograf
- systemd_dounit etc/scripts/chronograf.service
- insinto /usr/share/chronograf/canned
-doins canned/*.json
-keepdir /usr/share/chronograf/resources
- keepdir /var/log/chronograf
- fowners chronograf:chronograf /var/log/chronograf
- newconfd "${FILESDIR}"/chronograf.confd chronograf
- newinitd "${FILESDIR}"/chronograf.rc chronograf
- popd > /dev/null || die
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- einfo "In order to use chronograf, you will need to configure"
- einfo "the appropriate options in ${EROOT}etc/conf.d/chronograf"
- fi
-}
diff --git a/net-analyzer/chronograf/chronograf-1.7.3.ebuild b/net-analyzer/chronograf/chronograf-1.7.3.ebuild
deleted file mode 100644
index c4eb4def22b..00000000000
--- a/net-analyzer/chronograf/chronograf-1.7.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2018 Sony Interactive Entertainment Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN=github.com/influxdata/chronograf
-
-inherit golang-build golang-vcs-snapshot systemd user
-
-DESCRIPTION="Monitoring, processing and alerting on time series data"
-HOMEPAGE="https://www.influxdata.com"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~williamh/dist/${PN}-gen-${PV}.tar.gz"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-pkg_setup() {
- enewgroup chronograf
- enewuser chronograf -1 -1 /var/lib/chronograf chronograf
-}
-
-src_unpack() {
- local f
- golang-vcs-snapshot_src_unpack
- pushd "${S}/src/${EGO_PN}" > /dev/null || die
- for f in ${A}; do
- case $f in
- ${PN}-gen-*.tar.*)
- unpack ${f}
- ;;
- esac
- done
-}
-
-src_compile() {
- pushd "src/${EGO_PN}" > /dev/null || die
- set -- env GOPATH="${S}" go build -o chronograf cmd/chronograf/main.go
- echo "$@"
- "$@" || die "building chronograf failed"
- set -- env GOPATH="${S}" go build -o chronoctl cmd/chronoctl/main.go
- echo "$@"
- "$@" || die "building chronoctl failed"
- popd > /dev/null || die
-}
-
-src_install() {
- pushd "src/${EGO_PN}" > /dev/null || die
-dobin chronograf chronoctl
- dodoc CHANGELOG.md
- insinto /etc/logrotate.d
- newins etc/scripts/logrotate chronograf
- systemd_dounit etc/scripts/chronograf.service
- insinto /usr/share/chronograf/canned
-doins canned/*.json
-keepdir /usr/share/chronograf/resources
- keepdir /var/log/chronograf
- fowners chronograf:chronograf /var/log/chronograf
- newconfd "${FILESDIR}"/chronograf.confd chronograf
- newinitd "${FILESDIR}"/chronograf.rc chronograf
- popd > /dev/null || die
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- einfo "In order to use chronograf, you will need to configure"
- einfo "the appropriate options in ${EROOT}etc/conf.d/chronograf"
- fi
-}
diff --git a/net-analyzer/darkstat/Manifest b/net-analyzer/darkstat/Manifest
index 0614aa5c743..72513312afd 100644
--- a/net-analyzer/darkstat/Manifest
+++ b/net-analyzer/darkstat/Manifest
@@ -1 +1,2 @@
DIST darkstat-3.0.719.tar.bz2 117695 BLAKE2B b2aef3073aafaa42d006fd9ade652ea3542a5f238e347b219ee30e995915fa38b005161d26dff6a9a3e01e98b426ec14c32e1390592128d5816278e5f895f178 SHA512 264f6c5f862745fbfb5d125aae5a319369f028fd7be96cfb12775147f528a36b7f5a42bcd6434f2d376933292364641f2ec9cd9bdb1fe105f5a905e331181f98
+DIST darkstat-3.0.721.tar.gz 104050 BLAKE2B 1005bd3e40be59ad214c95908b34e70eb8b60e33a9b85ee3f6b7fa7f8f6691fad73234ef228ec529aaad0e8ad9eb07f0bdb9d08a560103af3cb377fd11765436 SHA512 077eec3cc69b021966d4545f408a7444136cedb8be1dbae96fb1ce94d9bcd3a1db3bf4ea1bed8999088b24f7e2ed333d1166fe39bf974f32772b8c8f6fde707c
diff --git a/net-analyzer/darkstat/darkstat-3.0.719-r4.ebuild b/net-analyzer/darkstat/darkstat-3.0.719-r4.ebuild
new file mode 100644
index 00000000000..1f62dd3d13c
--- /dev/null
+++ b/net-analyzer/darkstat/darkstat-3.0.719-r4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Network traffic analyzer with cute web interface"
+HOMEPAGE="https://unix4lyfe.org/darkstat/"
+if [[ ${PV} == *9999* ]] ; then
+ EGIT_REPO_URI="https://www.unix4lyfe.org/git/darkstat"
+ inherit git-r3
+else
+ SRC_URI="https://unix4lyfe.org/${PN}/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="acct-user/darkstat
+ dev-libs/libbsd
+ net-libs/libpcap
+ sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+DARKSTAT_CHROOT_DIR=${DARKSTAT_CHROOT_DIR:-/var/lib/darkstat}
+
+DOCS=( AUTHORS ChangeLog README NEWS )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.0.719-strncpy-off-by-one.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e '/-DNDEBUG/d' \
+ -e 's|-flto||g' \
+ configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf --with-privdrop-user=darkstat
+}
+
+src_install() {
+ default
+
+ newinitd "${FILESDIR}"/darkstat-initd darkstat
+ newconfd "${FILESDIR}"/darkstat-confd darkstat
+
+ sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/conf.d/darkstat || die
+ sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/init.d/darkstat || die
+
+ keepdir "${DARKSTAT_CHROOT_DIR}"
+ fowners darkstat:0 "${DARKSTAT_CHROOT_DIR}"
+}
+
+pkg_postinst() {
+ # Workaround bug #141619
+ DARKSTAT_CHROOT_DIR=$(
+ sed -n 's/^#CHROOT=\(.*\)/\1/p' "${EROOT}"/etc/conf.d/darkstat
+ )
+
+ if [[ -n "${DARKSTAT_CHROOT_DIR}" ]] && [[ "${DARKSTAT_CHROOT_DIR}" != "${EROOT:-/}" ]] ; then
+ chown darkstat:0 "${EROOT}/${DARKSTAT_CHROOT_DIR#/}/"
+ fi
+
+ elog "To start different darkstat instances which will listen on a different"
+ elog "interface, create within the ${EROOT}/etc/init.d directory a 'darkstat.if' symlink to"
+ elog "darkstat script where 'if' is the name of the interface."
+ elog "Also in the ${EROOT}/etc/conf.d directory, copy darkstat to darkstat.if"
+ elog "and edit it to change default values."
+ elog
+ elog "darkstat's default chroot directory is: ${EROOT}/${DARKSTAT_CHROOT_DIR#/}"
+}
diff --git a/net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild b/net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild
new file mode 100644
index 00000000000..3f38088b33e
--- /dev/null
+++ b/net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Network traffic analyzer with cute web interface"
+HOMEPAGE="https://unix4lyfe.org/darkstat/"
+if [[ ${PV} == *9999* ]] ; then
+ EGIT_REPO_URI="https://github.com/emikulic/darkstat"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/emikulic/darkstat/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="acct-user/darkstat
+ dev-libs/libbsd
+ net-libs/libpcap
+ sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+DARKSTAT_CHROOT_DIR=${DARKSTAT_CHROOT_DIR:-/var/lib/darkstat}
+
+DOCS=( AUTHORS ChangeLog README.md NEWS )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.0.719-strncpy-off-by-one.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e '/-DNDEBUG/d' \
+ -e 's|-flto||g' \
+ configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf --with-privdrop-user=darkstat
+}
+
+src_install() {
+ default
+
+ newinitd "${FILESDIR}"/darkstat-initd darkstat
+ newconfd "${FILESDIR}"/darkstat-confd darkstat
+
+ sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/conf.d/darkstat || die
+ sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/init.d/darkstat || die
+
+ keepdir "${DARKSTAT_CHROOT_DIR}"
+ fowners darkstat:0 "${DARKSTAT_CHROOT_DIR}"
+}
+
+pkg_postinst() {
+ elog "To start different darkstat instances which will listen on a different"
+ elog "interface, create within the ${EROOT}/etc/init.d directory a 'darkstat.if' symlink to"
+ elog "darkstat script where 'if' is the name of the interface."
+ elog "Also in the ${EROOT}/etc/conf.d directory, copy darkstat to darkstat.if"
+ elog "and edit it to change default values."
+ elog
+ elog "darkstat's default chroot directory is: ${EROOT}/var/lib/darkstat."
+ elog "Please chown it to darkstat:0 (or a different directory if you change it)."
+}
diff --git a/net-analyzer/darkstat/darkstat-9999999.ebuild b/net-analyzer/darkstat/darkstat-9999999.ebuild
index 4ca39eb748e..dcd53be61eb 100644
--- a/net-analyzer/darkstat/darkstat-9999999.ebuild
+++ b/net-analyzer/darkstat/darkstat-9999999.ebuild
@@ -1,32 +1,33 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit autotools git-r3
+inherit autotools
DESCRIPTION="Network traffic analyzer with cute web interface"
HOMEPAGE="https://unix4lyfe.org/darkstat/"
-EGIT_REPO_URI="https://www.unix4lyfe.org/git/darkstat"
+if [[ ${PV} == *9999* ]] ; then
+ EGIT_REPO_URI="https://github.com/emikulic/darkstat"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/emikulic/darkstat/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~ppc ~x86"
+fi
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS=""
-BDEPEND="
- app-editors/vim-core
-"
-DEPEND="
- acct-user/darkstat
+DEPEND="acct-user/darkstat
dev-libs/libbsd
net-libs/libpcap
- sys-libs/zlib
-"
-RDEPEND="
- ${DEPEND}
-"
+ sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
DARKSTAT_CHROOT_DIR=${DARKSTAT_CHROOT_DIR:-/var/lib/darkstat}
-DOCS=( AUTHORS ChangeLog README NEWS )
+
+DOCS=( AUTHORS ChangeLog README.md NEWS )
+
PATCHES=(
"${FILESDIR}"/${PN}-3.0.719-strncpy-off-by-one.patch
)
@@ -56,21 +57,24 @@ src_install() {
sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/init.d/darkstat || die
keepdir "${DARKSTAT_CHROOT_DIR}"
- chown darkstat:0 "${D}${DARKSTAT_CHROOT_DIR}"
+ fowners darkstat:0 "${DARKSTAT_CHROOT_DIR}"
}
pkg_postinst() {
# Workaround bug #141619
DARKSTAT_CHROOT_DIR=$(
- sed -n 's/^#CHROOT=\(.*\)/\1/p' "${ROOT}"/etc/conf.d/darkstat
+ sed -n 's/^#CHROOT=\(.*\)/\1/p' "${EROOT}"/etc/conf.d/darkstat
)
- chown darkstat:0 "${ROOT}${DARKSTAT_CHROOT_DIR}"
+
+ if [[ -n "${DARKSTAT_CHROOT_DIR}" ]] && [[ "${DARKSTAT_CHROOT_DIR}" != "${EROOT:-/}" ]] ; then
+ chown darkstat:0 "${EROOT}/${DARKSTAT_CHROOT_DIR#/}/"
+ fi
elog "To start different darkstat instances which will listen on a different"
- elog "interfaces create in /etc/init.d directory the 'darkstat.if' symlink to"
+ elog "interface, create within the ${EROOT}/etc/init.d directory a 'darkstat.if' symlink to"
elog "darkstat script where 'if' is the name of the interface."
- elog "Also in /etc/conf.d directory copy darkstat to darkstat.if"
+ elog "Also in the ${EROOT}/etc/conf.d directory, copy darkstat to darkstat.if"
elog "and edit it to change default values."
elog
- elog "darkstat's default chroot directory is: \"${ROOT}${DARKSTAT_CHROOT_DIR}\""
+ elog "darkstat's default chroot directory is: ${EROOT}/${DARKSTAT_CHROOT_DIR#/}"
}
diff --git a/net-analyzer/darkstat/metadata.xml b/net-analyzer/darkstat/metadata.xml
index 8d234c1da50..7903d33acaf 100644
--- a/net-analyzer/darkstat/metadata.xml
+++ b/net-analyzer/darkstat/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
@@ -10,4 +10,7 @@
runs as a background process on a cable/DSL router, gathers all sorts of
statistics about network usage, and serves them over HTTP.
</longdescription>
+ <upstream>
+ <remote-id type="github">emikulic/darkstat</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/net-analyzer/driftnet/driftnet-1.3.0.ebuild b/net-analyzer/driftnet/driftnet-1.3.0.ebuild
index 9134806f0c9..3d2fa78cc78 100644
--- a/net-analyzer/driftnet/driftnet-1.3.0.ebuild
+++ b/net-analyzer/driftnet/driftnet-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -38,6 +38,7 @@ DOCS="
PATCHES=(
"${FILESDIR}"/${PN}-1.3.0-CFLAGS.patch
"${FILESDIR}"/${PN}-1.3.0-gtk.patch
+ "${FILESDIR}"/${PN}-1.3.0-musl-stdint.patch
)
src_prepare() {
diff --git a/net-analyzer/driftnet/files/driftnet-1.3.0-musl-stdint.patch b/net-analyzer/driftnet/files/driftnet-1.3.0-musl-stdint.patch
new file mode 100644
index 00000000000..7261bbc80e1
--- /dev/null
+++ b/net-analyzer/driftnet/files/driftnet-1.3.0-musl-stdint.patch
@@ -0,0 +1,113 @@
+https://bugs.gentoo.org/832419
+--- a/src/media/image.c
++++ b/src/media/image.c
+@@ -11,6 +11,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h> /* On many systems (Darwin...), stdio.h is a prerequisite. */
++#include <stdint.h>
+ #include <string.h>
+
+ #include <netinet/in.h> /* ntohl */
+@@ -288,7 +289,7 @@ unsigned char *find_jpeg_image(const unsigned char *data, const size_t len, unsi
+ unsigned char *find_png_eoi(unsigned char *buffer, const size_t len) {
+ unsigned char *end_data, *data, chunk_code[PNG_CODE_LEN + 1];
+ struct png_chunk chunk;
+- u_int32_t datalen;
++ uint32_t datalen;
+
+ /* Move past the PNG header */
+ data = (buffer + PNG_SIG_LEN);
+--- a/src/network/layer2.c
++++ b/src/network/layer2.c
+@@ -12,6 +12,7 @@
+
+ #include "compat/compat.h"
+
++#include <stdint.h>
+ #include <string.h>
+
+ #ifdef __FreeBSD__
+@@ -39,7 +40,7 @@
+ struct ethhdr {
+ unsigned char h_dest[ETH_ALEN];
+ unsigned char h_source[ETH_ALEN];
+- u_int16_t h_proto;
++ uint16_t h_proto;
+ } __attribute__((packed));
+ #endif
+
+@@ -55,20 +56,20 @@ struct ethhdr {
+ #endif
+
+ struct ieee80211_radiotap_header {
+- u_int8_t it_version; /* set to 0 */
+- u_int8_t it_pad;
+- u_int16_t it_len; /* entire length */
+- u_int32_t it_present; /* fields present */
++ uint8_t it_version; /* set to 0 */
++ uint8_t it_pad;
++ uint16_t it_len; /* entire length */
++ uint32_t it_present; /* fields present */
+ };
+
+ struct ieee80211_frame {
+- u_int16_t fc;
+- u_int16_t wi_duration;
+- u_int8_t wi_add1[6];
+- u_int8_t wi_add2[6];
+- u_int8_t wi_add3[6];
+- u_int16_t wi_sequenceControl;
+- // u_int8_t wi_add4[6];
++ uint16_t fc;
++ uint16_t wi_duration;
++ uint8_t wi_add1[6];
++ uint8_t wi_add2[6];
++ uint8_t wi_add3[6];
++ uint16_t wi_sequenceControl;
++ // uint8_t wi_add4[6];
+ //unsigned int qosControl:2;
+ //unsigned int frameBody[23124];
+ };
+@@ -89,13 +90,13 @@ struct frame_control {
+
+ /* SNAP LLC header format */
+ struct snap_header {
+- u_int8_t dsap;
+- u_int8_t ssap;
+- u_int8_t ctl;
+- u_int8_t org1;
+- u_int8_t org2;
+- u_int8_t org3;
+- u_int16_t ether_type; /* ethernet type */
++ uint8_t dsap;
++ uint8_t ssap;
++ uint8_t ctl;
++ uint8_t org1;
++ uint8_t org2;
++ uint8_t org3;
++ uint16_t ether_type; /* ethernet type */
+ };
+
+ /*
+--- a/src/network/layer3.c
++++ b/src/network/layer3.c
+@@ -12,6 +12,7 @@
+
+ #include "compat/compat.h"
+
++#include <stdint.h>
+ #include <string.h>
+ #include <assert.h>
+
+@@ -30,8 +31,8 @@
+ int layer3_find_tcp(const u_char *pkt, uint8_t nextproto, int * offset,
+ struct sockaddr * src, struct sockaddr * dst, struct tcphdr * tcp)
+ {
+- u_int16_t *sport = NULL;
+- u_int16_t *dport = NULL;
++ uint16_t *sport = NULL;
++ uint16_t *dport = NULL;
+
+ while (1) {
+ switch (nextproto) {
diff --git a/net-analyzer/dsniff/metadata.xml b/net-analyzer/dsniff/metadata.xml
index 32fb662b837..50567512027 100644
--- a/net-analyzer/dsniff/metadata.xml
+++ b/net-analyzer/dsniff/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>netmon@gentoo.org</email>
diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434-r5.ebuild
index c623eb8d039..d5d48472542 100644
--- a/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild
+++ b/net-analyzer/echoping/echoping-6.0.2_p434-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,8 +15,8 @@ IUSE="gnutls http icp idn priority smtp ssl tos postgres ldap"
RESTRICT="test"
RDEPEND="
- idn? ( net-dns/libidn )
- ldap? ( net-nds/openldap )
+ idn? ( net-dns/libidn:= )
+ ldap? ( net-nds/openldap:= )
postgres? ( dev-db/postgresql:* )
ssl? (
gnutls? ( >=net-libs/gnutls-3.3:= )
diff --git a/net-analyzer/ethloop/ethloop-10-r4.ebuild b/net-analyzer/ethloop/ethloop-10-r4.ebuild
index 17108d44427..dc5653f727a 100644
--- a/net-analyzer/ethloop/ethloop-10-r4.ebuild
+++ b/net-analyzer/ethloop/ethloop-10-r4.ebuild
@@ -1,25 +1,26 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit toolchain-funcs
DESCRIPTION="Local simulator for testing Linux QoS disciplines"
HOMEPAGE="http://luxik.cdi.cz/~devik/qos/ethloop/"
SRC_URI="http://luxik.cdi.cz/~devik/qos/${PN}/${PN}${PV}.tgz"
+S="${WORKDIR}"/${PN}
LICENSE="all-rights-reserved"
SLOT="0"
KEYWORDS="~amd64 ~ppc x86"
RESTRICT="mirror bindist"
-S=${WORKDIR}/${PN}
PATCHES=(
"${FILESDIR}"/${P}-misc.patch
)
src_compile() {
- emake CC=$(tc-getCC) CFLAGS="${CFLAGS}"
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
}
src_install() {
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.2-r1.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.2-r1.ebuild
deleted file mode 100644
index 52bfd2a78f2..00000000000
--- a/net-analyzer/fail2ban/fail2ban-0.11.2-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit bash-completion-r1 distutils-r1 systemd tmpfiles
-
-DESCRIPTION="Scans log files and bans IPs that show malicious signs"
-HOMEPAGE="https://www.fail2ban.org/"
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN}"
- inherit git-r3
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux systemd"
-
-RDEPEND="
- virtual/logger
- virtual/mta
- selinux? ( sec-policy/selinux-fail2ban )
- systemd? (
- $(python_gen_cond_dep '
- || (
- dev-python/python-systemd[${PYTHON_USEDEP}]
- sys-apps/systemd[python(-),${PYTHON_USEDEP}]
- )' 'python*' )
- )
-"
-
-DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
-
-PATCHES=(
- "${FILESDIR}"/${P}-fix-tests-for-2021.patch
- "${FILESDIR}"/${PN}-0.11.2-adjust-apache-logs-paths.patch
- "${FILESDIR}"/${P}-fix-2to3-usage.patch
- "${FILESDIR}"/${P}-fix-systemd-test.patch
-)
-
-python_prepare_all() {
- # Replace /var/run with /run, but not in the top source directory
- find . -mindepth 2 -type f -exec \
- sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
-
- sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- ./fail2ban-2to3 || die
- distutils-r1_python_compile
-}
-
-python_test() {
- bin/fail2ban-testcases \
- --no-network \
- --no-gamin \
- --verbosity=4 || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- rm -rf "${ED}"/usr/share/doc/${PN} "${ED}"/run || die
-
- # Not ${FILESDIR}
- newconfd files/gentoo-confd ${PN}
- newinitd files/gentoo-initd ${PN}
-
- sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}"/${PN}.service || die
- systemd_dounit "${T}"/${PN}.service
- dotmpfiles files/${PN}-tmpfiles.conf
-
- doman man/*.{1,5}
-
- # Use INSTALL_MASK if you do not want to touch /etc/logrotate.d.
- # See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
- insinto /etc/logrotate.d
- newins files/${PN}-logrotate ${PN}
-
- keepdir /var/lib/${PN}
-
- newbashcomp files/bash-completion ${PN}-client
- bashcomp_alias ${PN}-client ${PN}-server ${PN}-regex
-}
-
-pkg_preinst() {
- has_version "<${CATEGORY}/${PN}-0.7"
- previous_less_than_0_7=$?
-}
-
-pkg_postinst() {
- tmpfiles_process ${PN}-tmpfiles.conf
-
- if [[ ${previous_less_than_0_7} = 0 ]] ; then
- elog
- elog "Configuration files are now in /etc/fail2ban/"
- elog "You probably have to manually update your configuration"
- elog "files before restarting Fail2Ban!"
- elog
- elog "Fail2Ban is not installed under /usr/lib anymore. The"
- elog "new location is under /usr/share."
- elog
- elog "You are upgrading from version 0.6.x, please see:"
- elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
- fi
-
- if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin ; then
- elog "For most jail.conf configurations, it is recommended you install either"
- elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
- elog "to control how log file modifications are detected"
- fi
-
- if ! has_version dev-lang/python[sqlite] ; then
- elog "If you want to use ${PN}'s persistent database, then reinstall"
- elog "dev-lang/python with USE=sqlite. If you do not use the"
- elog "persistent database feature, then you should set"
- elog "dbfile = :memory: in fail2ban.conf accordingly."
- fi
-
- if has_version sys-apps/systemd[-python] ; then
- elog "If you want to track logins through sys-apps/systemd's"
- elog "journal backend, then reinstall sys-apps/systemd with USE=python"
- fi
-}
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.2-r2.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.2-r2.ebuild
deleted file mode 100644
index e1483b6442e..00000000000
--- a/net-analyzer/fail2ban/fail2ban-0.11.2-r2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit bash-completion-r1 distutils-r1 systemd tmpfiles
-
-DESCRIPTION="Scans log files and bans IPs that show malicious signs"
-HOMEPAGE="https://www.fail2ban.org/"
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN}"
- inherit git-r3
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux systemd"
-
-RDEPEND="
- virtual/logger
- virtual/mta
- selinux? ( sec-policy/selinux-fail2ban )
- systemd? (
- $(python_gen_cond_dep '
- || (
- dev-python/python-systemd[${PYTHON_USEDEP}]
- sys-apps/systemd[python(-),${PYTHON_USEDEP}]
- )' 'python*' )
- )
-"
-
-DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
-
-PATCHES=(
- "${FILESDIR}"/${P}-fix-tests-for-2021.patch
- "${FILESDIR}"/${PN}-0.11.2-adjust-apache-logs-paths.patch
- "${FILESDIR}"/${P}-fix-2to3-usage.patch
- "${FILESDIR}"/${P}-fix-systemd-test.patch
- "${FILESDIR}"/${P}-fix-py3.10-collections.patch
-)
-
-python_prepare_all() {
- # Replace /var/run with /run, but not in the top source directory
- find . -mindepth 2 -type f -exec \
- sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
-
- sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- ./fail2ban-2to3 || die
- distutils-r1_python_compile
-}
-
-python_test() {
- bin/fail2ban-testcases \
- --no-network \
- --no-gamin \
- --verbosity=4 || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- rm -rf "${ED}"/usr/share/doc/${PN} "${ED}"/run || die
-
- # Not ${FILESDIR}
- newconfd files/gentoo-confd ${PN}
- newinitd files/gentoo-initd ${PN}
-
- sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}"/${PN}.service || die
- systemd_dounit "${T}"/${PN}.service
- dotmpfiles files/${PN}-tmpfiles.conf
-
- doman man/*.{1,5}
-
- # Use INSTALL_MASK if you do not want to touch /etc/logrotate.d.
- # See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
- insinto /etc/logrotate.d
- newins files/${PN}-logrotate ${PN}
-
- keepdir /var/lib/${PN}
-
- newbashcomp files/bash-completion ${PN}-client
- bashcomp_alias ${PN}-client ${PN}-server ${PN}-regex
-}
-
-pkg_preinst() {
- has_version "<${CATEGORY}/${PN}-0.7"
- previous_less_than_0_7=$?
-}
-
-pkg_postinst() {
- tmpfiles_process ${PN}-tmpfiles.conf
-
- if [[ ${previous_less_than_0_7} = 0 ]] ; then
- elog
- elog "Configuration files are now in /etc/fail2ban/"
- elog "You probably have to manually update your configuration"
- elog "files before restarting Fail2Ban!"
- elog
- elog "Fail2Ban is not installed under /usr/lib anymore. The"
- elog "new location is under /usr/share."
- elog
- elog "You are upgrading from version 0.6.x, please see:"
- elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
- fi
-
- if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin ; then
- elog "For most jail.conf configurations, it is recommended you install either"
- elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
- elog "to control how log file modifications are detected"
- fi
-
- if ! has_version dev-lang/python[sqlite] ; then
- elog "If you want to use ${PN}'s persistent database, then reinstall"
- elog "dev-lang/python with USE=sqlite. If you do not use the"
- elog "persistent database feature, then you should set"
- elog "dbfile = :memory: in fail2ban.conf accordingly."
- fi
-
- if has_version sys-apps/systemd[-python] ; then
- elog "If you want to track logins through sys-apps/systemd's"
- elog "journal backend, then reinstall sys-apps/systemd with USE=python"
- fi
-}
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.2-r3.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.2-r4.ebuild
index 1390bc1bdc3..ffabcf3a0b7 100644
--- a/net-analyzer/fail2ban/fail2ban-0.11.2-r3.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.11.2-r4.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
fi
LICENSE="GPL-2"
@@ -64,6 +64,9 @@ python_test() {
--no-network \
--no-gamin \
--verbosity=4 || die "Tests failed with ${EPYTHON}"
+
+ # Workaround for bug #790251
+ rm -r fail2ban.egg-info || die
}
python_install_all() {
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
deleted file mode 100644
index 967284198c1..00000000000
--- a/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit bash-completion-r1 distutils-r1 systemd tmpfiles
-
-DESCRIPTION="Scans log files and bans IPs that show malicious signs"
-HOMEPAGE="https://www.fail2ban.org/"
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN}"
- inherit git-r3
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux systemd"
-
-RDEPEND="
- virtual/logger
- virtual/mta
- selinux? ( sec-policy/selinux-fail2ban )
- systemd? (
- $(python_gen_cond_dep '
- || (
- dev-python/python-systemd[${PYTHON_USEDEP}]
- sys-apps/systemd[python(-),${PYTHON_USEDEP}]
- )' 'python*' )
- )
-"
-
-DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
-
-PATCHES=(
- "${FILESDIR}"/${P}-fix-tests-for-2021.patch
-)
-
-python_prepare_all() {
- # Replace /var/run with /run, but not in the top source directory
- find . -mindepth 2 -type f -exec \
- sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
-
- sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- ./fail2ban-2to3 || die
- distutils-r1_python_compile
-}
-
-python_test() {
- bin/fail2ban-testcases \
- --no-network \
- --no-gamin \
- --verbosity=4 || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- rm -rf "${ED}"/usr/share/doc/${PN} "${ED}"/run || die
-
- # Not ${FILESDIR}
- newconfd files/gentoo-confd ${PN}
- newinitd files/gentoo-initd ${PN}
-
- sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}"/${PN}.service || die
- systemd_dounit "${T}"/${PN}.service
- dotmpfiles files/${PN}-tmpfiles.conf
-
- doman man/*.{1,5}
-
- # Use INSTALL_MASK if you do not want to touch /etc/logrotate.d.
- # See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
- insinto /etc/logrotate.d
- newins files/${PN}-logrotate ${PN}
-
- keepdir /var/lib/${PN}
-
- newbashcomp files/bash-completion ${PN}-client
- bashcomp_alias ${PN}-client ${PN}-server ${PN}-regex
-}
-
-pkg_preinst() {
- has_version "<${CATEGORY}/${PN}-0.7"
- previous_less_than_0_7=$?
-}
-
-pkg_postinst() {
- tmpfiles_process ${PN}-tmpfiles.conf
-
- if [[ ${previous_less_than_0_7} = 0 ]] ; then
- elog
- elog "Configuration files are now in /etc/fail2ban/"
- elog "You probably have to manually update your configuration"
- elog "files before restarting Fail2Ban!"
- elog
- elog "Fail2Ban is not installed under /usr/lib anymore. The"
- elog "new location is under /usr/share."
- elog
- elog "You are upgrading from version 0.6.x, please see:"
- elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
- fi
-
- if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin ; then
- elog "For most jail.conf configurations, it is recommended you install either"
- elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
- elog "to control how log file modifications are detected"
- fi
-
- if ! has_version dev-lang/python[sqlite] ; then
- elog "If you want to use ${PN}'s persistent database, then reinstall"
- elog "dev-lang/python with USE=sqlite. If you do not use the"
- elog "persistent database feature, then you should set"
- elog "dbfile = :memory: in fail2ban.conf accordingly."
- fi
-
- if has_version sys-apps/systemd[-python] ; then
- elog "If you want to track logins through sys-apps/systemd's"
- elog "journal backend, then reinstall sys-apps/systemd with USE=python"
- fi
-}
diff --git a/net-analyzer/fail2ban/fail2ban-9999.ebuild b/net-analyzer/fail2ban/fail2ban-9999.ebuild
index 59203cfb4af..e4e61c3a52a 100644
--- a/net-analyzer/fail2ban/fail2ban-9999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-9999.ebuild
@@ -39,7 +39,6 @@ DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
PATCHES=(
"${FILESDIR}"/${PN}-0.11.2-adjust-apache-logs-paths.patch
- "${FILESDIR}"/${PN}-0.11.2-upstream-openrc.patch
)
python_prepare_all() {
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild
index c163a391b79..6697b3256a8 100644
--- a/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild
+++ b/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/5u623l20/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD GPL-3"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="debug mysql postgres ssl static-libs"
RDEPEND="
diff --git a/net-analyzer/fping/Manifest b/net-analyzer/fping/Manifest
index 96b39264dfd..196c468ebd2 100644
--- a/net-analyzer/fping/Manifest
+++ b/net-analyzer/fping/Manifest
@@ -1 +1,2 @@
DIST fping-5.0.tar.gz 185281 BLAKE2B 6dbb6708ecb55c1f1281bcd9e298475a1ad3a21aa81d8488b61cb39ad07d1d7285247a3c39883cbaae0b1a0e4403b6340ea7ec43411b81546f0e8eeefb02ef88 SHA512 c843f7bb7c4e3289c4dd9eb8ae2ab93a363316c0000aac9187f79580a3d2505df179f2e0ae9e0a791c74bfc9e17c476874f8e122dfa6ad74930498c4e02d0de3
+DIST fping-5.1.tar.gz 191224 BLAKE2B 2fb344e650b5a359fb8780f2c599455d39405ae823edf695ee4385aa2661dc5811e088bafa1b9f53846ee90c0afa959a92832381a03346d1fda048eb4e7ee098 SHA512 1a208da8dcd99093d0512af5d85ba5e7b5743ec97993d24c1fe612bb58d93090ac1ba0952f648aa075f16d390a77c4be65e394ae56dbede2a6914e0e8c68e2bd
diff --git a/net-analyzer/fping/fping-5.0.ebuild b/net-analyzer/fping/fping-5.0.ebuild
index da4e623accc..36614ec7655 100644
--- a/net-analyzer/fping/fping-5.0.ebuild
+++ b/net-analyzer/fping/fping-5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://fping.org/dist/${P}.tar.gz"
LICENSE="fping"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
IUSE="ipv6 suid"
FILECAPS=( cap_net_raw+ep usr/sbin/fping )
diff --git a/net-analyzer/fping/fping-5.1.ebuild b/net-analyzer/fping/fping-5.1.ebuild
new file mode 100644
index 00000000000..07d43604bf0
--- /dev/null
+++ b/net-analyzer/fping/fping-5.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps
+
+DESCRIPTION="A utility to ping multiple hosts at once"
+HOMEPAGE="https://fping.org/ https://github.com/schweikert/fping/"
+SRC_URI="https://fping.org/dist/${P}.tar.gz"
+
+LICENSE="fping"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="suid"
+
+FILECAPS=( cap_net_raw+ep usr/sbin/fping )
+
+src_configure() {
+ econf --enable-ipv6
+}
+
+src_install() {
+ default
+
+ if use suid; then
+ fperms u+s /usr/sbin/fping
+ fi
+
+ dosym fping /usr/sbin/fping6
+}
diff --git a/net-analyzer/gnome-nettool/Manifest b/net-analyzer/gnome-nettool/Manifest
index d63b7d4fc22..3bf87fa3024 100644
--- a/net-analyzer/gnome-nettool/Manifest
+++ b/net-analyzer/gnome-nettool/Manifest
@@ -1 +1 @@
-DIST gnome-nettool-3.8.1.tar.xz 589024 BLAKE2B f12c43b713ae81a2460b12c150e2c52baf98900b14ce0ff188b3fb1a55aa636391fb62d9c20b40d3a60ff322d4af9744d072c2727a77bced056ef0df042e21cf SHA512 c1c90fa727ebbf21442c4d0f5f4e98acf91fdd68a476f5f378167f92c3d7938ef33598525b62b838dc9b485abeb40171bdffb0fe3cb060fd3982db013a30bbed
+DIST gnome-nettool-42.0.tar.xz 422880 BLAKE2B 847f14781865eb936f0ded28a3f45ffa4ed02a20d335aea95a623795a2bb40bf57a49ecb28b26088c2818d028a401b3ef346806ea60305022bcafc9972094f4e SHA512 a640cd7f2008be870c4c457d3f793e6d31a10457b826641ef3cb9b831ea1d80756abc2a39aef7cb093905adafe41f27ee3c5648b1a6a3a01aa3d3ee7988330ce
diff --git a/net-analyzer/gnome-nettool/files/42.0-meson-drop-unused-positional-arguments.patch b/net-analyzer/gnome-nettool/files/42.0-meson-drop-unused-positional-arguments.patch
new file mode 100644
index 00000000000..e1da4288a74
--- /dev/null
+++ b/net-analyzer/gnome-nettool/files/42.0-meson-drop-unused-positional-arguments.patch
@@ -0,0 +1,38 @@
+https://gitlab.gnome.org/GNOME/gnome-nettool/-/merge_requests/3
+
+From 1124c3e1fdb8472d30b7636500229aa16cdc1244 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jeremy.bicha@canonical.com>
+Date: Wed, 6 Apr 2022 13:05:25 -0400
+Subject: [PATCH] meson: drop unused positional arguments
+
+This fixes a build error with newer meson
+---
+ data/meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 585e6d3..ed1e8bb 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -20,16 +20,14 @@ desktop_in = configure_file(input: 'gnome-nettool.desktop.in.in',
+ output: 'gnome-nettool.desktop.in',
+ configuration: desktop_conf)
+
+-i18n.merge_file('desktop',
+- type: 'desktop',
++i18n.merge_file(type: 'desktop',
+ input: desktop_in,
+ output: 'gnome-nettool.desktop',
+ po_dir: po_dir,
+ install: true,
+ install_dir: join_paths(prefix, datadir, 'applications'))
+
+-i18n.merge_file('appdata',
+- type: 'xml',
++i18n.merge_file(type: 'xml',
+ input: 'gnome-nettool.appdata.xml.in',
+ output: 'gnome-nettool.appdata.xml',
+ po_dir: po_dir,
+--
+GitLab
+
diff --git a/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-42.0.ebuild
index d2180ca2b6a..cd1094cb845 100644
--- a/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild
+++ b/net-analyzer/gnome-nettool/gnome-nettool-42.0.ebuild
@@ -1,44 +1,51 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
-GCONF_DEBUG="yes"
+EAPI=8
-inherit gnome2
+PYTHON_COMPAT=( python3_{8..10} )
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
DESCRIPTION="Graphical front-ends to various networking command-line"
HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-nettool"
LICENSE="GPL-2"
SLOT="0"
-IUSE="debug"
KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-COMMON_DEPEND="
- >=dev-libs/glib-2.25.10:2
+DEPEND="
+ >=x11-libs/gtk+-3.0.0:3
+ >=dev-libs/glib-2.26:2
gnome-base/libgtop:2=
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.90.4:3
- x11-libs/pango
"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
|| (
net-misc/iputils
net-analyzer/tcptraceroute
- net-analyzer/traceroute )
+ net-analyzer/traceroute
+ )
net-analyzer/nmap
net-dns/bind-tools
net-misc/netkit-fingerd
net-misc/whois
"
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
+ ${PYTHON_DEPS}
app-text/yelp-tools
- >=dev-util/intltool-0.40
virtual/pkgconfig
sys-devel/gettext
"
-src_configure() {
- gnome2_src_configure $(use_enable debug)
+PATCHES=(
+ "${FILESDIR}"/${PV}-meson-drop-unused-positional-arguments.patch
+)
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
}
diff --git a/net-analyzer/gr-fosphor/files/gr-fosphor-0.0_p20200131-htmldir.patch b/net-analyzer/gr-fosphor/files/gr-fosphor-0.0_p20200131-htmldir.patch
new file mode 100644
index 00000000000..16a4475299b
--- /dev/null
+++ b/net-analyzer/gr-fosphor/files/gr-fosphor-0.0_p20200131-htmldir.patch
@@ -0,0 +1,8 @@
+--- a/docs/doxygen/CMakeLists.txt
++++ b/docs/doxygen/CMakeLists.txt
+@@ -50,4 +50,4 @@
+
+ add_custom_target(doxygen_target ALL DEPENDS ${BUILT_DIRS})
+
+-install(DIRECTORY ${BUILT_DIRS} DESTINATION ${GR_PKG_DOC_DIR})
++install(DIRECTORY ${BUILT_DIRS} DESTINATION ${CMAKE_INSTALL_DOCDIR})
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131-r1.ebuild
index e3c5413176f..b26a6c758c2 100644
--- a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild
+++ b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131-r1.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+EAPI=8
-inherit cmake-utils python-single-r1
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit cmake python-single-r1
DESCRIPTION="gnuradio fosphor block (GPU spectrum display)"
HOMEPAGE="https://sdr.osmocom.org/trac/wiki/fosphor"
-if [[ ${PV} == 9999* ]]; then
+if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/osmocom/${PN}.git"
else
@@ -19,18 +20,12 @@ else
KEYWORDS="~amd64 ~x86"
fi
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
LICENSE="GPL-3+"
SLOT="0"
IUSE="glfw qt5"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RDEPEND="qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- )
+RDEPEND="
dev-libs/boost:=
dev-libs/log4cpp
media-libs/freetype
@@ -39,16 +34,16 @@ RDEPEND="qt5? (
virtual/opencl
virtual/opengl
${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
- dev-lang/swig:0
- dev-util/cppunit
-"
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtwidgets:5
+ )"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/swig:0"
-src_prepare() {
- cmake-utils_src_prepare
- default
-}
+PATCHES=( "${FILESDIR}"/${P}-htmldir.patch )
src_configure() {
# tries to run OpenCL test program, but failing doesn't hurt
@@ -60,5 +55,5 @@ src_configure() {
-DENABLE_QT="$(usex qt5)"
-DENABLE_PYTHON=ON
)
- cmake-utils_src_configure
+ cmake_src_configure
}
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
index e3c5413176f..d02fe497370 100644
--- a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
+++ b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+EAPI=8
-inherit cmake-utils python-single-r1
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit cmake python-single-r1
DESCRIPTION="gnuradio fosphor block (GPU spectrum display)"
HOMEPAGE="https://sdr.osmocom.org/trac/wiki/fosphor"
-if [[ ${PV} == 9999* ]]; then
+if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/osmocom/${PN}.git"
else
@@ -19,18 +20,12 @@ else
KEYWORDS="~amd64 ~x86"
fi
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
LICENSE="GPL-3+"
SLOT="0"
IUSE="glfw qt5"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RDEPEND="qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- )
+RDEPEND="
dev-libs/boost:=
dev-libs/log4cpp
media-libs/freetype
@@ -39,16 +34,14 @@ RDEPEND="qt5? (
virtual/opencl
virtual/opengl
${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
- dev-lang/swig:0
- dev-util/cppunit
-"
-
-src_prepare() {
- cmake-utils_src_prepare
- default
-}
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtwidgets:5
+ )"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/swig:0"
src_configure() {
# tries to run OpenCL test program, but failing doesn't hurt
@@ -60,5 +53,5 @@ src_configure() {
-DENABLE_QT="$(usex qt5)"
-DENABLE_PYTHON=ON
)
- cmake-utils_src_configure
+ cmake_src_configure
}
diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest
index d34c717db75..28489bc090a 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -1 +1,2 @@
+DIST graphite-web-1.1.10.tar.gz 1192965 BLAKE2B cd60e38a70c124c2be53c12394e994f4772a3fcdbae5fa8f26097e79de3de326ec90d5ee23b4e2e8c696e50d7d7ba897b6bb441a1fc7692d1b6e581c11a3da04 SHA512 fb0a2ed5cfa4a8c12bbb7f64f0c7846b439d8094a0b415e5750fe175bbcc2c047fccad50fdeda7696aee0ed9532eb75948f3a376ee34e188cacf226c02bbb3f9
DIST graphite-web-1.1.8.tar.gz 1177214 BLAKE2B 20e058feff0fa7f12393cfd41acca7cf05ff6a3995aa5f6547764fae3b8824e8b424efb8d5d47227eb2b5591ae6b45ab960da30f810acb4f1fbd0b9ae78ec47b SHA512 4637a541e61f56c1ac69bf18e7eab88ecf93f59099dc3e8022d8bf8fb1b204672bc0a1b5302e5031701714db17aabb316ba40f4cfabb2bf4fb0dedb8f412e4a9
diff --git a/net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch b/net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch
deleted file mode 100644
index 4cbbe7213b3..00000000000
--- a/net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Install FHS-style paths
-
---- a/conf/graphite.wsgi.example
-+++ b/conf/graphite.wsgi.example
-@@ -1,4 +1,4 @@
- import sys
--sys.path.append('/opt/graphite/webapp')
-+sys.path.append('@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp')
-
- from graphite.wsgi import application
---- a/setup.py
-+++ b/setup.py
-@@ -107,8 +107,8 @@
- ],
- package_data={'graphite' :
- ['templates/*', 'local_settings.py.example']},
-- scripts=glob('bin/*'),
-- data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples,
-+ scripts=['bin/graphite-web-build-index'],
-+ data_files=list(webapp_content.items()),
- install_requires=['Django>=1.8,<2.1', 'django-tagging==0.4.3', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'],
- classifiers=[
- 'Intended Audience :: Developers',
---- a/webapp/graphite/local_settings.py.example
-+++ b/webapp/graphite/local_settings.py.example
-@@ -101,6 +101,7 @@
- # Change only GRAPHITE_ROOT if your install is merely shifted from /opt/graphite
- # to somewhere else
- #GRAPHITE_ROOT = '/opt/graphite'
-+GRAPHITE_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web'
-
- # Most installs done outside of a separate tree such as /opt/graphite will
- # need to change these settings. Note that the default settings for each
-@@ -110,6 +111,11 @@
- #STATIC_ROOT = '/opt/graphite/static'
- #LOG_DIR = '/opt/graphite/storage/log/webapp'
- #INDEX_FILE = '/opt/graphite/storage/index' # Search index file
-+CONF_DIR = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web'
-+STORAGE_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon'
-+STATIC_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp/content'
-+LOG_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/log/graphite-web'
-+INDEX_FILE = '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/index' # Search index file
-
- # To further or fully customize the paths, modify the following. Note that the
- # default settings for each of these are relative to CONF_DIR and STORAGE_DIR
-@@ -127,6 +133,8 @@
- #CERES_DIR = '/opt/graphite/storage/ceres'
- #WHISPER_DIR = '/opt/graphite/storage/whisper'
- #RRD_DIR = '/opt/graphite/storage/rrd'
-+WHISPER_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/whisper'
-+RRD_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/rrd'
- #
- # Data directories using the "Standard" metrics finder (i.e. not Ceres)
- #STANDARD_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above variables
-@@ -244,7 +244,7 @@
- #
- #DATABASES = {
- # 'default': {
--# 'NAME': '/opt/graphite/storage/graphite.db',
-+# 'NAME': '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/graphite.db',
- # 'ENGINE': 'django.db.backends.sqlite3',
- # 'USER': '',
- # 'PASSWORD': '',
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.10.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.10.ebuild
new file mode 100644
index 00000000000..ca42298c3bf
--- /dev/null
+++ b/net-analyzer/graphite-web/graphite-web-1.1.10.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+DISTUTILS_USE_SETUPTOOLS=no # export USE_SETUPTOOLS to activate
+
+inherit distutils-r1 prefix
+
+DESCRIPTION="Enterprise scalable realtime graphing"
+HOMEPAGE="https://graphiteapp.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+carbon ldap mysql memcached postgres +sqlite"
+
+DEPEND=""
+RDEPEND="
+ carbon? ( dev-python/carbon[${PYTHON_USEDEP}] )
+ ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+ memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] )
+ mysql? ( dev-python/mysqlclient[${PYTHON_USEDEP}] )
+ postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+ >=dev-python/django-1.11.19[sqlite?,${PYTHON_USEDEP}]
+ <dev-python/django-4[sqlite?,${PYTHON_USEDEP}]
+ >=dev-python/django-tagging-0.4.6[${PYTHON_USEDEP}]
+ dev-python/cairocffi[${PYTHON_USEDEP}]
+ dev-python/pyparsing[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/urllib3[${PYTHON_USEDEP}]
+ media-libs/fontconfig
+"
+
+PATCHES=(
+ # Do not install the configuration and data files. We install them
+ # somewhere sensible by hand.
+ "${FILESDIR}"/${PN}-1.1.7-fhs-paths.patch
+)
+
+python_prepare_all() {
+ # Use a less common name
+ mv bin/build-index bin/${PN}-build-index || die
+ # use FHS-style paths
+ export GRAPHITE_NO_PREFIX=yes
+ distutils-r1_python_prepare_all
+ eprefixify \
+ conf/graphite.wsgi.example \
+ webapp/graphite/local_settings.py.example
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ keepdir /var/{lib,log}/${PN}
+ docinto examples
+ docompress -x "/usr/share/doc/${PF}/examples"
+ dodoc \
+ examples/example-graphite-vhost.conf \
+ conf/dashboard.conf.example \
+ conf/graphite.wsgi.example
+}
+
+python_install() {
+ distutils-r1_python_install \
+ --install-data="${EPREFIX}"/usr/share/${PN}
+
+ # copy the file once, to keep the timestamps correct, #808863
+ if [[ ! -e ${ED}/etc/${PN}/local_settings.py ]] ; then
+ insinto /etc/${PN}
+ newins webapp/graphite/local_settings.py.example local_settings.py
+ fi
+ pushd "${D}/$(python_get_sitedir)"/graphite > /dev/null || die
+ ln -s ../../../../../etc/${PN}/local_settings.py local_settings.py || die
+ popd > /dev/null || die
+
+ python_optimize
+}
+
+pkg_config() {
+ "${EROOT}"/usr/bin/django-admin.py migrate \
+ --settings=graphite.settings --run-syncdb
+ "${EROOT}"/usr/bin/${PN}-build-index
+}
+
+pkg_postinst() {
+ # Only display this for new installs
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog "You need to configure ${PN} to run with a WSGI server of your choice."
+ elog "For example using Apache, you can use www-apache/mod_wsgi,"
+ elog " using Nginx, you can use www-servers/uwsgi."
+ elog "Don't forget to edit local_settings.py in ${EPREFIX}/etc/${PN}"
+ elog "See https://graphite.readthedocs.org/en/latest/config-local-settings.html"
+ elog "Run emerge --config =${PN}-${PVR} if this is a fresh install."
+ elog ""
+ elog "If you want to update the search index regularily, you should consider running"
+ elog "the '${PN}-build-index' script in a crontab."
+ fi
+}
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.8-r2.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.8-r3.ebuild
index 933b28b75a8..ba068f3f4c1 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.8-r2.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.8-r3.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
mysql? ( dev-python/mysqlclient[${PYTHON_USEDEP}] )
postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
>=dev-python/django-1.11.19[sqlite?,${PYTHON_USEDEP}]
+ <dev-python/django-4[sqlite?,${PYTHON_USEDEP}]
>=dev-python/django-tagging-0.4.6[${PYTHON_USEDEP}]
dev-python/cairocffi[${PYTHON_USEDEP}]
dev-python/pyparsing[${PYTHON_USEDEP}]
diff --git a/net-analyzer/greenbone-security-assistant/Manifest b/net-analyzer/greenbone-security-assistant/Manifest
deleted file mode 100644
index a58a52bdcbc..00000000000
--- a/net-analyzer/greenbone-security-assistant/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST greenbone-security-assistant-20.8.1-node_modules.tar.gz 56048261 BLAKE2B feb9c8bc1f6675f9cfe0914acc2afbd8dc69a0445f198f893c4dcd73364404491541fb5c81980b627c741ba58621d26f4a1c4c07d18dc89d9c0050739352e0fc SHA512 2fa731aa0037b1c5e24ae34afa1d1dd1519ca8fac7af9dbd6d00486fa2ecab6fecfebe0864bc7f0ac38bfc0443c7ea05b85b3dbe75d891af4f5544bc80601c46
-DIST greenbone-security-assistant-20.8.1.tar.gz 2136158 BLAKE2B 769b9fc10879f866bc6c17cecf35a33d1a8813fbfacac16f1a97f1f58f1545c4e3997880642e5306b782c74c5515a11f527d31526ae4224d037a6c5e06fb0241 SHA512 85a96d59317bedfbe748b02b71fcf5f931f049d1ca688e3d4e87e701f14cd39ec4320621689f3a9f6b91fc1cf4e25c422df4d9b4675a7bcfed330b431b64d3ef
-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-20.8.1-node.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-20.8.1-node.patch
deleted file mode 100644
index c39a66c5405..00000000000
--- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-20.8.1-node.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/gsa/CMakeLists.txt b/gsa/CMakeLists.txt
-index db597d390..d30e33ec1 100644
---- a/gsa/CMakeLists.txt
-+++ b/gsa/CMakeLists.txt
-@@ -1176,29 +1176,17 @@ set (GSA_JS_SRC_FILES
- ${GSA_SRC_DIR}/src/web/wizard/taskwizard.js
- )
-
--
--
--add_custom_command (OUTPUT node-modules.stamp
-- DEPENDS ${GSA_PKG_FILES}
-- COMMAND ${INSTALLER} "${INSTALLER_ARGS}" "install"
-- COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/node-modules.stamp
-- WORKING_DIRECTORY ${GSA_SRC_DIR}
-- COMMENT "Install gsa js dependencies")
--
--
- add_custom_command (OUTPUT bundle.stamp
-- COMMAND ${CMAKE_COMMAND} -E env REACT_APP_VERSION=${PROJECT_VERSION_STRING} ${INSTALLER} "${INSTALLER_ARGS}" run build
-+ COMMAND ${CMAKE_COMMAND} -E env REACT_APP_VERSION=${PROJECT_VERSION_STRING} ${INSTALLER} --offline run build
- COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/bundle.stamp
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/node-modules.stamp
-- ${GSA_PKG_FILES}
-+ DEPENDS ${GSA_PKG_FILES}
- ${GSA_STATIC_SRC_FILES}
- ${GSA_JS_SRC_FILES}
- COMMENT "Build gsa install files")
-
- add_custom_target (gsa ALL
-- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/node-modules.stamp
-- ${CMAKE_CURRENT_BINARY_DIR}/bundle.stamp)
-+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/bundle.stamp)
-
- set (GSA_STATIC_BUILD_FILES
- ${GSA_BUILD_DIR}/index.html)
-@@ -1209,9 +1197,6 @@ install (FILES ${GSA_STATIC_BUILD_FILES}
- 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-8.0.1-node.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-node.patch
deleted file mode 100644
index 116bd48264d..00000000000
--- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-node.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/gsa/CMakeLists.txt 2019-07-17 16:45:39.000000000 +0300
-+++ b/gsa/CMakeLists.txt 2019-07-17 22:24:49.466906757 +0300
-@@ -1095,28 +1095,17 @@
- ${GSA_JS_SRC_FILES}
- PARENT_SCOPE)
-
--
--add_custom_command (OUTPUT node-modules.stamp
-- DEPENDS ${GSA_PKG_FILES}
-- COMMAND ${INSTALLER} "${INSTALLER_ARGS}" "install"
-- COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/node-modules.stamp
-- WORKING_DIRECTORY ${GSA_SRC_DIR}
-- COMMENT "Install gsa-ng js dependencies")
--
--
- add_custom_command (OUTPUT bundle.stamp
-- COMMAND ${CMAKE_COMMAND} -E env REACT_APP_VERSION=${PROJECT_VERSION_STRING} ${INSTALLER} "${INSTALLER_ARGS}" run build
-+ COMMAND ${CMAKE_COMMAND} -E env REACT_APP_VERSION=${PROJECT_VERSION_STRING} ${INSTALLER} --offline run build
- COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/bundle.stamp
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/node-modules.stamp
-- ${GSA_PKG_FILES}
-+ DEPENDS ${GSA_PKG_FILES}
- ${GSA_STATIC_SRC_FILES}
- ${GSA_JS_SRC_FILES}
- COMMENT "Build gsa-ng install files")
-
- add_custom_target (gsa-ng ALL
-- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/node-modules.stamp
-- ${CMAKE_CURRENT_BINARY_DIR}/bundle.stamp)
-+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/bundle.stamp)
-
- set (GSA_STATIC_BUILD_FILES
- ${GSA_BUILD_DIR}/index.html)
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
deleted file mode 100644
index f9f587c96c8..00000000000
--- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-9.0.1-glibc_siglist.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-#-------------------------------------------------------------------
-# 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/files/greenbone-security-assistant-9.0.1-uninstall-snippet.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-9.0.1-uninstall-snippet.patch
deleted file mode 100644
index 8622fd81067..00000000000
--- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-9.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
-@@ -1164,9 +1164,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/gsa.nginx.reverse.proxy.example b/net-analyzer/greenbone-security-assistant/files/gsa.nginx.reverse.proxy.example
deleted file mode 100644
index b233911a2f1..00000000000
--- a/net-analyzer/greenbone-security-assistant/files/gsa.nginx.reverse.proxy.example
+++ /dev/null
@@ -1,78 +0,0 @@
-upstream backend {
- server 127.0.0.1:9392;
- keepalive 64;
-}
-
-server {
- listen IP:80;
- server_name openvas.domain.tdl;
- return 301 https://openvas.domain.tdl$request_uri;
-}
-
-server {
- listen IP:443 ssl http2;
- server_name openvas.domain.tdl;
- access_log /var/log/nginx/openvas.domain.tdl.access.log;
- error_log /var/log/nginx/openvas.domain.tdl.error.log;
- # Not sourcing directly from file
- fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
- fastcgi_param QUERY_STRING $query_string;
- fastcgi_param REQUEST_METHOD $request_method;
- fastcgi_param CONTENT_TYPE $content_type;
- fastcgi_param CONTENT_LENGTH $content_length;
- fastcgi_param SCRIPT_NAME $fastcgi_script_name;
- fastcgi_param REQUEST_URI $request_uri;
- fastcgi_param DOCUMENT_URI $document_uri;
- fastcgi_param SERVER_PROTOCOL $server_protocol;
- fastcgi_param REQUEST_SCHEME $scheme;
- fastcgi_param HTTPS $https;
- fastcgi_param GATEWAY_INTERFACE CGI/1.1;
- fastcgi_param SERVER_SOFTWARE nginx/$nginx_version;
- fastcgi_param REMOTE_ADDR $remote_addr;
- fastcgi_param REMOTE_PORT $remote_port;
- fastcgi_param SERVER_ADDR $server_addr;
- fastcgi_param SERVER_PORT $server_port;
- fastcgi_param SERVER_NAME $server_name;
- fastcgi_param REDIRECT_STATUS 200;
- fastcgi_param HTTP_PROXY "";
- fastcgi_param PATH_INFO $fastcgi_path_info;
- fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
- fastcgi_param DOCUMENT_ROOT $document_root;
-
- location / {
- proxy_set_header Host $http_host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header REMOTE_HOST $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-FORWARDED-PROTOCOL $scheme;
- proxy_pass https://backend;
- proxy_http_version 1.1;
- proxy_pass_request_headers on;
- proxy_set_header Connection "keep-alive";
- proxy_store off;
- gzip on;
- gzip_proxied any;
- gzip_types *;
- }
-
- resolver 127.0.0.1;
- resolver_timeout 6s;
- ssl_certificate /openvas.domain.tdl/fullchain.pem;
- ssl_certificate_key /openvas.domain.tdl/privkey.pem;
- ssl_trusted_certificate /openvas.domain.tdl/chain.pem;
- ssl_dhparam /openvas.domain.tdl/dhparam.pem;
- ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
- ssl_prefer_server_ciphers on;
- ssl_ciphers ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS;
- ssl_ecdh_curve secp384r1;
- ssl_stapling on;
- ssl_stapling_verify on;
- ssl_session_cache shared:SSL:40m;
- ssl_session_timeout 21h;
- ssl_session_tickets off;
- ssl_buffer_size 4k;
- add_header Referrer-Policy no-referrer-when-downgrade;
- add_header X-Frame-Options "SAMEORIGIN";
- add_header X-Content-Type-Options "nosniff";
- add_header X-XSS-Protection "1; mode=block";
-}
diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.logrotate b/net-analyzer/greenbone-security-assistant/files/gsad.logrotate
deleted file mode 100644
index f80bba881c7..00000000000
--- a/net-analyzer/greenbone-security-assistant/files/gsad.logrotate
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# Daemon ignore HUP so we use 'copytruncate' instead of 'create'
-# with safe file size to prevent losing log entries.
-
-/var/log/gvm/gsad.log {
- compress
- missingok
- notifempty
- sharedscripts
- copytruncate
- maxsize 10M
-}
diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.service b/net-analyzer/greenbone-security-assistant/files/gsad.service
deleted file mode 100644
index 91e79187800..00000000000
--- a/net-analyzer/greenbone-security-assistant/files/gsad.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Greenbone Security Assistant
-After=network.target
-After=openvassd.service
-After=gvmd.service
-Wants=gvmd.service
-
-[Service]
-Type=forking
-User=gvm
-Group=gvm
-EnvironmentFile=-/etc/gvm/sysconfig/gsad-daemon.conf
-ExecStart=/usr/bin/gsad $GSAD_OPTIONS $GSAD_LISTEN_ADDRESS $GSAD_LISTEN_PORT $GVMD_LISTEN_ADDRESS $GVMD_LISTEN_PORT $GSAD_GNUTLS_PRIORITIES
-Restart=always
-RestartSec=10
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-20.8.1.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-20.8.1.ebuild
deleted file mode 100644
index a513fc165a4..00000000000
--- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-20.8.1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake systemd toolchain-funcs
-
-MY_PN="gsa"
-MY_DN="gsad"
-MY_NODE_N="node_modules"
-
-DESCRIPTION="Greenbone Security Assistant"
-HOMEPAGE="https://www.greenbone.net/en/ https://github.com/greenbone/gsa"
-SRC_URI="https://github.com/greenbone/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/greenbone/${MY_PN}/releases/download/v${PV}/gsa-node-modules-${PV}.tar.gz -> ${P}-${MY_NODE_N}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="extras"
-
-DEPEND="
- acct-group/gvm
- acct-user/gvm
- dev-libs/libgcrypt:0=
- dev-libs/libxml2
- dev-libs/libxslt
- >=net-analyzer/gvm-libs-20.8.0
- net-libs/gnutls:=
- net-libs/libmicrohttpd"
-
-RDEPEND="
- ${DEPEND}
- >=net-analyzer/gvmd-20.8.0
- net-analyzer/ospd-openvas"
-
-BDEPEND="
- dev-python/polib
- >=net-libs/nodejs-10.0.0[ssl]
- >=sys-apps/yarn-1.15.2
- virtual/pkgconfig
- extras? (
- app-doc/doxygen[dot]
- app-doc/xmltoman
- app-text/htmldoc
- sys-devel/gettext
- )"
-
-BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build"
-S="${WORKDIR}/${MY_PN}-${PV}"
-MY_NODE_DIR="${S}/${MY_PN}/"
-
-PATCHES=(
- # Disable yarn-fetch during compile.
- # AND Remove ugly uninstall-snippet that causes failing re-emerge.
- "${FILESDIR}/${P}-node.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 9.0.0
- 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"
- "-DSBINDIR=${EPREFIX}/usr/bin"
- "-DGSAD_PID_DIR=${EPREFIX}/run/"
- "-DDEFAULT_CONFIG_DIR=${EPREFIX}/etc/default"
- "-DLOGROTATE_DIR=${EPREFIX}/etc/logrotate.d"
- )
- cmake_src_configure
-}
-
-src_compile() {
- # setting correct PATH for finding react-js
- NODE_ENV=production PATH="$PATH:${S}/gsa/node_modules/.bin/" cmake_src_compile
- if use extras; then
- cmake_build -C "${BUILD_DIR}" doc
- cmake_build doc-full -C "${BUILD_DIR}" doc
- fi
- cmake_build rebuild_cache
-}
-
-src_install() {
- if use extras; then
- local HTML_DOCS=( "${BUILD_DIR}/${MY_DN}/doc/generated/html/." )
- fi
- cmake_src_install
-
- insinto /etc/gvm/sysconfig
- doins "${FILESDIR}/${MY_DN}-daemon.conf"
-
- 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
deleted file mode 100644
index 9bb270be4e3..00000000000
--- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-9.0.1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake 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/${MY_PN}/releases/download/v${PV}/gsa-node-modules-${PV}.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/libxml2
- dev-libs/libxslt
- >=net-analyzer/gvm-libs-11.0.1
- net-libs/gnutls:=
- net-libs/libmicrohttpd"
-
-RDEPEND="
- ${DEPEND}
- >=net-analyzer/gvmd-9.0.1
- net-analyzer/ospd-openvas"
-
-BDEPEND="
- dev-python/polib
- >=net-libs/nodejs-8.12.0[ssl]
- >=sys-apps/yarn-1.15.2
- virtual/pkgconfig
- extras? (
- app-doc/doxygen[dot]
- app-doc/xmltoman
- app-text/htmldoc
- sys-devel/gettext
- )"
-
-BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build"
-S="${WORKDIR}/${MY_PN}-${PV}"
-MY_NODE_DIR="${S}/${MY_PN}/"
-
-PATCHES=(
- # Disable yarn-fetch during compile.
- "${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() {
- 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 9.0.0
- 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"
- "-DSBINDIR=${EPREFIX}/usr/bin"
- "-DGSAD_PID_DIR=${EPREFIX}/run/"
- "-DDEFAULT_CONFIG_DIR=${EPREFIX}/etc/default"
- "-DLOGROTATE_DIR=${EPREFIX}/etc/logrotate.d"
- )
- cmake_src_configure
-}
-
-src_compile() {
- # setting correct PATH for finding react-js
- NODE_ENV=production PATH="$PATH:${S}/gsa/node_modules/.bin/" cmake_src_compile
- if use extras; then
- cmake_build -C "${BUILD_DIR}" doc
- cmake_build doc-full -C "${BUILD_DIR}" doc
- fi
- cmake_build rebuild_cache
-}
-
-src_install() {
- if use extras; then
- local HTML_DOCS=( "${BUILD_DIR}/${MY_DN}/doc/generated/html/." )
- fi
- cmake_src_install
-
- insinto /etc/gvm/sysconfig
- doins "${FILESDIR}/${MY_DN}-daemon.conf"
-
- 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/gsa/Manifest b/net-analyzer/gsa/Manifest
new file mode 100644
index 00000000000..dfae85233d9
--- /dev/null
+++ b/net-analyzer/gsa/Manifest
@@ -0,0 +1,2 @@
+DIST gsa-21.4.2-node_modules.tar.gz 86572528 BLAKE2B 1aec3d8636241d7cd4ca591133cdadd26d349bf4342ee1595a678871617b4b3a763348a7a0e6d44b50780f330362131d7ba72953a40f53e79b1f9709775999fb SHA512 c44f3822864b9f68cbfe0e4052b2295ab74cb2c429cd9aa667b19b8cfb423c49dc65b1455f785abecdc4329f31b43fe368b0bd5276b4ad95d5fa2e208bb4a4ec
+DIST gsa-21.4.4.tar.gz 2471442 BLAKE2B b3ac937a87038d93e90223f7c33d087b0dbb043c4fcaa8a00c9d44148e686c064fdcc311899b7b3b4084658d23193bc128fb809f22621583898551f4348ece6f SHA512 5a7b45132a049adf608ccd8988d69a415290cc57d6e7537835a78e19aafb5dfdf204197576f69277726587efaccce189c1ccab55c43e5a0a7855c538b3bc4b67
diff --git a/net-analyzer/gsa/gsa-21.4.4.ebuild b/net-analyzer/gsa/gsa-21.4.4.ebuild
new file mode 100644
index 00000000000..c806a73a593
--- /dev/null
+++ b/net-analyzer/gsa/gsa-21.4.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_NODE_N="node_modules"
+MY_NODE_PV="21.4.2"
+
+DESCRIPTION="Greenbone Security Assistant"
+HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gsa"
+SRC_URI="
+ https://github.com/greenbone/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/greenbone/${PN}/releases/download/v${MY_NODE_PV}/gsa-node-modules-${MY_NODE_PV}.tar.gz -> ${PN}-${MY_NODE_PV}-${MY_NODE_N}.tar.gz
+"
+
+SLOT="0"
+LICENSE="AGPL-3+"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+ >=net-libs/nodejs-14.0.0[ssl]
+ >=sys-apps/yarn-1.15.2
+"
+
+MY_NODE_DIR="${S}/${MY_NODE_N}/"
+
+src_prepare() {
+ default
+ # We will use pre-generated npm stuff.
+ mv "${WORKDIR}/${MY_NODE_N}" "${MY_NODE_DIR}" || die "couldn't move node_modules"
+}
+
+src_compile() {
+ # setting correct PATH for finding react-js
+ NODE_ENV=production PATH="${PATH}:${MY_NODE_DIR}/.bin/" \
+ yarn --offline build || die
+}
+
+src_install() {
+ insinto "usr/share/gvm/gsad/web"
+ doins -r build/*
+}
diff --git a/net-analyzer/greenbone-security-assistant/metadata.xml b/net-analyzer/gsa/metadata.xml
index 9383ad622b7..e0d8b744cdb 100644
--- a/net-analyzer/greenbone-security-assistant/metadata.xml
+++ b/net-analyzer/gsa/metadata.xml
@@ -9,14 +9,10 @@
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
- <use>
- <flag name="extras">Pdf results, extra fonts, html docs support</flag>
- </use>
<longdescription lang="en">
The Greenbone Security Assistant is the web interface developed for the Greenbone Security Manager appliances.
It connects to the Greenbone Vulnerability Manager GVM to provide a full-featured user interface for vulnerability management.
- Greenbone Security Assistant consists of GSA - The webpage written in React and
- GSAD - The HTTP server talking to the GVM daemon.
+ Greenbone Security Assistant consists of GSA - The webpage written in React and
</longdescription>
<upstream>
<remote-id type="github">greenbone/gsa</remote-id>
diff --git a/net-analyzer/gsad/Manifest b/net-analyzer/gsad/Manifest
new file mode 100644
index 00000000000..7b657dda3b1
--- /dev/null
+++ b/net-analyzer/gsad/Manifest
@@ -0,0 +1 @@
+DIST gsad-21.4.4.tar.gz 220618 BLAKE2B 276164ce1e03a6ed211d3bdf24c7f9b5ac832c07891b34b467f61ec02c5670d5368ea3219b3cc445e4ef83fef0aee7375c89ce8008746ea7e08abf50da8fb9fd SHA512 092c8187754b3f0503e4ae6fd9c41dbd6917264668a5f8f831d40e88c7b8db6772acd354db62ac66b4af13b7c27e78516d4975f5bfede0d28001007a46c39f75
diff --git a/net-analyzer/greenbone-security-assistant/files/gsad-daemon.conf b/net-analyzer/gsad/files/gsad-daemon.conf
index f7c7ee514e5..f7c7ee514e5 100644
--- a/net-analyzer/greenbone-security-assistant/files/gsad-daemon.conf
+++ b/net-analyzer/gsad/files/gsad-daemon.conf
diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.init b/net-analyzer/gsad/files/gsad.init
index 7dc4b82afa7..79004c8481c 100644
--- a/net-analyzer/greenbone-security-assistant/files/gsad.init
+++ b/net-analyzer/gsad/files/gsad.init
@@ -1,9 +1,9 @@
#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
: ${GSAD_USER:=gvm}
-: ${GSAD_GROUP:=gvm}
+: ${GSAD_GROUP:=$(id -ng ${GSAD_USER})}
: ${GSAD_TIMEOUT:=30}
name="Greenbone Security Assistant (GSA)"
diff --git a/net-analyzer/gsad/gsad-21.4.4.ebuild b/net-analyzer/gsad/gsad-21.4.4.ebuild
new file mode 100644
index 00000000000..24f235b0705
--- /dev/null
+++ b/net-analyzer/gsad/gsad-21.4.4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd toolchain-funcs
+
+DESCRIPTION="Greenbone Security Assistant"
+HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gsad"
+SRC_URI="https://github.com/greenbone/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="AGPL-3+"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="
+ acct-user/gvm
+ dev-libs/glib:2
+ dev-libs/libgcrypt:0=
+ dev-libs/libxml2
+ dev-libs/libxslt
+ >=net-analyzer/gvm-libs-${PV}
+ net-libs/gnutls:=
+ net-libs/libmicrohttpd:=
+"
+RDEPEND="
+ ${DEPEND}
+ >=net-analyzer/gvmd-${PV}
+ >=net-analyzer/gsa-${PV}
+ net-analyzer/ospd-openvas
+"
+BDEPEND="
+ dev-python/polib
+ virtual/pkgconfig
+ doc? (
+ app-doc/doxygen[dot]
+ app-doc/xmltoman
+ app-text/htmldoc
+ sys-devel/gettext
+ )
+"
+
+src_prepare() {
+ cmake_src_prepare
+
+ # QA-Fix | Remove !CLANG doxygen warnings for 9.0.0
+ if use doc; 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
+
+ # Do not install the empty /run/gsad run dir. https://github.com/greenbone/gsad/pull/54
+ sed -i "/^install.*GSAD_RUN_DIR/d" CMakeLists.txt || die
+
+ # Drop Group= directive. https://github.com/greenbone/gsad/pull/55
+ sed -i "/^Group=/d" config/gsad.service.in || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ "-DLOCALSTATEDIR=${EPREFIX}/var"
+ "-DSYSCONFDIR=${EPREFIX}/etc"
+ "-DSBINDIR=${EPREFIX}/usr/bin"
+ "-DGSAD_PID_DIR=/run/gsad"
+ "-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)"
+ "-DLOGROTATE_DIR=${EPREFIX}/etc/logrotate.d"
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ # setting correct PATH for finding react-js
+ NODE_ENV=production PATH="$PATH:${S}/gsa/node_modules/.bin/" cmake_src_compile
+ if use doc; then
+ cmake_build -C "${BUILD_DIR}" doc
+ cmake_build doc-full -C "${BUILD_DIR}" doc
+ fi
+ cmake_build rebuild_cache
+}
+
+src_install() {
+ if use doc; then
+ local HTML_DOCS=( "${BUILD_DIR}/doc/generated/html/." )
+ fi
+ cmake_src_install
+
+ insinto /etc/gvm/sysconfig
+ doins "${FILESDIR}/${PN}-daemon.conf"
+
+ newinitd "${FILESDIR}/${PN}.init" "${PN}"
+ newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}"
+}
diff --git a/net-analyzer/gsad/metadata.xml b/net-analyzer/gsad/metadata.xml
new file mode 100644
index 00000000000..c68ff94a68f
--- /dev/null
+++ b/net-analyzer/gsad/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>jonas.licht@gmail.com</email>
+ <name>Jonas Licht</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">greenbone/gsad</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/gvm-libs/Manifest b/net-analyzer/gvm-libs/Manifest
index 46134020f4e..b6621741287 100644
--- a/net-analyzer/gvm-libs/Manifest
+++ b/net-analyzer/gvm-libs/Manifest
@@ -1,3 +1,2 @@
-DIST gvm-libs-10.0.1.tar.gz 198483 BLAKE2B 4f4ddc7a3a1b4d45a51868cf03844365a9c4dd07f17ab53957ac4a1452ecba595885abdf01402a78aa784163aaba60b5c452fb9c2b5a11d38c40706e820c22c2 SHA512 961570e8fa8f89f0b462991bff1bf4e512ed6419cff6871c7432899847fb9edcc9f0adb7c280d12ee69fbb5c8e306c9e4366e2cbbb05fc3bae06795dcfb42206
-DIST gvm-libs-11.0.1.tar.gz 213553 BLAKE2B b7c8ffeca8682fcfe68afe0992632fac18a01fc9b0016fcbaf27c0340b5150337784caac2368a22789073714808ce2c0471efde668e6911dcd0cfceaf862b671 SHA512 159acbe8e24f172398a6396988b87676a214fa15c2985e67845dcad1ebcb92ba5e2a19cee2994dc7cd0cac706992e81e8c6a793e99216aaac87a91c1c72c9a46
DIST gvm-libs-20.8.1.tar.gz 267872 BLAKE2B ec0979bba5e88692375fcdcdbd1c1b47c2d93e1d1c911884b77e0d81028bd6b587dac5f8aaae7439cbd1f594ec3c5708510bc2e356cadaefee221a11a1982efa SHA512 846b062b849688019715cbff1d6c4f6a1b4dd8c58cfdef78ea08df3cd104810e9091385cca3c49618538a28c42c0fe78a38fb934fbde604aef86e84c4f2dda94
+DIST gvm-libs-21.4.4.tar.gz 298551 BLAKE2B 271716d8be2376e2b54218b95069e19d10939c5feda9894220418bf184c4098eeacf61d1faedd49fe3215aa0fbf4a4afcfe2a929ac88450502737eb8af8f8e35 SHA512 6c80820c830cbc2e62865a0823740d857db075f2faa1a1e58af7a8f07e0179e7a78934d7613ec57f144900a5530206d4c07c912a6bbe40ad9d0549f9443bfb12
diff --git a/net-analyzer/gvm-libs/files/gvm-libs-10.0.1-pid.patch b/net-analyzer/gvm-libs/files/gvm-libs-10.0.1-pid.patch
deleted file mode 100644
index 29c2a4cd83a..00000000000
--- a/net-analyzer/gvm-libs/files/gvm-libs-10.0.1-pid.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt 2019-04-05 11:27:07.000000000 +0300
-+++ b/CMakeLists.txt 2019-07-14 23:42:42.723081614 +0300
-@@ -172,7 +172,7 @@
- endif (NOT DATADIR)
-
- if (NOT GVM_PID_DIR)
-- set (GVM_PID_DIR "${LOCALSTATEDIR}/run")
-+ set (GVM_PID_DIR "/var/lib/gvm")
- endif (NOT GVM_PID_DIR)
-
- if (NOT GVM_SYSCONF_DIR)
diff --git a/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild b/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild
deleted file mode 100644
index ebcbd599631..00000000000
--- a/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild
+++ /dev/null
@@ -1,100 +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 toolchain-funcs user
-
-DESCRIPTION="Greenbone vulnerability management libraries, previously named openvas-libraries"
-HOMEPAGE="https://www.greenbone.net/en/"
-SRC_URI="https://github.com/greenbone/gvm-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="extras ldap radius"
-
-DEPEND="
- app-crypt/gpgme:=
- dev-libs/hiredis
- dev-libs/libgcrypt:=
- dev-perl/UUID
- net-libs/gnutls:=
- net-libs/libssh:=
- sys-libs/zlib
- ldap? ( net-nds/openldap )
- radius? ( net-dialup/freeradius-client )"
-
-RDEPEND="
- ${DEPEND}"
-
-BDEPEND="
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- extras? ( app-doc/doxygen[dot]
- app-doc/xmltoman
- app-text/htmldoc
- dev-perl/CGI
- dev-perl/SQL-Translator
- )"
-
-PATCHES=(
- # Creating pid on build time instead of relying daemon!
- # QA fix for 10.0.1.
- "${FILESDIR}/${P}-pid.patch"
-)
-
-pkg_setup() {
- enewgroup gvm 495
- enewuser gvm 495 -1 /var/lib/gvm gvm
-}
-
-src_prepare() {
- cmake_src_prepare
- # QA-Fix | Remove doxygen warnings for !CLANG
- 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"
- $(usex ldap -DBUILD_WITHOUT_LDAP=0 -DBUILD_WITHOUT_LDAP=1)
- $(usex radius -DBUILD_WITHOUT_RADIUS=0 -DBUILD_WITHOUT_RADIUS=1)
- )
- # Add release hardening flags for 10.0.1
- append-cflags -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
-
- # Set proper permissions on required files/directories
- keepdir /var/lib/gvm
- fowners -R gvm:gvm /var/lib/gvm
-}
diff --git a/net-analyzer/gvm-libs/gvm-libs-20.8.1.ebuild b/net-analyzer/gvm-libs/gvm-libs-20.8.1-r1.ebuild
index fed39cbb5ac..1554c843e22 100644
--- a/net-analyzer/gvm-libs/gvm-libs-20.8.1.ebuild
+++ b/net-analyzer/gvm-libs/gvm-libs-20.8.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,7 +21,7 @@ DEPEND="
acct-user/gvm
app-crypt/gpgme:=
dev-libs/glib
- dev-libs/hiredis
+ dev-libs/hiredis:=
dev-libs/libgcrypt:=
dev-libs/libxml2:=
dev-perl/UUID
@@ -29,7 +29,7 @@ DEPEND="
net-libs/libssh:=
net-libs/libpcap:=
sys-libs/zlib
- ldap? ( net-nds/openldap )
+ ldap? ( net-nds/openldap:= )
radius? ( net-dialup/freeradius-client )"
RDEPEND="
diff --git a/net-analyzer/gvm-libs/gvm-libs-11.0.1.ebuild b/net-analyzer/gvm-libs/gvm-libs-21.4.4-r3.ebuild
index 07801678f81..bb212968146 100644
--- a/net-analyzer/gvm-libs/gvm-libs-11.0.1.ebuild
+++ b/net-analyzer/gvm-libs/gvm-libs-21.4.4-r3.ebuild
@@ -1,55 +1,63 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-CMAKE_MAKEFILE_GENERATOR="emake"
inherit cmake toolchain-funcs
-DESCRIPTION="Greenbone vulnerability management libraries, previously named openvas-libraries"
-HOMEPAGE="https://www.greenbone.net/en/"
+DESCRIPTION="Greenbone Vulnerability Management (GVM) libraries"
+HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gvm-libs/"
SRC_URI="https://github.com/greenbone/gvm-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SLOT="0"
LICENSE="GPL-2+"
+SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="extras ldap test radius"
+IUSE="doc ldap test radius"
RESTRICT="!test? ( test )"
DEPEND="
acct-user/gvm
app-crypt/gpgme:=
- dev-libs/glib
- dev-libs/hiredis
+ dev-libs/glib:2
+ dev-libs/hiredis:=
dev-libs/libgcrypt:=
+ dev-libs/libgpg-error
+ dev-libs/libxml2:=
dev-perl/UUID
net-libs/gnutls:=
+ net-libs/libnet:1.1
+ net-libs/libpcap
net-libs/libssh:=
+ sys-apps/util-linux
+ sys-libs/libxcrypt:=
sys-libs/zlib
- ldap? ( net-nds/openldap )
- radius? ( net-dialup/freeradius-client )"
-
-RDEPEND="
- ${DEPEND}"
-
+ ldap? ( net-nds/openldap:= )
+ radius? ( net-dialup/freeradius-client )
+"
+RDEPEND="${DEPEND}"
BDEPEND="
dev-vcs/git
sys-devel/bison
sys-devel/flex
virtual/pkgconfig
- extras? (
+ doc? (
app-doc/doxygen[dot]
app-doc/xmltoman
app-text/htmldoc
dev-perl/CGI
dev-perl/SQL-Translator
)
- test? ( dev-libs/cgreen )"
+ test? ( dev-libs/cgreen )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-20.8.1-disable-automagic-dep.patch
+)
src_prepare() {
cmake_src_prepare
# QA-Fix | Remove doxygen warnings for !CLANG
- if use extras; then
+ if use doc; then
if ! tc-is-clang; then
local f
for f in doc/*.in
@@ -61,21 +69,29 @@ src_prepare() {
done
fi
fi
+
+ #Remove tests that doesn't work in the network sandbox
+ if use test; then
+ sed -i 's/add_test (networking-test networking-test)/ /g' base/CMakeLists.txt || die
+ sed -i 's/add_test (util-test util-test)/ /g' boreas/CMakeLists.txt || die
+ fi
}
src_configure() {
local mycmakeargs=(
"-DLOCALSTATEDIR=${EPREFIX}/var"
"-DSYSCONFDIR=${EPREFIX}/etc"
- "-DGVM_PID_DIR=${EPREFIX}/var/lib/gvm"
+ "-DGVM_RUN_DIR=${EPREFIX}/var/lib/gvm"
"-DBUILD_TESTS=$(usex test)"
+ "-DBUILD_WITH_RADIUS=$(usex radius)"
+ "-DBUILD_WITH_LDAP=$(usex ldap)"
)
cmake_src_configure
}
src_compile() {
cmake_src_compile
- if use extras; then
+ if use doc; then
cmake_build -C "${BUILD_DIR}" doc
cmake_build doc-full -C "${BUILD_DIR}" doc
fi
@@ -86,12 +102,14 @@ src_compile() {
}
src_install() {
- if use extras; then
+ if use doc; then
local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
fi
cmake_src_install
# Set proper permissions on required files/directories
keepdir /var/lib/gvm
- fowners -R gvm:gvm /var/lib/gvm
+ if ! use prefix; then
+ fowners -R gvm:gvm /var/lib/gvm
+ fi
}
diff --git a/net-analyzer/gvm-tools/Manifest b/net-analyzer/gvm-tools/Manifest
index 0d1e3086dfd..ef527c9a737 100644
--- a/net-analyzer/gvm-tools/Manifest
+++ b/net-analyzer/gvm-tools/Manifest
@@ -1,3 +1,4 @@
DIST gvm-tools-2.0.0.tar.gz 114592 BLAKE2B 73532138f4153ce625e68d4feb477bea4504be910266d6dac113caff1da096bc6072649ddc456b3348e1aba79c9b7e147ba019a70e4163267c474850019a076e SHA512 0adf7e06b1208c91fbc02dab42593280c95f6572e27d96d6f8777d710747a9e427c79678d9aef785b7ecd6d4fd30e79a1c063fe4256025ac0616c1d242f45025
DIST gvm-tools-2.1.0.tar.gz 128144 BLAKE2B d9dd1857446912bd26a0b5efa38cc34c77bfe9959aaa9ab42ea8518ef9231e5877317319ac8e924b14a5382c80cb00c70d0413635506355eb111b84b5715bf4e SHA512 80933ab8303c1ff77451a9fafd9331b6a0b4c3ae40c4ea318171b6b9e969fb6f20c6970d021a14db1bf8ff816c7f779e2eb750bf84f9093055273f58ad04cda2
DIST gvm-tools-21.1.0.tar.gz 147382 BLAKE2B e7e4bd2e552d07790a21df5eba8370a0b7ae38e2960a53ece98572ac17b258cf7d74e0f1c0fd53382d9b97f18a43bcc6acecbdf861ea871602d72cfeb3c0b407 SHA512 4a02d84045642d018a52e0a17d9a4b683108e1140c512daed48403e56e996dd2487ffe914bc2fbf454c244c51500cff5a934e43feee18f76088ba1912ef84c3f
+DIST gvm-tools-21.10.0.tar.gz 162620 BLAKE2B b205fad4ef05dbd7f8d01b92cf8c123145cb526320dbe881b82ae53ebfbe5e1ee5858996687e256540dd9ce66a8fa50937b6bc0b79888c2c43389db107cefcb0 SHA512 0dc202debaae1431194585575d11b1af6aa057456429dc46e7bf6677b2217fd8569572dc71b8ada578caa961ff2b371a364fb67277c40e76e3025b6b3fcb3a5b
diff --git a/net-analyzer/gvm-tools/gvm-tools-21.10.0-r1.ebuild b/net-analyzer/gvm-tools/gvm-tools-21.10.0-r1.ebuild
new file mode 100644
index 00000000000..33c7d664715
--- /dev/null
+++ b/net-analyzer/gvm-tools/gvm-tools-21.10.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=poetry
+inherit distutils-r1
+
+DESCRIPTION="Remote control for Greenbone Vulnerability Manager, previously named openvas-cli"
+HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gvm-tools/"
+SRC_URI="https://github.com/greenbone/gvm-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=net-analyzer/python-gvm-21.11.0[${PYTHON_USEDEP}]
+ !net-analyzer/openvas-cli
+ !net-analyzer/openvas-tools
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+ distutils-r1_src_prepare
+
+ # Fixing tests
+ # Use correct socket path
+ sed -i "s/\/usr\/local\/var\/run\/gvmd.sock/\/var\/run\/gvmd.sock/g" tests/test_parser.py || die
+ # ignore help formating
+ sed -i "s/class HelpFormatting/@unittest.skip('ignoring help formatting')\nclass HelpFormatting/g" tests/test_parser.py || die
+}
diff --git a/net-analyzer/gvm/gvm-10.0.1.ebuild b/net-analyzer/gvm/gvm-10.0.1.ebuild
deleted file mode 100644
index 25b7338d62e..00000000000
--- a/net-analyzer/gvm/gvm-10.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature
-
-DESCRIPTION="Greenbone Vulnerability Management,previously named OpenVAS"
-HOMEPAGE="https://www.greenbone.net/en/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli +cron +extras +gsa ldap ospd radius"
-
-RDEPEND="
- >=net-analyzer/gvm-libs-10.0.1[extras?,ldap?,radius?]
- >=net-analyzer/gvmd-8.0.1[extras?]
- >=net-analyzer/openvas-scanner-6.0.1[cron?,extras?]
- cli? ( >=net-analyzer/gvm-tools-2.0.0 )
- gsa? ( >=net-analyzer/greenbone-security-assistant-8.0.1[extras?] )
- ospd? ( >=net-analyzer/ospd-2.0.0[extras?] )"
-
-pkg_postinst() {
- optfeature "web server scanning and testing tool" net-analyzer/nikto
- optfeature "port scanner" net-analyzer/nmap
- optfeature "IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan
- optfeature "OVALdi — an OVAL Interpreter" app-forensics/ovaldi
- optfeature "Linux-kernel-based portscanner" net-analyzer/portbunny
- optfeature "web application attack and audit framework" net-analyzer/w3af
-}
diff --git a/net-analyzer/gvm/gvm-11.0.0.ebuild b/net-analyzer/gvm/gvm-11.0.0.ebuild
deleted file mode 100644
index 7eefd05a5af..00000000000
--- a/net-analyzer/gvm/gvm-11.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature
-
-DESCRIPTION="Greenbone Vulnerability Management,previously named OpenVAS"
-HOMEPAGE="https://www.greenbone.net/en/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli +cron +extras +gsa ldap ospd radius"
-
-RDEPEND="
- >=net-analyzer/gvm-libs-11.0.0[extras?,ldap?,radius?]
- >=net-analyzer/gvmd-9.0.0[extras?]
- >=net-analyzer/openvas-scanner-7.0.0[cron?,extras?]
- cli? ( >=net-analyzer/gvm-tools-2.0.0 )
- gsa? ( >=net-analyzer/greenbone-security-assistant-9.0.0[extras?] )
- ospd? ( >=net-analyzer/ospd-2.0.0[extras?] )"
-
-pkg_postinst() {
- optfeature "web server scanning and testing tool" net-analyzer/nikto
- optfeature "port scanner" net-analyzer/nmap
- optfeature "IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan
- optfeature "OVALdi — an OVAL Interpreter" app-forensics/ovaldi
- optfeature "Linux-kernel-based portscanner" net-analyzer/portbunny
- optfeature "web application attack and audit framework" net-analyzer/w3af
-}
diff --git a/net-analyzer/gvm/gvm-20.8.0.ebuild b/net-analyzer/gvm/gvm-20.8.0.ebuild
deleted file mode 100644
index d0b25e29750..00000000000
--- a/net-analyzer/gvm/gvm-20.8.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature
-
-DESCRIPTION="Greenbone Vulnerability Management, previously named OpenVAS"
-HOMEPAGE="https://www.greenbone.net/en/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli +cron +extras +gsa ldap ospd radius"
-
-RDEPEND="
- >=net-analyzer/gvm-libs-20.8.0[extras?,ldap?,radius?]
- >=net-analyzer/gvmd-20.8.0[extras?]
- >=net-analyzer/openvas-scanner-20.8.0[cron?,extras?]
- cli? ( >=net-analyzer/gvm-tools-20.8.0 )
- gsa? ( >=net-analyzer/greenbone-security-assistant-20.8.0[extras?] )
- ospd? ( >=net-analyzer/ospd-20.8.0[extras?] )"
-
-pkg_postinst() {
- optfeature "web server scanning and testing tool" net-analyzer/nikto
- optfeature "port scanner" net-analyzer/nmap
- optfeature "IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan
- optfeature "OVALdi — an OVAL Interpreter" app-forensics/ovaldi
- optfeature "Linux-kernel-based portscanner" net-analyzer/portbunny
- optfeature "web application attack and audit framework" net-analyzer/w3af
-}
diff --git a/net-analyzer/gvm/gvm-21.4.ebuild b/net-analyzer/gvm/gvm-21.4.ebuild
new file mode 100644
index 00000000000..6097666ebdc
--- /dev/null
+++ b/net-analyzer/gvm/gvm-21.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature
+
+DESCRIPTION="Greenbone Vulnerability Management, previously named OpenVAS"
+HOMEPAGE="https://www.greenbone.net"
+
+SLOT="0"
+LICENSE="AGPL-3+"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli doc +gsa ldap ospd radius"
+
+RDEPEND="
+ >=net-analyzer/gvm-libs-${PV}[doc?,ldap?,radius?]
+ >=net-analyzer/gvmd-${PV}[doc?]
+ >=net-analyzer/openvas-scanner-${PV}[doc?]
+ cli? ( >=net-analyzer/gvm-tools-21.10.0 )
+ gsa? ( >=net-analyzer/gsad-${PV}[doc?] )
+ ospd? ( >=net-analyzer/ospd-openvas-${PV}[doc?] )
+"
+
+pkg_postinst() {
+ optfeature "web server scanning and testing tool" net-analyzer/nikto
+ optfeature "port scanner" net-analyzer/nmap
+ optfeature "IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan
+ optfeature "OVALdi — an OVAL Interpreter" app-forensics/ovaldi
+}
diff --git a/net-analyzer/gvm/metadata.xml b/net-analyzer/gvm/metadata.xml
index 88c7b1dd1b6..8beb6053f45 100644
--- a/net-analyzer/gvm/metadata.xml
+++ b/net-analyzer/gvm/metadata.xml
@@ -11,17 +11,12 @@
</maintainer>
<use>
<flag name="cli">Command Line Interface for OpenVAS Scanner</flag>
- <flag name="cron">A cron job to update GVM's vulnerability feeds daily</flag>
- <flag name="extras">Extra fonts, pdf-results! and html docs support</flag>
<flag name="gsa">Greenbone Security Assistant (WebUI)</flag>
<flag name="ospd">Enable support for scanner wrappers</flag>
</use>
<longdescription lang="en">
- GVM previously named OpenVAS stands for Open Vulnerability Assessment System and is a network security scanner
- with associated tools like a graphical user front-end.
+ GVM previously named OpenVAS stands for Open Vulnerability Assessment System and is a network security scanner
+ with associated tools like a graphical user front-end.
The core component is a server with a set of network vulnerability tests (NVTs) to detect security problems in remote systems and applications.
</longdescription>
- <upstream>
- <remote-id type="github">greenbone</remote-id>
- </upstream>
</pkgmetadata>
diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index b5200b5bbfd..afe9b2d63f6 100644
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@@ -1,3 +1 @@
-DIST gvm-report-formats-0.1.tar.gz 58962 BLAKE2B 45cb5a7b81b68524254947503921f871577b86c2d7696758b365205b5ed8e4516840f704d3bcb8da6925a536db8e01fb9f0d922a3a2233dd4d4fa21e4308dc1b SHA512 8ae128ca087b7d1ecd2b84cb43e67b8f920001699268b9ce70d1f703f1dac68d8905354f5a8203808982291fdeb80fb11569a0bb559df0263296c603c691b422
-DIST gvmd-20.8.1.tar.gz 1024660 BLAKE2B c2981d73efe4bb32008c82ba9a017f58ade18efe00d85c1876a872ae9c6260e801697ef7c7bc9c0862e92043167ecd58d082b97c746308d983ffac7991146d83 SHA512 e946be6c67970fdb0e4e6fbb2ac9445576c280c3ac7503ff42aac2c079e817ee587a37477956917b576bafab3e7caa281da5befa6502b044562051ae976889b2
-DIST gvmd-9.0.1.tar.gz 1446748 BLAKE2B 7b7b4e8e4224e7a24964f39157bd0535fb4e6405b2813da7c827f4705c4b5df4d953783a3e21950c9196aa5878a09ce6eec7b4d906cc13730e508b0aa5d4be61 SHA512 4c4f0e1fdd2255be1a96967d61d9066d8860aecc5959f04c559b1a248bcc54d9cb75facd0156e223d674f038718f1e8ba0ee6b36cdc8ed88efe480acd1aa54cf
+DIST gvmd-21.4.5.tar.gz 1041186 BLAKE2B 18edc375084a6c6445f12779935e34d20826d2390481cbcdc06cab8dea81ea9c6bddeda437b081137f858e860f725431d33d5654eae231e303e0dc5618a89c8a SHA512 5b22b9bfd58ae73fb973941c7a96027599ccc5b78d822eac9c840460cb75bf60a398519569daa04d5c4d935dbe3974335f87e2c1c5fa751b4cec1ea6e5f064ec
diff --git a/net-analyzer/gvmd/files/greenbone-certdata-sync.conf b/net-analyzer/gvmd/files/greenbone-certdata-sync.conf
deleted file mode 100644
index d31a7331d34..00000000000
--- a/net-analyzer/gvmd/files/greenbone-certdata-sync.conf
+++ /dev/null
@@ -1 +0,0 @@
-COMMUNITY_CERT_RSYNC_FEED="rsync://feed.openvas.org:/cert-data"
diff --git a/net-analyzer/gvmd/files/greenbone-nvt-sync.conf b/net-analyzer/gvmd/files/greenbone-nvt-sync.conf
deleted file mode 100644
index 967c41dec2e..00000000000
--- a/net-analyzer/gvmd/files/greenbone-nvt-sync.conf
+++ /dev/null
@@ -1 +0,0 @@
-COMMUNITY_NVT_RSYNC_FEED="rsync://feed.openvas.org:/nvt-feed"
diff --git a/net-analyzer/gvmd/files/greenbone-scapdata-sync.conf b/net-analyzer/gvmd/files/greenbone-scapdata-sync.conf
deleted file mode 100644
index 4a7426bc805..00000000000
--- a/net-analyzer/gvmd/files/greenbone-scapdata-sync.conf
+++ /dev/null
@@ -1 +0,0 @@
-COMMUNITY_SCAP_RSYNC_FEED="rsync://feed.openvas.org:/scap-data"
diff --git a/net-analyzer/gvmd/files/gvm-sync-all b/net-analyzer/gvmd/files/gvm-sync-all
new file mode 100644
index 00000000000..d12b860e7fc
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvm-sync-all
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+case ${USER} in
+ root)
+ exec su --shell /bin/bash --command "$0 $@" gvm
+ ;;
+ gvm)
+ ;;
+ *)
+ >&2 echo "Must be run as root or gvm user not ${USER}"
+ exit 1
+ ;;
+esac
+
+while getopts d OPTION "$@"; do
+ case ${OPTION} in
+ d)
+ set -x
+ ;;
+ esac
+done
+shift $((OPTIND - 1))
+
+greenbone-nvt-sync
+# Note that Greenbone recommends to sync CERT *after* SCAP, as the
+# former depends on the later. See
+# https://github.com/greenbone/gvmd/blob/main/INSTALL.md#keeping-the-feeds-up-to-date
+for FEED_TYPE in SCAP CERT GVMD_DATA; do
+ greenbone-feed-sync --type ${FEED_TYPE}
+done
diff --git a/net-analyzer/gvmd/files/gvm-sync-all.service b/net-analyzer/gvmd/files/gvm-sync-all.service
new file mode 100644
index 00000000000..a82e2950f3f
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvm-sync-all.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Update all feeds of the Greenbone Vulerability Management (GMV) suite
+After=network-online.target
+
+[Service]
+ExecStart=/usr/sbin/gvm-sync-all
+User=gvm
diff --git a/net-analyzer/gvmd/files/gvm-sync-all.timer b/net-analyzer/gvmd/files/gvm-sync-all.timer
new file mode 100644
index 00000000000..9faf470e013
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvm-sync-all.timer
@@ -0,0 +1,9 @@
+[Unit]
+Description=Daily update of all feeds of the Greenbone Vulerability Management (GMV) suite
+
+[Timer]
+OnCalendar=daily
+RandomizedDelaySec=2hour
+
+[Install]
+WantedBy=timers.target
diff --git a/net-analyzer/gvmd/files/gvmd-21.4.5.init b/net-analyzer/gvmd/files/gvmd-21.4.5.init
new file mode 100644
index 00000000000..047ad8446a4
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvmd-21.4.5.init
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+: ${GVMD_USER:=gvm}
+: ${GVMD_GROUP:=gvm}
+: ${GVMD_TIMEOUT:=30}
+
+name="Greenbone Vulnerability Manager"
+command=/usr/bin/gvmd
+command_args="${GVMD_OPTIONS} ${GVMD_LISTEN_ADDRESS_TCP} ${GVMD_PORT} ${GVMD_SCANNER_HOST} ${GVMD_GNUTLS_PRIORITIES}"
+command_user="${GVMD_USER}:${GVMD_GROUP}"
+pidfile="/run/gvmd/gvmd.pid"
+retry="${GVMD_TIMEOUT}"
+
+depend() {
+ after bootmisc
+ need localmount net ospd-openvas
+}
+
+start_pre() {
+ mkdir /run/gvmd
+ for p in gvm-checking gvm-create-functions gvm-helping gvm-migrating gvm-serving; do
+ touch /run/gvmd/${p}
+ done
+ chown -R gvm:gvm /run/gvmd/
+
+ touch /run/feed-update.lock
+ chown gvm:gvm /run/feed-update.lock
+}
diff --git a/net-analyzer/gvmd/files/gvmd-9.0.1-glibc_siglist.patch b/net-analyzer/gvmd/files/gvmd-9.0.1-glibc_siglist.patch
deleted file mode 100644
index 186bd882bdd..00000000000
--- a/net-analyzer/gvmd/files/gvmd-9.0.1-glibc_siglist.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From ed07f5a23dd0644d0bbd3f2ddc1cec3b6ce922c6 Mon Sep 17 00:00:00 2001
-From: Timo Gurr <timo.gurr@gmail.com>
-Date: Tue, 1 Sep 2020 10:03:34 +0200
-Subject: [PATCH] Replace deprecated sys_siglist with strsignal
-
-Required to work with glibc >= 2.32.
-
-https://sourceware.org/pipermail/libc-announce/2020/000029.html
-
- The deprecated arrays sys_siglist, _sys_siglist, and sys_sigabbrev
- are no longer available to newly linked binaries, and their declarations
- have been removed from <string.h>. They are exported solely as
- compatibility symbols to support old binaries. All programs should use
- strsignal instead.
-
---- ./src/manage.c 2020-05-12 18:54:26.000000000 +0200
-+++ ./src/manage.c 2020-10-27 13:32:20.423421085 +0100
-@@ -3283,7 +3283,7 @@
- {
- g_debug ("%s: Received %s signal.",
- __FUNCTION__,
-- sys_siglist[get_termination_signal()]);
-+ strsignal(get_termination_signal()));
- }
- if (global_current_report)
- {
-@@ -3305,7 +3305,7 @@
- {
- g_debug ("%s: Received %s signal.",
- __FUNCTION__,
-- sys_siglist[get_termination_signal()]);
-+ strsignal(get_termination_signal()));
- if (global_current_report)
- {
- set_report_scan_run_status (global_current_report,
---- ./src/gvmd.c 2020-05-12 18:54:26.000000000 +0200
-+++ ./src/gvmd.c 2020-10-27 13:34:47.606424207 +0100
-@@ -922,7 +922,7 @@
- if (sigaction (signal, &action, NULL) == -1)
- {
- g_critical ("%s: failed to register %s handler",
-- __FUNCTION__, sys_siglist[signal]);
-+ __FUNCTION__, strsignal(termination_signal));
- exit (EXIT_FAILURE);
- }
- }
-@@ -953,7 +953,7 @@
- if (sigaction (signal, &action, NULL) == -1)
- {
- g_critical ("%s: failed to register %s handler",
-- __FUNCTION__, sys_siglist[signal]);
-+ __FUNCTION__, strsignal(termination_signal));
- exit (EXIT_FAILURE);
- }
- }
-@@ -1258,7 +1258,7 @@
- if (termination_signal)
- {
- g_debug ("Received %s signal",
-- sys_siglist[termination_signal]);
-+ strsignal(termination_signal));
- cleanup ();
- /* Raise signal again, to exit with the correct return value. */
- setup_signal_handler (termination_signal, SIG_DFL, 0);
-@@ -1347,7 +1347,7 @@
- if (termination_signal)
- {
- g_debug ("Received %s signal",
-- sys_siglist[termination_signal]);
-+ strsignal(termination_signal));
- cleanup ();
- /* Raise signal again, to exit with the correct return value. */
- setup_signal_handler (termination_signal, SIG_DFL, 0);
---- ./src/manage_sql.c 2020-05-12 18:54:26.000000000 +0200
-+++ ./src/manage_sql.c 2020-10-27 13:36:19.071426148 +0100
-@@ -18711,7 +18711,7 @@
- void
- manage_cleanup_process_error (int signal)
- {
-- g_debug ("Received %s signal", sys_siglist[signal]);
-+ g_debug ("Received %s signal", strsignal(signal));
- if (sql_is_open ())
- {
- if (current_scanner_task)
---- ./src/gmpd.c 2020-05-12 18:54:26.000000000 +0200
-+++ ./src/gmpd.c 2020-10-27 13:46:29.687439101 +0100
-@@ -496,8 +496,7 @@
- {
- g_debug ("%s: Received %s signal.",
- __FUNCTION__,
-- sys_siglist[get_termination_signal()]);
--
-+ strsignal(get_termination_signal()));
- goto client_free;
- }
-
diff --git a/net-analyzer/gvmd/files/gvmd-startpre.sh b/net-analyzer/gvmd/files/gvmd-startpre.sh
deleted file mode 100644
index 5ba4b5c273c..00000000000
--- a/net-analyzer/gvmd/files/gvmd-startpre.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# Greenbone Vulnerability Manager Systemd ExecStartPre
-touch /var/run/gvm-{checking,create-functions,helping,migrating,serving}
-chown -R gvm:gvm /var/run/gvm-{checking,create-functions,helping,migrating,serving}
-touch /var/run/feed-update.lock
-chown gvm:gvm /var/run/feed-update.lock
diff --git a/net-analyzer/gvmd/files/gvmd.init b/net-analyzer/gvmd/files/gvmd.init
deleted file mode 100644
index 098232afa1e..00000000000
--- a/net-analyzer/gvmd/files/gvmd.init
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-: ${GVMD_USER:=gvm}
-: ${GVMD_GROUP:=gvm}
-: ${GVMD_TIMEOUT:=30}
-
-name="Greenbone Vulnerability Manager"
-command=/usr/bin/gvmd
-command_args="--foreground ${GVMD_OPTIONS} ${GVMD_LISTEN_ADDRESS_TCP} ${GVMD_PORT} ${GVMD_SCANNER_HOST} ${GVMD_GNUTLS_PRIORITIES}"
-command_background="true"
-command_user="${GVMD_USER}:${GVMD_GROUP}"
-pidfile="/run/gvmd.pid"
-retry="${GVMD_TIMEOUT}"
-
-depend() {
- after bootmisc
- need localmount net ospd-openvas
-}
-
-start_pre() {
- /bin/bash /etc/gvm/gvmd-startpre.sh
-}
diff --git a/net-analyzer/gvmd/files/gvmd.logrotate b/net-analyzer/gvmd/files/gvmd.logrotate
deleted file mode 100644
index 453462575f8..00000000000
--- a/net-analyzer/gvmd/files/gvmd.logrotate
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# Daemon ignore HUP so we use 'copytruncate' instead of 'create'
-# with safe file size to prevent losing log entries.
-
-/var/log/gvm/gvmd.log {
- compress
- missingok
- notifempty
- sharedscripts
- copytruncate
- maxsize 10M
-}
diff --git a/net-analyzer/gvmd/files/gvmd.service b/net-analyzer/gvmd/files/gvmd.service
deleted file mode 100644
index 2e3ad84c85a..00000000000
--- a/net-analyzer/gvmd/files/gvmd.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=Greenbone Vulnerability Manager
-After=network.target
-After=openvassd.service
-Wants=openvassd.service
-Before=gsad.service
-
-[Service]
-Type=forking
-PrivateTmp=yes
-User=gvm
-Group=gvm
-PermissionsStartOnly=true
-EnvironmentFile=-/etc/gvm/sysconfig/gvmd-daemon.conf
-ExecStartPre=-/etc/gvm/gvmd-startpre.sh
-ExecStart=/usr/bin/gvmd $GVMD_OPTIONS $GVMD_LISTEN_ADDRESS_TCP $GVMD_PORT $GVMD_SCANNER_HOST $GVMD_GNUTLS_PRIORITIES
-Restart=on-failure
-RestartSec=10
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-analyzer/gvmd/gvmd-20.8.1.ebuild b/net-analyzer/gvmd/gvmd-20.8.1.ebuild
deleted file mode 100644
index 87213ec3215..00000000000
--- a/net-analyzer/gvmd/gvmd-20.8.1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake systemd toolchain-funcs
-
-DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager"
-HOMEPAGE="https://www.greenbone.net/en/ https://github.com/greenbone/gvmd/"
-SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/j-licht/gvmd_report_formats/archive/v0.1.tar.gz -> gvm-report-formats-0.1.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="extras test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- acct-group/gvm
- acct-user/gvm
- dev-db/postgresql:*[uuid]
- dev-libs/libgcrypt:0=
- dev-libs/libical
- >=net-analyzer/gvm-libs-20.8.0
- net-libs/gnutls:=[tools]
- extras? (
- app-text/xmlstarlet
- dev-texlive/texlive-latexextra )"
-
-RDEPEND="
- ${DEPEND}
- net-analyzer/ospd-openvas"
-
-BDEPEND="
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- extras? (
- app-doc/doxygen[dot]
- app-doc/xmltoman
- app-text/htmldoc
- dev-libs/libxslt
- )
- test? ( dev-libs/cgreen )"
-
-src_prepare() {
- cmake_src_prepare
- # QA-Fix | Use correct FHS/Gentoo policy paths for 9.0.0
- sed -i -e "s*share/doc/gvm/html/*share/doc/gvmd-${PV}/html/*g" doc/CMakeLists.txt || die
- sed -i -e "s*/doc/gvm/*/doc/gvmd-${PV}/*g" CMakeLists.txt || die
- # QA-Fix | Remove !CLANG Doxygen warnings for 9.0.0
- 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"
- "-DLIBDIR=${EPREFIX}/usr/$(get_libdir)"
- "-DSBINDIR=${EPREFIX}/usr/bin"
- )
- 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
- fi
- if use test; then
- cmake_build tests
- fi
- cmake_build rebuild_cache
-}
-
-src_install() {
- if use extras; then
- local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
- fi
- cmake_src_install
-
- #QA-Fix
- rm -r "${D}/usr/etc" || die
-
- insinto /etc/gvm
- doins -r "${FILESDIR}"/*sync*
-
- 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
-
- #add report formats from old version for migration
- insinto /usr/share/gvm/gvmd/
- doins -r "${WORKDIR}/gvmd_report_formats-0.1/report_formats/"
-}
diff --git a/net-analyzer/gvmd/gvmd-9.0.1.ebuild b/net-analyzer/gvmd/gvmd-21.4.5-r5.ebuild
index 2e848ce6b59..05dd1b3e920 100644
--- a/net-analyzer/gvmd/gvmd-9.0.1.ebuild
+++ b/net-analyzer/gvmd/gvmd-21.4.5-r5.ebuild
@@ -1,60 +1,59 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-CMAKE_MAKEFILE_GENERATOR="emake"
inherit cmake systemd toolchain-funcs
DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager"
-HOMEPAGE="https://www.greenbone.net/en/"
+HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gvmd/"
SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0"
-LICENSE="GPL-2+"
+LICENSE="AGPL-3+"
KEYWORDS="~amd64 ~x86"
-IUSE="extras test"
+IUSE="doc test"
RESTRICT="!test? ( test )"
DEPEND="
+ acct-group/gvm
+ acct-user/gvm
+ app-crypt/gpgme:1=
dev-db/postgresql:*[uuid]
- dev-libs/libgcrypt:0=
- dev-libs/libical
- >=net-analyzer/gvm-libs-11.0.1
+ dev-libs/glib:2
+ dev-libs/libical:=
+ >=net-analyzer/gvm-libs-21.4.4
net-libs/gnutls:=[tools]
- extras? (
- app-text/xmlstarlet
- dev-texlive/texlive-latexextra )"
-
+"
+# gvmd (optionally) uses xml_split from XML-Twig at runtime. And texlive
+# and xmlstartlet are used for (PDF) report generator at runtime.
RDEPEND="
${DEPEND}
- acct-user/gvm
- net-analyzer/ospd-openvas"
-
+ app-text/xmlstarlet
+ dev-perl/XML-Twig
+ dev-texlive/texlive-latexextra
+ net-analyzer/ospd-openvas
+"
BDEPEND="
sys-devel/bison
sys-devel/flex
virtual/pkgconfig
- extras? (
+ doc? (
app-doc/doxygen[dot]
app-doc/xmltoman
app-text/htmldoc
dev-libs/libxslt
)
- test? ( dev-libs/cgreen )"
-
-PATCHES=(
- # Replace deprecated glibc sys_siglist with strsignal
- "${FILESDIR}/${P}-glibc_siglist.patch"
-)
+ test? ( dev-libs/cgreen )
+"
src_prepare() {
cmake_src_prepare
# QA-Fix | Use correct FHS/Gentoo policy paths for 9.0.0
- 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
+ sed -i -e "s*share/doc/gvm/html/*share/doc/${PF}/html/*g" doc/CMakeLists.txt || die
+ sed -i -e "s*/doc/gvm/*/doc/${PF}/*g" CMakeLists.txt || die
# QA-Fix | Remove !CLANG Doxygen warnings for 9.0.0
- if use extras; then
+ if use doc; then
if ! tc-is-clang; then
local f
for f in doc/*.in
@@ -66,6 +65,18 @@ src_prepare() {
done
fi
fi
+
+ # https://github.com/greenbone/gvmd/pull/1819
+ sed -i "/^EnvironmentFile/d" config/gvmd.service.in || die
+
+ # Upstream 3ebab6044818f1710b73c04e94fd9bea148c9853
+ sed -i \
+ -e 's/^RuntimeDirectory=gvm/RuntimeDirectory=gvmd/' \
+ -e 's/GVM_RUN_DIR/GVMD_RUN_DIR/' \
+ config/gvmd.service.in || die
+
+ # https://github.com/greenbone/gvmd/pull/1824
+ sed -i '/^install (DIRECTORY DESTINATION ${GVMD_RUN_DIR})/d' CMakeLists.txt || die
}
src_configure() {
@@ -74,13 +85,15 @@ src_configure() {
"-DSYSCONFDIR=${EPREFIX}/etc"
"-DLIBDIR=${EPREFIX}/usr/$(get_libdir)"
"-DSBINDIR=${EPREFIX}/usr/bin"
+ "-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)"
+ "-DGVM_DEFAULT_DROP_USER=gvm"
)
cmake_src_configure
}
src_compile() {
cmake_src_compile
- if use extras; then
+ if use doc; then
cmake_build -C "${BUILD_DIR}" doc
cmake_build doc-full -C "${BUILD_DIR}" doc
fi
@@ -91,31 +104,26 @@ src_compile() {
}
src_install() {
- if use extras; then
+ if use doc; then
local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
fi
cmake_src_install
- insinto /etc/gvm
- doins -r "${FILESDIR}"/*sync*
-
insinto /etc/gvm/sysconfig
doins "${FILESDIR}/${PN}-daemon.conf"
+ if ! use prefix; then
+ fowners -R gvm:gvm /etc/gvm
+ fi
- exeinto /etc/gvm
- doexe "${FILESDIR}"/gvmd-startpre.sh
-
- fowners -R gvm:gvm /etc/gvm
-
- newinitd "${FILESDIR}/${PN}.init" "${PN}"
+ newinitd "${FILESDIR}/${P}.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
+ if ! use prefix; then
+ fowners -R gvm:gvm /var/lib/gvm
+ fi
+
+ dosbin "${FILESDIR}"/gvm-sync-all
+ systemd_dounit "${FILESDIR}"/gvm-sync-all.{service,timer}
}
diff --git a/net-analyzer/gvmd/metadata.xml b/net-analyzer/gvmd/metadata.xml
index d60e9b09e0d..f0294aac8dd 100644
--- a/net-analyzer/gvmd/metadata.xml
+++ b/net-analyzer/gvmd/metadata.xml
@@ -9,14 +9,11 @@
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
- <use>
- <flag name="extras">Html docs support</flag>
- </use>
<longdescription lang="en">
The Greenbone Vulnerability Manager is the central management service between security scanners and the user clients.
It manages the storage of any vulnerability management configurations and of the scan results.
Access to data, control commands and workflows is offered via the XML-based Greenbone Management Protocol (GMP).
- The primary scanner OpenVAS Scanner is controlled directly via protocol OTP while any other
+ The primary scanner OpenVAS Scanner is controlled directly via protocol OTP while any other
remote scanner is coupled with the Open Scanner Protocol (OSP).
</longdescription>
<upstream>
diff --git a/net-analyzer/hping/hping-3_pre20141226.ebuild b/net-analyzer/hping/hping-3_pre20141226.ebuild
index 5b7241faa8d..c2b4404dfc1 100644
--- a/net-analyzer/hping/hping-3_pre20141226.ebuild
+++ b/net-analyzer/hping/hping-3_pre20141226.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${HPING_COMMIT}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc sparc x86"
IUSE="tcl"
DEPEND="
diff --git a/net-analyzer/httping/httping-2.5.ebuild b/net-analyzer/httping/httping-2.5.ebuild
index b454614720f..13b748882e3 100644
--- a/net-analyzer/httping/httping-2.5.ebuild
+++ b/net-analyzer/httping/httping-2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.vanheusden.com/${PN}/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~mips ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~sparc x86"
IUSE="debug fftw l10n_nl ncurses ssl +tfo"
RDEPEND="
diff --git a/net-analyzer/httping/httping-9999999.ebuild b/net-analyzer/httping/httping-9999999.ebuild
deleted file mode 100644
index c3e262a43ac..00000000000
--- a/net-analyzer/httping/httping-9999999.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit git-r3 toolchain-funcs flag-o-matic
-
-DESCRIPTION="like ping but for HTTP requests"
-HOMEPAGE="https://www.vanheusden.com/httping/"
-EGIT_REPO_URI="https://github.com/flok99/httping"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug fftw l10n_nl ncurses ssl +tfo"
-
-RDEPEND="
- fftw? ( sci-libs/fftw:3.0 )
- ncurses? ( sys-libs/ncurses:0= )
- ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="ncurses? ( virtual/pkgconfig )"
-
-# This would bring in test? ( dev-util/cppcheck ) but unlike
-# upstream we should only care about compile/run time testing
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.2.1-flags.patch
-)
-
-src_prepare() {
- default
-
- # doman does not get PN-LANG.CAT so we move things around and then point at
- # it later
- if use l10n_nl; then
- mkdir nl || die
- mv httping-nl.1 nl/httping.1 || die
- fi
-}
-
-src_configure() {
- # not an autotools script
- echo > makefile.inc || die
-
- if use ncurses ; then
- local ncurses_flags="$($(tc-getPKG_CONFIG) --libs ncurses)"
-
- # Don't require ncurses with unicode support
- # bug #731950
- sed -i -e "s/-lncursesw/${ncurses_flags}/" Makefile || die
- append-ldflags "${ncurses_flags}"
- fi
-}
-
-src_compile() {
- emake \
- CC="$(tc-getCC)" \
- FW=$(usex fftw) \
- DEBUG=$(usex debug) \
- NC=$(usex ncurses) \
- SSL=$(usex ssl) \
- TFO=$(usex tfo)
-}
-
-src_install() {
- dobin httping
- doman httping.1
-
- use l10n_nl && doman -i18n=nl nl/httping.1
-}
diff --git a/net-analyzer/httping/metadata.xml b/net-analyzer/httping/metadata.xml
index a52f62aaf55..5d57b334f6c 100644
--- a/net-analyzer/httping/metadata.xml
+++ b/net-analyzer/httping/metadata.xml
@@ -8,7 +8,4 @@
<use>
<flag name="tfo">Enable support for TCP Fast Open</flag>
</use>
- <upstream>
- <remote-id type="github">flok99/httping</remote-id>
- </upstream>
</pkgmetadata>
diff --git a/net-analyzer/hunt/hunt-1.5_p6_p1.ebuild b/net-analyzer/hunt/hunt-1.5_p6_p1.ebuild
index 3790bdef652..b31b315b375 100644
--- a/net-analyzer/hunt/hunt-1.5_p6_p1.ebuild
+++ b/net-analyzer/hunt/hunt-1.5_p6_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -31,7 +31,7 @@ src_configure() {
src_compile() {
local target
for target in . tpserv; do
- emake CC=$(tc-getCC) LDFLAGS="${CFLAGS} ${LDFLAGS}" -C "${target}"
+ emake CC="$(tc-getCC)" LDFLAGS="${CFLAGS} ${LDFLAGS}" -C "${target}"
done
}
diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index f12f1ce825e..b3c28ec9126 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -1,2 +1,3 @@
DIST hydra-9.1.tar.gz 611846 BLAKE2B 9a5b6dc52b5f4069bf326e86728ebaf8c1fe018536f3943b83493de934703bff6770ae3f7a9a223ee00b5f52f7bd10ee4ddc272e1bbad00c399aa19cc0c083ba SHA512 863176375fe1aae4c0a2b74c11aba297682d66e522c98c926c539348309b0af4e407e460b4cb803d2c83c008787c73f7f1e56ac6aca9791351e1b596c2e4fbb2
DIST hydra-9.2.tar.gz 614176 BLAKE2B 102c744fbdd3702c624b1c8339178883b689db093d9f1c66d8e04816327eb8095f3e3133f889b2a6ee6dcabb9e5af0c71ec8470731b4b174021fbd79741d05e7 SHA512 ee8ecd854b61ac9d708098c8a0d9a128d8b80b38db1a2ba8eb06de6fbbc6865135d994620ade8e3742fb993899274ed9d8fd0e95bed7a9fbeb1ca9e182540322
+DIST hydra-9.3.tar.gz 829856 BLAKE2B 5ae1ab77f64d2bc17bd8389acf8a47201d84455a82f5ae28ab740594571a13ab145f5981efdfb09ddab3d6cc443e171e4664bff08c1a6b2f08169dea4f87ba54 SHA512 06d2ed61492c76d16ff3b2fbbde3938f79d6038c979a2af949f9b4d116a1506943e0a3a246da4d1bc8848cf440097e6175962e3fdf3e7644dd36ad7c2f6b2ce4
diff --git a/net-analyzer/hydra/files/hydra-9.3-pcre2.patch b/net-analyzer/hydra/files/hydra-9.3-pcre2.patch
new file mode 100644
index 00000000000..bb12936254b
--- /dev/null
+++ b/net-analyzer/hydra/files/hydra-9.3-pcre2.patch
@@ -0,0 +1,113 @@
+https://github.com/vanhauser-thc/thc-hydra/commit/c82e5d51c5595374e6b7801bfc84c26a497d8989.patch
+https://bugs.gentoo.org/838031
+
+From c82e5d51c5595374e6b7801bfc84c26a497d8989 Mon Sep 17 00:00:00 2001
+From: vanhauser-thc <vh@thc.org>
+Date: Tue, 1 Mar 2022 14:56:05 +0100
+Subject: [PATCH] switch to pcre2
+
+--- a/configure
++++ b/configure
+@@ -380,21 +380,21 @@ if [ "X" = "X$CURSES_PATH" -o "X" = "X$CURSES_IPATH" ]; then
+ CURSES_IPATH=""
+ fi
+
+-echo "Checking for pcre (libpcre/pcre.h) ..."
++echo "Checking for pcre2 (libpcre/pcre.h) ..."
+ for i in $LIBDIRS ; do
+ if [ "X" = "X$PCRE_PATH" ]; then
+- if [ -f "$i/libpcre.so" -o -f "$i/libpcre.dylib" -o -f "$i/libpcre.a" ]; then
++ if [ -f "$i/libpcre2-8.so" -o -f "$i/libpcre2-8.dylib" -o -f "$i/libpcre2-8.a" ]; then
+ PCRE_PATH="$i"
+ fi
+ fi
+ if [ "X" = "X$PCRE_PATH" ]; then
+- TMP_LIB=`/bin/ls $i/libpcre.so* 2> /dev/null | grep libpcre.`
++ TMP_LIB=`/bin/ls $i/libpcre2*.so* 2> /dev/null | grep libpcre.`
+ if [ -n "$TMP_LIB" ]; then
+ PCRE_PATH="$i"
+ fi
+ fi
+ if [ "X" = "X$PCRE_PATH" ]; then
+- TMP_LIB=`/bin/ls $i/libpcre.dll* 2> /dev/null | grep libpcre.`
++ TMP_LIB=`/bin/ls $i/libpcre2*.dll* 2> /dev/null | grep libpcre.`
+ if [ -n "$TMP_LIB" ]; then
+ PCRE_PATH="$i"
+ fi
+@@ -402,20 +402,20 @@ for i in $LIBDIRS ; do
+ done
+ for i in $INCDIRS ; do
+ if [ "X" != "X$PCRE_PATH" ]; then
+- if [ -f "$i/pcre.h" ]; then
++ if [ -f "$i/pcre2.h" ]; then
+ PCRE_IPATH="$i"
+ fi
+ fi
+ done
+ if [ "X" != "X$DEBUG" ]; then
+ echo DEBUG: PCRE_PATH=$PCRE_PATH/libpcre
+- echo DEBUG: PCRE_IPATH=$PCRE_IPATH/pcre.h
++ echo DEBUG: PCRE_IPATH=$PCRE_IPATH/pcre2.h
+ fi
+ if [ -n "$PCRE_PATH" -a -n "$PCRE_IPATH" ]; then
+- echo " ... found"
++ echo " ... found"
+ fi
+ if [ "X" = "X$PCRE_PATH" -o "X" = "X$PCRE_IPATH" ]; then
+- echo " ... NOT found, server response checks will be less reliable"
++ echo " ... NOT found, server response checks will be less reliable"
+ PCRE_PATH=""
+ PCRE_IPATH=""
+ fi
+@@ -1649,7 +1649,7 @@ if [ -n "$IDN_PATH" ]; then
+ XLIBS="$XLIBS -lidn"
+ fi
+ if [ -n "$PCRE_PATH" ]; then
+- XLIBS="$XLIBS -lpcre"
++ XLIBS="$XLIBS -lpcre2-8"
+ fi
+ if [ -n "$MYSQL_PATH" ]; then
+ XLIBS="$XLIBS -lmysqlclient"
+--- a/hydra-mod.c
++++ b/hydra-mod.c
+@@ -7,7 +7,8 @@
+ #include <openssl/ssl.h>
+ #endif
+ #ifdef HAVE_PCRE
+-#include <pcre.h>
++#define PCRE2_CODE_UNIT_WIDTH 8
++#include <pcre2.h>
+ #endif
+
+ #define MAX_CONNECT_RETRY 1
+@@ -1291,19 +1292,23 @@ void hydra_set_srcport(int32_t port) { src_port = port; }
+
+ #ifdef HAVE_PCRE
+ int32_t hydra_string_match(char *str, const char *regex) {
+- pcre *re = NULL;
+- int32_t offset_error = 0;
+- const char *error = NULL;
++ pcre2_code *re = NULL;
++ int32_t error_code = 0;
++ PCRE2_SIZE error_offset;
+ int32_t rc = 0;
+
+- re = pcre_compile(regex, PCRE_CASELESS | PCRE_DOTALL, &error, &offset_error, NULL);
++ re = pcre2_compile(regex, PCRE2_ZERO_TERMINATED, PCRE2_CASELESS | PCRE2_DOTALL, &error_code, &error_offset, NULL);
+ if (re == NULL) {
+- fprintf(stderr, "[ERROR] PCRE compilation failed at offset %d: %s\n", offset_error, error);
++ fprintf(stderr, "[ERROR] PCRE compilation failed at offset %d: %d\n", error_offset, error_code);
+ return 0;
+ }
+
+- rc = pcre_exec(re, NULL, str, strlen(str), 0, 0, NULL, 0);
+- if (rc >= 0) {
++ pcre2_match_data *match_data = pcre2_match_data_create_from_pattern(re, NULL);
++ rc = pcre2_match(re, str, PCRE2_ZERO_TERMINATED, 0, 0, match_data, NULL);
++ pcre2_match_data_free(match_data);
++ pcre2_code_free(re);
++
++ if (rc >= 1) {
+ return 1;
+ }
+ return 0;
diff --git a/net-analyzer/hydra/hydra-9.3-r1.ebuild b/net-analyzer/hydra/hydra-9.3-r1.ebuild
new file mode 100644
index 00000000000..5ce501996e2
--- /dev/null
+++ b/net-analyzer/hydra/hydra-9.3-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Parallelized network login hacker"
+HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra"
+SRC_URI="https://github.com/vanhauser-thc/thc-hydra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/thc-${P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug firebird gcrypt gtk idn memcached mongodb mysql ncurses oracle pcre postgres rdp libssh samba subversion zlib"
+
+RDEPEND="
+ dev-libs/openssl:=
+ gtk? (
+ dev-libs/atk
+ dev-libs/glib:2
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:2
+ )
+ firebird? ( dev-db/firebird )
+ gcrypt? ( dev-libs/libgcrypt )
+ idn? ( net-dns/libidn:0= )
+ memcached? ( dev-libs/libmemcached[sasl] )
+ mongodb? ( dev-libs/mongo-c-driver )
+ mysql? ( dev-db/mysql-connector-c:0= )
+ ncurses? ( sys-libs/ncurses:= )
+ oracle? ( dev-db/oracle-instantclient[sdk] )
+ pcre? ( dev-libs/libpcre2 )
+ postgres? ( dev-db/postgresql:* )
+ rdp? ( net-misc/freerdp )
+ libssh? ( >=net-libs/libssh-0.4.0 )
+ samba? ( net-fs/samba )
+ subversion? ( dev-vcs/subversion )
+ zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-pcre2.patch
+)
+
+src_prepare() {
+ default
+
+ # None of the settings in Makefile.unix are useful to us
+ mv Makefile.unix{,.gentoo_unused} || die
+ touch Makefile.unix || die
+
+ sed -i \
+ -e 's:|| echo.*$::' \
+ -e '/\t-$(CC)/s:-::' \
+ -e '/^OPTS/{s|=|+=|;s| -O3||}' \
+ -e '/ -o /s:$(OPTS):& $(LDFLAGS):g' \
+ Makefile.am || die
+
+ # Needed to get GTK+ 3 change in configure.in (.in got updated, but
+ # configure not regen'd.)
+ #cd hydra-gtk || die
+ #sed -i -e 's:AC_INIT(configure.in):AC_INIT(configure.ac):' configure.in || die
+ #eautoreconf
+}
+
+src_configure() {
+ # Note: the top level configure script is not autoconf-based
+ tc-export CC PKG_CONFIG
+
+ export OPTS="${CFLAGS}"
+
+ hydra_sed() {
+ if use ${1}; then
+ einfo "Enabling ${1}"
+ if [[ -n "${3}" ]]; then
+ sed -i 's#'"${2}"'#'"${3}"'#' configure || die
+ fi
+ else
+ einfo "Disabling ${1}"
+ sed -i 's#'"${2}"'##; s#'"${4}"'##' configure || die
+ fi
+ }
+
+ hydra_sed firebird '-lfbclient' '' '-DLIBFIREBIRD'
+ hydra_sed gcrypt '-lgcrypt' '$( ${CTARGET:-${CHOST}}-libgcrypt-config --libs )' '-DHAVE_GCRYPT'
+ hydra_sed idn '-lidn' '$( "${PKG_CONFIG}" --libs libidn )' '-DLIBIDN -DHAVE_PR29_H'
+ hydra_sed libssh '-lssh' '$( "${PKG_CONFIG}" --libs libssh )' '-DLIBSSH'
+ hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}" --libs libmemcached )' '-DLIBMCACHED'
+ hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}" --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON'
+ hydra_sed mysql '-lmysqlclient' '$( ${CTARGET:-${CHOST}}-mysql_config --libs )' '-DLIBMYSQLCLIENT'
+ hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES'
+ hydra_sed pcre '-lpcre2-8' '$( "${PKG_CONFIG}" --libs libpcre2-8 )' '-DHAVE_PCRE'
+ hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}" --libs libpq )' '-DLIBPOSTGRES'
+ hydra_sed oracle '-locci -lclntsh' '' '-DLIBORACLE'
+ hydra_sed rdp '-lfreerdp2' '$( "${PKG_CONFIG}" --libs freerdp2 )' '-DLIBFREERDP'
+ # TODO: https://bugs.gentoo.org/686148
+ #hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '$( "${PKG_CONFIG}" --libs libsvn_client )' '-DLIBSVN'
+ hydra_sed samba '-lsmbclient' '$( "${PKG_CONFIG}" --libs smbclient )' '-DLIBSMBCLIENT'
+ hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '' '-DLIBSVN'
+ hydra_sed zlib '-lz' '$( "${PKG_CONFIG}" --libs zlib )' '-DHAVE_ZLIB'
+
+ sh configure \
+ $(use gtk || echo --disable-xhydra) \
+ $(usex debug '--debug' '') \
+ --nostrip \
+ --prefix=/usr \
+ || die
+
+ if use gtk ; then
+ pushd hydra-gtk || die
+ econf
+ fi
+}
+
+src_compile() {
+ emake XLIBPATHS=''
+ use gtk && emake -C hydra-gtk
+}
+
+src_install() {
+ dobin hydra pw-inspector
+ use gtk && dobin hydra-gtk/src/xhydra
+ dodoc CHANGES README
+}
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 257e30c33fe..a09d4f7975b 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1,2 @@
-DIST icinga2-2.13.2-9092.patch 1118 BLAKE2B c63342b8eff6afead9bf3ccec5c6df6583c2e327edb1433731ca14743ce9c6b0bde0797c6f251480e3bbfb5e6cdaae3444ea6ae6f6740bc228bd6aae5380044d SHA512 1056ff8bd66f2da86afb9664e3415d713be03b80def6d256b6db57f0864d150bc26c0fd3ce05d836da126a2616f2c70ecce05a83bb5425c25f6204d7e522ef94
-DIST icinga2-2.13.2.tar.gz 7589357 BLAKE2B 6e1ba570e0286f09f37b3cea3b1cd833fd3005c5788e24b750edb100346c46958e97ed5df05947dc47c2bbf856cc6090d661e741072f473b8308aee5e1c0e94e SHA512 39a6f996bca671a2a22fc04e5995714b874e027888a7c9e479d5b526b23104915b7f99afb1220d440af482013043e5b969b0a0145041ac55009d1a81053e2906
+DIST icinga2-2.13.3.tar.gz 7529976 BLAKE2B f661919b0a7b420eba663d6cb01f2223c15b2be7f4ad649e1e09b7b4068d1122d63c6baac490ff3a0bd808066b759138748e70de364eea4d89f560168a448c72 SHA512 818eb565c6d46bfb538d70b9e33bb7424ab6fb98289da9eb947ec1f36b7e3b0e3869db789acd565b5e5b3d8b4819fe991000f4df362e28686dd9e3394cec3743
+DIST icinga2-2.13.4.tar.gz 9662432 BLAKE2B fdae71d081a646b2f70d768b43c56602221d585997a1fca96d2f6c30c27eb6344a443a1d12981c94542fdb77443b40be3c4ec87796a82bfcab1b53fe6b46e0ec SHA512 454eb03587c66de2697d0d604fab37ae4ce243653357cd3295998ab9b58287acefc27876e06e530b8bd6bb4d96c1289a1f05ef25f0b19573123a0cf1d99b5cfb
diff --git a/net-analyzer/icinga2/icinga2-2.13.2-r3.ebuild b/net-analyzer/icinga2/icinga2-2.13.3.ebuild
index f485dd354e5..39584c5c24c 100644
--- a/net-analyzer/icinga2/icinga2-2.13.2-r3.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.13.3.ebuild
@@ -6,8 +6,7 @@ EAPI=7
inherit cmake systemd
if [[ ${PV} != 9999 ]]; then
- SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/Icinga/icinga2/commit/8cde21ddfd66a0fcfac704544a0fd7990cfc94ec.patch -> ${P}-9092.patch"
+ SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64 ~arm64 x86"
else
inherit git-r3
@@ -47,11 +46,6 @@ RDEPEND="
REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-PATCHES=(
- # https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875
- "${DISTDIR}/${P}-9092.patch"
-)
-
src_configure() {
local mycmakeargs=(
-DICINGA2_UNITY_BUILD=$(usex jumbo-build)
diff --git a/net-analyzer/icinga2/icinga2-2.13.4.ebuild b/net-analyzer/icinga2/icinga2-2.13.4.ebuild
new file mode 100644
index 00000000000..d9cef157f92
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.13.4.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2022 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 lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
+
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
+ dev-libs/openssl: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 ) )"
+
+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 -R icinga:icinga /etc/icinga2
+ fperms 0750 /etc/icinga2
+ fowners icinga:icinga /var/lib/icinga2
+ fowners -R icinga:icingacmd /var/lib/icinga2/api
+ fowners -R icinga:icingacmd /var/lib/icinga2/certificate-requests
+ fowners -R icinga:icingacmd /var/lib/icinga2/certs
+ fowners icinga:icinga /var/spool/icinga2
+ 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/ifstat/ifstat-1.1-r2.ebuild b/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
index 6ece35858b7..5682724e0c8 100644
--- a/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
+++ b/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://gael.roualland.free.fr/ifstat/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 hppa ~mips ppc ppc64 ~riscv sparc x86"
IUSE="snmp"
DEPEND="snmp? ( >=net-analyzer/net-snmp-5.0 )"
diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
index 45a3bfa2dd1..bf47434f2ea 100644
--- a/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
+++ b/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
RDEPEND="
net-libs/libpcap
diff --git a/net-analyzer/ipaudit/ipaudit-1.0_beta2-r1.ebuild b/net-analyzer/ipaudit/ipaudit-1.0_beta2-r1.ebuild
index fba409faf3e..fce596bdb7e 100644
--- a/net-analyzer/ipaudit/ipaudit-1.0_beta2-r1.ebuild
+++ b/net-analyzer/ipaudit/ipaudit-1.0_beta2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ MY_P="${PN}-${PV/_beta/BETA}"
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc x86"
IUSE="mysql"
DEPEND="net-libs/libpcap
mysql? ( dev-db/mysql-connector-c:0= )"
diff --git a/net-analyzer/ipguard/ipguard-1.04-r1.ebuild b/net-analyzer/ipguard/ipguard-1.04-r1.ebuild
index cbd0d12934c..0b9d630790e 100644
--- a/net-analyzer/ipguard/ipguard-1.04-r1.ebuild
+++ b/net-analyzer/ipguard/ipguard-1.04-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -29,16 +29,16 @@ PATCHES=(
src_compile() {
emake \
- CC=$(tc-getCC) \
+ CC="$(tc-getCC)" \
LIBNET_CONFIG="$(tc-getPKG_CONFIG) libnet" \
- PREFIX=\"${EPREFIX:-/usr}\"
+ PREFIX=\""${EPREFIX:-/usr}"\"
}
src_install() {
emake \
DESTDIR="${D}" \
LIBNET_CONFIG="$(tc-getPKG_CONFIG) libnet" \
- PREFIX=\"${EPREFIX:-/usr}\" \
+ PREFIX=\""${EPREFIX:-/usr}"\" \
install
newinitd doc/${PN}.gentoo ${PN}
diff --git a/net-analyzer/iplog/iplog-2.2.3-r3.ebuild b/net-analyzer/iplog/iplog-2.2.3-r3.ebuild
index 8733fa8e1a5..f2e64563a5d 100644
--- a/net-analyzer/iplog/iplog-2.2.3-r3.ebuild
+++ b/net-analyzer/iplog/iplog-2.2.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
LICENSE="|| ( GPL-2 FDL-1.1 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~ppc sparc x86"
DEPEND="net-libs/libpcap"
RDEPEND="${DEPEND}"
diff --git a/net-analyzer/iptstate/Manifest b/net-analyzer/iptstate/Manifest
index f5163c1b723..5414199ac37 100644
--- a/net-analyzer/iptstate/Manifest
+++ b/net-analyzer/iptstate/Manifest
@@ -1,2 +1 @@
-DIST iptstate-2.2.6.tar.bz2 28700 BLAKE2B 66e18425a4fed423a5a03c8f9ecbc87f4553a64475ab77144f3f37969eb6a399d52d7166bb68d9c9e80753163b841c71b42bfc13796e4a9d2c23db084740f3f5 SHA512 411b357aced384c52caac17b23f3c6bd631ff34d41b6000b90ff6dfc3cf20e36e46416d3691ac699b06f16d6042a42681b42a5d3594ce287aa6cf3b3b637c999
DIST iptstate-2.2.7.tar.bz2 29994 BLAKE2B 0be657d4452b40b1835279bfa141b94e3db7adeeba141dede8456c64e4847efbb23197afab7e2452c9ad84c1be5eaffa1d9f7da15a5aaeb0c6fb28c1d62d6733 SHA512 43e258639e0f728d4a393d2dd7a834a6df1131da5291559a504800a0918dad3e010baaeb1bca66cb9a62bad6955f678be3302aac916fc956a525cdd7e9d0690a
diff --git a/net-analyzer/iptstate/files/iptstate-2.2.5-gentoo.patch b/net-analyzer/iptstate/files/iptstate-2.2.5-gentoo.patch
deleted file mode 100644
index fdaeeb7867b..00000000000
--- a/net-analyzer/iptstate/files/iptstate-2.2.5-gentoo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -17,12 +17,11 @@
- ### ADVANCED USERS AND PACKAGERS MIGHT WANT TO CHANGE THIS
-
- CXX?= g++
--CXXFLAGS?= -g -Wall -O2
-+CXXFLAGS+= -Wall
- CXXFILES?= iptstate.cc
-
- # THIS IS FOR NORMAL COMPILATION
--LIBS?= -lncurses -lnetfilter_conntrack
--CPPFLAGS=
-+LIBS= $(shell $(PKG_CONFIG) --libs ncurses libnetfilter_conntrack)
-
- ### YOU SHOULDN'T NEED TO CHANGE ANYTHING BELOW THIS
-
-@@ -45,7 +44,7 @@
- echo "+------------------------------------------------------------+" ;\
- echo "";
-
-- $(CXX) $(CXXFLAGS) $(CXXFILES) -o iptstate $(LIBS) $(CPPFLAGS)
-+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(CXXFILES) -o iptstate $(LIBS)
- @touch iptstate
-
- @\
diff --git a/net-analyzer/iptstate/iptstate-2.2.6.ebuild b/net-analyzer/iptstate/iptstate-2.2.6.ebuild
deleted file mode 100644
index 0f85670270c..00000000000
--- a/net-analyzer/iptstate/iptstate-2.2.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="IP Tables State displays states being kept by iptables in a top-like format"
-HOMEPAGE="https://www.phildev.net/iptstate/ https://github.com/jaymzh/iptstate"
-SRC_URI="https://github.com/jaymzh/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
-
-RDEPEND="
- >=sys-libs/ncurses-5.7-r7:0=
- >=net-libs/libnetfilter_conntrack-0.0.50
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-2.2.5-gentoo.patch
-)
-
-src_prepare() {
- default
- tc-export CXX PKG_CONFIG
-}
-
-src_install() {
- emake PREFIX="${D}"/usr install
- dodoc BUGS Changelog CONTRIB README.md WISHLIST
-}
diff --git a/net-analyzer/iptstate/iptstate-2.2.7.ebuild b/net-analyzer/iptstate/iptstate-2.2.7.ebuild
index 4d851b9e14b..8ac212c6fb0 100644
--- a/net-analyzer/iptstate/iptstate-2.2.7.ebuild
+++ b/net-analyzer/iptstate/iptstate-2.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jaymzh/${PN}/releases/download/v${PV}/${P}.tar.bz2"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc x86"
RDEPEND=">=sys-libs/ncurses-5.7-r7:=
>=net-libs/libnetfilter_conntrack-0.0.50"
diff --git a/net-analyzer/jmx2munin/Manifest b/net-analyzer/jmx2munin/Manifest
deleted file mode 100644
index 4d69d490d87..00000000000
--- a/net-analyzer/jmx2munin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jmx2munin-gentoo-1.0_p20120811.tar.gz 6890 BLAKE2B f28622405cf76cfd6effd4a86a1994e921eb71afced8e0c9c167422fc20378b607b63d7b93add0b816b21a8dc3c9504a4c406ea17f3db159dfd9f4aea440ac32 SHA512 154817d63fb278970d04785821a29833007a553055efe28aa6a3654d01b7a4422a2a1c98cd1693ae52ea28a57505b6d7988f241f6d119425f5c3ae38471b72be
diff --git a/net-analyzer/jmx2munin/jmx2munin-1.0_p20120811-r1.ebuild b/net-analyzer/jmx2munin/jmx2munin-1.0_p20120811-r1.ebuild
deleted file mode 100644
index ad8601a5fcc..00000000000
--- a/net-analyzer/jmx2munin/jmx2munin-1.0_p20120811-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-gentoo-${PV}"
-
-DESCRIPTION="JMX Monitoring plugin for Munin"
-HOMEPAGE="https://github.com/tcurdt/jmx2munin"
-SRC_URI="https://github.com/gentoo/jmx2munin/tarball/${MY_P} -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-CDEPEND="dev-java/jcommander:0"
-
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.6"
-
-RDEPEND="${CDEPEND}
- net-analyzer/munin
- >=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_SRC_DIR="src/main/java/org/vafer/jmx"
-JAVA_GENTOO_CLASSPATH="jcommander"
-
-src_unpack() {
- unpack ${A}
- mv gentoo-${PN}-* ${MY_P}
-}
-
-java_prepare() {
- rm pom.xml || die
-}
-
-src_install() {
- java-pkg-simple_src_install
- java-pkg_dolauncher ${PN} --main org.vafer.jmx.munin.Munin
-
- exeinto /usr/libexec/munin/plugins
- newexe contrib/${PN}.sh ${PN}_
-
- dodoc README.md contrib/jmx2munin.cfg/cassandra/nodes_in_cluster
-
- keepdir /etc/munin/${PN}
-}
diff --git a/net-analyzer/jmx2munin/metadata.xml b/net-analyzer/jmx2munin/metadata.xml
deleted file mode 100644
index 1a01a3529a1..00000000000
--- a/net-analyzer/jmx2munin/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <maintainer type="project">
- <email>sysadmin@gentoo.org</email>
- <name>Gentoo Sysadmin Project</name>
- </maintainer>
- <upstream>
- <remote-id type="github">gentoo/jmx2munin</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-analyzer/linkchecker/linkchecker-10.1.0.ebuild b/net-analyzer/linkchecker/linkchecker-10.1.0.ebuild
index c839792807f..35609f6170a 100644
--- a/net-analyzer/linkchecker/linkchecker-10.1.0.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-10.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]]; then
inherit git-r3
else
SRC_URI="https://github.com/linkchecker/linkchecker/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
LICENSE="GPL-2"
diff --git a/net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild b/net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild
index 93a8476bcb3..ed18fd45624 100644
--- a/net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild
+++ b/net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="
mirror://debian/pool/main/m/${PN}/${PN}_${PV/_p*}-$(ver_cut 5).$(ver_cut 7).debian.tar.xz
"
LICENSE="GPL-2"
-KEYWORDS="amd64 arm ~arm64 ppc sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
SLOT="0"
PATCHES=(
diff --git a/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-disk-on-btrfs.patch b/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-disk-on-btrfs.patch
new file mode 100644
index 00000000000..cbd45837213
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-disk-on-btrfs.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/830249
+https://github.com/monitoring-plugins/monitoring-plugins/issues/1357
+https://github.com/monitoring-plugins/monitoring-plugins/commit/e17c1e9ed95b8b9681dccd5a909ac5a02a04416c
+
+diff --git a/plugins/check_disk.c b/plugins/check_disk.c
+index 844e625f..a2735195 100644
+--- a/plugins/check_disk.c
++++ b/plugins/check_disk.c
+@@ -1068,10 +1068,7 @@ get_stats (struct parameter_list *p, struct fs_usage *fsp) {
+
+ void
+ get_path_stats (struct parameter_list *p, struct fs_usage *fsp) {
+- /* 2007-12-08 - Workaround for Gnulib reporting insanely high available
+- * space on BSD (the actual value should be negative but fsp->fsu_bavail
+- * is unsigned) */
+- p->available = fsp->fsu_bavail > fsp->fsu_bfree ? 0 : fsp->fsu_bavail;
++ p->available = fsp->fsu_bavail;
+ p->available_to_root = fsp->fsu_bfree;
+ p->used = fsp->fsu_blocks - fsp->fsu_bfree;
+ if (freespace_ignore_reserved) {
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r2.ebuild
index 1e9762f79b2..98c4b159221 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -28,7 +28,7 @@ REAL_DEPEND="dev-lang/perl
dev-libs/uriparser
net-misc/curl
)
- ldap? ( net-nds/openldap )
+ ldap? ( net-nds/openldap:= )
mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
postgres? ( dev-db/postgresql:= )
ssl? (
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild
new file mode 100644
index 00000000000..70689ddedd5
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit flag-o-matic
+
+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="curl gnutls ipv6 ldap 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
+ curl? (
+ dev-libs/uriparser
+ net-misc/curl
+ )
+ ldap? ( net-nds/openldap:= )
+ mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
+ postgres? ( dev-db/postgresql:= )
+ ssl? (
+ !gnutls? (
+ dev-libs/openssl:0=
+ )
+ 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}
+ acct-group/nagios
+ acct-user/nagios
+ !net-analyzer/nagios-plugins"
+
+# At least one test is interactive.
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-fix-check-disk-on-btrfs.patch" #830249
+)
+
+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 -4 -n -U -w %d -c %d %s" )
+
+ if use ipv6; then
+ 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) \
+ $(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_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/mrtg-ping-probe/mrtg-ping-probe-2.2.0-r1.ebuild b/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0-r1.ebuild
index c435fe21a0b..12267a6386c 100644
--- a/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0-r1.ebuild
+++ b/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0-r1.ebuild
@@ -17,6 +17,7 @@ RDEPEND="
"
src_prepare() {
+ default
sed -i check-ping-fmt \
-e 's:#!/usr/local/bin/perl -w:#!/usr/bin/perl -w:' \
|| die
diff --git a/net-analyzer/mrtg/Manifest b/net-analyzer/mrtg/Manifest
index 9e4a593387c..ee8725bdc3d 100644
--- a/net-analyzer/mrtg/Manifest
+++ b/net-analyzer/mrtg/Manifest
@@ -1,2 +1,2 @@
-DIST mrtg-2.17.7.tar.gz 1098650 BLAKE2B f8191296fc163b950792b8ecee773cfe643a7390d49444ce8b5012b2dbd932093cb4f71745ba2c86bda579fbcd3c73a4f9cebc1fa4e7f791a7b4461ae92ac191 SHA512 b25ab38416213bc5128612724530f36f4a855bb66a65f8bbe4bdafef05d2688eed68f5c3df1e13193102507a4114e71ec226ad32dd6b4d3ae2e2291320d8e768
+DIST mrtg-2.17.10.tar.gz 1084792 BLAKE2B a2e69c651a1428514fbe1f4d04cbddde9c7ed3b865d57f204814ec797dabd414c16b03d34bd19a005257938dd9bd2de0e99f641222f240c907fa5f67429710f1 SHA512 b1c5232f1b3dcec39adc4fb5a423738f9470ad470e91c6a918cf3f875e71af263d8e03694c3d66129b2653fa498d8d9d9b95349fe90e9d2e0b3ed6c09d06e080
DIST mrtg-2.17.8.tar.gz 1102598 BLAKE2B d5d513de641087f6daa207f154bbcca0196ccc8cba79a03ad6916c9c0065980745be3746953063127fc017d57e235ff67252531380fc9f68c9e5c3332d5230ce SHA512 c1dbeb5ce065b2b071d18e1eec1100d56eb7c4c654562de530139acee27ad57614354b74e3d0777cb6d4470a58ed6acae0f1af9c6f7115bf329132a68b6e0aaa
diff --git a/net-analyzer/mrtg/metadata.xml b/net-analyzer/mrtg/metadata.xml
index dce3f3be66c..dfef87e6bc6 100644
--- a/net-analyzer/mrtg/metadata.xml
+++ b/net-analyzer/mrtg/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>netmon@gentoo.org</email>
- <name>Gentoo network monitoring and analysis project</name>
-</maintainer>
+ <maintainer type="project">
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">oetiker/mrtg</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/net-analyzer/mrtg/mrtg-2.17.7.ebuild b/net-analyzer/mrtg/mrtg-2.17.10.ebuild
index e63814c2ef9..a29090ce930 100644
--- a/net-analyzer/mrtg/mrtg-2.17.7.ebuild
+++ b/net-analyzer/mrtg/mrtg-2.17.10.ebuild
@@ -1,40 +1,36 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DESCRIPTION="A tool to monitor the traffic load on network-links"
HOMEPAGE="https://oss.oetiker.ch/mrtg/"
-SRC_URI="https://oss.oetiker.ch/mrtg/pub/${P}.tar.gz"
+SRC_URI="https://oss.oetiker.ch/mrtg/pub/${P}.tar.gz https://github.com/oetiker/mrtg/releases/download/v${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="selinux"
-DEPEND="
+DEPEND="dev-lang/perl
>=dev-perl/SNMP_Session-1.13-r2
>=dev-perl/Socket6-0.23
- dev-lang/perl
- media-libs/gd[png]
-"
-RDEPEND="
- ${DEPEND}
- selinux? ( sec-policy/selinux-mrtg )
-"
+ media-libs/gd[png]"
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-mrtg )"
PATCHES=(
"${FILESDIR}"/${PN}-2.17.4-socket6.patch
)
src_prepare() {
+ default
+
rm ./lib/mrtg2/{SNMP_{Session,util},BER}.pm || die
sed -i \
-e 's|main::SL}lib${main::SL|main::SL}'"$(get_libdir)"'${main::SL|g' \
$(find bin -type f) contrib/cfgmaker_dlci/cfgmaker_dlci || die
-
- default
}
src_install() {
diff --git a/net-analyzer/mrtg/mrtg-2.17.8.ebuild b/net-analyzer/mrtg/mrtg-2.17.8.ebuild
index ad7a69595c2..83edb448022 100644
--- a/net-analyzer/mrtg/mrtg-2.17.8.ebuild
+++ b/net-analyzer/mrtg/mrtg-2.17.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://oss.oetiker.ch/mrtg/pub/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86"
IUSE="selinux"
DEPEND="
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index c36571283ff..056c1c39aa3 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -1,2 +1 @@
-DIST mtr-0.94.tar.gz 143616 BLAKE2B e9b4619a85a515d729f0987d5882fb91e4bfa3be82476efbfdb832d0b13ed334be1c1a1bcf8ab4ca820002e79ca4a24d0b50f2739d9284b7dec0b8852a1a91e0 SHA512 0e58bd79562ff80f9308135562ab22aa1f1eea686aefd3aef07bac05e661e34b60fde7c66c96bf4f0919f546376fbd6106ecd8fa92328c24f6f903097496bf11
DIST mtr-0.95.tar.gz 144541 BLAKE2B 3c972675b97945b96562802c5d0f10de963160682c93c0ea2991b72eca33d136d18948c5e746ca3dfb280ebc9c3ab154e7774f8409ed4e5f7470a8feb128e71b SHA512 a7d69e0c551a10ae80a650a34588119e6c6b124a8c2c93d3de29e5daa6ef99f9217d875529d443c3760cd6fd7bd04d1e9abe33ef12635826c66a98bd776c1690
diff --git a/net-analyzer/mtr/mtr-0.94-r1.ebuild b/net-analyzer/mtr/mtr-0.94-r1.ebuild
deleted file mode 100644
index dd897d66ef6..00000000000
--- a/net-analyzer/mtr/mtr-0.94-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 fcaps
-
-DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
-HOMEPAGE="https://www.bitwizard.nl/mtr/"
-SRC_URI="https://github.com/traviscross/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="gtk +ipinfo +ipv6 jansson ncurses"
-# This is an inherited RESTRICT - figure out why!
-RESTRICT="test"
-
-RDEPEND="
- gtk? (
- dev-libs/glib:2
- x11-libs/gtk+:3
- )
- jansson? ( dev-libs/jansson:= )
- ncurses? ( sys-libs/ncurses:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( AUTHORS FORMATS NEWS README.md SECURITY TODO )
-FILECAPS=( cap_net_raw usr/sbin/mtr-packet )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.88-tinfo.patch
-)
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable ipv6) \
- $(use_with gtk) \
- $(use_with ipinfo) \
- $(use_with jansson) \
- $(use_with ncurses) \
- --with-bashcompletiondir="$(get_bashcompdir)"
-}
-
-pkg_postinst() {
- fcaps_pkg_postinst
-
- if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
- ewarn "mtr needs root privileges to run. To grant them:"
- ewarn " % sudo chown root ${EPREFIX}/usr/sbin/mtr"
- ewarn " % sudo chmod u+s ${EPREFIX}/usr/sbin/mtr"
- fi
-}
diff --git a/net-analyzer/mtr/mtr-0.95.ebuild b/net-analyzer/mtr/mtr-0.95.ebuild
index 42b6aeb30b0..9bfb694f0a2 100644
--- a/net-analyzer/mtr/mtr-0.95.ebuild
+++ b/net-analyzer/mtr/mtr-0.95.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/traviscross/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
fi
LICENSE="GPL-2"
diff --git a/net-analyzer/munin/files/munin-asyncd.init.2 b/net-analyzer/munin/files/munin-asyncd.init.2
index 15a17a7bef6..c9fc267f12e 100644
--- a/net-analyzer/munin/files/munin-asyncd.init.2
+++ b/net-analyzer/munin/files/munin-asyncd.init.2
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
command=/usr/libexec/munin/munin-asyncd
diff --git a/net-analyzer/munin/munin-2.0.67-r6.ebuild b/net-analyzer/munin/munin-2.0.67-r6.ebuild
deleted file mode 100644
index fe50e885c3a..00000000000
--- a/net-analyzer/munin/munin-2.0.67-r6.ebuild
+++ /dev/null
@@ -1,418 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PATCHSET=1
-
-inherit java-pkg-opt-2 systemd tmpfiles
-
-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.8 )
- 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.8:*
- || ( 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 || die
- 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
-
- newtmpfiles - ${CATEGORY}:${PN}:${SLOT}.conf <<-EOF || die
- 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() {
- tmpfiles_process ${CATEGORY}:${PN}:${SLOT}.conf
-
- 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.67-r7.ebuild b/net-analyzer/munin/munin-2.0.67-r7.ebuild
index 00a940ba1b5..08d21fe6d7b 100644
--- a/net-analyzer/munin/munin-2.0.67-r7.ebuild
+++ b/net-analyzer/munin/munin-2.0.67-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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/nagios-check_ipmi_sensor/Manifest b/net-analyzer/nagios-check_ipmi_sensor/Manifest
index f549319a887..45e45ed8c88 100644
--- a/net-analyzer/nagios-check_ipmi_sensor/Manifest
+++ b/net-analyzer/nagios-check_ipmi_sensor/Manifest
@@ -1,2 +1 @@
DIST check_ipmi_sensor_v3-3.13.tar.gz 27079 BLAKE2B 19f2eddeeb43a73eb8faa2907b53f2b0514a19a3313e90487082c463ef12a128cb3b252457768c1afcacd06402b572f54cab7c05d159df4e6f7881b191663046 SHA512 b117ca13936e8c2201f3262302004bd0f903d19ee7289222962ee6b53119ba8306cdf355292c63b9d7639d850bd59c24b2875ccb8b3c408bdac60d144837e97a
-DIST check_ipmi_sensor_v3-8120430.tgz 20620 BLAKE2B 2542c4320498700362e8e7c1cfe0d00d98e4894e987aac002f0e2db499fdab4c27b33ff587349a836ae18d7b89939a96f6a66484b46486caa0d548c3e794d1c3 SHA512 89b3fd7ae2d523e1510c528d44d03ad9af5bc174bb325393f50a4a95380c996867b4502b55f38712515f556fe0f2019e15f6800ca1db00a9bbbcef655f1fd845
diff --git a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.13.ebuild b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.13.ebuild
index 4c846630fe6..994a1a52d40 100644
--- a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.13.ebuild
+++ b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.13.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit multilib
-
MY_P="${PN#nagios-}_v$(ver_cut 1)-${PV}"
DESCRIPTION="IPMI Sensor Monitoring Plugin for Nagios/Icinga"
@@ -13,7 +11,7 @@ SRC_URI="https://github.com/thomas-krenn/check_ipmi_sensor_v3/archive/refs/tags/
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 hppa x86"
IUSE=""
DEPEND=""
diff --git a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild
deleted file mode 100644
index 37653d213a5..00000000000
--- a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib versionator
-
-MY_COMMIT="8120430"
-MY_P="${PN#nagios-}_v$(get_major_version ${PV})-${MY_COMMIT}"
-
-DESCRIPTION="IPMI Sensor Monitoring Plugin for Nagios/Icinga"
-HOMEPAGE="http://www.thomas-krenn.com/en/oss/ipmi-plugin/"
-SRC_URI="http://git.thomas-krenn.com/?p=check_ipmi_sensor_v3.git;a=snapshot;h=${MY_COMMIT};sf=tgz -> ${MY_P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/perl
- dev-perl/IPC-Run
- sys-libs/freeipmi"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
- exeinto /usr/$(get_libdir)/nagios/plugins
- doexe check_ipmi_sensor
-
- dodoc changelog.txt
-}
diff --git a/net-analyzer/nagios-check_logfiles/Manifest b/net-analyzer/nagios-check_logfiles/Manifest
index cec2e146f4c..931a75480d8 100644
--- a/net-analyzer/nagios-check_logfiles/Manifest
+++ b/net-analyzer/nagios-check_logfiles/Manifest
@@ -1 +1,2 @@
DIST nagios-check_logfiles-3.7.6.3.tar.gz 238683 BLAKE2B c2bd47a13263ac76c1bbced7a1410416c07ef35b39ea60bbf6037de3c10dd00df30a215f461270501240d5eb35e2b687fd5590d291028d7975c15470c06177a4 SHA512 2f72d571bfc0815e12b5c9a6e178b7b9b6e58d69e2d1a3efc560dd6b7bfd3d04a705d15e93069959611be1981941866e8775ee7d67c5dbf3983a155ab2ec3c91
+DIST nagios-check_logfiles-4.0.1.3.tar.gz 254371 BLAKE2B d4219e03ac2b981b08866baa4eab4fb16857215cb817ee44f23690094a3b29bf806caa6c1cd98c439ba81fa31cd63ce1fcfca5c92d1aad260490db087a560fd7 SHA512 1893e67d9b27939fae6f330b1f796e98becbb1c4bd1dfe11811236b0d9bcdab0b2fea2a49f7b90302d15c75328422f479d1a26a486cfbe1ec0d3b8f9b71a5150
diff --git a/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-4.0.1.3.ebuild b/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-4.0.1.3.ebuild
new file mode 100644
index 00000000000..f32c1802c02
--- /dev/null
+++ b/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-4.0.1.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A nagios plugin for checking logfiles"
+HOMEPAGE="https://labs.consol.de/nagios/check_logfiles/index.html"
+
+MY_P=${P/nagios-/}
+
+SRC_URI="https://labs.consol.de/assets/downloads/nagios/${MY_P}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="|| ( >=net-analyzer/nagios-plugins-1.4.13-r1 >=net-analyzer/monitoring-plugins-2 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ econf \
+ --libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins" \
+ --sysconfdir="${EPREFIX}/etc/nagios"
+}
diff --git a/net-analyzer/nagios-check_rbl/Manifest b/net-analyzer/nagios-check_rbl/Manifest
index 1b3800e794d..eae4701c7cc 100644
--- a/net-analyzer/nagios-check_rbl/Manifest
+++ b/net-analyzer/nagios-check_rbl/Manifest
@@ -1 +1,2 @@
DIST check_rbl-1.4.1.tar.gz 47585 BLAKE2B 24979d1579ef46f6d0626700bb8b9aa3f3acd4b422398ecbfa98909248fd6ffe61a763e377e7942d3078d8b91488f3fc0e2ab25f7c4821bcfa5cde08d000bd5c SHA512 3023aab6ba42dec46cb93eb2ef15e1998a1b3226bd1f143441e14a4271279ac9b24b85b9fc41a382eb203e5d2846b7f4ea4fe27db99d75b104d9182ea53079cb
+DIST check_rbl-1.6.3.tar.gz 50250 BLAKE2B cdaaf7252871c6a2cf34a1cacef36251b8526b73f4edb73fc1611a3426f350523928532bc78068438b8e71ec0e023da46749673aa5e9e1d5c6cd8b889f330305 SHA512 2fc84089eb9e41657f522aa7813776b3d46811759e177d031ff5d2f737d63c00897d50d5d878c1e5d5368ca1dde0b173e81b8a6f16fbb970270ef63d988add9b
diff --git a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.6.3.ebuild b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.6.3.ebuild
new file mode 100644
index 00000000000..ada2a30fe7a
--- /dev/null
+++ b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.6.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Monitor whether or not a host is blacklisted"
+HOMEPAGE="https://github.com/matteocorti/check_rbl"
+
+MY_P="${P/nagios-/}"
+SRC_URI="https://github.com/matteocorti/check_rbl/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+IUSE=""
+
+# No, this is not redundant -- see bug 627082.
+RESTRICT=test
+
+# The package's INSTALL/Makefile.PL files specify its dependencies.
+#
+# * Data::Validate::Domain (dev-perl/Data-Validate-Domain)
+# * Data::Validate::IP (dev-perl/Data-Validate-IP)
+# * IO::Select (dev-lang/perl)
+# * Monitoring::Plugin (dev-perl/Monitoring-Plugin)
+# * Monitoring::Plugin::Getopt (dev-perl/Monitoring-Plugin)
+# * Monitoring::Plugin::Threshold (dev-perl/Monitoring-Plugin)
+# * Net::DNS (dev-perl/Net-DNS)
+# * Net::IP (dev-perl/Net-IP)
+# * Readonly (dev-perl/Readonly)
+# * Socket (virtual/perl-Socket)
+#
+RDEPEND="dev-lang/perl
+ dev-perl/Data-Validate-Domain
+ dev-perl/Data-Validate-IP
+ dev-perl/Monitoring-Plugin
+ dev-perl/Net-DNS
+ dev-perl/Net-IP
+ dev-perl/Readonly
+ virtual/perl-Socket"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ perl Makefile.PL INSTALLDIRS=vendor || die
+}
+
+src_install() {
+ default
+
+ local nagiosplugindir=/usr/$(get_libdir)/nagios/plugins
+
+ # It's simplest to move this file after it's been installed.
+ dodir "${nagiosplugindir}"
+ mv "${D}"/usr/bin/check_rbl "${D}"/"${nagiosplugindir}" || die
+}
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 8e5831ec7d2..a5805796b0b 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,2 +1,3 @@
DIST nagios-4.4.6.tar.gz 11333414 BLAKE2B b64d34c9267349582cb43500b7b90f7948152b5fd9b28ecb0a376d0255ec9774e693beba9205512294b07dddc4702f37d0f45b3c3fcc6abbf8e8b4d9236d0ace SHA512 6ceb582816ec741439963bde1fe8d85fa3bc4ed3c2238fb818db0c4f4224a4333d153040c11a7f4d783e919c11f9ff45907bdc478504e4155f64a4c575f80550
+DIST nagios-4.4.7.tar.gz 11340759 BLAKE2B 4316e6cfc7f576d0fe5ba075aba2931dc850c97fe84b124eceeefaa6c01563c0639c8cecf751e086d5a6f9c0a1079f7e9bd013f961956d7d59536dea4516cf86 SHA512 92adc74e687bcbbd742075c8c7222d42c90795a4eb7582e3f1f492349db8200c61f390bf3c4cab4b023c5c111353a43f5dd687b0ee5ab6a8775444e06d42517b
DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
index 6cbbe87c684..9483f0dda9d 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.6-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit systemd toolchain-funcs
@@ -17,8 +17,8 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
-IUSE="apache2 classicui lighttpd perl +web vim-syntax"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
+IUSE="apache2 classicui lighttpd +web vim-syntax"
# In pkg_postinst(), we change the group of the Nagios configuration
# directory to that of the web server user. It can't belong to both
@@ -53,7 +53,7 @@ MOD_ALIAS=apache2_modules_alias
CONFIGURE_DEPEND="acct-group/nagios
acct-user/nagios
virtual/mailx
- perl? ( dev-lang/perl:= )"
+ dev-lang/perl:="
# In addition to the things that the ./configure script checks for,
# we also need to be able to unzip stuff on the build host.
@@ -93,10 +93,6 @@ S="${WORKDIR}/${MY_P}"
src_configure() {
local myconf
- if use perl; then
- myconf="${myconf} --enable-embedded-perl --with-perlcache"
- fi
-
if use !apache2 && use !lighttpd ; then
myconf="${myconf} --with-command-group=nagios"
else
@@ -136,11 +132,11 @@ src_configure() {
}
src_compile() {
- emake CC=$(tc-getCC) nagios
+ emake CC="$(tc-getCC)" nagios
if use web; then
# Only compile the CGIs/HTML when USE=web is set.
- emake CC=$(tc-getCC) DESTDIR="${D}" cgis html
+ emake CC="$(tc-getCC)" cgis html
fi
}
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild
new file mode 100644
index 00000000000..e0583cea138
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs
+
+MY_P="${PN/-core}-${PV}"
+DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
+HOMEPAGE="https://www.nagios.org/"
+
+# The name of the directory into which our Gentoo icons will be
+# extracted, and also the basename of the archive containing it.
+GENTOO_ICONS="${PN}-gentoo-icons-20141125"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
+ web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 classicui lighttpd +web vim-syntax"
+
+# In pkg_postinst(), we change the group of the Nagios configuration
+# directory to that of the web server user. It can't belong to both
+# apache/lighttpd groups at the same time, so we block this combination
+# for our own sanity.
+#
+# This could be made to work, but we would need a better way to allow
+# the web user read-only access to Nagios's configuration directory.
+#
+REQUIRED_USE="apache2? ( !lighttpd )"
+
+#
+# Note, we require one of the apache2 CGI modules:
+#
+# * mod_cgi (USE=apache2_modules_cgi)
+# * mod_cgid (USE=apache2_modules_cgid)
+# * mod_fcgid (www-apache/mod_fcgid)
+#
+# We just don't care /which/ one. And of course PHP supports both CGI
+# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
+# dependencies, and expect the user not to do anything /too/
+# stupid. (For example, installing Apache with only FastCGI support, and
+# PHP with only CGI support.)
+#
+# Another annoyance is that the upstream Makefile uses app-arch/unzip to
+# extract a snapshot of AngularJS, but that's only needed when USE=web.
+#
+MOD_ALIAS=apache2_modules_alias
+
+# The dependencies checked by the configure script. All of these are
+# also runtime dependencies; that's why ./configure checks for them.
+CONFIGURE_DEPEND="acct-group/nagios
+ acct-user/nagios
+ virtual/mailx
+ dev-lang/perl:="
+
+# In addition to the things that the ./configure script checks for,
+# we also need to be able to unzip stuff on the build host.
+#
+# We need the apache/lighttpd groups in src_install() for the things
+# installed as the --with-command-group argument, so they go here too.
+# The groups are also needed at runtime, but that is ensured by apache
+# and lighttpd themselves being in RDEPEND.
+BDEPEND="${CONFIGURE_DEPEND}
+ apache2? ( acct-group/apache )
+ lighttpd? ( acct-group/lighttpd )
+ web? ( app-arch/unzip )"
+
+# This is linked into /usr/bin/nagios{,tats}
+DEPEND="dev-libs/libltdl:0"
+
+RDEPEND="${CONFIGURE_DEPEND}
+ ${DEPEND}
+ web? (
+ media-libs/gd[jpeg,png]
+ lighttpd? ( www-servers/lighttpd[php] )
+ apache2? (
+ || (
+ www-servers/apache[${MOD_ALIAS},apache2_modules_cgi]
+ www-servers/apache[${MOD_ALIAS},apache2_modules_cgid]
+ ( www-servers/apache[${MOD_ALIAS}] www-apache/mod_fcgid ) )
+ || (
+ dev-lang/php:*[apache2]
+ dev-lang/php:*[cgi]
+ dev-lang/php:*[fpm] )
+ )
+ )
+ vim-syntax? ( app-vim/nagios-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ local myconf
+
+ if use !apache2 && use !lighttpd ; then
+ myconf="${myconf} --with-command-group=nagios"
+ else
+ if use apache2 ; then
+ myconf="${myconf} --with-command-group=apache"
+ myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
+ elif use lighttpd ; then
+ myconf="${myconf} --with-command-group=lighttpd"
+ 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" \
+ --localstatedir="${EPREFIX}/var/lib/nagios" \
+ --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-init-type="unknown"
+
+ # The paths in the web server configuration files need to match
+ # those passed to econf above.
+ cp "${FILESDIR}/99_nagios4-r1.conf" \
+ "${FILESDIR}/lighttpd_nagios4-r1.conf" \
+ "${T}/" || die "failed to create copies of web server conf files"
+
+ sed -e "s|@CGIBINDIR@|${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin|g" \
+ -e "s|@WEBDIR@|${EPREFIX}/usr/share/nagios/htdocs|" \
+ -i "${T}/99_nagios4-r1.conf" \
+ -i "${T}/lighttpd_nagios4-r1.conf" \
+ || die "failed to substitute paths into web server conf files"
+
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" nagios
+
+ if use web; then
+ # Only compile the CGIs/HTML when USE=web is set.
+ emake CC="$(tc-getCC)" cgis html
+ fi
+}
+
+src_install() {
+ dodoc Changelog CONTRIBUTING.md README.md THANKS UPGRADING
+
+ # There is no way to install the CGIs unstripped from the top-level
+ # makefile, so descend into base/ here. The empty INSTALL_OPTS
+ # ensures that root:root: owns the nagios executables.
+ cd "${S}/base" || die
+ emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
+ cd "${S}" || die
+
+ # Otherwise this gets installed as 770 and you get "access denied"
+ # for some reason or other when starting nagios. The permissions
+ # on nagiostats are just for consistency (these should both get
+ # fixed upstream).
+ fperms 775 /usr/sbin/nagios /usr/sbin/nagiostats
+
+ # INSTALL_OPTS are needed for most of install-basic, but we don't
+ # want them on the LIBEXECDIR, argh.
+ emake DESTDIR="${D}" install-basic
+ fowners root:root /usr/$(get_libdir)/nagios/plugins
+
+ # Don't make the configuration owned by the nagios user, because
+ # then he can edit nagios.cfg and trick nagios into running as root
+ # and doing his bidding.
+ emake INSTALL_OPTS="" DESTDIR="${D}" install-config
+
+ # No INSTALL_OPTS used in install-commandmode, thankfully.
+ emake DESTDIR="${D}" install-commandmode
+
+ # The build system installs these directories, but portage assumes
+ # that the build system doesn't know what it's doing so we have to
+ # keepdir them, too. I guess you'll have to manually re-check the
+ # upstream build system forever to see if this is still necessary.
+ keepdir /var/lib/nagios{,/archives,/rw,/spool,/spool/checkresults}
+
+ if use web; then
+ # There is no way to install the CGIs unstripped from the
+ # top-level makefile, so descend into cgi/ here. The empty
+ # INSTALL_OPTS ensures that root:root: owns the CGI executables.
+ cd "${S}/cgi" || die
+ emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
+ cd "${S}" || die
+
+ # install-html installs the new exfoliation theme
+ emake INSTALL_OPTS="" DESTDIR="${D}" install-html
+
+ if use classicui; then
+ # This overwrites the already-installed exfoliation theme
+ emake INSTALL_OPTS="" DESTDIR="${D}" install-classicui
+ fi
+
+ # Install cute Gentoo icons (bug #388323), setting their
+ # owner, group, and mode to match those of the rest of Nagios's
+ # images.
+ insinto /usr/share/nagios/htdocs/images/logos
+ 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
+ # Install the Nagios configuration file for Apache.
+ insinto "/etc/apache2/modules.d"
+ newins "${T}/99_nagios4-r1.conf" "99_nagios4.conf"
+ elif use lighttpd ; then
+ # Install the Nagios configuration file for Lighttpd.
+ insinto /etc/lighttpd
+ newins "${T}/lighttpd_nagios4-r1.conf" nagios.conf
+ else
+ ewarn "${CATEGORY}/${PF} only supports apache or lighttpd"
+ ewarn "out of the box. Since you are not using one of them, you"
+ ewarn "will have to configure your webserver yourself."
+ fi
+ fi
+}
+
+pkg_postinst() {
+
+ if use web; then
+ if use apache2 || use lighttpd ; then
+ if use apache2; then
+ elog "To enable the Nagios web front-end, please edit"
+ elog "${ROOT}/etc/conf.d/apache2 and add \"-D NAGIOS -D PHP\""
+ elog "to APACHE2_OPTS. Then Nagios will be available at,"
+ elog
+ elif use lighttpd; then
+ elog "To enable the Nagios web front-end, please add"
+ elog "'include \"nagios.conf\"' to the lighttpd configuration"
+ elog "file at ${ROOT}/etc/lighttpd/lighttpd.conf. Then Nagios"
+ elog "will be available at,"
+ elog
+ fi
+
+ elog " http://localhost/nagios/"
+ fi
+ fi
+
+ elog
+ elog "If your kernel has /proc protection, nagios"
+ elog "will not be happy as it relies on accessing the proc"
+ elog "filesystem. You can fix this by adding nagios into"
+ elog "the group wheel, but this is not recomended."
+ elog
+
+ if [ -n "${REPLACING_VERSIONS}" ]; then
+ ewarn "The local state directory for nagios has changed in v4.4.5,"
+ ewarn "from ${EROOT}/var/nagios to ${EROOT}/var/lib/nagios. If you"
+ ewarn "wish to migrate your state to the new location, first stop"
+ ewarn "nagios and then run"
+ ewarn ""
+ ewarn " diff --recursive --brief ${EROOT}/var/nagios ${EROOT}/var/lib/nagios"
+ ewarn ""
+ ewarn "to identify any files that should be moved to the new"
+ ewarn "location. They can simply be moved with \"mv\" before"
+ ewarn "restarting nagios."
+ fi
+}
diff --git a/net-analyzer/nagios-plugin-check_raid/Manifest b/net-analyzer/nagios-plugin-check_raid/Manifest
index 608fac71c87..4eeb321c9ee 100644
--- a/net-analyzer/nagios-plugin-check_raid/Manifest
+++ b/net-analyzer/nagios-plugin-check_raid/Manifest
@@ -1,2 +1 @@
DIST nagios-plugin-check_raid-4.0.10.tar.gz 54895 BLAKE2B 6432624de419fca2d376362e5d13031272b6feeccdc6202b8a7eec92ab1f6c362ab88f9c912b10695c34347388dd154b12757a8b4268d30c0436589da060d5cc SHA512 1b8c353fbd0dff6fea5311c4149af16b1e1a5778794ef0085dcd8ee18f196579cca0b9f8c1ecef51f3ee36665aec6069f64ebe4d2e565bf7223bed59f2de5ee1
-DIST nagios-plugin-check_raid-4.0.8.tar.gz 53803 BLAKE2B debc312ccf688c6ed4c4d89d77efbf454ae030260741277f1f10966d28348a317255a69a932ceba69300c37b98448ebb3ca3a0b463d64814a4ca11043bdc5850 SHA512 237cbe798aa6c65b4bd6b9c9e24923e172d3d62c50afd7df23e2b6c8888041368025860edf5f826a77c6858e6312bba05225f0e20787e1bb579d833950b324ee
diff --git a/net-analyzer/nagios-plugin-check_raid/metadata.xml b/net-analyzer/nagios-plugin-check_raid/metadata.xml
index 2ce7209ce36..92b1823c07b 100644
--- a/net-analyzer/nagios-plugin-check_raid/metadata.xml
+++ b/net-analyzer/nagios-plugin-check_raid/metadata.xml
@@ -20,7 +20,6 @@
<flag name="hpa">Support HP Array controllers</flag>
<flag name="hpsa">Support HP SmartArray (CCISS) controllers</flag>
<flag name="megaraid-sas">Support LSI MegaRAID SAS controllers</flag>
- <flag name="megaraid-scsi">Support LSI MegaRAID SCSI controllers</flag>
<flag name="mpt-sas2">Support LSI SAS-2 controllers</flag>
<flag name="mpt">Support LSI MPT Fusion controllers</flag>
</use>
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r1.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r3.ebuild
index eaf055e9fad..e5295fefced 100644
--- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r1.ebuild
+++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r3.ebuild
@@ -1,53 +1,53 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit perl-module
-DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status"
-HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid"
#COMMIT=""
MY_PV="${COMMIT:-${PV}}"
MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status"
+HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid"
SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="3ware aacraid dmraid hpa hpsa megaraid-sas megaraid-scsi mpt mpt-sas2"
+IUSE="3ware aacraid dmraid hpa hpsa megaraid-sas mpt mpt-sas2"
-DEPEND="dev-perl/Monitoring-Plugin
- dev-perl/Module-Pluggable"
+DEPEND="
+ dev-perl/Monitoring-Plugin
+ dev-perl/Module-Pluggable"
RDEPEND="${DEPEND}
- sys-apps/smartmontools
- sys-fs/lsscsi
- 3ware? ( sys-block/tw_cli )
- aacraid? ( sys-block/arcconf )
- dmraid? ( sys-fs/dmraid )
- hpa? ( sys-block/hpacucli )
- hpsa? ( sys-apps/cciss_vol_status )
- megaraid-sas? ( sys-block/megacli )
- megaraid-scsi? ( sys-block/megarc )
- mpt-sas2? ( sys-block/sas2ircu )
- mpt? ( sys-block/mpt-status )
-"
-
-S="${WORKDIR}/${MY_P}"
+ sys-apps/smartmontools
+ sys-fs/lsscsi
+ 3ware? ( sys-block/tw_cli )
+ aacraid? ( sys-block/arcconf )
+ dmraid? ( sys-fs/dmraid )
+ hpa? ( sys-block/hpacucli )
+ hpsa? ( sys-apps/cciss_vol_status )
+ megaraid-sas? ( sys-block/megacli )
+ mpt-sas2? ( sys-block/sas2ircu )
+ mpt? ( sys-block/mpt-status )"
src_prepare() {
- # Upstream has a custom Makefile that is meant to build bundles.
- #mv -f Makefile Makefile.upstream || die
- sed -i '/CPANfile/d' Makefile.PL || die
default
+
+ # Upstream has a custom Makefile that is meant to build bundles
+ sed -i '/CPANfile/d' Makefile.PL || die
}
src_install() {
default
- plugindir="/usr/$(get_libdir)/nagios/plugins"
- dodir "${plugindir}"
- mv -f "${ED}"/usr/bin/check_raid.pl "${ED}"/"${plugindir}" || die
dodoc README.md CHANGELOG.md CONTRIBUTING.md check_raid.cfg
+
+ local plugindir="/usr/$(get_libdir)/nagios/plugins"
+ dodir "${plugindir}"
+ mv -f "${ED}"/usr/bin/check_raid.pl "${ED}/${plugindir}" || die
}
pkg_postinst() {
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8-r1.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8-r1.ebuild
deleted file mode 100644
index eaf055e9fad..00000000000
--- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit perl-module
-
-DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status"
-HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid"
-#COMMIT=""
-MY_PV="${COMMIT:-${PV}}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="3ware aacraid dmraid hpa hpsa megaraid-sas megaraid-scsi mpt mpt-sas2"
-
-DEPEND="dev-perl/Monitoring-Plugin
- dev-perl/Module-Pluggable"
-RDEPEND="${DEPEND}
- sys-apps/smartmontools
- sys-fs/lsscsi
- 3ware? ( sys-block/tw_cli )
- aacraid? ( sys-block/arcconf )
- dmraid? ( sys-fs/dmraid )
- hpa? ( sys-block/hpacucli )
- hpsa? ( sys-apps/cciss_vol_status )
- megaraid-sas? ( sys-block/megacli )
- megaraid-scsi? ( sys-block/megarc )
- mpt-sas2? ( sys-block/sas2ircu )
- mpt? ( sys-block/mpt-status )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- # Upstream has a custom Makefile that is meant to build bundles.
- #mv -f Makefile Makefile.upstream || die
- sed -i '/CPANfile/d' Makefile.PL || die
- default
-}
-
-src_install() {
- default
- plugindir="/usr/$(get_libdir)/nagios/plugins"
- dodir "${plugindir}"
- mv -f "${ED}"/usr/bin/check_raid.pl "${ED}"/"${plugindir}" || die
- dodoc README.md CHANGELOG.md CONTRIBUTING.md check_raid.cfg
-}
-
-pkg_postinst() {
- einfo "The following RAID controllers are supported without special tools:"
- einfo "GDT (Intel/ICP) RAID Controller"
- einfo "HP MSA (special configuration needed)"
- einfo "The following RAID controllers do not have tools packaged in Gentoo, but ARE supported by this tool:"
- einfo "Intel: CmdTool2"
- einfo "Areca: areca-cli"
- einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/10"
- einfo "Marvell RAID: mvcli"
- einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/92"
- einfo "Adaptec ServeRAID: aaccli"
- einfo "Adaptec AACRAID: afacli (* some controllers supported by USE=aacraid, sys-block/arcconf)"
- einfo "Adaptec ServeRAID 7k: ipssend"
-}
diff --git a/net-analyzer/nagios-plugins-linux-madrisan/Manifest b/net-analyzer/nagios-plugins-linux-madrisan/Manifest
index b1d8f6d2e28..985aed02d71 100644
--- a/net-analyzer/nagios-plugins-linux-madrisan/Manifest
+++ b/net-analyzer/nagios-plugins-linux-madrisan/Manifest
@@ -1,2 +1,2 @@
-DIST nagios-plugins-linux-madrisan-28.tar.xz 390428 BLAKE2B bc41fb7d3b639fe2d133c2ff6643562ce94e5523b13aa18045d7265ae8d9d80873b0611aaee0f0fa8b959e0da3e2c350868574a8986c0d9436b6bd4e4154d908 SHA512 c72065ade12ec60c86479276370215bc0dc419ae9681d7260c550f8985300c39c1c8e39537c51c56e0c1ae61283befc5d111ffd47394de7dc7f7daa5993254fc
DIST nagios-plugins-linux-madrisan-29.tar.xz 392700 BLAKE2B edc93bfb113cb12ce8a345e38627881decb952cb1e7a948dcdced2aaa9c940956b75a7c8f7ad1b72daac132236ab27762b6f8b14a5098eaac648bafae6dfdb33 SHA512 412464b894fe2a0953e495c7c87604ed6b282f65fd1988043757b162ba4fecf9e8f9740e7e09ec2dad8ba8d80fa928df4d7e644260538117d19776f4883045f6
+DIST nagios-plugins-linux-madrisan-30.tar.xz 391164 BLAKE2B 3b16d0e61a68153fa90bed4c3540d9457546d2448b3b0da2b9313cd99e9b65f44c6f8d52322500570510171a049759ab85855f262d0581c6f926a96fbfe268dd SHA512 c02f81b6bbd4a0453780d9301a5cd1be67b9640e1b75d06c626a433b6e544fb4649c9b14e8e9a2c84dc6917aaf2011fb9a864ef36fef661bbcd673fa00bc5d57
diff --git a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-28.ebuild b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-30.ebuild
index a0e44b8d7fe..6e71445b286 100644
--- a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-28.ebuild
+++ b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-30.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index bea1ea58975..5a0fd0a3b9c 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -1,2 +1,3 @@
DIST nagios-plugins-2.3.1.tar.gz 2833267 BLAKE2B f89eda7a29558dd33dedbf0de150b6a13ba66d213d74041d9eb8c680880b3825bcc9312d251d22f3b483a14c0de7c59d7801954e7563c16352bfc38236676863 SHA512 89208f211e51db4e0d56725a6ff6d2fcf4eb2207f877a2b8f130cda8480a70f318eceb94140eb4f2a17fe3dd967bb3615ccc366c1a531ebd4ff0a04b60c61b8a
DIST nagios-plugins-2.3.3.tar.gz 2782610 BLAKE2B f02ded0ed6d5c649a82fe7fe06e393b404fc6e9a260365b128c114381d411d93c8980fee6da73c4d03ab73669d5b8754225ff5aa14ef4430ee0c91d8c56cb131 SHA512 2128601b1098eb82f4e7d720b96a5f92d6ad75dc181a94b25c38172767de8b72f9fece3eddb74933b1cd520928ae9416a7dc665e2f059bfe362dd74041d28cd7
+DIST nagios-plugins-2.4.0.tar.gz 2738643 BLAKE2B 695c3804aec592dad0ae1f2f19222a5ae066944de4169beba08dd1e7beee51c5082679dfc1cf5adc052758e3142f33187ebde9636af19ae313f1448867764878 SHA512 f6f4cd604d28161f36c1429dbfa8f07e9fa468d8d8c21925d53d7049f0765504cb785e1f1189a0c93aa1f0cd1fe3985409c420b7724aa39790836af5c3f725ff
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r3.ebuild
index eca9702888e..a5d5583481b 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r2.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc x86"
IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl"
# Most of the plugins use automagic dependencies, i.e. the plugin will
@@ -31,8 +31,8 @@ BDEPEND="${AUTOMAGIC_DEPEND}
dev-lang/perl"
DEPEND="
- ldap? ( net-nds/openldap )
- mysql? ( dev-db/mysql-connector-c )
+ ldap? ( net-nds/openldap:= )
+ mysql? ( dev-db/mysql-connector-c:= )
postgres? ( dev-db/postgresql:* )
ssl? (
dev-libs/openssl:0=
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.3.3-r2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.3.3-r3.ebuild
index 959874004cb..bb1f5bbbfd5 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.3.3-r2.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.3.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -31,8 +31,8 @@ BDEPEND="${AUTOMAGIC_DEPEND}
dev-lang/perl"
DEPEND="
- ldap? ( net-nds/openldap )
- mysql? ( dev-db/mysql-connector-c )
+ ldap? ( net-nds/openldap:= )
+ mysql? ( dev-db/mysql-connector-c:= )
postgres? ( dev-db/postgresql:* )
ssl? (
dev-libs/openssl:0=
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.4.0.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.4.0.ebuild
new file mode 100644
index 00000000000..a21696d1d32
--- /dev/null
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.4.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Official plugins for Nagios"
+HOMEPAGE="https://nagios-plugins.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl"
+
+# Most of the plugins use automagic dependencies, i.e. the plugin will
+# get built if the binary it uses is installed. For example, check_snmp
+# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
+# installed. End result: most of our runtime dependencies are required
+# at build time as well.
+AUTOMAGIC_DEPEND="
+ nagios-dns? ( net-dns/bind-tools )
+ nagios-game? ( games-util/qstat )
+ nagios-ping? ( net-analyzer/fping )
+ samba? ( net-fs/samba )
+ ssh? ( net-misc/openssh )
+ snmp? ( dev-perl/Net-SNMP
+ net-analyzer/net-snmp[-minimal] )"
+
+# Perl really needs to run during the build...
+BDEPEND="${AUTOMAGIC_DEPEND}
+ dev-lang/perl"
+
+DEPEND="
+ ldap? ( net-nds/openldap:= )
+ mysql? ( dev-db/mysql-connector-c:= )
+ postgres? ( dev-db/postgresql:* )
+ ssl? (
+ dev-libs/openssl:0=
+ )
+ radius? ( net-dialup/freeradius-client )"
+
+# Basically everything in net-analyzer/monitoring-plugins collides with
+# nagios-plugins. Perl (from BDEPEND) is needed at runtime, too.
+RDEPEND="${BDEPEND}
+ ${DEPEND}
+ !net-analyzer/monitoring-plugins
+ selinux? ( sec-policy/selinux-nagios )"
+
+# At least one test is interactive.
+RESTRICT="test"
+
+DOCS=(
+ ACKNOWLEDGEMENTS
+ AUTHORS
+ CODING
+ ChangeLog
+ FAQ
+ NEWS
+ README
+ REQUIREMENTS
+ SUPPORT
+ THANKS
+)
+
+PATCHES=(
+ "${FILESDIR}/define-own-mysql-port-constant.patch"
+)
+
+src_prepare() {
+ default
+
+ # Fix the path to our perl interpreter
+ sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \
+ "${S}"/plugins-scripts/*.pl \
+ || die 'failed to fix perl interpreter path'
+}
+
+src_configure() {
+ # Use an array to prevent econf from mangling the ping args.
+ local myconf=()
+
+ if use ssl; then
+ myconf+=( $(use_with ssl openssl /usr) )
+ else
+ myconf+=( --without-openssl )
+ myconf+=( --without-gnutls )
+ fi
+
+ # The autodetection for these two commands can hang if localhost is
+ # down or ICMP traffic is filtered. Bug #468296.
+ myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" )
+
+ if use ipv6; then
+ myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" )
+ fi
+
+ econf \
+ $(use_with mysql) \
+ $(use_with ipv6) \
+ $(use_with ldap) \
+ $(use_with postgres pgsql /usr) \
+ $(use_with radius) \
+ "${myconf[@]}" \
+ --libexecdir="/usr/$(get_libdir)/nagios/plugins" \
+ --sysconfdir="/etc/nagios"
+}
+
+pkg_postinst() {
+ elog "This ebuild has a number of USE flags that determine what you"
+ elog "are able to monitor. Depending on what you want to monitor, some"
+ elog "or all of these USE flags need to be set."
+ elog
+ elog "The plugins are installed in ${ROOT}/usr/$(get_libdir)/nagios/plugins"
+}
diff --git a/net-analyzer/nagios/nagios-4.4.6.ebuild b/net-analyzer/nagios/nagios-4.4.6.ebuild
index dfde78da41e..be5cb8515d0 100644
--- a/net-analyzer/nagios/nagios-4.4.6.ebuild
+++ b/net-analyzer/nagios/nagios-4.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.nagios.org/"
LICENSE="metapackage"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
IUSE=""
RDEPEND="~net-analyzer/nagios-core-${PV}
diff --git a/net-analyzer/nagios/nagios-4.4.7.ebuild b/net-analyzer/nagios/nagios-4.4.7.ebuild
new file mode 100644
index 00000000000..25c696692b7
--- /dev/null
+++ b/net-analyzer/nagios/nagios-4.4.7.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="The Nagios metapackage"
+HOMEPAGE="https://www.nagios.org/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="~net-analyzer/nagios-core-${PV}
+ || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )"
diff --git a/net-analyzer/nagstamon/nagstamon-3.8.0.ebuild b/net-analyzer/nagstamon/nagstamon-3.8.0.ebuild
index dbacd751d08..5c88fc18e54 100644
--- a/net-analyzer/nagstamon/nagstamon-3.8.0.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-3.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
inherit python-r1 distutils-r1
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/HenriWahl/Nagstamon/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/net-analyzer/nbtscan/Manifest b/net-analyzer/nbtscan/Manifest
index 15c4906f4d6..8ce623844a6 100644
--- a/net-analyzer/nbtscan/Manifest
+++ b/net-analyzer/nbtscan/Manifest
@@ -1 +1,2 @@
DIST nbtscan-1.6.tar.gz 27290 BLAKE2B 3e38e946aa875be2bca8ad0155a5bf4c612cecda3761623d75657b2ab54aa7a7526d284a78db764518748e092c2719a4c02bcdce32095c87537c9979571c10f7 SHA512 b791357160ae7fe784ebf3b74df551c0b7dcaeefae2ddd585a9e5ac0fe7dd1bb32f00d2b898dcd700e74809708f42fc8e5f0022254e1282914b3f668564b4bcb
+DIST nbtscan-1.7.2.tar.gz 29758 BLAKE2B 8e6af433a600865c391d0f7a72a8aa0b82d6ae61abedec8c2dc5cc89515f92c2ebdfd4868d578d4028b9aee4224b2f972bd574040db3c30caf9e0e59f9eb303a SHA512 b20eafe6737aa378e230dd2842e045bf2a48497e21b87ce6c534366cbb162862168a5c8143c0a69d495525caca75e91e437b87d9778e4cfe573b20461e2ccbbf
diff --git a/net-analyzer/nbtscan/nbtscan-1.7.2.ebuild b/net-analyzer/nbtscan/nbtscan-1.7.2.ebuild
new file mode 100644
index 00000000000..a004786f28b
--- /dev/null
+++ b/net-analyzer/nbtscan/nbtscan-1.7.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="NBTscan is a program for scanning IP networks for NetBIOS name information"
+HOMEPAGE="https://github.com/resurrecting-open-source-projects/nbtscan"
+SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DOCS=( AUTHORS CONTRIBUTING.md ChangeLog NEWS README.md )
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest
index 921834a8fbe..75fbb16e254 100644
--- a/net-analyzer/nessus-agent-bin/Manifest
+++ b/net-analyzer/nessus-agent-bin/Manifest
@@ -1 +1 @@
-DIST NessusAgent-10.0.1-es8.x86_64.rpm 15611336 BLAKE2B b9b40e4b892ba1b6bd84584937814848004981aa5e9f04ff736b18f1db558344d2ad516fe680805ec8fe2e64727c54cd3d38f211d49ddde483356733e97972cb SHA512 2ef04593b6dd84dc6c02375c9a9d37bede82eea3941d243b463b3937530c90b942a336e139b7aeed52a51df5daffa2f8a0aa00207782ae03fecd2c5ad22b4ef0
+DIST NessusAgent-10.1.4-es8.x86_64.rpm 13279708 BLAKE2B 43fa89a69c1a95249415bb6fa33e34c16d82348e20520b58cd00b63d2f5194dcbb3c89a8f40c78a5a454230139a00973e7f948562c6a3a0dea5fd6adca816b79 SHA512 ac5fec82774f6b431a1ae148d834260d394934ee6abdce969469fe3734dca85a1cae69fdd9157d8ed605a75493611357ea5fc834fd8fac920910d62d2bd05a96
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.0.1.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.1.4.ebuild
index 8d4c4cdd4e5..3b22d5b2779 100644
--- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.0.1.ebuild
+++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest
index 4de86afc005..569b53ef31c 100644
--- a/net-analyzer/nessus-bin/Manifest
+++ b/net-analyzer/nessus-bin/Manifest
@@ -1 +1 @@
-DIST Nessus-10.0.2-es8.x86_64.rpm 47542540 BLAKE2B 02afb5a90204e6d8a8ca8eea0e6a8241f05385c274d77802de8d0ff2eea3b3c03866d8974cfd022e856ce603870677aaf779469c0613b5d1b7b8efb549114151 SHA512 32cc9de9f2d098562092a9d6e593786e42daa79c0830d863873ff2847cd7c25a951775f39eeecdccf20331ced5a2dec0f207bd398ee2cd6f954b8424c88dc86a
+DIST Nessus-10.2.0-es8.x86_64.rpm 47599332 BLAKE2B f50864220bf6bb0c8a4159fbaee7e8d0d815daba6125110a6774ecef8ffc20801b7d9c067b859819af57b5ca6b4cb898b5cc4fc292a2884b75144d9128985387 SHA512 eac05e8d150ffcb7e7c46643801f7d2668ff966c20f0a3125ab88cd785a402508875ebb9310cf37609961de0850493f22cbc582805afe4fc1dceb5f1ebd2486f
diff --git a/net-analyzer/nessus-bin/nessus-bin-10.0.2.ebuild b/net-analyzer/nessus-bin/nessus-bin-10.2.0.ebuild
index 6620c073f75..0692bd7052b 100644
--- a/net-analyzer/nessus-bin/nessus-bin-10.0.2.ebuild
+++ b/net-analyzer/nessus-bin/nessus-bin-10.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index b4a54d47a08..ebce48029c4 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -1,2 +1,3 @@
DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636
DIST net-snmp-5.9.1.tar.gz 6781346 BLAKE2B 4242ca77372005f995dfd228bec51d35b6b0f8c0ab0e44ed40cdb3cc0578b64e97444ffcb074dceca30739deadb46e68f1c75e87d3f1768d81b5e084b0fc0f5f SHA512 ae158ab41961ee2064d85187337979e6ff6ba90f3136b8a960e9ae46ee1408d9d2f0c5c4dfc3a3302e6dbb357cddf1221489435288c4f52182a03e94a9e450c3
+DIST net-snmp-5.9.2.tar.gz 6646200 BLAKE2B 95af69d530d3f5267bb75165cc2cf72128547a14fe4148d20610a45d42298475fb4c553c1e4eff1ffb4a368b609868b0ca36530c0f3a98800cf6290707bb3fb7 SHA512 d67810b15c4956a28ccb4d9a3870604bc94e71247d9a8d3a9959041268122b3500cf68a7912cfb01a6cff27f3f4364cbd106629ab80c12974f694b6c548bde59
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
deleted file mode 100644
index c06c94ff7ac..00000000000
--- a/net-analyzer/net-snmp/files/net-snmp-5.9-r3-f2fs.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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/files/net-snmp-5.9.2-fix-LDFLAGS.patch b/net-analyzer/net-snmp/files/net-snmp-5.9.2-fix-LDFLAGS.patch
new file mode 100644
index 00000000000..158d8f1b5be
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.9.2-fix-LDFLAGS.patch
@@ -0,0 +1,18 @@
+diff --git a/Makefile.top b/Makefile.top
+index d6394ca..f5119b5 100644
+--- a/Makefile.top
++++ b/Makefile.top
+@@ -86,11 +86,11 @@ LIBCURRENT = 41
+ LIBAGE = 2
+ LIBREVISION = 0
+
+-LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o
++LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o
+ LIB_EXTENSION = la
+ LIB_VERSION =
+ LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(INSTALL_PREFIX)$(libdir)
+-LINK = $(LIBTOOL) --mode=link $(LINKCC)
++LINK = $(LIBTOOL) --mode=link $(LINKCC) $(LDFLAGS)
+ # RANLIB = @RANLIB@
+ RANLIB = :
+
diff --git a/net-analyzer/net-snmp/net-snmp-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.2.ebuild
index 80a7944c40d..ca95665fcf9 100644
--- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DISTUTILS_OPTIONAL=yes
DISTUTILS_SINGLE_IMPL=yes
@@ -9,12 +9,21 @@ GENTOO_DEPEND_ON_PERL=no
PYTHON_COMPAT=( python3_{8..10} )
WANT_AUTOMAKE=none
-inherit autotools distutils-r1 git-r3 perl-module systemd
+inherit autotools distutils-r1 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/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz"
+HOMEPAGE="https://www.net-snmp.org/"
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/net-snmp/net-snmp"
+ inherit git-r3
+else
+ # https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+SRC_URI+=" https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz"
# GPL-2 for the init scripts
LICENSE="HPND BSD GPL-2"
@@ -67,13 +76,13 @@ RDEPEND="
"
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.2-fix-LDFLAGS.patch
"${FILESDIR}"/${PN}-99999999-tinfo.patch
)
@@ -83,15 +92,18 @@ pkg_setup() {
src_unpack() {
default
- git-r3_src_unpack
+
+ [[ ${PV} == 9999 ]] && git-r3_src_unpack
}
src_prepare() {
# snmpconf generates config files with proper selinux context
use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
+ mv "${WORKDIR}"/patches/0001-Fix-toolchain-quadruplet-detection-Gentoo-bug-432004.patch{,.disabled} || die
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
+ mv "${WORKDIR}"/patches/0005-Respect-LDFLAGS-properly.patch{,.disabled} || die
eapply "${WORKDIR}"/patches/*.patch
default
@@ -127,7 +139,6 @@ src_configure() {
$(use_with ssl openssl) \
$(use_with tcpd libwrap) \
$(use_with zlib) \
- --disable-static \
--enable-shared \
--with-default-snmp-version="3" \
--with-ldflags="${LDFLAGS}" \
diff --git a/net-analyzer/net-snmp/net-snmp-9999.ebuild b/net-analyzer/net-snmp/net-snmp-9999.ebuild
new file mode 100644
index 00000000000..ca95665fcf9
--- /dev/null
+++ b/net-analyzer/net-snmp/net-snmp-9999.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=yes
+DISTUTILS_SINGLE_IMPL=yes
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python3_{8..10} )
+WANT_AUTOMAKE=none
+
+inherit autotools distutils-r1 perl-module systemd
+
+DESCRIPTION="Software for generating and retrieving SNMP data"
+HOMEPAGE="https://www.net-snmp.org/"
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/net-snmp/net-snmp"
+ inherit git-r3
+else
+ # https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+SRC_URI+=" https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz"
+
+# GPL-2 for the init scripts
+LICENSE="HPND BSD GPL-2"
+SLOT="0/40"
+IUSE="
+ X bzip2 doc elf kmem ipv6 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="
+ virtual/libcrypt:=
+ 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? (
+ >=dev-libs/openssl-0.9.6d:0=
+ )
+ 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.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.2-fix-LDFLAGS.patch
+ "${FILESDIR}"/${PN}-99999999-tinfo.patch
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+ default
+
+ [[ ${PV} == 9999 ]] && git-r3_src_unpack
+}
+
+src_prepare() {
+ # snmpconf generates config files with proper selinux context
+ use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
+
+ mv "${WORKDIR}"/patches/0001-Fix-toolchain-quadruplet-detection-Gentoo-bug-432004.patch{,.disabled} || die
+ 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
+ mv "${WORKDIR}"/patches/0005-Respect-LDFLAGS-properly.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) \
+ --enable-shared \
+ --with-default-snmp-version="3" \
+ --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/netdata/Manifest b/net-analyzer/netdata/Manifest
index cae8b2df319..fc4992c878c 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1 +1 @@
-DIST netdata-1.32.1.tar.gz 22472431 BLAKE2B e05e4f29930493ad0c31373dabff57a3fd4f178730848fe4153aebb6219055ef0edda59577fe0c6cc9bd5cf3444b055e8330744f75581804f316f343fc692710 SHA512 869829eadcec4dd9c05cc6b6279830691b6cf9345cdcc0834e90d71f3bbee508c658d16bd379c51ce470c4e735e7c8d607dc045f45a60da2aa3dac36f37b5757
+DIST netdata-1.35.1.tar.gz 22335562 BLAKE2B a715f26f1318f01ce45266bbc78ada5ec2e3516f7ff2a6fda77829433398986bc564b377362097ea7c2595ac01911a817be124c9f0ba560dd00ae5001a080da7 SHA512 43cbf099841fe2547b7de56610f811e55fdf2e9af3dc18fde818e09de1125a7f8d57f6a16f2dee8ea4b9e6f2683959549810a1ea7f8f7b5007eb7069bfddb477
diff --git a/net-analyzer/netdata/netdata-1.32.1.ebuild b/net-analyzer/netdata/netdata-1.35.1.ebuild
index 00cda3564e2..3df5ef6ecd4 100644
--- a/net-analyzer/netdata/netdata-1.32.1.ebuild
+++ b/net-analyzer/netdata/netdata-1.35.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python{3_8,3_9,3_10} )
inherit autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
inherit git-r3
else
- SRC_URI="https://github.com/netdata/${PN}/releases/download/${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/netdata/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}-v${PV}"
KEYWORDS="~amd64 ~ppc64 ~x86"
fi
@@ -49,6 +49,7 @@ RDEPEND="
dev-libs/openssl:=
)
dev-libs/libuv
+ cloud? ( dev-libs/protobuf:= )
compression? ( sys-libs/zlib )
ipmi? ( sys-libs/freeipmi )
jsonc? ( dev-libs/json-c:= )
@@ -101,17 +102,17 @@ src_configure() {
econf \
--localstatedir="${EPREFIX}"/var \
--with-user=netdata \
+ --without-bundled-protobuf \
$(use_enable cloud) \
- $(use_with cloud aclk-ng) \
$(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 kinesis exporting-kinesis) \
$(use_enable lto lto) \
- $(use_enable mongodb backend-mongodb) \
- $(use_enable prometheus backend-prometheus-remote-write) \
+ $(use_enable mongodb exporting-mongodb) \
+ $(use_enable prometheus exporting-prometheus-remote-write) \
$(use_enable xen plugin-xenstat) \
$(use_enable cpu_flags_x86_sse2 x86-sse) \
$(use_with compression zlib)
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index 2acb180f99b..3df5ef6ecd4 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python{3_8,3_9,3_10} )
inherit autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
@@ -10,8 +10,8 @@ if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
inherit git-r3
else
- SRC_URI="https://github.com/netdata/${PN}/releases/download/${PV}/${PN}-${PV}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${PV}"
+ SRC_URI="https://github.com/netdata/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${PN}-v${PV}"
KEYWORDS="~amd64 ~ppc64 ~x86"
fi
@@ -49,6 +49,7 @@ RDEPEND="
dev-libs/openssl:=
)
dev-libs/libuv
+ cloud? ( dev-libs/protobuf:= )
compression? ( sys-libs/zlib )
ipmi? ( sys-libs/freeipmi )
jsonc? ( dev-libs/json-c:= )
@@ -101,17 +102,17 @@ src_configure() {
econf \
--localstatedir="${EPREFIX}"/var \
--with-user=netdata \
+ --without-bundled-protobuf \
$(use_enable cloud) \
- $(use_with cloud aclk-ng) \
$(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 kinesis exporting-kinesis) \
$(use_enable lto lto) \
- $(use_enable mongodb backend-mongodb) \
- $(use_enable prometheus backend-prometheus-remote-write) \
+ $(use_enable mongodb exporting-mongodb) \
+ $(use_enable prometheus exporting-prometheus-remote-write) \
$(use_enable xen plugin-xenstat) \
$(use_enable cpu_flags_x86_sse2 x86-sse) \
$(use_with compression zlib)
diff --git a/net-analyzer/nethogs/Manifest b/net-analyzer/nethogs/Manifest
index b556b6df2f8..733e8a3e1c8 100644
--- a/net-analyzer/nethogs/Manifest
+++ b/net-analyzer/nethogs/Manifest
@@ -1 +1,2 @@
DIST nethogs-0.8.6.tar.gz 116720 BLAKE2B 2d3695c2138f4e88c11a8c515156a430015c2844e09dd599091ff090fd87a3c12a1c5a7d1d9d32d302512a4e027a739a6b864f8d1e549593c6f86ab749989662 SHA512 1116f2e57bbf4d9213080598d04ff41c9ae28bd3e5c45c99068c783beb109eff3ffb02f9c3610f20ef0aa53606b3c500917d5d6983496599904d8c5a35cf2a6f
+DIST nethogs-0.8.7.tar.gz 270631 BLAKE2B 179227d4b1fde5328e4885ce72bb28ac20482fa161afee7562546af5b403be1e851533e3861dfa2f514968aebe91a822e6b792520407853dfb1055c6d29ad121 SHA512 d965f3fa439ea9fbba83578b4272d03f396bf3cff9ae73a94936d47a3422d066d885c7f6f2a47fbe2f445a017bffa3fb3a1215976522ef0ad120fae3b95b31a2
diff --git a/net-analyzer/nethogs/nethogs-0.8.7.ebuild b/net-analyzer/nethogs/nethogs-0.8.7.ebuild
new file mode 100644
index 00000000000..67bfac5facf
--- /dev/null
+++ b/net-analyzer/nethogs/nethogs-0.8.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps toolchain-funcs
+
+DESCRIPTION="A small 'net top' tool, grouping bandwidth by process"
+HOMEPAGE="https://github.com/raboof/nethogs"
+SRC_URI="https://github.com/raboof/nethogs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~x86"
+
+RDEPEND="net-libs/libpcap
+ sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( DESIGN README.decpcap.txt README.md )
+
+FILECAPS=(
+ cap_net_admin,cap_net_raw usr/sbin/nethogs
+)
+
+src_compile() {
+ tc-export CC CXX
+
+ emake NCURSES_LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )" ${PN}
+}
+
+src_install() {
+ emake DESTDIR="${ED}" PREFIX="/usr" install
+ einstalldocs
+}
diff --git a/net-analyzer/netperf/files/netperf-2.7.0-fcommon.patch b/net-analyzer/netperf/files/netperf-2.7.0-fcommon.patch
new file mode 100644
index 00000000000..0682c76cd89
--- /dev/null
+++ b/net-analyzer/netperf/files/netperf-2.7.0-fcommon.patch
@@ -0,0 +1,30 @@
+https://github.com/HewlettPackard/netperf/pull/46
+https://bugs.gentoo.org/706694
+
+From c6a2e17fe35f0e68823451fedfdf5b1dbecddbe3 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 12 Aug 2020 09:57:23 -0700
+Subject: [PATCH] nettest_omni: Remove duplicate variable definitions
+
+These defines are already defined in nettest_bsd.c and exported by
+nettest_bsd.h this should fix build with -fno-common
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/src/nettest_omni.c
++++ b/src/nettest_omni.c
+@@ -458,14 +458,6 @@ static int client_port_max = 65535;
+
+ /* different options for the sockets */
+
+-int
+- loc_nodelay, /* don't/do use NODELAY locally */
+- rem_nodelay, /* don't/do use NODELAY remotely */
+- loc_sndavoid, /* avoid send copies locally */
+- loc_rcvavoid, /* avoid recv copies locally */
+- rem_sndavoid, /* avoid send copies remotely */
+- rem_rcvavoid; /* avoid recv_copies remotely */
+-
+ extern int
+ loc_tcpcork,
+ rem_tcpcork,
+
diff --git a/net-analyzer/netperf/netperf-2.7.0-r3.ebuild b/net-analyzer/netperf/netperf-2.7.0-r3.ebuild
index 93441fc7cb5..950df8cd767 100644
--- a/net-analyzer/netperf/netperf-2.7.0-r3.ebuild
+++ b/net-analyzer/netperf/netperf-2.7.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,7 +7,7 @@ inherit flag-o-matic
DESCRIPTION="Network performance benchmark"
SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
HOMEPAGE="http://www.netperf.org/"
LICENSE="netperf"
diff --git a/net-analyzer/netperf/netperf-2.7.0-r4.ebuild b/net-analyzer/netperf/netperf-2.7.0-r4.ebuild
new file mode 100644
index 00000000000..51a9ab06b8d
--- /dev/null
+++ b/net-analyzer/netperf/netperf-2.7.0-r4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="Network performance benchmark"
+HOMEPAGE="http://www.netperf.org/"
+SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+LICENSE="netperf"
+SLOT="0"
+IUSE="demo sctp"
+
+DEPEND="
+ acct-group/netperf
+ acct-user/netperf
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-fix-scripts.patch
+ "${FILESDIR}"/${PN}-2.6.0-log-dir.patch
+ "${FILESDIR}"/${PN}-2.7.0-includes.patch
+ "${FILESDIR}"/${PN}-2.7.0-space.patch
+ "${FILESDIR}"/${PN}-2.7.0-inline.patch
+ "${FILESDIR}"/${PN}-2.7.0-fcommon.patch
+)
+
+src_prepare() {
+ # Fixing paths in scripts
+ sed -i \
+ -e 's:^\(NETHOME=\).*:\1"/usr/bin":' \
+ doc/examples/sctp_stream_script \
+ doc/examples/tcp_range_script \
+ doc/examples/tcp_rr_script \
+ doc/examples/tcp_stream_script \
+ doc/examples/udp_rr_script \
+ doc/examples/udp_stream_script \
+ || die
+
+ default
+}
+
+src_configure() {
+ # netlib.c:2292:5: warning: implicit declaration of function ‘sched_setaffinity’
+ # nettest_omni.c:2943:5: warning: implicit declaration of function ‘splice’
+ append-cppflags -D_GNU_SOURCE
+
+ econf \
+ $(use_enable demo) \
+ $(use_enable sctp)
+}
+
+src_install() {
+ default
+
+ # Move netserver into sbin as we had it before 2.4 was released with its
+ # autoconf goodness
+ dodir /usr/sbin
+ mv "${ED}"/usr/{bin,sbin}/netserver || die
+
+ # init.d / conf.d
+ newinitd "${FILESDIR}"/${PN}-2.7.0-init netperf
+ newconfd "${FILESDIR}"/${PN}-2.2-conf netperf
+
+ keepdir /var/log/${PN}
+ fowners netperf:netperf /var/log/${PN}
+ fperms 0755 /var/log/${PN}
+
+ # documentation and example scripts
+ dodoc AUTHORS ChangeLog NEWS README Release_Notes
+ dodir /usr/share/doc/${PF}/examples
+ # Scripts no longer get installed by einstall
+ cp doc/examples/*_script "${ED}"/usr/share/doc/${PF}/examples || die
+}
diff --git a/net-analyzer/netselect/netselect-0.4-r2.ebuild b/net-analyzer/netselect/netselect-0.4-r2.ebuild
index c9f3a3a436d..acf571f4b07 100644
--- a/net-analyzer/netselect/netselect-0.4-r2.ebuild
+++ b/net-analyzer/netselect/netselect-0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${P}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="ipv6"
PATCHES=(
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index 32325041d89..00d4e7ade1a 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -1 +1,2 @@
DIST nfdump-1.6.23.tar.gz 568879 BLAKE2B ca844f87e02fb3761d5b470cac11beada9873b0c7e3e9ca7ccc7899d57f0cfd96329698ac84467a55d683e83ce16c2b114a571845c7cb6069addcdd5d4a43903 SHA512 e3f79af69a170985fcbd1757fab86e90840d040cf7a6214c7f9851ed59695d3844a15269904c3ba989b6b6ed2ddf29fd19a493165d3037e49aa2bb69b831f168
+DIST nfdump-1.6.24.tar.gz 647945 BLAKE2B 6f054c7ccdbc6c5052d1c4655509414b9acc7de320152e932dd31d6cc9eb915b73efa29e42a212ea206c4619c9e025bfd751762808fd8136c38d4edb72f4fabf SHA512 b1e092663ce245247af721565139eb0a264918747e6c0695c59f0b70a99049e92d79674d75c248f60aa832949d7e13027887cc825e393fce7dc5571771bce1d7
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.23-autotools.patch b/net-analyzer/nfdump/files/nfdump-1.6.23-autotools.patch
new file mode 100644
index 00000000000..65558bbe7df
--- /dev/null
+++ b/net-analyzer/nfdump/files/nfdump-1.6.23-autotools.patch
@@ -0,0 +1,216 @@
+https://github.com/phaag/nfdump/commit/e6261098570f69ad973a7a4ea7aaebb1663712e8
+https://github.com/phaag/nfdump/commit/67da975f20076751bce49caf57c89ed21ed92ad0
+https://github.com/phaag/nfdump/commit/4652c2014012a81438f53cb590687c8c93419140
+
+From: Peter Haag <flow-dev@pyxis.ch>
+Date: Tue, 22 Feb 2022 10:54:19 +0100
+Subject: [PATCH] Fix issue #304 - accept CFLAGS
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -8,8 +8,11 @@ AC_INIT(nfdump, 1.6.23, peter@people.ops-trust.net)
+ AC_CONFIG_HEADER([config.h])
+ AM_INIT_AUTOMAKE([subdir-objects])
+
++if test "x$CFLAGS" = "x"; then
++ CFLAGS="-g -O3"
++fi
++
+ # Checks for programs.
+-CFLAGS="-g -O3"
+ AC_PROG_CC([clang gcc])
+ AX_CHECK_C11
+ CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -fno-strict-aliasing"
+
+From: Peter Haag <peter@people.ops-trust.net>
+Date: Fri, 25 Feb 2022 09:12:27 +0100
+Subject: [PATCH] Cleanup automake files. Fixes #304.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,12 +1,13 @@
+ # -*- Autoconf -*-
+ # Process this file with autoconf to produce a configure script.
+
+-AC_PREREQ(2.59)
++AC_PREREQ([2.71])
+ AC_REVISION($Revision: 244 $)dnl
+-AC_INIT(nfdump, 1.6.23, peter@people.ops-trust.net)
++AC_INIT([nfdump],[1.6.23],[peter@people.ops-trust.net])
+
+-AC_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AM_INIT_AUTOMAKE([subdir-objects])
++AC_CONFIG_MACRO_DIRS([m4])
+
+ if test "x$CFLAGS" = "x"; then
+ CFLAGS="-g -O3"
+@@ -15,7 +16,12 @@ fi
+ # Checks for programs.
+ AC_PROG_CC([clang gcc])
+ AX_CHECK_C11
+-CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -fno-strict-aliasing"
++AX_APPEND_FLAG([-Wall], [CFLAGS])
++AX_APPEND_FLAG([-Wstrict-prototypes], [CFLAGS])
++AX_APPEND_FLAG([-Wmissing-prototypes], [CFLAGS])
++AX_APPEND_FLAG([-Wmissing-declarations], [CFLAGS])
++AX_APPEND_FLAG([-Wmissing-noreturn], [CFLAGS])
++AX_APPEND_FLAG([-fno-strict-aliasing], [CFLAGS])
+
+ LT_INIT
+
+@@ -59,7 +65,7 @@ if test "${enable_fixtimebug}" = "yes" ; then
+ fi
+
+ AC_PROG_YACC
+-AC_PROG_LEX
++AC_PROG_LEX(yywrap)
+ which $LEX > /dev/null 2>&1
+ if test $? = 1; then
+ AC_MSG_ERROR(No lex or flex found on system)
+@@ -312,7 +318,11 @@ AC_LINK_IFELSE(
+
+ # Checks for header files.
+ AC_HEADER_DIRENT
+-AC_HEADER_STDC
++# Autoupdate added the next two lines to ensure that your configure
++# script's behavior did not change. They are probably safe to remove.
++AC_CHECK_INCLUDES_DEFAULT
++AC_PROG_EGREP
++
+ AC_CHECK_HEADERS(stdio_ext.h)
+ AC_CHECK_HEADERS([nameser8_compat.h])
+ AC_CHECK_HEADERS([features.h arpa/inet.h fcntl.h netinet/in.h fts.h stdint.h stdlib.h stddef.h string.h sys/socket.h syslog.h unistd.h iso/limits_iso.h])
+@@ -404,17 +414,14 @@ AC_CHECK_FUNCS(memcmp memcpy memmove memset)
+ AC_MSG_CHECKING([for union semun])
+ AC_CACHE_VAL(ac_cv_struct_semun,
+ [
+- AC_TRY_COMPILE(
+- [
++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <sys/types.h>
+ #include <sys/ipc.h>
+ #include <sys/sem.h>;
+- ],
+- [
++ ]], [[
+ union semun semdat;
+- ],
+- ac_cv_struct_semun=yes, ac_cv_struct_semun=no
+- )
++ ]])],[ac_cv_struct_semun=yes],[ac_cv_struct_semun=no
++ ])
+ ]
+ )
+
+@@ -424,7 +431,7 @@ if test "$ac_cv_struct_semun" = "yes"; then
+ fi
+
+ AC_MSG_CHECKING(for the %z format string in printf())
+-AC_TRY_RUN([
++AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <stdio.h>
+ #include <sys/types.h>
+
+@@ -438,28 +445,38 @@ char string[16];
+
+ return i == 5 ? 0 : 1;
+ }
+-],
+-[
++]])],[
+ AC_MSG_RESULT(yes)
+ AC_DEFINE([HAVE_SIZE_T_Z_FORMAT], [1],
+ [Define to 1 if you have a printf() that supports the %z format string.])
+-],
+-[
++],[
+ AC_MSG_RESULT(no)
+-],
+-[
++],[
+ AC_MSG_RESULT(no)
+-]
+-)
+
++])
++
++AC_CONFIG_FILES([Makefile bin/Makefile man/Makefile])
++AC_CONFIG_FILES([doc/Makefile])
+ AC_PATH_PROG([DOXYGEN], [doxygen], [])
+ AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])
+ AM_COND_IF([HAVE_DOXYGEN], AC_CONFIG_FILES([doc/Doxyfile]))
+-AC_OUTPUT(doc/Makefile)
+-
+-#AC_CONFIG_FILES([Makefile])
+-AC_OUTPUT(Makefile bin/Makefile man/Makefile)
++AC_OUTPUT
+
++echo ""
++echo "----------------------------------"
++echo " Build Settings for ${PACKAGE_TARNAME} v${PACKAGE_VERSION}"
++echo "----------------------------------"
++echo " host type = $host_os"
++echo " install dir = $prefix"
++echo " CC = $CC"
++echo " CFLAGS = $AM_CFLAGS $CFLAGS"
++echo " CPPFLAGS = $AM_CPPFLAGS $CPPFLAGS"
++echo " LDFLAGS = $AM_LDFLAGS $LDFLAGS"
++echo " LIBS = $LIBS"
++echo "----------------------------------"
++echo ""
++echo " You can run ./make now."
+ echo ""
+ echo "* Many thanks for using nfdump tools"
+ echo "* Please send bug reports back to me: peter@people.ops-trust.net"
+
+From: Peter Haag <peter@people.ops-trust.net>
+Date: Thu, 3 Mar 2022 09:25:15 +0100
+Subject: [PATCH] Make configure.ac autoconf 2.69 compatible
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,7 +1,7 @@
+ # -*- Autoconf -*-
+ # Process this file with autoconf to produce a configure script.
+
+-AC_PREREQ([2.71])
++AC_PREREQ([2.69])
+ AC_REVISION($Revision: 244 $)dnl
+ AC_INIT([nfdump],[1.6.23],[peter@people.ops-trust.net])
+
+@@ -47,7 +47,7 @@ if test "${enable_jnat}" = "yes" ; then
+ fi
+
+ if test "${enable_nsel}" = "yes" -a "${enable_jnat}" = "yes"; then
+- AC_MSG_ERROR(You can use only one of --enable-nsel or --enable-jnat. CISCO and Juniper are not compatible.)
++ AC_MSG_ERROR([You can use only one of --enable-nsel or --enable-jnat. CISCO and Juniper are not compatible.])
+ fi
+
+ AC_ARG_ENABLE(nel,
+@@ -287,7 +287,6 @@ AC_SUBST(FT_INCLUDES)
+ AC_SUBST(FT_LDFLAGS)
+ AC_SUBST(LFLAGS)
+
+-
+ # Checks for libraries.
+ AC_CHECK_FUNCS(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname,,[AC_CHECK_LIB(socket,gethostbyname)])])
+ AC_CHECK_FUNCS(setsockopt,,[AC_CHECK_LIB(socket,setsockopt)])
+@@ -447,8 +446,7 @@ char string[16];
+ }
+ ]])],[
+ AC_MSG_RESULT(yes)
+- AC_DEFINE([HAVE_SIZE_T_Z_FORMAT], [1],
+- [Define to 1 if you have a printf() that supports the %z format string.])
++ AC_DEFINE([HAVE_SIZE_T_Z_FORMAT], [1], [Define to 1 if you have a printf() that supports the %z format string.])
+ ],[
+ AC_MSG_RESULT(no)
+ ],[
+--- /dev/null
++++ b/m4/extensions.m4
+@@ -0,0 +1,4 @@
++dnl Define to empty for the benefit of Autoconf 2.69
++dnl AC_USE_SYSTEM_EXTENSIONS (below) can be used unchanged from Autoconf 2.70+.
++m4_ifndef([AC_CHECK_INCLUDES_DEFAULT],
++ [AC_DEFUN([AC_CHECK_INCLUDES_DEFAULT], [])])
+
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir-automake.patch b/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir-automake.patch
new file mode 100644
index 00000000000..755db8b7cf5
--- /dev/null
+++ b/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir-automake.patch
@@ -0,0 +1,23 @@
+https://github.com/phaag/nfdump/pull/336
+
+From e882722e4e006d0440fb5a37fb051d4747e4f225 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 24 Mar 2022 22:50:13 +0000
+Subject: [PATCH] Makefile.am: add ACLOCAL_AMFLAGS
+
+Per autoconf docs [0], if using automake and AC_CONFIG_MACRO_DIR,
+we need to include ACLOCAL_AMFLAGS in Makefile.am.
+
+So, let's set ACLOCAL_AMFLAGS = -I m4.
+
+This sorts out an automake warning.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,3 +1,4 @@
++ACLOCAL_AMFLAGS = -I m4
+
+ SUBDIRS = . bin man doc
+
+
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir.patch b/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir.patch
new file mode 100644
index 00000000000..ac25ee09465
--- /dev/null
+++ b/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir.patch
@@ -0,0 +1,19 @@
+Variant sent upstream (configure.ac hunk irrelevant now): https://github.com/phaag/nfdump/pull/336
+https://bugs.gentoo.org/832420
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,3 +1,4 @@
++ACLOCAL_AMFLAGS = -I m4
+
+ SUBDIRS = . bin man doc
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,6 +7,7 @@ AC_INIT(nfdump, 1.6.23, peter@people.ops-trust.net)
+
+ AC_CONFIG_HEADER([config.h])
+ AM_INIT_AUTOMAKE([subdir-objects])
++AC_CONFIG_MACRO_DIR([m4])
+
+ # Checks for programs.
+ AX_CHECK_C11
diff --git a/net-analyzer/nfdump/nfdump-1.6.23-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.23-r1.ebuild
new file mode 100644
index 00000000000..34bb2bd90ad
--- /dev/null
+++ b/net-analyzer/nfdump/nfdump-1.6.23-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A set of tools to collect and process netflow data"
+HOMEPAGE="https://github.com/phaag/nfdump"
+SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow"
+
+REQUIRED_USE="?? ( jnat nsel )"
+
+RDEPEND="
+ app-arch/bzip2
+ sys-libs/zlib
+ ftconv? ( net-analyzer/flow-tools )
+ nfpcapd? ( net-libs/libpcap )
+ nfprofile? ( net-analyzer/rrdtool )
+ nftrack? ( net-analyzer/rrdtool )
+ readpcap? ( net-libs/libpcap )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ sys-devel/flex
+ virtual/yacc
+ doc? (
+ app-doc/doxygen
+ media-gfx/graphviz
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-autotools.patch
+ "${FILESDIR}"/${P}-m4-dir-automake.patch
+ "${FILESDIR}"/${PN}-1.6.19-libft.patch
+)
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+src_prepare() {
+ default
+
+ eautoreconf
+
+ if use doc; then
+ doxygen -u doc/Doxyfile.in || die
+ fi
+}
+
+src_configure() {
+ tc-export CC
+
+ # --without-ftconf is not handled well, bug #322201
+ econf \
+ $(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
+ $(use nfpcapd && echo --enable-nfpcapd) \
+ $(use nfprofile && echo --enable-nfprofile) \
+ $(use nftrack && echo --enable-nftrack) \
+ $(use_enable debug devel) \
+ $(use_enable jnat) \
+ $(use_enable nsel) \
+ $(use_enable readpcap) \
+ $(use_enable sflow)
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -delete || die
+
+ newinitd "${FILESDIR}"/nfcapd.initd nfcapd
+ newconfd "${FILESDIR}"/nfcapd.confd nfcapd
+
+ if use doc; then
+ dodoc -r doc/html
+ fi
+}
diff --git a/net-analyzer/nfdump/nfdump-1.6.23.ebuild b/net-analyzer/nfdump/nfdump-1.6.23.ebuild
index 9c9c2bd847b..dca53c21054 100644
--- a/net-analyzer/nfdump/nfdump-1.6.23.ebuild
+++ b/net-analyzer/nfdump/nfdump-1.6.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -38,6 +38,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-1.6.19-compiler.patch
"${FILESDIR}"/${PN}-1.6.19-libft.patch
+ "${FILESDIR}"/${PN}-1.6.23-m4-dir.patch
)
DOCS=( AUTHORS ChangeLog README.md )
diff --git a/net-analyzer/nfdump/nfdump-1.6.24.ebuild b/net-analyzer/nfdump/nfdump-1.6.24.ebuild
new file mode 100644
index 00000000000..d4302f132f6
--- /dev/null
+++ b/net-analyzer/nfdump/nfdump-1.6.24.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="A set of tools to collect and process netflow data"
+HOMEPAGE="https://github.com/phaag/nfdump"
+SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 x86"
+IUSE="debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow"
+
+REQUIRED_USE="?? ( jnat nsel )"
+
+RDEPEND="
+ app-arch/bzip2
+ sys-libs/zlib
+ elibc_musl? ( sys-libs/fts-standalone )
+ ftconv? ( net-analyzer/flow-tools )
+ nfpcapd? ( net-libs/libpcap )
+ nfprofile? ( net-analyzer/rrdtool )
+ nftrack? ( net-analyzer/rrdtool )
+ readpcap? ( net-libs/libpcap )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ sys-devel/flex
+ virtual/yacc
+ doc? (
+ app-doc/doxygen
+ media-gfx/graphviz
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.19-libft.patch
+)
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+src_prepare() {
+ default
+
+ eautoreconf
+
+ if use doc; then
+ doxygen -u doc/Doxyfile.in || die
+ fi
+}
+
+src_configure() {
+ tc-export CC
+
+ # bug #853763
+ use elibc_musl && append-libs "-lfts"
+
+ # --without-ftconf is not handled well, bug #322201
+ econf \
+ $(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
+ $(use nfpcapd && echo --enable-nfpcapd) \
+ $(use nfprofile && echo --enable-nfprofile) \
+ $(use nftrack && echo --enable-nftrack) \
+ $(use_enable debug devel) \
+ $(use_enable jnat) \
+ $(use_enable nsel) \
+ $(use_enable readpcap) \
+ $(use_enable sflow)
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -delete || die
+
+ newinitd "${FILESDIR}"/nfcapd.initd nfcapd
+ newconfd "${FILESDIR}"/nfcapd.confd nfcapd
+
+ if use doc; then
+ dodoc -r doc/html
+ fi
+}
diff --git a/net-analyzer/nikto/Manifest b/net-analyzer/nikto/Manifest
index 4f81fbf790d..482137d6f73 100644
--- a/net-analyzer/nikto/Manifest
+++ b/net-analyzer/nikto/Manifest
@@ -1,2 +1,3 @@
DIST nikto-2.1.6_p20200901.tar.gz 521285 BLAKE2B 243f0baf5835e5586b8270fc9dd1005c08e903f478666359c34bb0d30c0645f5ab9a19109718dbbd2f6015dcb64c3a98b832b5412c9151720dedd102fb1936d1 SHA512 88b9e681ce4588e3473f90c93ea41d46fc99a54b895185465cfe1a28152ad944edbadfcf5cee4540b4ec48eb78ca73a1952637c3da9038e52d837c0de5d0260c
DIST nikto-2.1.6_p20210304.tar.gz 521719 BLAKE2B 66715e109dfb47bb5ed6b64cfff4dbdd0667883e5ce28c26a7325645fe42ccfdcb6f9bcf956adce6f626c51ff363122724955eda86c715d4f8ec4894ebf1ae4a SHA512 d78cedad0b2f96d02964097699d5765fdb895b7ec1a9e196cbf9181888dd19cfca7d912f172a870e4b8bd2b53e4fc41407a60ed129ef24592909ef6111d04a0e
+DIST nikto-2.1.6_p20220602.tar.gz 455528 BLAKE2B 71094c786b274069eb17aac7d367bdc8535c7730afde7c7bf36d40719e2799561eb31ad9cc09ee39c47101880795eee0f1c46ca51c00644cdc23916033cc5f7e SHA512 5c8ce194951c10b8a5f4299e088928022193aa8ae7ed4fb6b9be76bcf03a405d776d6e30274f997ad9eeb95c012c7e09b6dec7cbecbe0ab4049e5d15529ae814
diff --git a/net-analyzer/nikto/nikto-2.1.6_p20220602.ebuild b/net-analyzer/nikto/nikto-2.1.6_p20220602.ebuild
new file mode 100644
index 00000000000..c5fef7c1709
--- /dev/null
+++ b/net-analyzer/nikto/nikto-2.1.6_p20220602.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Web server vulnerability scanner"
+HOMEPAGE="https://www.cirt.net/Nikto2"
+COMMIT="dc98b86d3860ea18d82b5a427ab7abcd57e01552"
+MY_P="${PN}-${COMMIT}"
+SRC_URI="https://github.com/sullo/nikto/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# nikto provides its own libwhisker, do no use net-libs/libwhisker[ssl]
+# https://bugs.gentoo.org/533900
+RDEPEND="
+ dev-lang/perl
+ dev-perl/Net-SSLeay
+ net-analyzer/nmap
+ virtual/perl-JSON-PP
+"
+
+S="${WORKDIR}/${MY_P}/program"
+
+src_prepare() {
+ sed -i -e 's:/etc/nikto.conf:/etc/nikto/nikto.conf:' nikto.pl || die
+ sed -i -e 's:# EXECDIR=/opt/nikto:EXECDIR=/usr/share/nikto:' nikto.conf.default || die
+
+ default
+}
+
+src_install() {
+ insinto /etc/nikto
+ newins nikto.conf.default nikto.conf
+
+ dobin nikto.pl replay.pl
+ dosym nikto.pl /usr/bin/nikto
+
+ insinto /usr/share/nikto
+ doins -r plugins templates databases
+
+ dodoc docs/nikto_manual.html
+ dodoc docs/nikto_schema.sql
+ doman docs/nikto.1
+}
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 335efc4b01d..49819935ca2 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,5 +1,2 @@
-DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b588888b716070e05105a09b0185622aed9268715ae2c SHA512 d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b
-DIST nmap-7.91.tar.bz2 10503500 BLAKE2B a758e0a20f8243b33b000c23e025b87bdb712390b82982a1aca219c9b98cd55c6ababb810328c7d0cdb5c884ef9bd5b187b9e4929454278342d7ee5ef441cded SHA512 9d59f031b5f748311e9f9a0b9d05ad4a7a70fc6ac17598d7c4c81a4825c95d53817d74435d839e67b9379a052f2d37889fd634f9c75301a851f465d60fb9974d
-DIST nmap-7.91.tar.bz2.asc 195 BLAKE2B 16c4bad309c4652128a67f00c6b89f6552f432166733cac45756c20df0f48bdd0b8b9edbcce3df8f25d0a8e422be2494d9d5639fa74fc3f1e2c13489c52387c1 SHA512 376b74fc15896a1008709dac45b5af5d35ca00a1753994aba3ee6cffe2c2f0d67619fab45d57e83b454cfb376defe965f2bf881ef4cb8d5f8f2215979ad8ee96
DIST nmap-7.92.tar.bz2 10498200 BLAKE2B 0f3022e797ffca7d1d3497990c86bb60ac9a80bb93cb4ec7fcfa4f51782cb8d79d4f0aca0fa6119bfd604cfe7b89af3d4223ce13ad3e6c948c021909aebd956b SHA512 7828367f9dc76ff4d1e8c821260e565fb0c3cb6aba0473d24759133a3006cdf2cb087574f0dd7d2ba47a63754ba4f72e0b78cdae1333a58f05c41d428b56ad59
DIST nmap-7.92.tar.bz2.asc 195 BLAKE2B a8052138e58cd8009341a5f3fb3a31f55af9383b9dbb6c7ce858d80541e000b17953c053e9a3a6d86a5551244cf13f181e6e3943095b86335cbb5dae96e20bdd SHA512 300a22ab097bbff67de354de6b22a8e3287f95dd6318fcabd546ba52158e9589b19ede175587c6e31518c47bc118c7dd05db43755def075d810b16945b65e05a
diff --git a/net-analyzer/nmap/files/nmap-7.25-no-FORTIFY_SOURCE.patch b/net-analyzer/nmap/files/nmap-7.25-no-FORTIFY_SOURCE.patch
deleted file mode 100644
index 85594038bf6..00000000000
--- a/net-analyzer/nmap/files/nmap-7.25-no-FORTIFY_SOURCE.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/nbase/Makefile.in
-+++ b/nbase/Makefile.in
-@@ -12,7 +12,7 @@
- CCOPT =
- DEFS = @DEFS@
- # With GCC, add extra security checks to source code.
--DEFS += -D_FORTIFY_SOURCE=2
-+DEFS +=
- CPPFLAGS = @CPPFLAGS@
- CFLAGS = @CFLAGS@ $(CCOPT) $(GLIB_CFLAGS) $(DEFS) $(INCLS)
- STATIC =
---- a/ncat/Makefile.in
-+++ b/ncat/Makefile.in
-@@ -53,7 +53,7 @@
- LIBS = @LIBS@
- DEFS = @DEFS@ -DNCAT_DATADIR="\"$(pkgdatadir)\""
- # With GCC, add extra security checks to source code.
--DEFS += -D_FORTIFY_SOURCE=2
-+DEFS +=
- INCLS = -I. -I.. -I../nsock/include/ -I$(NBASEDIR)
- RM = rm -f
- STRIP = @STRIP@
---- a/nsock/src/Makefile.in
-+++ b/nsock/src/Makefile.in
-@@ -13,7 +13,7 @@
- CCOPT =
- DEFS = @DEFS@ -DNSOCK_VERSION=\"$(NSOCK_VERSION)\"
- # With GCC, add extra security checks to source code.
--DEFS += -D_FORTIFY_SOURCE=2
-+DEFS +=
- INCLS = -I../include
- CFLAGS = @CFLAGS@ $(CCOPT)
- # CFLAGS = -g -Wall $(DEFS) $(INCLS)
---- a/libnetutil/Makefile.in
-+++ b/libnetutil/Makefile.in
-@@ -5,7 +5,7 @@
- CXXFLAGS = @CXXFLAGS@
- CPPFLAGS = @CPPFLAGS@ $(DEFS)
- DEFS = @DEFS@
--DEFS += -D_FORTIFY_SOURCE=2
-+DEFS +=
- AR = ar
- RANLIB = @RANLIB@
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -41,7 +41,7 @@
- # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html
- # Level 1 only makes changes that don't affect "conforming" programs,
- # while level 2 enforces additional restrictions.
--DEFS += -D_FORTIFY_SOURCE=2
-+DEFS +=
- # For mtrace debugging -- see MTRACE define in main.cc for instructions
- # Should only be enabled during debugging and not in any real release.
- # DEFS += -DMTRACE=1
---- a/nping/Makefile.in
-+++ b/nping/Makefile.in
-@@ -38,7 +38,7 @@
- # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html
- # Level 1 only makes changes that don't affect "conforming" programs,
- # while level 2 enforces additional restrictions.
--DEFS += -D_FORTIFY_SOURCE=2
-+DEFS +=
- # For mtrace debugging -- see MTRACE define in main.cc for instructions
- # Should only be enabled during debugging and not in any real release.
- # DEFS += -DMTRACE=1
---- a/nmap-update/Makefile.in
-+++ b/nmap-update/Makefile.in
-@@ -12,7 +12,7 @@
- LDFLAGS = @LDFLAGS@
- MAC_FLAGS =
- LIBS = @LIBS@ $(NBASELIB) $(MAC_FLAGS)
--DEFS = @DEFS@ -D_FORTIFY_SOURCE=2
-+DEFS = @DEFS@
- APR_LIBS = @APR_LIBS@
- SVN_LIBS = @SVN_LIBS@
-
diff --git a/net-analyzer/nmap/files/nmap-7.91-ncat-proxy.patch b/net-analyzer/nmap/files/nmap-7.91-ncat-proxy.patch
deleted file mode 100644
index 513c7fbd418..00000000000
--- a/net-analyzer/nmap/files/nmap-7.91-ncat-proxy.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/770808
-https://github.com/nmap/nmap/commit/169d7e5a922ef8e63b51ee2bdf4fd4ad60ed2689
-
-From 169d7e5a922ef8e63b51ee2bdf4fd4ad60ed2689 Mon Sep 17 00:00:00 2001
-From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
-Date: Thu, 19 Nov 2020 17:34:24 +0000
-Subject: [PATCH] Restore call to post_connect in non-ssl case. Fixes #2149
-
----
- ncat/ncat_connect.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/ncat/ncat_connect.c b/ncat/ncat_connect.c
-index 606eac412f..f59dd4372f 100644
---- a/ncat/ncat_connect.c
-+++ b/ncat/ncat_connect.c
-@@ -1064,12 +1064,17 @@ int ncat_connect(void)
- bye("Failed to set hostname on iod.");
- if (o.ssl)
- {
-+ /* connect_handler creates stdin_nsi and calls post_connect */
- nsock_reconnect_ssl(mypool, cs.sock_nsi, connect_handler, o.conntimeout, NULL, NULL);
- }
-+ else
-+ {
-+ /* Create IOD for nsp->stdin */
-+ if ((cs.stdin_nsi = nsock_iod_new2(mypool, 0, NULL)) == NULL)
-+ bye("Failed to create stdin nsiod.");
-
-- /* Create IOD for nsp->stdin */
-- if ((cs.stdin_nsi = nsock_iod_new2(mypool, 0, NULL)) == NULL)
-- bye("Failed to create stdin nsiod.");
-+ post_connect(mypool, cs.sock_nsi);
-+ }
- }
-
- /* connect */
diff --git a/net-analyzer/nmap/files/nmap-7.91-ncat-unix-sockets.patch b/net-analyzer/nmap/files/nmap-7.91-ncat-unix-sockets.patch
deleted file mode 100644
index f617fd4b134..00000000000
--- a/net-analyzer/nmap/files/nmap-7.91-ncat-unix-sockets.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/765148
-https://github.com/nmap/nmap/commit/f6b40614e4a8131394792d590965f8af3c635323
-
-From f6b40614e4a8131394792d590965f8af3c635323 Mon Sep 17 00:00:00 2001
-From: nnposter <nnposter@e0a8ed71-7df4-0310-8962-fdc924857419>
-Date: Fri, 16 Oct 2020 02:54:52 +0000
-Subject: [PATCH] Fix a Unix domain socket crash. Fixes #2154
-
-diff --git a/ncat/ncat_main.c b/ncat/ncat_main.c
-index 8942d83cb9..2792a6ac24 100644
---- a/ncat/ncat_main.c
-+++ b/ncat/ncat_main.c
-@@ -846,7 +846,7 @@ int main(int argc, char *argv[])
- targetaddrs->addr.un.sun_family = AF_UNIX;
- strncpy(targetaddrs->addr.un.sun_path, argv[optind], sizeof(targetaddrs->addr.un.sun_path));
- targetaddrs->addrlen = SUN_LEN(&targetaddrs->addr.un);
-- o.target = argv[optind];
-+ o.sslservername = o.target = argv[optind];
- optind++;
- } else
- #endif
-@@ -865,7 +865,7 @@ int main(int argc, char *argv[])
- targetaddrs->addr.vm.svm_cid = long_cid;
-
- targetaddrs->addrlen = sizeof(targetaddrs->addr.vm);
-- o.target = argv[optind];
-+ o.sslservername = o.target = argv[optind];
- optind++;
- }
- } else
diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index 1e504a2dd7d..21fee1f7bbb 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -16,7 +16,6 @@
<use>
<flag name="libssh2">Enable SSH support through <pkg>net-libs/libssh2</pkg></flag>
<flag name="ncat">Install the ncat utility</flag>
- <flag name="nmap-update">Install nmap-update, which uses <pkg>dev-vcs/subversion</pkg> to update nmap scripts in your home directory</flag>
<flag name="nping">Install the nping utility</flag>
<flag name="nse">Include support for the Nmap Scripting Engine (NSE)</flag>
<flag name="system-lua">Use <pkg>dev-lang/lua</pkg> instead of the bundled liblua</flag>
diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild b/net-analyzer/nmap/nmap-7.80-r2.ebuild
deleted file mode 100644
index 37d6bd0196e..00000000000
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-3 )
-LUA_REQ_USE="deprecated"
-
-inherit autotools lua-single 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 libssh2 ncat nmap-update nping +nse ssl +system-lua"
-REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
-
-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? ( dev-libs/openssl:0= )
- system-lua? ( ${LUA_DEPS} )
-"
-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
-)
-
-pkg_setup() {
- use system-lua && lua-single_pkg_setup
-}
-
-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 yes 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.91-r2.ebuild b/net-analyzer/nmap/nmap-7.91-r2.ebuild
deleted file mode 100644
index 7beabe6e0b0..00000000000
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-3 )
-LUA_REQ_USE="deprecated"
-inherit autotools lua-single toolchain-funcs
-
-DESCRIPTION="Network exploration tool and security / port scanner"
-HOMEPAGE="https://nmap.org/"
-if [[ ${PV} == *9999* ]] ; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/nmap/nmap"
-
- # Just in case for now as future seems undecided.
- LICENSE="NPSL"
-else
- VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/nmap.asc
- inherit verify-sig
-
- SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
- SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
-
- LICENSE="|| ( NPSL GPL-2 )"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-SLOT="0"
-IUSE="ipv6 libssh2 ncat nping +nse ssl +system-lua"
-REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
-
-RDEPEND="
- dev-libs/liblinear:=
- dev-libs/libpcre
- net-libs/libpcap
- libssh2? (
- net-libs/libssh2[zlib]
- sys-libs/zlib
- )
- nse? ( sys-libs/zlib )
- ssl? ( dev-libs/openssl:0= )
- system-lua? ( ${LUA_DEPS} )
-"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV} != *9999* ]] ; then
- BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-nmap )"
-fi
-
-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
- "${FILESDIR}"/${P}-ncat-proxy.patch
- "${FILESDIR}"/${P}-ncat-unix-sockets.patch
-)
-
-pkg_setup() {
- use system-lua && lua-single_pkg_setup
-}
-
-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 yes 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/nmap/nmap-7.92.ebuild b/net-analyzer/nmap/nmap-7.92.ebuild
index 348adce730a..8d80c56138a 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -116,12 +116,14 @@ src_compile() {
done
emake \
- AR=$(tc-getAR) \
- RANLIB=$(tc-getRANLIB)
+ AR="$(tc-getAR)" \
+ RANLIB="$(tc-getRANLIB)"
}
src_install() {
+ # See bug #831713 for return of -j1
LC_ALL=C emake \
+ -j1 \
DESTDIR="${D}" \
STRIP=: \
nmapdatadir="${EPREFIX}"/usr/share/nmap \
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 466e9b414a0..2812d659900 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -117,12 +117,14 @@ src_compile() {
done
emake \
- AR=$(tc-getAR) \
- RANLIB=$(tc-getRANLIB)
+ AR="$(tc-getAR)" \
+ RANLIB="$(tc-getRANLIB)"
}
src_install() {
+ # See bug #831713 for return of -j1
LC_ALL=C emake \
+ -j1 \
DESTDIR="${D}" \
STRIP=: \
nmapdatadir="${EPREFIX}"/usr/share/nmap \
diff --git a/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild b/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild
index 4381c801ab8..f98da58998d 100644
--- a/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild
+++ b/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://nmbscan.g76r.eu/down/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
RDEPEND="net-dns/bind-tools
net-fs/samba
diff --git a/net-analyzer/nrpe/nrpe-4.0.0.ebuild b/net-analyzer/nrpe/nrpe-4.0.0.ebuild
index e39d700be6f..1012fda3907 100644
--- a/net-analyzer/nrpe/nrpe-4.0.0.ebuild
+++ b/net-analyzer/nrpe/nrpe-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/NagiosEnterprises/nrpe/releases/download/${P}/${P}.t
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 sparc x86"
IUSE="command-args selinux ssl"
DEPEND="acct-group/nagios
diff --git a/net-analyzer/nrpe/nrpe-4.0.3.ebuild b/net-analyzer/nrpe/nrpe-4.0.3.ebuild
index 585fd858b11..27d333e8504 100644
--- a/net-analyzer/nrpe/nrpe-4.0.3.ebuild
+++ b/net-analyzer/nrpe/nrpe-4.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/NagiosEnterprises/nrpe/releases/download/${P}/${P}.t
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 sparc x86"
IUSE="command-args selinux ssl tcpd"
DEPEND="acct-group/nagios
diff --git a/net-analyzer/nsca/nsca-2.7.2-r103.ebuild b/net-analyzer/nsca/nsca-2.7.2-r103.ebuild
index c7120d06b66..bb6a49ecfbf 100644
--- a/net-analyzer/nsca/nsca-2.7.2-r103.ebuild
+++ b/net-analyzer/nsca/nsca-2.7.2-r103.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/nagios/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 sparc x86"
IUSE="tcpd +crypt minimal"
DEPEND="crypt? ( >=dev-libs/libmcrypt-2.5.1-r4 )
diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index 9a94093e236..c97edb42bb7 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -1,2 +1,3 @@
DIST ntopng-4.2.tar.gz 57554819 BLAKE2B a9eaf7ea670dbd9c830696a4b017330e25a82307852a0a85d95ddbb4e32a3123d43eda1b686c359da1fef77e601cd3791dcdf257141e2e1d3ed7974b92edaac8 SHA512 e89ec3f35644ae8bc570d9802ecfadbf0067145e23a589df2032e8781e9c954f4166d3abb650ddafc65e4fbad656730ee1abf9c5273d3e09f8173d423436b8ff
DIST ntopng-5.0.tar.gz 57935381 BLAKE2B 420bda10ecc264d6baea0714367e8c475e72480ab1a114251c6712535ad1415288154623aa3ef780a5bab55bec684ddd7c0582997654f8fbb96ec08e17cb099f SHA512 e157430d9c98871d0136d2f51af6c7fed3a95fa21f8d3a9447ee69ac2aaee3752b6eddfd584715e3ee36234fd0fdcf865b761b0ec1a08727f6d988bc115d21e6
+DIST ntopng-5.2.1.tar.gz 60280025 BLAKE2B e7885a1ec9e5d37ee06def83a83c62f41acf87d939d18c33c8d114fe0bed0c973a6146f26fd92343aa7c7e7484970c3e95c33fe76468fe382809daddeed6541b SHA512 01cdf21deac61a3b11e7d0e6b662c911123241332e812bb676cb8c5c003fe1d50a4c61231f9c327d467e89dd1345fc1bdbab5d2599fe04b04a8fe12654c01bdd
diff --git a/net-analyzer/ntopng/files/ntopng-5.2.1-build-system.patch b/net-analyzer/ntopng/files/ntopng-5.2.1-build-system.patch
new file mode 100644
index 00000000000..ff05d103f22
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-5.2.1-build-system.patch
@@ -0,0 +1,89 @@
+https://github.com/ntop/ntopng/pull/6288
+
+From 93b62eb0b48f9914fed5511dc2a4289a83a1ed34 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 8 Feb 2022 06:07:21 +0000
+Subject: [PATCH 1/3] build: fail configure if ZMQ can't be found
+
+We already "fail" (makefile won't be generated) when ZMQ can't be found but
+the exit code doesn't represent this until now.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ configure.ac.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac.in b/configure.ac.in
+index b032d7faa34..0b30e9480c7 100644
+--- a/configure.ac.in
++++ b/configure.ac.in
+@@ -132,7 +132,7 @@ if test "x$ac_cv_lib_zmq_zmq_socket_monitor" = xyes; then :
+ AC_DEFINE_UNQUOTED(HAVE_ZMQ, 1, [ZMQ is present])
+ else
+ echo "ZMQ not present or too old (< v. 3.x)"
+- exit
++ exit 1
+ fi
+
+ AC_CHECK_LIB([sodium], [sodium_init], LIBS="${LIBS} -lsodium")
+
+From 75206e5a3fdc289a2229770595fbf588de79402b Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 8 Feb 2022 06:08:02 +0000
+Subject: [PATCH 2/3] build: avoid bashism in configure
+
+[[ ]] and == are both Bashisms and /bin/sh may be a POSIX compliant
+shell (Debian notably uses dash for /bin/sh which wouldn't be
+happy with this).
+
+This will continue to work on Bash.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ configure.ac.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac.in b/configure.ac.in
+index 0b30e9480c7..3dc6ef4a539 100644
+--- a/configure.ac.in
++++ b/configure.ac.in
+@@ -187,7 +187,7 @@ fi
+
+ if [ test -f /usr/bin/lsb_release ]; then
+ CODENAME=`/usr/bin/lsb_release -c|cut -f 2`
+- if [[ $CODENAME == "wheezy" ]]; then :
++ if test $CODENAME = "wheezy" ; then
+ CPPFLAGS="${CPPFLAGS} -DOLD_NETFILTER_INTERFACE=1"
+ fi
+ fi
+
+From 6e355cb98078dbfc379ba178ec99b7e351afdfe9 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 8 Feb 2022 06:09:44 +0000
+Subject: [PATCH 3/3] build: use $(MAKE)
+
+This allows parallel builds to work properly as we'll be calling 'make ...'
+with any additional arguments it internally passes down rather than literally
+just make.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ configure.ac.in | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/configure.ac.in b/configure.ac.in
+index 3dc6ef4a539..3ff06c4efd4 100644
+--- a/configure.ac.in
++++ b/configure.ac.in
+@@ -720,10 +720,7 @@ fi
+
+ AC_DEFINE_UNQUOTED(_CRT_SECURE_NO_WARNINGS, 1, [Disable warning on windows])
+
+-GMAKE=`which gmake`
+-if test x$GMAKE = x; then
+- GMAKE="make"
+-fi
++GMAKE='$(MAKE)'
+
+ GIT=`which git`
+ if test x$GIT = x; then
diff --git a/net-analyzer/ntopng/files/ntopng-5.2.1-mysqltool.patch b/net-analyzer/ntopng/files/ntopng-5.2.1-mysqltool.patch
new file mode 100644
index 00000000000..48551589f02
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-5.2.1-mysqltool.patch
@@ -0,0 +1,17 @@
+--- a/configure.ac.in
++++ b/configure.ac.in
+@@ -596,13 +596,7 @@ if test "${with_nedge+set}" != set; then
+ if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then
+ MYSQLTOOL="mariadb_config"
+ else
+- PATH=$PATH:/usr/local/mysql/bin
+- AC_CHECK_TOOL(MYSQL, mysql_config)
+- if test "x$ac_cv_prog_ac_ct_MYSQL" = "xmysql_config"; then
+- MYSQLTOOL="mysql_config"
+- else
+- MYSQLTOOL=""
+- fi
++ MYSQLTOOL="mysql_config"
+ fi
+
+ if test -n "$MYSQLTOOL"; then
diff --git a/net-analyzer/ntopng/files/ntopng-5.2.1-ndpi-linking.patch b/net-analyzer/ntopng/files/ntopng-5.2.1-ndpi-linking.patch
new file mode 100644
index 00000000000..4940cb44b73
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-5.2.1-ndpi-linking.patch
@@ -0,0 +1,13 @@
+--- a/configure.ac.in
++++ b/configure.ac.in
+@@ -236,8 +236,8 @@ fi
+ PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [
+ NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"`
+ # Use static libndpi library as building against the dynamic library fails
+- NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic"
+- #NDPI_LIB="$NDPI_LIBS"
++ #NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic"
++ NDPI_LIB="$NDPI_LIBS"
+ NDPI_LIB_DEP=
+ ], [
+ AC_MSG_CHECKING(for nDPI source)
diff --git a/net-analyzer/ntopng/ntopng-5.2.1.ebuild b/net-analyzer/ntopng/ntopng-5.2.1.ebuild
new file mode 100644
index 00000000000..b1e0ebb1186
--- /dev/null
+++ b/net-analyzer/ntopng/ntopng-5.2.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Network traffic analyzer with web interface"
+HOMEPAGE="https://www.ntop.org/"
+SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-db/mysql-connector-c:=
+ dev-db/sqlite:3
+ dev-libs/hiredis:=
+ dev-libs/json-c:=
+ dev-libs/libmaxminddb
+ dev-libs/libsodium:=
+ dev-libs/openssl:=
+ net-analyzer/rrdtool
+ net-libs/libpcap
+ >=net-libs/nDPI-4.2:=
+ >=net-libs/zeromq-3:=
+ net-misc/curl
+ sys-libs/libcap
+ sys-libs/zlib"
+RDEPEND="${DEPEND}
+ acct-user/ntopng
+ acct-group/ntopng
+ dev-db/redis"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.2.1-mysqltool.patch
+ "${FILESDIR}"/${PN}-5.2.1-ndpi-linking.patch
+ "${FILESDIR}"/${PN}-5.2.1-build-system.patch
+)
+
+src_prepare() {
+ default
+
+ # Follows upstream's autogen.sh
+ sed \
+ -e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" \
+ -e "s/@SHORT_VERSION@/${PV}/g" \
+ -e "s/@GIT_DATE@/$(date)/g" \
+ -e "s/@GIT_RELEASE@/${PV}.$(date +%y%m%d)/g" \
+ -e "s/@GIT_BRANCH@//g" < "${S}/configure.ac.in" \
+ > "${S}/configure.ac" || die
+
+ eautoreconf
+}
+
+src_configure() {
+ tc-export PKG_CONFIG
+
+ # configure.ac.in at least has some bashisms(?) which get lost(?)
+ # in conversion to configure.ac (like [ -> nothing?) so just force
+ # bash for now. It's still not quite right but at least upstream will be
+ # testing with it. TODO: fix this!
+ CONFIG_SHELL="${BROOT}/bin/bash" econf
+}
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)" \
+ MYCFLAGS="${CFLAGS}" \
+ MYLDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
+ insinto "${SHARE_NTOPNG_DIR}"
+ doins -r httpdocs
+ doins -r scripts
+
+ insinto "${SHARE_NTOPNG_DIR}/third-party"
+ doins -r third-party/i18n.lua-master
+ doins -r third-party/lua-resty-template-master
+
+ exeinto /usr/bin
+ doexe "${PN}"
+ doman "${PN}.8"
+
+ newinitd "${FILESDIR}"/ntopng.init.d ntopng
+ newconfd "${FILESDIR}"/ntopng.conf.d ntopng
+
+ keepdir /var/lib/ntopng
+ fowners ntopng /var/lib/ntopng
+}
+
+pkg_postinst() {
+ elog "ntopng default credentials are user='admin' password='admin'"
+}
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild
index 859270ce857..70a973b584c 100644
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild
@@ -35,7 +35,7 @@ src_prepare() {
}
src_compile() {
- emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
}
src_install() {
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
index 48dfecb119b..10daf438195 100644
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
BDEPEND="virtual/pkgconfig"
RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
@@ -41,7 +41,7 @@ src_prepare() {
}
src_compile() {
- emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
}
src_install() {
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild
index 90851a6bcac..d82b685da2a 100644
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild
@@ -35,7 +35,7 @@ src_prepare() {
}
src_compile() {
- emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
}
src_install() {
diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest
index 44d0ded741f..7dac2d80b69 100644
--- a/net-analyzer/openvas-scanner/Manifest
+++ b/net-analyzer/openvas-scanner/Manifest
@@ -1,3 +1,4 @@
DIST openvas-scanner-20.8.1.tar.gz 431985 BLAKE2B 60b328dc261bf48f37aa2727f4b63904c898467f989abef8f05e29329a24d0d98c13690005c5c7a8c93f899db709771ea60832927f169f6779707a1fac602368 SHA512 6114f37a91a3dd42c3693f10548a7727fb88fbe535ce511b164a440d5ace1c736d4c8a45db9a7e83b9abbd376c4d6b13afd3d23a995a5d089329a2bb8bd71cec
+DIST openvas-scanner-21.4.4.tar.gz 460601 BLAKE2B 66d627e76912735539399aed637fdc07a7d13c9e4eb142498dcf181b8ea952dd93107bcc1f2ef577126178ff3dad1e5f6e50d67840692cd49f7352e3a726ce8f SHA512 f2fe1f802b14fc41ee0d7657d031d318b651c3ec9ef554b33379a7459d40c17b44525c8f666ccb9670868576c101766936dd0c700778e46683bf43f0683834b6
DIST openvas-scanner-6.0.1.tar.gz 522100 BLAKE2B af82b41736329bd90ba1ea73a0ace36d4115375f81a7aaff5d3bd50f21cfa3195cdf4012aa952da52c4103a31475de5c5790ef3e2e36180aa06737371fa0e5a0 SHA512 db4087fffe1d50e232fa1e51325cf7f142237e2bd3cc5dcaa1e7058a4871300f352f2c0e700eae72ea9412c347b072e9d1f2eca508b27cb30f36c6895ec95147
DIST openvas-scanner-7.0.1.tar.gz 429012 BLAKE2B 13fd0fef2ce88f6789da9f00e8f35329e915ebc74a29b3bd52af93c6b70292d055fa1159aec4041d79a785971a583eb514e8700d1d38a76775446e40af9b2fac SHA512 201ea02b25bf247320437ae5c82bdc95db981cc6bd99fdece9403573434db122cdc8db7b82a08cba34b6d67d5794b2364f798847c79b421495666adc95a02571
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-21.4.4-r2.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-21.4.4-r2.ebuild
new file mode 100644
index 00000000000..59b7fae5193
--- /dev/null
+++ b/net-analyzer/openvas-scanner/openvas-scanner-21.4.4-r2.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs
+
+MY_PN="openvas"
+MY_DN="openvassd"
+
+DESCRIPTION="Open Vulnerability Assessment Scanner"
+HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/openvas-scanner/"
+SRC_URI="https://github.com/greenbone/openvas-scanner/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc snmp test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ acct-user/gvm
+ app-crypt/gpgme:=
+ dev-db/redis
+ dev-libs/glib:2
+ dev-libs/libgcrypt:=
+ dev-libs/libgpg-error
+ dev-libs/libksba
+ >=net-analyzer/gvm-libs-${PV}
+ snmp? ( net-analyzer/net-snmp:= )
+ net-libs/gnutls:=
+ net-libs/libpcap
+ net-libs/libssh:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+ doc? (
+ app-doc/doxygen[dot]
+ app-doc/xmltoman
+ app-text/htmldoc
+ dev-perl/CGI
+ dev-perl/SQL-Translator
+ )
+ test? ( dev-libs/cgreen )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-7.0.1-disable-automagic-dep.patch
+ "${FILESDIR}"/${PN}-7.0.1-fix-linking-with-lld.patch
+ #qa fix for rpath
+ "${FILESDIR}"/${PN}-20.8.1-rpath-qa-fix.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+ # QA-Fix | Correct FHS/Gentoo policy paths for 7.0.0
+ sed -i -e "s*/doc/openvas-scanner/*/doc/openvas-scanner-${PV}/*g" "${S}"/src/CMakeLists.txt || die
+ # QA-Fix | Remove !CLANG doxygen warnings for 7.0.0
+ if use doc; 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
+
+ #Remove tests that doesn't work in the network sandbox
+ if use test; then
+ sed -i 's/add_test (pcap-test pcap-test)/ /g' misc/CMakeLists.txt || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ "-DLOCALSTATEDIR=${EPREFIX}/var"
+ "-DSYSCONFDIR=${EPREFIX}/etc"
+ "-DSBINDIR=${EPREFIX}/usr/bin"
+ "-DBUILD_WITH_SNMP=$(usex snmp)"
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ if use doc; then
+ cmake_build -C "${BUILD_DIR}" doc
+ cmake_build doc-full -C "${BUILD_DIR}" doc
+ fi
+ cmake_build rebuild_cache
+ if use test; then
+ cmake_build tests
+ fi
+}
+
+src_install() {
+ if use doc; then
+ local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
+ fi
+ cmake_src_install
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}"
+
+ # Set proper permissions on required files/directories
+ keepdir /var/log/gvm
+ if ! use prefix; then
+ fowners gvm:gvm /var/log/gvm
+ fi
+
+ keepdir /var/lib/openvas/{gnupg,plugins}
+ if ! use prefix; then
+ fowners -R gvm:gvm /var/lib/openvas
+ fi
+
+ insinto /etc/openvas
+ doins "${FILESDIR}/openvas.conf"
+}
diff --git a/net-analyzer/ospd-openvas/Manifest b/net-analyzer/ospd-openvas/Manifest
index 00956885cf4..62b5a8d2c3c 100644
--- a/net-analyzer/ospd-openvas/Manifest
+++ b/net-analyzer/ospd-openvas/Manifest
@@ -1,2 +1 @@
-DIST ospd-openvas-1.0.1.tar.gz 50455 BLAKE2B 06a4cdcc2f51351215fffa5517cb2cae620b9b7ffded738d3c63bda11fa8572fe93e0b5fc1c8c9a1bd27cbea65641b0586c329d1d05a022e1fba79c8782d091c SHA512 bdcdb1a8bc08fc27f1a85846ad944b3764a67c153cd75ffa607f69e0c07f223aa0e0965ee081e2398d4d47fc6faf1fd6fad90e6bc724952a0679de783dd2cc87
-DIST ospd-openvas-20.8.1.tar.gz 86733 BLAKE2B 1f747d7409a9b2cef4ea320cdc3fb8714105498ac798c96bb4be243a000985b881e33b56458d1c97b7a0359d51c95a4f975efa97cd4405b359d5a1e7aeaba9e6 SHA512 fb4ceb0a2306255e59948fe2246f9c66adefb4e68e26d3a8f95366a9ef1cb5581a3b036f6982cdd4c8499a9fb1e6acbe72041144e9ff3a057fc253e0684c0c0f
+DIST ospd-openvas-21.4.4.tar.gz 173368 BLAKE2B 4568eb45bb999d0ff2cf91652dd56000bceb967f5c37c3061735322d1c72165f9b869c8b48694b37fd6d684679fa1bbff4a5550076bbcfcee5936b470cb04700 SHA512 3981b0a9044f90243fe06f15b0d8ee5a6b1a334556f6de76955aecda0404da2f8bd1d39bf547093a31c244f0aabae819f5e45e8c518984fc7d50764a267086e9
diff --git a/net-analyzer/ospd-openvas/files/ospd-openvas.service b/net-analyzer/ospd-openvas/files/ospd-openvas.service
deleted file mode 100644
index f496797d54f..00000000000
--- a/net-analyzer/ospd-openvas/files/ospd-openvas.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=OSPD OpenVAS
-After=network.target networking.service dnsmasq.service redis-server@openvas.service systemd-tmpfiles.service
-ConditionKernelCommandLine=!recovery
-
-[Service]
-Type=forking
-User=gvm
-Group=gvm
-ExecStart=/usr/bin/ospd-openvas --config /etc/openvas/ospd.conf --foreground
-SuccessExitStatus=SIGKILL
-# This works asynchronously, but does not take the daemon down during the reload so it's ok.
-Restart=always
-RestartSec=60
-
-[Install]
-WantedBy=multi-user.target
-Alias=ospd-openvas.service
diff --git a/net-analyzer/ospd-openvas/files/ospd.conf b/net-analyzer/ospd-openvas/files/ospd.conf
deleted file mode 100644
index bac46565001..00000000000
--- a/net-analyzer/ospd-openvas/files/ospd.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[OSPD - openvas]
-
-#required by gvmd
-unix_socket = /tmp/ospd.sock
-
-#socket_mode = 0o770
-#unix_socket = /run/ospd/ospd-openvas.pid
-
-log_level = DEBUG
-log_file = /var/log/gvm/ospd-openvas.log
diff --git a/net-analyzer/ospd-openvas/files/redis.conf.example b/net-analyzer/ospd-openvas/files/redis.conf.example
deleted file mode 100644
index 6a41211aaae..00000000000
--- a/net-analyzer/ospd-openvas/files/redis.conf.example
+++ /dev/null
@@ -1,57 +0,0 @@
-bind 127.0.0.1
-protected-mode yes
-port 0
-tcp-backlog 511
-unixsocket /tmp/redis.sock
-unixsocketperm 700
-timeout 0
-tcp-keepalive 300
-daemonize no
-supervised no
-pidfile /run/redis/redis.pid
-loglevel notice
-logfile /var/log/redis/redis.log
-databases 16
-always-show-logo yes
-stop-writes-on-bgsave-error yes
-rdbcompression yes
-rdbchecksum yes
-dbfilename dump.rdb
-dir /var/lib/redis/
-slave-serve-stale-data yes
-slave-read-only yes
-repl-diskless-sync no
-repl-diskless-sync-delay 5
-repl-disable-tcp-nodelay no
-slave-priority 100
-lazyfree-lazy-eviction no
-lazyfree-lazy-expire no
-lazyfree-lazy-server-del no
-slave-lazy-flush no
-appendonly no
-appendfilename "appendonly.aof"
-appendfsync everysec
-no-appendfsync-on-rewrite no
-auto-aof-rewrite-percentage 100
-auto-aof-rewrite-min-size 64mb
-aof-load-truncated yes
-aof-use-rdb-preamble no
-lua-time-limit 5000
-slowlog-log-slower-than 10000
-slowlog-max-len 128
-latency-monitor-threshold 0
-notify-keyspace-events ""
-hash-max-ziplist-entries 512
-hash-max-ziplist-value 64
-list-max-ziplist-size -2
-list-compress-depth 0
-set-max-intset-entries 512
-zset-max-ziplist-entries 128
-zset-max-ziplist-value 64
-hll-sparse-max-bytes 3000
-activerehashing yes
-client-output-buffer-limit normal 0 0 0
-client-output-buffer-limit slave 256mb 64mb 60
-client-output-buffer-limit pubsub 32mb 8mb 60
-hz 10
-aof-rewrite-incremental-fsync yes
diff --git a/net-analyzer/ospd-openvas/ospd-openvas-1.0.1.ebuild b/net-analyzer/ospd-openvas/ospd-openvas-1.0.1.ebuild
deleted file mode 100644
index 3e6e76f0659..00000000000
--- a/net-analyzer/ospd-openvas/ospd-openvas-1.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 systemd
-
-DESCRIPTION="This is an OSP server implementation to allow GVM to remotely control OpenVAS"
-HOMEPAGE="https://github.com/greenbone/ospd-openvas"
-SRC_URI="https://github.com/greenbone/ospd-openvas/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- acct-user/gvm
- dev-python/packaging[${PYTHON_USEDEP}]
- dev-python/psutil[${PYTHON_USEDEP}]
- >=dev-python/redis-py-3.0.1[${PYTHON_USEDEP}]
- >=net-analyzer/ospd-2.0.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
- ${DEPEND}
- >=net-analyzer/openvas-scanner-7.0.0"
-BDEPEND=""
-
-distutils_enable_tests unittest
-
-python_install() {
- distutils-r1_python_install
-
- insinto /etc/openvas
- doins "${FILESDIR}"/redis.conf.example
- doins "${FILESDIR}"/ospd.conf
-
- fowners -R gvm:gvm /etc/openvas
-
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-}
diff --git a/net-analyzer/ospd-openvas/ospd-openvas-20.8.1.ebuild b/net-analyzer/ospd-openvas/ospd-openvas-20.8.1.ebuild
deleted file mode 100644
index 18cbd96b144..00000000000
--- a/net-analyzer/ospd-openvas/ospd-openvas-20.8.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 systemd
-
-DESCRIPTION="This is an OSP server implementation to allow GVM to remotely control OpenVAS"
-HOMEPAGE="https://github.com/greenbone/ospd-openvas"
-SRC_URI="https://github.com/greenbone/ospd-openvas/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- acct-group/gvm
- acct-user/gvm
- >=dev-python/packaging-20.4[${PYTHON_USEDEP}]
- >=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
- >=dev-python/redis-py-3.5.3[${PYTHON_USEDEP}]
- >=net-analyzer/ospd-20.8.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
- ${DEPEND}
- >=net-analyzer/openvas-scanner-20.8.0"
-BDEPEND=""
-
-distutils_enable_tests unittest
-
-python_install() {
- distutils-r1_python_install
-
- insinto /etc/openvas
- doins "${FILESDIR}"/redis.conf.example
- doins "${FILESDIR}"/ospd.conf
-
- fowners -R gvm:gvm /etc/openvas
-
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-}
diff --git a/net-analyzer/ospd-openvas/ospd-openvas-21.4.4-r4.ebuild b/net-analyzer/ospd-openvas/ospd-openvas-21.4.4-r4.ebuild
new file mode 100644
index 00000000000..a7791ba4ba2
--- /dev/null
+++ b/net-analyzer/ospd-openvas/ospd-openvas-21.4.4-r4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=poetry
+inherit distutils-r1 systemd
+
+DESCRIPTION="This is an OSP server implementation to allow GVM to remotely control OpenVAS"
+HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/ospd-openvas"
+SRC_URI="https://github.com/greenbone/ospd-openvas/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3+ GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="
+ acct-user/gvm
+ dev-python/defusedxml[${PYTHON_USEDEP}]
+ dev-python/deprecated[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ >=dev-python/packaging-20.4[${PYTHON_USEDEP}]
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ >=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
+ >=dev-python/redis-py-3.5.3[${PYTHON_USEDEP}]
+ !net-analyzer/ospd[${PYTHON_USEDEP}]
+"
+RDEPEND="
+ ${DEPEND}
+ app-admin/sudo
+ >=net-analyzer/openvas-scanner-${PV}
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+ default
+
+ # https://github.com/greenbone/ospd-openvas/pull/649
+ sed -i '/^Group=gvm/d' config/ospd-openvas.service || die
+
+ # https://github.com/greenbone/ospd-openvas/pull/653
+ sed -i 's;/usr/local/bin/;/usr/bin/;' config/ospd-openvas.service || die
+}
+
+python_compile() {
+ if use doc; then
+ bash "${S}"/docs/generate || die
+ HTML_DOCS=( "${S}"/docs/. )
+ fi
+ distutils-r1_python_compile
+}
+
+python_install() {
+ distutils-r1_python_install
+
+ insinto /etc/gvm
+ doins config/${PN}.conf
+ if ! use prefix; then
+ fowners -R gvm:gvm /etc/gvm
+ fi
+
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+ systemd_dounit config/${PN}.service
+
+ # OSPD OpenVAS attempts to call openvas via sudo as network security
+ # scanning often requires priviliged operations.
+ insinto /etc/sudoers.d
+ newins - openvas <<-EOF
+ gvm ALL = NOPASSWD: /usr/bin/openvas
+EOF
+}
diff --git a/net-analyzer/ospd/Manifest b/net-analyzer/ospd/Manifest
deleted file mode 100644
index 2eb1accdf10..00000000000
--- a/net-analyzer/ospd/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST ospd-2.0.1.tar.gz 87313 BLAKE2B cf527742246ceb5acaf69900d48f1800ef98153026fa6aae2661e4a3aafad6f69221fa7c7f34a222a0972cf5550a9543696b1e7a4368ef050574ca08f72f0978 SHA512 4aed0e1a22ea6c0db26977e7b0bde9c9c37890422f3480ad83ef23ad193b7ae3dd7352872c4fe377808d2a398317a4c1d38d7ab2ef5a0266c544e0ef55a0365a
-DIST ospd-20.8.2.tar.gz 122686 BLAKE2B 3e05c157e41837af52d54fc4f430da57ad5fb3dff97ed6fef7339844e8b0990977a1ef5e0878a06ca7c3e209f988bdd2e13b0829d47f6d309f183960a8a286b3 SHA512 127ca6fe370faf99c9c2d2b182bb524b279d714635f367a30318acde1d383048e7a2a5e3944e83642d3963304c506fe893763b6ee78404391ead8d751c978873
diff --git a/net-analyzer/ospd/metadata.xml b/net-analyzer/ospd/metadata.xml
deleted file mode 100644
index 66c937b52db..00000000000
--- a/net-analyzer/ospd/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>jonas.licht@gmail.com</email>
- <name>Jonas Licht</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
- <use>
- <flag name="extras">Html docs support</flag>
- </use>
- <longdescription lang="en">
- OSPD is a base class for scanner wrappers which share the same communication protocol:
- OSP (Open Scanner Protocol). OSP creates a unified interface for different security scanners
- and makes their control flow and scan results consistently available under the central
- Greenbone Vulnerability Manager service.
- </longdescription>
- <upstream>
- <remote-id type="github">greenbone/ospd</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-analyzer/ospd/ospd-2.0.1.ebuild b/net-analyzer/ospd/ospd-2.0.1.ebuild
deleted file mode 100644
index 124b5a105ea..00000000000
--- a/net-analyzer/ospd/ospd-2.0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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 distutils-r1
-
-DESCRIPTION="Base class for scanner wrappers,communication protocol for GVM"
-HOMEPAGE="https://www.greenbone.net/en/"
-SRC_URI="https://github.com/greenbone/ospd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="extras"
-
-RDEPEND="
- dev-python/defusedxml[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/paramiko[${PYTHON_USEDEP}]"
-
-DEPEND="
- ${RDEPEND}"
-
-distutils_enable_tests unittest
-
-python_compile() {
- if use extras; then
- bash "${S}"/doc/generate || die
- HTML_DOCS=( "${S}"/doc/. )
- fi
- distutils-r1_python_compile
-}
diff --git a/net-analyzer/ospd/ospd-20.8.2.ebuild b/net-analyzer/ospd/ospd-20.8.2.ebuild
deleted file mode 100644
index f7108a88627..00000000000
--- a/net-analyzer/ospd/ospd-20.8.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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 distutils-r1
-
-DESCRIPTION="Base class for scanner wrappers, communication protocol for GVM"
-HOMEPAGE="https://www.greenbone.net/en/ https://github.com/greenbone/ospd/"
-SRC_URI="https://github.com/greenbone/ospd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="AGPL-3+"
-KEYWORDS="~amd64 ~x86"
-IUSE="extras"
-
-RDEPEND="
- dev-python/defusedxml[${PYTHON_USEDEP}]
- dev-python/deprecated[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-python/psutil[${PYTHON_USEDEP}]"
-
-DEPEND="
- ${RDEPEND}"
-
-distutils_enable_tests unittest
-
-src_prepare() {
- default
- #QA-Fix: do not install test subpackages
- sed -i "s/tests']/tests*']/g" setup.py || die
-}
-
-python_compile() {
- if use extras; then
- bash "${S}"/doc/generate || die
- HTML_DOCS=( "${S}"/doc/. )
- fi
- distutils-r1_python_compile
-}
diff --git a/net-analyzer/ostinato/ostinato-1.1-r1.ebuild b/net-analyzer/ostinato/ostinato-1.1-r2.ebuild
index 2b835a9bcec..bccd03f406c 100644
--- a/net-analyzer/ostinato/ostinato-1.1-r1.ebuild
+++ b/net-analyzer/ostinato/ostinato-1.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit qmake-utils
@@ -24,6 +24,7 @@ DEPEND="
dev-qt/qtscript:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
+ dev-libs/libnl:=
>=net-libs/libpcap-1.8.1-r2
"
RDEPEND="${DEPEND}"
@@ -33,5 +34,9 @@ PATCHES=(
)
src_configure() {
- eqmake5 PREFIX="${ED}/usr" ost.pro
+ eqmake5 PREFIX="/usr" ost.pro
+}
+
+src_install() {
+ emake INSTALL_ROOT="${ED}" install
}
diff --git a/net-analyzer/packit/Manifest b/net-analyzer/packit/Manifest
index df96e38d0b6..743b4bac828 100644
--- a/net-analyzer/packit/Manifest
+++ b/net-analyzer/packit/Manifest
@@ -1 +1,2 @@
DIST packit-1.7.tar.gz 53192 BLAKE2B f5a7fcd0790e05be593be47c2339c3ecb14b2fd45308a273ecc9d5398087698605c2174a8440e870ccf35fd9d560bea11ca720e44045115c15757f6f98d00ac4 SHA512 4e7d13ef5387dc446e718792562dbf84f9e0b611196a3590ea8e8b4411ae30694b48f28ab632a0b692935adffb44757e65a4eb5ab942b5d625acbdc08d34aefd
+DIST packit-1.8.tar.gz 150410 BLAKE2B d0a0926643b6b595159d1fec703295a880c1fcad188e2d9a6719b879bad0b1f081ab75031550257d5c8573f2d8ed9960e7d46fdbe4c4c19c669015b048509a24 SHA512 1873c687c8be489966d5f8868def3cb824264dcfd8c6572b03fd51f15f8920965c8682b13cc6a9d6fec62bf9fe3b4e91f5a9d3d4c6441232d3f6f51a244a8baf
diff --git a/net-analyzer/packit/packit-1.8.ebuild b/net-analyzer/packit/packit-1.8.ebuild
new file mode 100644
index 00000000000..77ed5d2691a
--- /dev/null
+++ b/net-analyzer/packit/packit-1.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Network packet generator and capture tool"
+HOMEPAGE="https://github.com/resurrecting-open-source-projects/packit"
+SRC_URI="https://github.com/resurrecting-open-source-projects/packit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="net-libs/libnet:1.1
+ net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_install() {
+ default
+
+ dodoc docs/*
+}
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r10.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r10.ebuild
index 21b8ec9aacf..ab4a072f70b 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r10.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
IUSE="apache2 icinga +nagios"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
REQUIRED_USE="^^ ( icinga nagios )"
diff --git a/net-analyzer/prelude-correlator/metadata.xml b/net-analyzer/prelude-correlator/metadata.xml
index f0e9972b784..e5b33cb13b4 100644
--- a/net-analyzer/prelude-correlator/metadata.xml
+++ b/net-analyzer/prelude-correlator/metadata.xml
@@ -1,14 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>thomas.andrejak@gmail.com</email>
- <name>Thomas Andrejak</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!-- maintainer-needed -->
<longdescription lang="en">
Prelude-Correlator allows conducting multi-stream correlations
thanks to a powerful programming language for writing correlation
diff --git a/net-analyzer/prelude-lml-rules/Manifest b/net-analyzer/prelude-lml-rules/Manifest
index 2e6f47ca115..258928ff65d 100644
--- a/net-analyzer/prelude-lml-rules/Manifest
+++ b/net-analyzer/prelude-lml-rules/Manifest
@@ -1,2 +1 @@
-DIST prelude-lml-rules-5.1.0.tar.gz 117585 BLAKE2B 0df09a472cd5bd3306927e788b0fc5451d95bf200ec83f77cede2653c1e28da1c777b4bc6ed1232bbf82c06557bc77ece18c02843349c14a8e0bf453db5191d9 SHA512 ef31b7933a441efa43a994170d3cec377b211b55ee80abbbff7986474d58a1f7b780c717a6c364c9ae162d3a8830004a7dd5c43b5cd8df0e2d92a38ad312eadc
DIST prelude-lml-rules-5.2.0.tar.gz 117046 BLAKE2B e0c8e6477497304dfc36c8abf93bd0bea7b86920652786ebfe84df391129b9a4ba76fc8c9fcf3ac817a805924a6626afa6f115c602f73519fc3271ed405ef4bf SHA512 d15a9e90e15cf484d4f2bf53005fe8b37bbf582d6b65f30a010e77290a56c0439b24322be948f7d096b92d1a5cf72a6dc3a0ee1495486840fa0bab603bbeeeeb
diff --git a/net-analyzer/prelude-lml-rules/metadata.xml b/net-analyzer/prelude-lml-rules/metadata.xml
index 43c6af29da6..fcf1cd64f68 100644
--- a/net-analyzer/prelude-lml-rules/metadata.xml
+++ b/net-analyzer/prelude-lml-rules/metadata.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>thomas.andrejak@gmail.com</email>
- <name>Thomas Andrejak</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
-</pkgmetadata>
+ <!-- maintainer-needed -->
+ </pkgmetadata>
diff --git a/net-analyzer/prelude-lml-rules/prelude-lml-rules-5.1.0.ebuild b/net-analyzer/prelude-lml-rules/prelude-lml-rules-5.1.0.ebuild
deleted file mode 100644
index 31c1829ee02..00000000000
--- a/net-analyzer/prelude-lml-rules/prelude-lml-rules-5.1.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Prelude LML community ruleset"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="~net-analyzer/prelude-lml-${PV}"
-
-DEPEND="${RDEPEND}"
-
-src_install() {
- insinto "/etc/prelude-lml/ruleset"
- doins ruleset/*.rules
-}
diff --git a/net-analyzer/prelude-lml/Manifest b/net-analyzer/prelude-lml/Manifest
index fb6cb0034a1..621a92c59ab 100644
--- a/net-analyzer/prelude-lml/Manifest
+++ b/net-analyzer/prelude-lml/Manifest
@@ -1,2 +1 @@
-DIST prelude-lml-5.1.0.tar.gz 1585080 BLAKE2B 572a3bf2b013dc3f427f7e3a4cc650219945a0e481e10f9f8f8e6afac75c86db5319fd16f1bf9157ede55ae511ce5151a0fe63694d0b8cc2becbd6430521fba3 SHA512 248434352c340d9979051897190fc7fbe835c7b1f2411ec98a04cbf0bebb6f115e80ca854d35ab2b2f50722c052eea10e088e4557ca4218f0dfed21ae21109ae
DIST prelude-lml-5.2.0.tar.gz 1584414 BLAKE2B c97a730e366cdf0663ad6393acc0125d01995bd1339f4538a1dd62c2aa85e46dd78e3e279067a2bac328db675b5de59cebb8474bdafbe00d745320d360124535 SHA512 45de2dea196941086a690b3081b98253a3d9685552a25f39cf3b92d3b223c5a9d98057f855da1f23fff7aa425fd832e6021050d2d7fe58322c4f3f48c34394b5
diff --git a/net-analyzer/prelude-lml/metadata.xml b/net-analyzer/prelude-lml/metadata.xml
index 4ee28cb2f82..60708d8389e 100644
--- a/net-analyzer/prelude-lml/metadata.xml
+++ b/net-analyzer/prelude-lml/metadata.xml
@@ -1,14 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>thomas.andrejak@gmail.com</email>
- <name>Thomas Andrejak</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!-- maintainer-needed -->
<longdescription lang="en">
Prelude-LML is a log analyser that allows Prelude to collect and
analyze information from all kind of applications emitting logs or
diff --git a/net-analyzer/prelude-lml/prelude-lml-5.1.0.ebuild b/net-analyzer/prelude-lml/prelude-lml-5.1.0.ebuild
deleted file mode 100644
index 26fe70882ee..00000000000
--- a/net-analyzer/prelude-lml/prelude-lml-5.1.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd tmpfiles
-
-DESCRIPTION="The prelude log analyzer"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="icu ssl"
-
-RDEPEND="dev-libs/libpcre
- >=dev-libs/libprelude-5.1.0
- <dev-libs/libprelude-6
- icu? ( dev-libs/icu:= )
- ssl? ( net-libs/gnutls:= )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.1.0-run.patch"
- "${FILESDIR}/${PN}-3.0.0-conf.patch"
-)
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=(
- --localstatedir="${EPREFIX}/var"
- $(use_with ssl libgnutls-prefix)
- )
-
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
-
- rm -rv "${ED}/run" || die "rm failed"
- keepdir /var/${PN}
-
- find "${D}" -name '*.la' -delete || die
-
- systemd_dounit "${FILESDIR}/${PN}.service"
- newtmpfiles "${FILESDIR}/${PN}.run" "${PN}.conf"
-
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-}
-
-pkg_postinst() {
- tmpfiles_process ${PN}.conf
-}
diff --git a/net-analyzer/pypacker/Manifest b/net-analyzer/pypacker/Manifest
index eababc35475..9885b80185e 100644
--- a/net-analyzer/pypacker/Manifest
+++ b/net-analyzer/pypacker/Manifest
@@ -1 +1,2 @@
DIST pypacker-4.9.tar.gz 602068 BLAKE2B 1ddc16e361ba0aa57b4dab62c38c37aabeffe2cab5cb819e627aeaac5452201117c2f806f2f443cad96d673f93bf0f0a159fa6a7d59564879d038524a2de1eb1 SHA512 804bb32eda76a00121c88d38722a6fb51a9fcff0a5625bd46bda68329e39139624c4fb8e2736208733a6b97ec0df02f173d304fcf3bb39549f3fa119fcf0ae2f
+DIST pypacker-5.1.tar.gz 623638 BLAKE2B 329e8ec2af336118a4ff8d200ced2e356a10dae5217582fb69b77be336e830d3c2356165ea42be6224ef8fd2291637b23fde35733652969affae1f81eb2411dc SHA512 427d2afc45735e920867098c77be8256e28840031a7a01dfae5c9817ff78d2ddb699bf94721eda3b1f4b568bb70bd3bd25ccb8cb77076b84e2aa71898ba0bf57
diff --git a/net-analyzer/pypacker/metadata.xml b/net-analyzer/pypacker/metadata.xml
index 95397898717..61659fe10b6 100644
--- a/net-analyzer/pypacker/metadata.xml
+++ b/net-analyzer/pypacker/metadata.xml
@@ -6,7 +6,7 @@
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
<upstream>
- <remote-id type="github">mike01/pypacker</remote-id>
+ <remote-id type="gitlab">mike01/pypacker</remote-id>
<maintainer>
<email>michael.stahn.42@googlemail.com</email>
<name>Michael Stahn</name>
diff --git a/net-analyzer/pypacker/pypacker-5.1.ebuild b/net-analyzer/pypacker/pypacker-5.1.ebuild
new file mode 100644
index 00000000000..af71a3b3868
--- /dev/null
+++ b/net-analyzer/pypacker/pypacker-5.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Fast and simple packet creation and parsing library for Python"
+HOMEPAGE="https://gitlab.com/mike01/pypacker"
+SRC_URI="https://gitlab.com/mike01/pypacker/-/archive/v${PV}/pypacker-v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DOCS=( AUTHORS CHANGES HACKING README.md )
+
+python_test() {
+ "${EPYTHON}" tests/test_pypacker.py || die
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ use examples && dodoc -r examples
+}
diff --git a/net-analyzer/python-gvm/Manifest b/net-analyzer/python-gvm/Manifest
index bc9ede7565f..ccb8777ca0d 100644
--- a/net-analyzer/python-gvm/Manifest
+++ b/net-analyzer/python-gvm/Manifest
@@ -1 +1,2 @@
DIST python-gvm-21.1.3.tar.gz 244785 BLAKE2B 7f0a63651a01a914359ea683cf52fe2e1ced22aba0bb90d232c4e5a13f25bb0a9d76a647c2bbe34f0be9615c0ce4d7fb938eee3fbe3a2389b7483b4d55069fee SHA512 eb92be77e69303e0ece54efb5bceaefb469ab1c3f4a2714ec1c839d43584e5760618c39a133aaaeb436c9f62d6deec8f40608e792f408e8cae7c083db857183f
+DIST python-gvm-21.11.0.tar.gz 230324 BLAKE2B 1c4ca09f62dbeb6863e6f2da7188fd499d38ec9e1c01a2cac3534b2bff996082a5075a437e225a51bbb98f7a6ebc67062f5bd31ac1ce1a831a82bcc85f377a62 SHA512 df1fe64c65453a782dd89615cb6426a47091c82899d73855ec14174ea01ca3066a987eacb4f553c575695c6a962ec635023d0b79eafe143b564e4dfe494cc2a9
diff --git a/net-analyzer/python-gvm/python-gvm-21.11.0.ebuild b/net-analyzer/python-gvm/python-gvm-21.11.0.ebuild
new file mode 100644
index 00000000000..819a242b269
--- /dev/null
+++ b/net-analyzer/python-gvm/python-gvm-21.11.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=poetry
+
+inherit distutils-r1
+
+DESCRIPTION="Greenbone Vulnerability Management Python Library"
+HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/python-gvm/"
+SRC_URI="https://github.com/greenbone/python-gvm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/defusedxml[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/paramiko[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+ distutils-r1_src_prepare
+
+ # drop connection tests
+ rm -r tests/connections || die
+}
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index d0902d1b33b..e3ece643a7c 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -1 +1 @@
-DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
+DIST rrdtool-1.8.0.tar.gz 2955398 BLAKE2B d821d662af432c53760bc0e9636b84d9209933a810fa71091fc4c2b44518c89c7ad509bde7955d952279ee41464c3bfa4f631662dde61b6fff46699bb382653f SHA512 8ae6f94d119e8d0e1ba7f2d0738f1ba008a4880d1022f1c0c5436f662d961fceec5c42e01c241493ece3d6f55c60fd7d1d264f93e678f3cf1251201dcde027c1
diff --git a/net-analyzer/rrdtool/files/rrdcached.confd b/net-analyzer/rrdtool/files/rrdcached.confd
deleted file mode 100644
index 0463a792346..00000000000
--- a/net-analyzer/rrdtool/files/rrdcached.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-RRCACHE_ARGS="-l unix:/var/run/rrdcached.sock -j /var/lib/rrdcached/journal/ -F -b /var/lib/rrdcached/db/ -B"
-
-USER=""
-GROUP=""
-
-MODE=""
-
-MAXWAIT=30
diff --git a/net-analyzer/rrdtool/files/rrdcached.confd-r1 b/net-analyzer/rrdtool/files/rrdcached.confd-r1
new file mode 100644
index 00000000000..99213acd1e1
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdcached.confd-r1
@@ -0,0 +1,13 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Default user and group for the rrdcached daemon
+GROUP="rrdcached"
+USER="root"
+
+# Default options for the rrdcached daemon
+RRCACHE_ARGS="-B -F -m 770 -s rrdcached -l unix:/run/rrdcached.sock"
+
+# Default path for database and journal
+RRCACHE_DATABASE="/var/lib/rrdcached/db"
+RRCACHE_JOURNAL="/var/lib/rrdcached/journal"
diff --git a/net-analyzer/rrdtool/files/rrdcached.init b/net-analyzer/rrdtool/files/rrdcached.init
deleted file mode 100644
index 51c2cbb6e81..00000000000
--- a/net-analyzer/rrdtool/files/rrdcached.init
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/bin/rrdcached"
-command_args="${RRCACHE_ARGS} -p /run/rrdcached.pid"
-start_stop_daemon_args="--quiet"
-description="RRDtool data caching daemon"
-
-depend() {
- need localmount net
- use logger
-}
diff --git a/net-analyzer/rrdtool/files/rrdcached.init-r1 b/net-analyzer/rrdtool/files/rrdcached.init-r1
new file mode 100644
index 00000000000..44ee3c5f19d
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdcached.init-r1
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Data caching daemon for RRDTool"
+rrdcached_database="${RRCACHE_DATABASE:-/var/lib/rrdcached/db}"
+rrdcached_group="${GROUP:-rrdcached}"
+rrdcached_journal="${RRCACHE_JOURNAL:-/var/lib/rrdcached/journal}"
+rrdcached_user="${USER:-rrdcached}"
+pidfile="/run/rrdcached.pid"
+
+command="/usr/bin/rrdcached"
+command_args="${RRCACHE_ARGS} -b ${rrdcached_database} -G ${rrdcached_group} -j ${rrdcached_journal} -p ${pidfile} -U ${rrdcached_user}"
+
+depend() {
+ need localmount
+ use logger
+}
+
+start_pre() {
+ checkpath -d -o "${rrdcached_user}:${rrdcached_group}" -q "${rrdcached_database}"
+ checkpath -d -o "${rrdcached_user}:${rrdcached_group}" -q "${rrdcached_journal}"
+}
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.5.5-rrdrados.pod b/net-analyzer/rrdtool/files/rrdtool-1.5.5-rrdrados.pod
deleted file mode 100644
index 0c645548a20..00000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.5.5-rrdrados.pod
+++ /dev/null
@@ -1,68 +0,0 @@
-=head1 NAME
-
-rrdrados - Creating, updating and retrieving RRD files from Ceph
-
-=head1 SYNOPSIS
-
-E<lt>rrdfileE<gt> = B<ceph//E<lt>nameE<gt>>
-
-
-=head1 DESCRIPTION
-
-This module adds support for creating, updating and retrieving RRD files
-directly from a Ceph cluster using librados.
-
-It adds a ceph// prefix to RRD file name which is used to instruct rrdtool to
-operate on a file that is stored in Ceph.
-
-Currently the module expects to find the Ceph configuration file in the default
-location at /etc/ceph/ceph.conf. By default it uses Ceph client ID "admin" and a
-Ceph pool named "rrd".
-
-
-=head1 ENVIRONMENT VARIABLES
-
-=over 4
-
-=item B<CEPH_ID>
-
-Sets the Ceph Client ID to use when connecting. By default the client ID "admin"
-is used.
-
-=item B<CEPH_POOL>
-
-Sets the name of the Ceph Pool to connect to. By default, the pool "rrd" is
-used.
-
-=back
-
-
-=head1 EXAMPLES
-
-B<Creating an RRD file on Ceph>
-
- rrdtool create ceph//temperature.rrd --step 300 \
- DS:temp:GAUGE:600:-273:5000 \
- RRA:AVERAGE:0.5:1:1200 \
- RRA:MIN:0.5:12:2400 \
- RRA:MAX:0.5:12:2400 \
- RRA:AVERAGE:0.5:12:2400
-
-
-B<Importing an existing RRD into Ceph>
-
- rrdtool dump existing.rrd | rrdtool restore - ceph//new.rrd
-
-Or you could also copy the RRD file directly into Ceph using the rados command
-line utility.
-
-
-B<Retrieving RRD data from Ceph>
-
- rrdtool fetch ceph//file.rrd AVERAGE
-
-
-=head1 AUTHOR
-
-Simon Boulet E<lt>simon@nostalgeek.comE<gt>
-
diff --git a/net-analyzer/rrdtool/metadata.xml b/net-analyzer/rrdtool/metadata.xml
index cdb31d558f7..7c83d2658e6 100644
--- a/net-analyzer/rrdtool/metadata.xml
+++ b/net-analyzer/rrdtool/metadata.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="person">
+ <email>conikost@gentoo.org</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
@@ -8,6 +12,7 @@
<use>
<flag name="graph">Enable support for graphing functions</flag>
<flag name="rados">Enable support for librados from <pkg>sys-cluster/ceph</pkg></flag>
+ <flag name="rrdcached">Build support for write-caching daemon</flag>
<flag name="rrdcgi">Build rrdcgi support</flag>
</use>
<upstream>
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
deleted file mode 100644
index 1c278a03879..00000000000
--- a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=true
-DISTUTILS_SINGLE_IMPL=true
-GENTOO_DEPEND_ON_PERL=no
-LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit autotools lua perl-module distutils-r1 flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
-SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0/8.0.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~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} )
- lua? (
- ${LUA_REQUIRED_USE}
- test? ( graph )
- )
-"
-
-RDEPEND="
- >=dev-libs/glib-2.28.7:2[static-libs(+)?]
- >=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
- dbi? ( dev-db/libdbi[static-libs(+)?] )
- graph? (
- >=media-libs/libpng-1.5.10:0=[static-libs(+)?]
- >=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
- >=x11-libs/pango-1.28
- )
- lua? ( ${LUA_DEPS} )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- rados? ( sys-cluster/ceph )
- tcl? ( dev-lang/tcl:0= )
- tcpd? ( sys-apps/tcp-wrappers )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- sys-apps/groff
- virtual/pkgconfig
- virtual/awk
- python? ( $(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') )
- test? (
- sys-devel/bc
- lua? ( ${LUA_DEPS} )
- )
-"
-
-PDEPEND="ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch
- "${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch
- "${FILESDIR}"/${PN}-1.7.1-configure.ac.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
- # At the next version bump, please see if you actually still need this
- # before adding versions
- if ! [[ -f doc/rrdrados.pod ]] ; then
- cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod
- else
- die "File already exists: doc/rrdrados.pod. Remove this code!"
- fi
-
- # bug 456810
- # no time to sleep
- sed -i \
- -e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
- -e 's|^sleep 1$||g' \
- -e '/^dnl.*png/s|^dnl||g' \
- configure.ac || die
-
- # Python bindings are built/installed manually
- sed -i \
- -e '/^all-local:/s| @COMP_PYTHON@||' \
- bindings/Makefile.am || die
-
- if ! use graph ; then
- sed -i \
- -e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \
- -e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \
- -e 's|graph1||g' \
- tests/Makefile.am || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- export rd_cv_gcc_flag__Werror=no
- export rd_cv_ms_async=ok
-
- filter-flags -ffast-math
-
- export RRDDOCDIR="${EPREFIX}"/usr/share/doc/${PF}
-
- # to solve bug #260380
- [[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
-
- # Stub configure.ac
- local myconf=()
- if ! use tcpd ; then
- myconf+=( "--disable-libwrap" )
- fi
- if ! use dbi ; then
- myconf+=( "--disable-libdbi" )
- fi
- if ! use rados ; then
- myconf+=( "--disable-librados" )
- fi
-
- # We will handle Lua bindings ourselves, upstream is not multi-impl-ready
- # and their Lua-detection logic depends on having the right version of the Lua
- # interpreter available at build time.
- econf \
- $(use_enable graph rrd_graph) \
- $(use_enable perl perl-site-install) \
- $(use_enable perl) \
- $(use_enable python) \
- $(use_enable rrdcgi) \
- $(use_enable static-libs static) \
- $(use_enable tcl) \
- $(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
- --with-perl-options=INSTALLDIRS=vendor \
- --disable-lua \
- --disable-ruby-site-install \
- --disable-ruby \
- ${myconf[@]}
-}
-
-python_compile() {
- cd bindings/python || die
- distutils-r1_python_compile
-}
-
-lua_src_compile() {
- pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}"
-
- # We do need the cmod-dir path here, otherwise libtool complains.
- # Use the real one (i.e. not within ${ED}) just in case.
- emake \
- LUA_CFLAGS=$(lua_get_CFLAGS) \
- LUA_INSTALL_CMOD="$(lua_get_cmod_dir)"
-
- popd
-}
-
-src_compile() {
- default
-
- if use lua; then
- # Only copy sources now so that we do not trigger librrd compilation
- # multiple times.
- lua_copy_sources
-
- lua_foreach_impl lua_src_compile
- fi
-
- use python && distutils-r1_src_compile
-}
-
-lua_src_test() {
- pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}"
-
- LUA_CPATH="${PWD}/.libs/?.so" emake LUA="${LUA}" test
-
- popd || die
-}
-
-src_test() {
- export LC_ALL=C
-
- default
- if use lua ; then
- lua_foreach_impl lua_src_test
- fi
-}
-
-python_install() {
- cd bindings/python || die
- distutils-r1_python_install
-}
-
-lua_src_install() {
- pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}"
-
- # This time we must prefix the cmod-dir path with ${ED} so that make
- # does not try to violate the sandbox.
- emake \
- LUA_INSTALL_CMOD="${ED}/$(lua_get_cmod_dir)" \
- install
-
- popd || die
-}
-
-src_install() {
- default
-
- if ! use doc ; then
- rm -rf "${ED}"/usr/share/doc/${PF}/{html,txt} || die
- fi
-
- if use lua ; then
- lua_foreach_impl lua_src_install
- fi
-
- if ! use rrdcgi ; then
- # uses rrdcgi, causes invalid shebang error in Prefix, useless
- # without rrdcgi installed
- rm -f "${ED}"/usr/share/${PN}/examples/cgi-demo.cgi || die
- fi
-
- if use perl ; then
- perl_delete_localpod
- perl_delete_packlist
- fi
-
- dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO
-
- find "${ED}"/usr -name '*.la' -exec rm -f {} + || die
-
- keepdir /var/lib/rrdcached/journal/
- keepdir /var/lib/rrdcached/db/
-
- newconfd "${FILESDIR}"/rrdcached.confd rrdcached
- newinitd "${FILESDIR}"/rrdcached.init rrdcached
-
- use python && distutils-r1_src_install
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.8.0.ebuild b/net-analyzer/rrdtool/rrdtool-1.8.0.ebuild
new file mode 100644
index 00000000000..ad96cbb5505
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.8.0.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+PYTHON_COMPAT=( python3_{8..10} )
+
+DISTUTILS_OPTIONAL="true"
+DISTUTILS_SINGLE_IMPL="true"
+GENTOO_DEPEND_ON_PERL="no"
+MY_P="${P/_/-}"
+
+inherit autotools lua perl-module distutils-r1 flag-o-matic
+
+DESCRIPTION="A data logging and graphing system for time series data"
+HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
+SRC_URI="https://github.com/oetiker/${PN}-1.x/releases/download/v${PV}/${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0/8.0.0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="dbi doc examples graph lua perl python rados rrdcached rrdcgi ruby static-libs tcl tcpd test"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+ lua? (
+ ${LUA_REQUIRED_USE}
+ test? ( graph )
+ )
+ test? ( rrdcached )
+"
+
+PDEPEND="ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )"
+
+RDEPEND="
+ dev-libs/glib:2[static-libs(+)?]
+ dev-libs/libxml2:2[static-libs(+)?]
+ dbi? ( dev-db/libdbi[static-libs(+)?] )
+ graph? (
+ media-libs/libpng:0=[static-libs(+)?]
+ x11-libs/cairo[svg,static-libs(+)?]
+ x11-libs/pango
+ )
+ lua? ( ${LUA_DEPS} )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ rados? ( sys-cluster/ceph )
+ rrdcached? (
+ acct-group/rrdcached
+ acct-user/rrdcached
+ )
+ tcl? ( dev-lang/tcl:0= )
+ tcpd? ( sys-apps/tcp-wrappers )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ sys-apps/groff
+ virtual/pkgconfig
+ virtual/awk
+ python? ( $(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') )
+ test? (
+ sys-devel/bc
+ lua? ( ${LUA_DEPS} )
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch
+ "${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch
+ "${FILESDIR}"/${PN}-1.7.1-configure.ac.patch
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # Bug #456810
+ local mysedargs=(
+ -e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g'
+ -e 's|^sleep 1$||g'
+ -e '/^dnl.*png/s|^dnl||g'
+ -i configure.ac
+ )
+
+ sed "${mysedargs[@]}" || die
+
+ # Python bindings are built and installed manually
+ local mysedargs=(
+ -e '/^all-local:/s| @COMP_PYTHON@||'
+ -i bindings/Makefile.am
+ )
+
+ sed "${mysedargs[@]}" || die
+
+ # Makefile needs to be adjusted for disabling 'graph' feature
+ if ! use graph ; then
+ local mysedargs=(
+ -e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;'
+ -e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::'
+ -e 's|graph1||g'
+ -i tests/Makefile.am
+ )
+
+ sed "${mysedargs[@]}" || die
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ export rd_cv_gcc_flag__Werror=no
+ export rd_cv_ms_async=ok
+ export RRDDOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+
+ # Bug #260380
+ [[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
+
+ # Enabling '-ffast-math' is known to cause problems.
+ filter-flags -ffast-math
+
+ # We will handle Lua bindings ourselves, upstream is not multi-impl-ready
+ # and their Lua-detection logic depends on having the right version of the Lua
+ # interpreter available at build time.
+ local myeconfargs=(
+ --disable-lua
+ --disable-ruby
+ --disable-ruby-site-install
+ $(usex !dbi '--disable-libdbi' '')
+ $(usex !examples '--disable-examples' '')
+ $(use_enable graph rrd_graph)
+ $(use_enable perl perl-site-install)
+ $(use_enable perl)
+ $(use_enable python)
+ $(usex !rados '--disable-librados' '')
+ $(usex !rrdcached '--disable-rrdcached' '')
+ $(use_enable rrdcgi)
+ $(use_enable static-libs static)
+ $(usex !tcpd '--disable-libwrap' '')
+ $(use_enable tcl)
+ $(use_enable tcl tcl-site)
+ $(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir))
+ --with-perl-options="INSTALLDIRS=vendor"
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+lua_src_compile() {
+ pushd "${BUILD_DIR}"/bindings/lua || die
+
+ # We do need the CMOD-dir path here, otherwise libtool complains.
+ # Use the real one (i.e. not within ${ED}) just in case.
+ local myemakeargs=(
+ LUA_CFLAGS=$(lua_get_CFLAGS)
+ LUA_INSTALL_CMOD="$(lua_get_cmod_dir)"
+ )
+
+ emake "${myemakeargs[@]}"
+
+ popd
+}
+
+python_compile() {
+ cd bindings/python || die
+ distutils-r1_python_compile
+}
+
+src_compile() {
+ default
+
+ # Only copy sources now so that we do not
+ # trigger librrd compilation multiple times.
+ if use lua; then
+ lua_copy_sources
+ lua_foreach_impl lua_src_compile
+ fi
+
+ use python && distutils-r1_src_compile
+}
+
+lua_src_test() {
+ pushd "${BUILD_DIR}"/bindings/lua || die
+ LUA_CPATH="${PWD}/.libs/?.so" emake LUA="${LUA}" test
+ popd || die
+}
+
+src_test() {
+ export LC_ALL=C
+ default
+
+ if use lua; then
+ lua_foreach_impl lua_src_test
+ fi
+}
+
+lua_src_install() {
+ pushd "${BUILD_DIR}"/bindings/lua || die
+
+ # This time we must prefix the CMOD-dir path with ${ED},
+ # so that make does not try to violate the sandbox.
+ local myemakeargs=(
+ LUA_INSTALL_CMOD="${ED}/$(lua_get_cmod_dir)"
+ )
+
+ emake "${myemakeargs[@]}" install
+
+ popd || die
+}
+
+python_install() {
+ cd bindings/python || die
+ distutils-r1_python_install
+}
+
+src_install() {
+ default
+
+ if ! use doc; then
+ rm -rf "${ED}"/usr/share/doc/"${PF}"/{html,txt} || die
+ fi
+
+ if use lua; then
+ lua_foreach_impl lua_src_install
+ fi
+
+ if use perl; then
+ perl_delete_localpod
+ perl_delete_packlist
+ fi
+
+ use python && distutils-r1_src_install
+
+ if use rrdcached; then
+ newconfd "${FILESDIR}"/rrdcached.confd-r1 rrdcached
+ newinitd "${FILESDIR}"/rrdcached.init-r1 rrdcached
+ fi
+
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-analyzer/sancp/Manifest b/net-analyzer/sancp/Manifest
index 5334b6da520..82188b27482 100644
--- a/net-analyzer/sancp/Manifest
+++ b/net-analyzer/sancp/Manifest
@@ -1,3 +1,4 @@
+DIST sancp-1.6.1-musl.patch.bz2 7013 BLAKE2B a54c3a3c45b1029a95451a21de2b42497434dff6715cb173db5f04293740f3e03869900e23c571dae97a563a9b7fdce76c4295f3267857a77a074a65e79f3b53 SHA512 3310577acef1d16b87b51924ed6fbb82b491afc5646555667fcd2430aef1b0dd5f0ee510c6356eebd32402b79eb8e9f5032955b5194517acc0c055da8dd74fc2
DIST sancp-1.6.1.fix200511.a.patch 662 BLAKE2B d3d5114662f3904db4052d581b3a95f07f5a492b439958bd64149ca6f9aaf48f2d2d9cf2094500b9ab829b3a06358180893637ed6d3f502ef46f87dfe8527ccc SHA512 87662d9ea863a3a2468b7b64c81a191d34c81348eab9374245a73d3ed63cf2f25df54561f092f3713d516d9cc4eb553d4d7286fd920676a301e61669a023142e
DIST sancp-1.6.1.fix200511.b.patch 870 BLAKE2B 18ad38c37f11aa1c4804400db5475323db25e0c135d3478e9c81af3a0a3885f397521fdf9b58825216fdd16ec2e2616584f3dc9e175e76d64c7125a767b2c029 SHA512 a54bbec1ce3799f83c006f7375297bafee85b12a90361f1f5dbbf46c936193c7e0f1196483a2bdf560019e93ceffe9129b3c01322eedc397e5dfa3a1a6b76b81
DIST sancp-1.6.1.fix200601.c.patch 3578 BLAKE2B 7c7e5ef0e1967d41f731d3c79f4273a4ebfc922159ada1940ba4635f6f82e63ed55faeffe53636d2c8fd96d57e1516211fff8852c73876d019fc13d59f4ace9d SHA512 3d15028d33e7dbddc74d8c6eefac6d66e357f024dca15afdfb8156b0cf969ab093c26baa43ebf7c1ac88f4275ef4bdc91c1cc69c5aa7b439a042ed966edea30f
diff --git a/net-analyzer/sancp/sancp-1.6.1-r7.ebuild b/net-analyzer/sancp/sancp-1.6.1-r7.ebuild
index e18588995cb..f3ea7b0a346 100644
--- a/net-analyzer/sancp/sancp-1.6.1-r7.ebuild
+++ b/net-analyzer/sancp/sancp-1.6.1-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,15 +7,14 @@ inherit toolchain-funcs
DESCRIPTION="collect network traffic statistics and store them in pcap format"
HOMEPAGE="https://sourceforge.net/projects/sancp/"
-SRC_URI="
- http://www.metre.net/files/${P}.tar.gz
+SRC_URI="http://www.metre.net/files/${P}.tar.gz
http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.a.patch
http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.b.patch
http://sancp.sourceforge.net/${PN}-1.6.1.fix200601.c.patch
http://sancp.sourceforge.net/${PN}-1.6.1.fix200606.d.patch
-"
+ https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.6.1-musl.patch.bz2"
-LICENSE="QPL-1.0 GPL-2" # GPL-2 for init script
+LICENSE="QPL-1.0 GPL-2" # GPL-2 for init script
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="sguil"
@@ -27,20 +26,17 @@ RDEPEND="
DEPEND="${RDEPEND}"
PATCHES=(
+ "${DISTDIR}"/${PN}-1.6.1.fix200511.a.patch
+ "${DISTDIR}"/${PN}-1.6.1.fix200511.b.patch
+ # bug 138337
+ "${DISTDIR}"/${PN}-1.6.1.fix200601.c.patch
+ "${DISTDIR}"/${PN}-1.6.1.fix200606.d.patch
"${FILESDIR}"/${PN}-1.6.1-compiler.patch
"${FILESDIR}"/${PN}-1.6.1-gcc6.patch
"${FILESDIR}"/${PN}-1.6.1-extern.patch
+ "${WORKDIR}"/${PN}-1.6.1-musl.patch
)
-src_prepare() {
- eapply "${DISTDIR}"/${PN}-1.6.1.fix200511.a.patch
- eapply "${DISTDIR}"/${PN}-1.6.1.fix200511.b.patch
- # bug 138337
- eapply "${DISTDIR}"/${PN}-1.6.1.fix200601.c.patch
- eapply "${DISTDIR}"/${PN}-1.6.1.fix200606.d.patch
- default
-}
-
src_compile() {
tc-export CC CXX
emake CFLAGS="${CXXFLAGS}"
diff --git a/net-analyzer/sarg/sarg-2.4.0.ebuild b/net-analyzer/sarg/sarg-2.4.0-r1.ebuild
index c2da09b5fa3..083cbcb2724 100644
--- a/net-analyzer/sarg/sarg-2.4.0.ebuild
+++ b/net-analyzer/sarg/sarg-2.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ IUSE="bzip2 doublecheck +gd +glob ldap lzma pcre zlib"
RDEPEND="
bzip2? ( app-arch/bzip2 )
gd? ( media-libs/gd[png,truetype] )
- ldap? ( net-nds/openldap )
+ ldap? ( net-nds/openldap:= )
lzma? ( app-arch/xz-utils )
pcre? ( dev-libs/libpcre )
zlib? ( sys-libs/zlib )
diff --git a/net-analyzer/scanlogd/scanlogd-2.2.7-r1.ebuild b/net-analyzer/scanlogd/scanlogd-2.2.7-r1.ebuild
index 7598563d381..425d76c6c15 100644
--- a/net-analyzer/scanlogd/scanlogd-2.2.7-r1.ebuild
+++ b/net-analyzer/scanlogd/scanlogd-2.2.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.openwall.com/scanlogd/"
LICENSE="scanlogd GPL-2" # GPL-2 for initscript
SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc x86"
IUSE="+nids pcap"
REQUIRED_USE="?? ( nids pcap )"
diff --git a/net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild b/net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild
index 0e6c20df4be..c4c0611a002 100644
--- a/net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild
+++ b/net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.openwall.com/scanlogd/"
LICENSE="scanlogd GPL-2" # GPL-2 for initscript
SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc x86"
IUSE="+nids pcap"
REQUIRED_USE="?? ( nids pcap )"
diff --git a/net-analyzer/sec/Manifest b/net-analyzer/sec/Manifest
index 445d76d447c..4ef9474c220 100644
--- a/net-analyzer/sec/Manifest
+++ b/net-analyzer/sec/Manifest
@@ -1 +1,2 @@
DIST sec-2.8.3.tar.gz 144950 BLAKE2B 03e6f3077628a1e4221149875878642574ab00d87a0e601144b4c2f35f1d54cb937053a22d30ee7c5f13c4079e845dcccdf743a71a5afd75d2c46a34e4dadcf6 SHA512 9eba7db0dfa3661a3ef4e8aad3eeef1db710784f7a71131991a06918cc4f5634577b8bff3f00fcc1c5d998bf0c1e80efe88e1c1df3f5530b6ab4905ff00f2269
+DIST sec-2.9.1.tar.gz 153305 BLAKE2B 0bbc70f786badb24153f4f124aaedbf6f34970556630ee3e8763e7854dc1765d0eb8f7d10efce119ca936eade2af8064188f3372e63f7977240a0b10327269a3 SHA512 c6764cf660ad969d260e4993c38809580e448a9d941d1a763c1b70630c5d55a7f215feb6b0fa50cbf23d68fb442e34f0d270d03e1172850d63d64042a689ac90
diff --git a/net-analyzer/sec/sec-2.9.1.ebuild b/net-analyzer/sec/sec-2.9.1.ebuild
new file mode 100644
index 00000000000..bf2342ed790
--- /dev/null
+++ b/net-analyzer/sec/sec-2.9.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Simple Event Correlator"
+HOMEPAGE="https://simple-evcorr.github.io/ https://github.com/simple-evcorr/sec"
+SRC_URI="https://github.com/simple-evcorr/sec/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+
+RDEPEND=">=dev-lang/perl-5.8.0
+ virtual/perl-JSON-PP"
+
+src_install() {
+ dobin sec
+
+ dodoc ChangeLog README
+ docinto contrib
+ dodoc contrib/{itostream.c,convert.pl,swatch2sec.pl}
+
+ newman sec.man sec.1
+
+ newinitd "${FILESDIR}"/sec.init.d sec
+ newconfd "${FILESDIR}"/sec.conf.d sec
+}
diff --git a/net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r2.ebuild b/net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r3.ebuild
index d783b8e9738..0403ede4f1b 100644
--- a/net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r2.ebuild
+++ b/net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -25,7 +25,7 @@ RDEPEND="
dev-tcltk/tls
>=net-analyzer/barnyard-0.2.0-r1
>=net-analyzer/snort-2.4.1-r1
- dev-ml/pcre-ocaml
+ dev-ml/pcre-ocaml:=
net-analyzer/sancp
"
diff --git a/net-analyzer/snallygaster/Manifest b/net-analyzer/snallygaster/Manifest
index ec0b3ff27da..4ed2543dbaa 100644
--- a/net-analyzer/snallygaster/Manifest
+++ b/net-analyzer/snallygaster/Manifest
@@ -1,4 +1,2 @@
DIST snallygaster-0.0.11.tar.gz 25238 BLAKE2B 11867c0a71cd1701205f499cc7e492520018d39dcdeae0d8e8ae130e2034fd15d20039ed2c7325c879b1640b67a02515685640d5278e0aaafba864fd9d47a7a0 SHA512 6c050f8d67748fa148a578e37f3788305251d210691047f045d63dd531eca4ef4eb9e1d74a22ce9db13c71e471ced304d8138b8f283a1fe4841381532baab733
-DIST snallygaster-0.0.6.tar.gz 22260 BLAKE2B 5f5f45678ee83922d477eb7356bf830a4ececbff6fc02bc21d2b714abf350c1b2643fb8134f330d8f54a4c58809b9de2671f46b728e631ac0a5f4996f87fd8e1 SHA512 abca663005e43948ef7c6516a3e85d1b1010811365f39a280b9c091490a8b4687fdaa1b0acbd29f5a84285fe16cd74398098eb9600b5ec41ec880d355cd0ddbd
-DIST snallygaster-0.0.8.tar.gz 23341 BLAKE2B 0b4e92b50c9f766440a19bab6e39f7be323c5574c8f350ed3fbd07499ca04b358ec0e66deeddd30b5e798d093a73fbce65434be4058285eb773918314f373dac SHA512 a4937d5e486109deb54d4a3494fcdb2b06a0938cb9ca686550616d31d2f5bde01b4162f610db15c34c86e41673f6f05f749fb921d5f858cbc4a2fc7f65a6dda6
-DIST snallygaster-0.0.9.tar.gz 24055 BLAKE2B 049a88250877ed87103d23a30443ed638320e61c788716d432d877407c837f439bd16dc78a6eb00f7fea844280975f155898d9b084f7e285a0ed81a6becf9d68 SHA512 e7de6d97576f1651e0a6882c4d2766efe82b8656f53a6c30a5e36eeadbaa4fdc2b79dc370a1106a0bbd916d45d1c92169dcfb5d7c75e89946b371bc80098366c
+DIST snallygaster-0.0.12.tar.gz 25234 BLAKE2B 69082fe94fc65d78b99519511b6850d569401d326788448dffac2baca3e359e166b161e69b5169dc0772c4eba5e3cf70968ed75fe09efad7924869971a0869c8 SHA512 507b5bbaa8a013bbbb18b53778781e1e212e295f113ea91b1b73d5162f93d35be74780fa0cba7499d62f40c8cd27b4cdfd79526bd0ab07018090460ca937eb48
diff --git a/net-analyzer/snallygaster/snallygaster-0.0.6.ebuild b/net-analyzer/snallygaster/snallygaster-0.0.12.ebuild
index cef08b8a35a..578572f0bfb 100644
--- a/net-analyzer/snallygaster/snallygaster-0.0.6.ebuild
+++ b/net-analyzer/snallygaster/snallygaster-0.0.12.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
DISTUTILS_SINGLE_IMPL=1
inherit distutils-r1
@@ -19,3 +19,7 @@ DEPEND="dev-python/dnspython
dev-python/beautifulsoup4"
RDEPEND="${DEPEND}"
DOCS=( README.md TESTS.md )
+
+# Only codingstyle and similar tests, require dependencies
+# not packaged in Gentoo
+RESTRICT="test"
diff --git a/net-analyzer/snallygaster/snallygaster-0.0.8.ebuild b/net-analyzer/snallygaster/snallygaster-0.0.8.ebuild
deleted file mode 100644
index cef08b8a35a..00000000000
--- a/net-analyzer/snallygaster/snallygaster-0.0.8.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1
-
-DESCRIPTION="Finds file leaks and other security problems on HTTP servers"
-HOMEPAGE="https://github.com/hannob/snallygaster"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-python/dnspython
- dev-python/urllib3
- dev-python/beautifulsoup4"
-RDEPEND="${DEPEND}"
-DOCS=( README.md TESTS.md )
diff --git a/net-analyzer/snallygaster/snallygaster-0.0.9.ebuild b/net-analyzer/snallygaster/snallygaster-0.0.9.ebuild
deleted file mode 100644
index b984ebb2e0f..00000000000
--- a/net-analyzer/snallygaster/snallygaster-0.0.9.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1
-
-DESCRIPTION="Finds file leaks and other security problems on HTTP servers"
-HOMEPAGE="https://github.com/hannob/snallygaster"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-python/dnspython
- dev-python/urllib3
- dev-python/beautifulsoup4"
-RDEPEND="${DEPEND}"
-DOCS=( README.md TESTS.md )
diff --git a/net-analyzer/snmpclitools/snmpclitools-0.6.4-r1.ebuild b/net-analyzer/snmpclitools/snmpclitools-0.6.4-r1.ebuild
new file mode 100644
index 00000000000..df68158355b
--- /dev/null
+++ b/net-analyzer/snmpclitools/snmpclitools-0.6.4-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python SNMP management tools, formerly pysnmp-apps"
+HOMEPAGE="https://github.com/etingof/snmpclitools"
+SRC_URI="https://github.com/etingof/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="!dev-python/pysnmp-apps
+ >=dev-python/pysnmp-4.2.2[${PYTHON_USEDEP}]
+ dev-python/pysnmp-mibs[${PYTHON_USEDEP}]"
diff --git a/net-analyzer/snort/files/snort_at.service b/net-analyzer/snort/files/snort_at.service
index f764015c219..40fb0cb1a1d 100644
--- a/net-analyzer/snort/files/snort_at.service
+++ b/net-analyzer/snort/files/snort_at.service
@@ -3,7 +3,7 @@ Description=Snort IDS system listening on '%I'
[Service]
Type=simple
-ExecStartPre=/usr/sbin/ip link set up dev %I
+ExecStartPre=/bin/ip link set up dev %I
ExecStart=/usr/bin/snort --daq-dir /usr/lib/daq/ -A fast -b -p -u snort -g snort -c /etc/snort/snort.conf -i %I
ExecReload=/bin/kill -HUP $MAINPID
diff --git a/net-analyzer/snort/snort-2.9.17-r1.ebuild b/net-analyzer/snort/snort-2.9.17-r1.ebuild
new file mode 100644
index 00000000000..ba2c5639326
--- /dev/null
+++ b/net-analyzer/snort/snort-2.9.17-r1.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( luajit )
+
+inherit autotools lua-single systemd tmpfiles
+
+DESCRIPTION="The de facto standard for intrusion detection/prevention"
+HOMEPAGE="https://www.snort.org"
+SRC_URI="https://www.snort.org/downloads/archive/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+active-response control-socket debug file-inspect +flexresp3 +gre
+high-availability inline-init-failopen large-pcap-64bit +libtirpc
+linux-smp-stats +non-ether-decoders open-appid +perfprofiling +ppm +react
+reload-error-restart selinux shared-rep side-channel sourcefire +threads"
+
+DEPEND="acct-user/snort
+ acct-group/snort
+ dev-libs/libdnet
+ >=dev-libs/libpcre-8.33
+ net-libs/libnsl:0=
+ >=net-libs/libpcap-1.3.0
+ sys-libs/zlib
+ !libtirpc? ( sys-libs/glibc[rpc(-)] )
+ libtirpc? ( net-libs/libtirpc )
+ open-appid? ( ${LUA_DEPS} )"
+BDEPEND=">=net-libs/daq-2.0.2"
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-snort )"
+
+REQUIRED_USE="!kernel_linux? ( !shared-rep )
+ open-appid? ( ${LUA_REQUIRED_USE} )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.9.8.3-no-implicit.patch"
+ "${FILESDIR}/${PN}-2.9.8.3-rpc.patch"
+ "${FILESDIR}/${PN}-2.9.12-snort.pc.patch"
+)
+
+pkg_setup() {
+ use open-appid && lua-single_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ mv configure.{in,ac} || die
+
+ # USE=debug exposes a macro whose name apparently wasn't changed
+ sed -i -e 's/BEFORE_SRV_FAIL/BEFORE_SERVICE_FAIL/' \
+ src/dynamic-preprocessors/appid/appInfoTable.c || die
+
+ AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable gre) \
+ $(use_enable control-socket) \
+ $(use_enable file-inspect) \
+ $(use_enable high-availability ha) \
+ $(use_enable non-ether-decoders) \
+ $(use_enable shared-rep) \
+ $(use_enable side-channel) \
+ $(use_enable sourcefire) \
+ $(use_enable ppm) \
+ $(use_enable perfprofiling) \
+ $(use_enable linux-smp-stats) \
+ $(use_enable inline-init-failopen) \
+ $(use_enable open-appid) \
+ $(use_enable threads pthread) \
+ $(use_enable debug) \
+ $(use_enable debug debug-msgs) \
+ $(use_enable debug corefiles) \
+ $(use_enable !debug dlclose) \
+ $(use_enable active-response) \
+ $(use_enable reload-error-restart) \
+ $(use_enable react) \
+ $(use_enable flexresp3) \
+ $(use_enable large-pcap-64bit large-pcap) \
+ $(use_with libtirpc) \
+ --enable-mpls \
+ --enable-normalizer \
+ --enable-reload \
+ --enable-targetbased \
+ --disable-build-dynamic-examples \
+ --disable-profile \
+ --disable-ppm-test \
+ --disable-intel-soft-cpm \
+ --disable-static-daq \
+ --disable-static \
+ --disable-so-with-static-lib
+}
+
+src_install() {
+ default
+
+ keepdir /var/log/snort \
+ /etc/snort/rules \
+ /etc/snort/so_rules \
+ /usr/$(get_libdir)/snort_dynamicrules
+
+ # config.log and build.log are needed by Sourcefire
+ # to trouble shoot build problems and bug reports so we are
+ # perserving them incase the user needs upstream support.
+ dodoc RELEASE.NOTES ChangeLog \
+ doc/* \
+ tools/u2boat/README.u2boat
+
+ insinto /etc/snort
+ doins etc/attribute_table.dtd \
+ etc/classification.config \
+ etc/gen-msg.map \
+ etc/reference.config \
+ etc/threshold.conf \
+ etc/unicode.map
+
+ # We use snort.conf.distrib because the config file is complicated
+ # and the one shipped with snort can change drastically between versions.
+ # Users should migrate setting by hand and not with etc-update.
+ newins etc/snort.conf snort.conf.distrib
+
+ # config.log and build.log are needed by Sourcefire
+ # to troubleshoot build problems and bug reports so we are
+ # preserving them incase the user needs upstream support.
+ if [ -f "${WORKDIR}/${PF}/config.log" ]; then
+ dodoc "${WORKDIR}/${PF}/config.log"
+ fi
+ if [ -f "${T}/build.log" ]; then
+ dodoc "${T}/build.log"
+ fi
+
+ insinto /etc/snort/preproc_rules
+ doins preproc_rules/decoder.rules \
+ preproc_rules/preprocessor.rules \
+ preproc_rules/sensitive-data.rules
+
+ fowners -R snort:snort \
+ /var/log/snort \
+ /etc/snort
+
+ newinitd "${FILESDIR}/snort.rc12" snort
+ newconfd "${FILESDIR}/snort.confd.2" snort
+ systemd_newunit "${FILESDIR}/snort_at.service" "snort@.service"
+
+ newtmpfiles "${FILESDIR}"/snort.tmpfiles snort.conf
+
+ # Sourcefire uses Makefiles to install docs causing Bug #297190.
+ # This removes the unwanted doc directory and rogue Makefiles.
+ rm -rf "${ED}"/usr/share/doc/snort || die "Failed to remove SF doc directories"
+ rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+
+ # Remove unneeded .la files (Bug #382863)
+ find "${ED}" -name '*.la' -type f -delete || die
+
+ # Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
+ sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
+ "${ED}/etc/snort/snort.conf.distrib" || die
+
+ # Set the correct rule location in the config
+ sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
+ "${ED}/etc/snort/snort.conf.distrib" || die
+
+ # Set the correct preprocessor/decoder rule location in the config
+ sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
+ "${ED}/etc/snort/snort.conf.distrib" || die
+
+ # Enable the preprocessor/decoder rules
+ sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
+ "${ED}/etc/snort/snort.conf.distrib" || die
+
+ sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
+ "${ED}/etc/snort/snort.conf.distrib" || die
+
+ # Just some clean up of trailing /'s in the config
+ sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
+ "${ED}/etc/snort/snort.conf.distrib" || die
+
+ # Make it clear in the config where these are...
+ sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
+ "${ED}/etc/snort/snort.conf.distrib" || die
+
+ sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
+ "${ED}/etc/snort/snort.conf.distrib" || die
+
+ # Disable all rule files by default.
+ sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
+ "${ED%}/etc/snort/snort.conf.distrib" || die
+
+ # Set the configured DAQ to afpacket
+ sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
+ "${ED%}/etc/snort/snort.conf.distrib" || die
+
+ # Set the location of the DAQ modules
+ sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \
+ "${ED%}/etc/snort/snort.conf.distrib" || die
+
+ # Set the DAQ mode to passive
+ sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \
+ "${ED%}/etc/snort/snort.conf.distrib" || die
+
+ # Set snort to run as snort:snort
+ sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
+ "${ED}/etc/snort/snort.conf.distrib" || die
+ sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
+ "${ED}/etc/snort/snort.conf.distrib" || die
+
+ # Set the default log dir
+ sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
+ "${ED}/etc/snort/snort.conf.distrib" || die
+
+ # Set the correct so_rule location in the config
+ sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
+ "${ED}/etc/snort/snort.conf.distrib" || die
+}
+
+pkg_postinst() {
+ tmpfiles_process snort.conf
+
+ einfo "There have been a number of improvements and new features"
+ einfo "added to ${P}. Please review the RELEASE.NOTES and"
+ einfo "ChangLog located in /usr/share/doc/${PF}."
+ einfo
+ elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
+ elog "users migrate their snort.conf customizations to the latest config"
+ elog "file released by the VRT. You can find the latest version of the"
+ elog "Snort config file in /etc/snort/snort.conf.distrib."
+ elog
+ elog "!! It is important that you migrate to this new snort.conf file !!"
+ elog
+ elog "This version of the ebuild includes an updated init.d file and"
+ elog "conf.d file that rely on options found in the latest Snort"
+ elog "config file provided by the VRT."
+
+ if use debug; then
+ elog "You have the 'debug' USE flag enabled. If this has been done to"
+ elog "troubleshoot an issue by producing a core dump or a back trace,"
+ elog "then you need to also ensure the FEATURES variable in make.conf"
+ elog "contains the 'nostrip' option."
+ fi
+}
diff --git a/net-analyzer/snortsam/snortsam-2.70.ebuild b/net-analyzer/snortsam/snortsam-2.70-r1.ebuild
index f32b3f6db2e..d900b52d06f 100644
--- a/net-analyzer/snortsam/snortsam-2.70.ebuild
+++ b/net-analyzer/snortsam/snortsam-2.70-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit epatch flag-o-matic toolchain-funcs vcs-clean
+inherit flag-o-matic toolchain-funcs vcs-clean
DESCRIPTION="Snort plugin that allows automated blocking of IP addresses on several firewalls"
HOMEPAGE="http://www.snortsam.net/"
@@ -15,8 +15,10 @@ SLOT="0"
KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
IUSE="debug"
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch
+ default
ecvs_clean
}
@@ -31,14 +33,13 @@ src_compile() {
src_install() {
dobin snortsam
- find "${S}" -depth -type f -name "*.asc" -exec rm -f {} \;
- dodoc docs/* conf/*
+
+ find . -depth -type f -name '*.asc' -delete || die
+ dodoc -r docs/. conf/.
}
pkg_postinst() {
- echo
elog "To use snortsam with snort, you'll have to compile snort with USE=snortsam."
elog "Read the INSTALL file to configure snort for snortsam, and configure"
elog "snortsam for your particular firewall."
- echo
}
diff --git a/net-analyzer/speedtest++/Manifest b/net-analyzer/speedtest++/Manifest
new file mode 100644
index 00000000000..788248bd96f
--- /dev/null
+++ b/net-analyzer/speedtest++/Manifest
@@ -0,0 +1 @@
+DIST speedtest++-0.0.20210829.tar.gz 13444 BLAKE2B ac6967d7ed0174e2278c91a8e76012621cc67e51c1722a0d359fc7889b4bc813abb1709b5e482eeef7ff0951be3c697777dc5f2258b099521a08db77c5d7fa40 SHA512 3085adab0f4c94c8e5c3168136094a571d901866352387e9afe0ef386127da6971329bc8f6d8c02efa5f32c8620ccd2482d65dce34da4ca4331b88edf34df2b3
diff --git a/net-analyzer/speedtest++/metadata.xml b/net-analyzer/speedtest++/metadata.xml
new file mode 100644
index 00000000000..2c5e2cf3619
--- /dev/null
+++ b/net-analyzer/speedtest++/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>zx2c4@gentoo.org</email>
+ <name>Jason A. Donenfeld</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">taganaka/SpeedTest</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/speedtest++/speedtest++-0.0.20210829.ebuild b/net-analyzer/speedtest++/speedtest++-0.0.20210829.ebuild
new file mode 100644
index 00000000000..4ccc533381c
--- /dev/null
+++ b/net-analyzer/speedtest++/speedtest++-0.0.20210829.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="High performance speedtest.net CLI"
+HOMEPAGE="https://github.com/taganaka/SpeedTest"
+SNAPSHOT_COMMIT="0f63cfbf7ce8d64ea803bf143b957eae76323405"
+SRC_URI="https://github.com/taganaka/SpeedTest/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+ net-misc/curl
+ dev-libs/libxml2:=
+ dev-libs/openssl:0=
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/SpeedTest-${SNAPSHOT_COMMIT}"
diff --git a/net-analyzer/speedtest-cli/metadata.xml b/net-analyzer/speedtest-cli/metadata.xml
index 3792bdc2e52..1608948afeb 100644
--- a/net-analyzer/speedtest-cli/metadata.xml
+++ b/net-analyzer/speedtest-cli/metadata.xml
@@ -2,8 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>zx2c4@gentoo.org</email>
- <name>Jason A. Donenfeld</name>
+ <email>conikost@gentoo.org</email>
+ <name>Conrad Kostecki</name>
</maintainer>
<upstream>
<remote-id type="github">sivel/speedtest-cli</remote-id>
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-2.1.3.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-2.1.3-r1.ebuild
index 4d4c4eb395b..2a7c8b1f1b6 100644
--- a/net-analyzer/speedtest-cli/speedtest-cli-2.1.3.ebuild
+++ b/net-analyzer/speedtest-cli/speedtest-cli-2.1.3-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7..10} )
+DISTUTILS_USE_PEP517="setuptools"
+PYTHON_COMPAT=( python3_{8..11} )
inherit distutils-r1
@@ -14,14 +15,17 @@ SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
-IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="${DEPEND}"
-DOCS=( CONTRIBUTING.md README.rst )
-
python_install_all() {
doman ${PN}.1
distutils-r1_python_install_all
}
+
+pkg_postinst() {
+ ewarn "net-analyzer/speedtest-cli is often times inaccurate, especially on faster"
+ ewarn "links, due to its use of the older HTTP-based API. In order to have more"
+ ewarn "accurate measurements, please use net-analyzer/speedtest++ instead."
+}
diff --git a/net-analyzer/squidsites/squidsites-1.01-r2.ebuild b/net-analyzer/squidsites/squidsites-1.01-r2.ebuild
index c165a7e043d..3c359aefe47 100644
--- a/net-analyzer/squidsites/squidsites-1.01-r2.ebuild
+++ b/net-analyzer/squidsites/squidsites-1.01-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit toolchain-funcs
-DESCRIPTION="A tool that parses Squid access log file and generates a report of the most visited sites"
+DESCRIPTION="A tool to parse Squid access log file and to generate reports"
HOMEPAGE="http://www.stefanopassiglia.com/misc.htm"
SRC_URI="http://www.stefanopassiglia.com/downloads/${P}.tar.gz"
S="${WORKDIR}/src"
diff --git a/net-analyzer/ssh-audit/Manifest b/net-analyzer/ssh-audit/Manifest
new file mode 100644
index 00000000000..169dc979d88
--- /dev/null
+++ b/net-analyzer/ssh-audit/Manifest
@@ -0,0 +1 @@
+DIST ssh-audit-2.5.0.tar.gz 125991 BLAKE2B 902c29c3eb6dc1ac894d8a75a28f74a43a2e172e513db97d70358d7e6737115e5308fef33541baf0f272a2dce4bb29355eb8809274cfffa64c16a02cb19ce75b SHA512 252d29cb95dc5b0c40d2c47f2f884417a924fe08668db49d6284a931806730729569b9e3049157b0cee00515fbb04d99a98c3933ebcfd8ad847ab343d13e234e
diff --git a/net-analyzer/ssh-audit/metadata.xml b/net-analyzer/ssh-audit/metadata.xml
new file mode 100644
index 00000000000..915e0081a17
--- /dev/null
+++ b/net-analyzer/ssh-audit/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>graaff@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">jtesta/ssh-audit</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/ssh-audit/ssh-audit-2.5.0.ebuild b/net-analyzer/ssh-audit/ssh-audit-2.5.0.ebuild
new file mode 100644
index 00000000000..f4ac09f741f
--- /dev/null
+++ b/net-analyzer/ssh-audit/ssh-audit-2.5.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=(python3_{8,9,10})
+
+inherit distutils-r1
+
+DESCRIPTION="SSH server auditing (banner, key exchange, encryption, mac, compression, etc)"
+HOMEPAGE="https://github.com/jtesta/ssh-audit"
+SRC_URI="https://github.com/jtesta/ssh-audit/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE=""
+
+# Tests require prospector which is not packaged
+RESTRICT="test"
+
+src_install() {
+ distutils-r1_src_install
+
+ doman ssh-audit.1
+}
diff --git a/net-analyzer/sshping/metadata.xml b/net-analyzer/sshping/metadata.xml
index 9a83c70d347..338f017da09 100644
--- a/net-analyzer/sshping/metadata.xml
+++ b/net-analyzer/sshping/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>ajak@gentoo.org</email>
diff --git a/net-analyzer/ssldump/Manifest b/net-analyzer/ssldump/Manifest
index 5a4c9105087..f1fb6428f86 100644
--- a/net-analyzer/ssldump/Manifest
+++ b/net-analyzer/ssldump/Manifest
@@ -1 +1,2 @@
DIST ssldump-1.4.tar.gz 129184 BLAKE2B db27f94deaa8b1f0e656d22e645db349bba872d8404a1d8a82098c3a2dd4c6d4b12bb3d430094825219a66bd203736cc27766967d3ce0923bd5fdd64a452d6cd SHA512 fb17c5610dcfce3e8020a5148d37be5b2fbc3083d78727281922ae32b5905c4aa882cd368c3581238f3492c6b5bab943dcff6a966d64160a3836d6a95bdc7682
+DIST ssldump-1.5.tar.gz 129388 BLAKE2B 9877bf604690911a3680cf4edfe0115a8a8e2ddf14abc260a99fdcc181bd727c5f3bfb0aa8864f502ff560ccab76e27a22266a3ed78eb516f019ed7cb44bef69 SHA512 4eb84744591539fdaf9b2454d23c917f5e97cb2e5f03e0c38393327caecc72dfc77ee7b734519b1f224a5e3a132185b8fccfeb9186fc9f1b586444fc748a3814
diff --git a/net-analyzer/ssldump/metadata.xml b/net-analyzer/ssldump/metadata.xml
index 9e5143ab862..d5af4bcfaf1 100644
--- a/net-analyzer/ssldump/metadata.xml
+++ b/net-analyzer/ssldump/metadata.xml
@@ -5,7 +5,4 @@
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
- <upstream>
- <remote-id type="sourceforge">downloads</remote-id>
- </upstream>
</pkgmetadata>
diff --git a/net-analyzer/ssldump/ssldump-1.5.ebuild b/net-analyzer/ssldump/ssldump-1.5.ebuild
new file mode 100644
index 00000000000..3935218c47f
--- /dev/null
+++ b/net-analyzer/ssldump/ssldump-1.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="An SSLv3/TLS network protocol analyzer"
+HOMEPAGE="https://github.com/adulau/ssldump/"
+SRC_URI="https://github.com/adulau/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="dev-libs/json-c:=
+ dev-libs/openssl:=
+ net-libs/libnet:1.1
+ net-libs/libpcap"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_install() {
+ dosbin ssldump
+ doman ssldump.1
+ dodoc ChangeLog CREDITS README README.md
+}
diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest
index 8f5c0cd4601..ad3f8d14357 100644
--- a/net-analyzer/sslscan/Manifest
+++ b/net-analyzer/sslscan/Manifest
@@ -1,4 +1,6 @@
-DIST sslscan-2.0.10.tar.gz 110417 BLAKE2B 88c095096dd615b13e3c68e6ece7eff8588e7debe65c5c6b228392d78c806029a2bc18a6c42bee480e2bb669b39753b39de160917eafbb654f5d8b64ba50d309 SHA512 d6adc76579dd99648359e9694b615bf1d9be90d71736e49305fefa0c0e1e386af2457c534136d8da2219c080b1119873f54a4cdf1b82675f0ce24f4e6ae068ee
DIST sslscan-2.0.11.tar.gz 110704 BLAKE2B 4d4db6fa7b8f6f611e752d0f97ff1219fcbd064280bc4133dd38d1268cb268847801d25403eeb6bc475579a931e944c9a21d90e40fed6bed2a6a6bc535540f7d SHA512 99681cd8b7240cf85dedfaf210cae11ba3dbf2d56c3fa8ef3f3cdcabb6b29916b640e5955a7876ebb9be36dbe326da303e5bda7537b48743ff0a8c1bd35dbf0c
-DIST sslscan-OpenSSL_1_1_1k.tar.gz 9996510 BLAKE2B 755bbdfa5738e2f2d0a72b0e01861acb2df33f499e140b46a40562b0d6035992f5aae084c480d9fe4e82e4a4f74929e686c31b04f126859375357a0f9c207b5b SHA512 b963e24f598d4c95455733a1b06f73b802ccf18c3a4aa8e1436ef597aba3daa6020d032051439b35f72bd566e9e62d24aaacce770567e2b9e5c82958698d3d97
+DIST sslscan-2.0.13.tar.gz 111142 BLAKE2B 049791183ebf1e00d11868c0dd7b79eddcd27cbb1f915812938f46837c4b300844c26e0a0bee0a4bee4886f24f7b10e5bc77ddedc86893ae228658ab71d11bea SHA512 50455a4f4a999e63107e705a4bc703b94b30d4fa71b5126cdc08788eedeb02f4c7a204a385fa485f0c9d0fa368c7a48f96c492b91631fe8833b68f20d45b0fca
+DIST sslscan-2.0.14.tar.gz 111539 BLAKE2B 392a5f043172aa5800c40e1a86c198421de7fb4ddf92f8504e0b6270c70f4c58f0527cfaaff4892469d763d970b044168ab2a37fa4d836cddda88e5e9fd04586 SHA512 bb496fffbd4e130bae8b9272d1303bfa0a681ff88aa3471e4b3f56bece2072ad8f8f41c19c4325de3d5772e785c1ab7491d3520ac3a44a7a170636ae4e13ed0d
DIST sslscan-OpenSSL_1_1_1m.tar.gz 10023608 BLAKE2B a6951bfcddea224a4920f18b7352feb427b979965f8f563b9adf3dc3152133fd44d7a3c490c522986066db6b23c2e878f135a7a9160f564d435e66c2cce0c51f SHA512 af85d15c9db06eb9cdfa9e16ef9f859df752d823aa7c7f0c1b334cd71ba924878c686a65e756fd09c7630b650aad1a2bbe02acdfd6c389b52c2560d32d4150fb
+DIST sslscan-OpenSSL_1_1_1n.tar.gz 10031245 BLAKE2B 8af659fc9eead7b91a7553c17570dabb17d15fb37a77e7eecfa2a9dffc9eb0a331dd3f11a193907d16e535594eb8c31707ae91d91db91e99c75d75bdd43a7774 SHA512 bfe45e4cbe082e45d165212caa8e660c8af68559675c42461aba5685a7baa7e16c9c0096557106706114176dc31142c760fe835022f796e4341eb08d1b20408d
+DIST sslscan-OpenSSL_1_1_1o.tar.gz 10030908 BLAKE2B 97b2e9a385ef8d2c9b23cacb6c5f5998572299cc4189b1110691c87b3d56fa9eebcedf6cc4cdaf305e3c419f2ab6bbac7b3260ff0e1070b0c2f620b7bb18db9c SHA512 ee9e9a8dd2ccc5dc63ede1774c4bf931570be3bad4555b208bca718cb2b814eea7a067dfe29f0eee8dcf5588d0d2df272b578526fea6fc3bf5ed2d6bbf21d2fb
diff --git a/net-analyzer/sslscan/files/gentoo.config-1.0.2 b/net-analyzer/sslscan/files/gentoo.config-1.0.2
new file mode 100644
index 00000000000..68d7d0ac1fc
--- /dev/null
+++ b/net-analyzer/sslscan/files/gentoo.config-1.0.2
@@ -0,0 +1,171 @@
+#!/usr/bin/env bash
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+#
+# Openssl doesn't play along nicely with cross-compiling
+# like autotools based projects, so let's teach it new tricks.
+#
+# Review the bundled 'config' script to see why kind of targets
+# we can pass to the 'Configure' script.
+
+
+# Testing routines
+if [[ $1 == "test" ]] ; then
+ for c in \
+ "arm-gentoo-linux-uclibc |linux-generic32 -DL_ENDIAN" \
+ "armv5b-linux-gnu |linux-armv4 -DB_ENDIAN" \
+ "x86_64-pc-linux-gnu |linux-x86_64" \
+ "alpha-linux-gnu |linux-alpha-gcc" \
+ "alphaev56-unknown-linux-gnu |linux-alpha+bwx-gcc" \
+ "i686-pc-linux-gnu |linux-elf" \
+ "whatever-gentoo-freebsdX.Y |BSD-generic32" \
+ "i686-gentoo-freebsdX.Y |BSD-x86-elf" \
+ "sparc64-alpha-freebsdX.Y |BSD-sparc64" \
+ "ia64-gentoo-freebsd5.99234 |BSD-ia64" \
+ "x86_64-gentoo-freebsdX.Y |BSD-x86_64" \
+ "hppa64-aldsF-linux-gnu5.3 |linux-generic32 -DB_ENDIAN" \
+ "powerpc-gentOO-linux-uclibc |linux-ppc" \
+ "powerpc64-unk-linux-gnu |linux-ppc64" \
+ "powerpc64le-linux-gnu |linux-ppc64le" \
+ "x86_64-apple-darwinX |darwin64-x86_64-cc" \
+ "powerpc64-apple-darwinX |darwin64-ppc-cc" \
+ "i686-apple-darwinX |darwin-i386-cc" \
+ "i386-apple-darwinX |darwin-i386-cc" \
+ "powerpc-apple-darwinX |darwin-ppc-cc" \
+ "i586-pc-winnt |winnt-parity" \
+ "s390-ibm-linux-gnu |linux-generic32 -DB_ENDIAN" \
+ "s390x-linux-gnu |linux64-s390x" \
+ ;do
+ CHOST=${c/|*}
+ ret_want=${c/*|}
+ ret_got=$(CHOST=${CHOST} "$0")
+
+ if [[ ${ret_want} == "${ret_got}" ]] ; then
+ echo "PASS: ${CHOST}"
+ else
+ echo "FAIL: ${CHOST}"
+ echo -e "\twanted: ${ret_want}"
+ echo -e "\twe got: ${ret_got}"
+ fi
+ done
+ exit 0
+fi
+[[ -z ${CHOST} && -n $1 ]] && CHOST=$1
+
+
+# Detect the operating system
+case ${CHOST} in
+ *-aix*) system="aix";;
+ *-darwin*) system="darwin";;
+ *-freebsd*) system="BSD";;
+ *-hpux*) system="hpux";;
+ *-linux*) system="linux";;
+ *-solaris*) system="solaris";;
+ *-winnt*) system="winnt";;
+ x86_64-*-mingw*) system="mingw64";;
+ *mingw*) system="mingw";;
+ *) exit 0;;
+esac
+
+
+# Compiler munging
+compiler="gcc"
+if [[ ${CC} == "ccc" ]] ; then
+ compiler=${CC}
+fi
+
+
+# Detect target arch
+machine=""
+chost_machine=${CHOST%%-*}
+case ${system} in
+linux)
+ case ${chost_machine}:${ABI} in
+ aarch64*be*) machine="aarch64 -DB_ENDIAN";;
+ aarch64*) machine="aarch64 -DL_ENDIAN";;
+ alphaev56*|\
+ alphaev[678]*)machine=alpha+bwx-${compiler};;
+ alpha*) machine=alpha-${compiler};;
+ armv[4-9]*b*) machine="armv4 -DB_ENDIAN";;
+ armv[4-9]*) machine="armv4 -DL_ENDIAN";;
+ arm*b*) machine="generic32 -DB_ENDIAN";;
+ arm*) machine="generic32 -DL_ENDIAN";;
+ avr*) machine="generic32 -DL_ENDIAN";;
+ bfin*) machine="generic32 -DL_ENDIAN";;
+ # hppa64*) machine=parisc64;;
+ hppa*) machine="generic32 -DB_ENDIAN";;
+ i[0-9]86*|\
+ x86_64*:x86) machine=elf;;
+ ia64*) machine=ia64;;
+ m68*) machine="generic32 -DB_ENDIAN";;
+ mips*el*) machine="generic32 -DL_ENDIAN";;
+ mips*) machine="generic32 -DB_ENDIAN";;
+ powerpc64*le*)machine=ppc64le;;
+ powerpc64*) machine=ppc64;;
+ powerpc*le*) machine="generic32 -DL_ENDIAN";;
+ powerpc*) machine=ppc;;
+ riscv32*) machine="generic32 -DL_ENDIAN";;
+ riscv64*) machine="generic64 -DL_ENDIAN";;
+ # sh64*) machine=elf;;
+ sh*b*) machine="generic32 -DB_ENDIAN";;
+ sh*) machine="generic32 -DL_ENDIAN";;
+ # TODO: Might want to do -mcpu probing like glibc to determine a
+ # better default for sparc-linux-gnu targets. This logic will
+ # break v7 and older systems when they use it.
+ sparc*v7*) machine="generic32 -DB_ENDIAN";;
+ sparc64*) machine=sparcv9 system=linux64;;
+ sparc*v9*) machine=sparcv9;;
+ sparc*v8*) machine=sparcv8;;
+ sparc*) machine=sparcv8;;
+ s390x*) machine=s390x system=linux64;;
+ s390*) machine="generic32 -DB_ENDIAN";;
+ x86_64*:x32) machine=x32;;
+ x86_64*) machine=x86_64;;
+ esac
+ ;;
+BSD)
+ case ${chost_machine} in
+ alpha*) machine=generic64;;
+ i[6-9]86*) machine=x86-elf;;
+ ia64*) machine=ia64;;
+ sparc64*) machine=sparc64;;
+ x86_64*) machine=x86_64;;
+ *) machine=generic32;;
+ esac
+ ;;
+aix)
+ machine=${compiler}
+ ;;
+darwin)
+ case ${chost_machine} in
+ powerpc64) machine=ppc-cc; system=${system}64;;
+ powerpc) machine=ppc-cc;;
+ i?86*) machine=i386-cc;;
+ x86_64) machine=x86_64-cc; system=${system}64;;
+ esac
+ ;;
+hpux)
+ case ${chost_machine} in
+ ia64) machine=ia64-${compiler} ;;
+ esac
+ ;;
+solaris)
+ case ${chost_machine} in
+ i386) machine=x86-${compiler} ;;
+ x86_64*) machine=x86_64-${compiler}; system=${system}64;;
+ sparcv9*) machine=sparcv9-${compiler}; system=${system}64;;
+ sparc*) machine=sparcv8-${compiler};;
+ esac
+ ;;
+winnt)
+ machine=parity
+ ;;
+mingw*)
+ # special case ... no xxx-yyy style name
+ echo ${system}
+ ;;
+esac
+
+
+# If we have something, show it
+[[ -n ${machine} ]] && echo ${system}-${machine}
diff --git a/net-analyzer/sslscan/sslscan-2.0.10.ebuild b/net-analyzer/sslscan/sslscan-2.0.10.ebuild
deleted file mode 100644
index a404662eae7..00000000000
--- a/net-analyzer/sslscan/sslscan-2.0.10.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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_1k"
-
-DESCRIPTION="Fast SSL configuration scanner"
-HOMEPAGE="https://github.com/rbsec/sslscan"
-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"
-
-# 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.11.ebuild b/net-analyzer/sslscan/sslscan-2.0.11.ebuild
index 52fba6fc392..76d7f078f93 100644
--- a/net-analyzer/sslscan/sslscan-2.0.11.ebuild
+++ b/net-analyzer/sslscan/sslscan-2.0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,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"
# Requires a docker environment
RESTRICT="test"
diff --git a/net-analyzer/sslscan/sslscan-2.0.13-r1.ebuild b/net-analyzer/sslscan/sslscan-2.0.13-r1.ebuild
new file mode 100644
index 00000000000..534847f179f
--- /dev/null
+++ b/net-analyzer/sslscan/sslscan-2.0.13-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+# 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_1n"
+
+DESCRIPTION="Fast SSL configuration scanner"
+HOMEPAGE="https://github.com/rbsec/sslscan"
+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 ~arm64 x86"
+
+# 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
+
+ # Copied from dev-libs/openssl
+ # allow openssl to be cross-compiled
+ cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+ chmod a+rx gentoo.config || die
+
+ default
+}
+
+src_configure() {
+ # Copied from dev-libs/openssl
+ unset APPS #197996
+ unset SCRIPTS #312551
+ unset CROSS_COMPILE #311473
+
+ tc-export CC AR RANLIB RC
+
+ local sslout=$(./gentoo.config)
+ einfo "Use configuration ${sslout:-(openssl knows best)}"
+ local config="Configure"
+ [[ -z ${sslout} ]] && config="config"
+
+ # Clean out hardcoded flags that openssl uses
+ local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+ -e 's:^CFLAGS=::' \
+ -e 's:\(^\| \)-fomit-frame-pointer::g' \
+ -e 's:\(^\| \)-O[^ ]*::g' \
+ -e 's:\(^\| \)-march=[^ ]*::g' \
+ -e 's:\(^\| \)-mcpu=[^ ]*::g' \
+ -e 's:\(^\| \)-m[^ ]*::g' \
+ -e 's:^ *::' \
+ -e 's: *$::' \
+ -e 's: \+: :g' \
+ -e 's:\\:\\\\:g'
+ )
+
+ # Now insert clean default flags with user flags
+ sed -i \
+ -e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+ -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+ Makefile || die
+}
+
+src_compile() {
+ emake static
+}
+
+src_install() {
+ DESTDIR="${D}" emake install
+
+ dodoc Changelog README.md
+}
diff --git a/net-analyzer/sslscan/sslscan-2.0.14.ebuild b/net-analyzer/sslscan/sslscan-2.0.14.ebuild
new file mode 100644
index 00000000000..048fd50ff5a
--- /dev/null
+++ b/net-analyzer/sslscan/sslscan-2.0.14.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+# 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_1o"
+
+DESCRIPTION="Fast SSL configuration scanner"
+HOMEPAGE="https://github.com/rbsec/sslscan"
+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 ~arm64 ~x86"
+
+# 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
+
+ # Copied from dev-libs/openssl
+ # allow openssl to be cross-compiled
+ cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+ chmod a+rx gentoo.config || die
+
+ default
+}
+
+src_configure() {
+ # Copied from dev-libs/openssl
+ unset APPS #197996
+ unset SCRIPTS #312551
+ unset CROSS_COMPILE #311473
+
+ tc-export CC AR RANLIB RC
+
+ local sslout=$(./gentoo.config)
+ einfo "Use configuration ${sslout:-(openssl knows best)}"
+ local config="Configure"
+ [[ -z ${sslout} ]] && config="config"
+
+ # Clean out hardcoded flags that openssl uses
+ local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+ -e 's:^CFLAGS=::' \
+ -e 's:\(^\| \)-fomit-frame-pointer::g' \
+ -e 's:\(^\| \)-O[^ ]*::g' \
+ -e 's:\(^\| \)-march=[^ ]*::g' \
+ -e 's:\(^\| \)-mcpu=[^ ]*::g' \
+ -e 's:\(^\| \)-m[^ ]*::g' \
+ -e 's:^ *::' \
+ -e 's: *$::' \
+ -e 's: \+: :g' \
+ -e 's:\\:\\\\:g'
+ )
+
+ # Now insert clean default flags with user flags
+ sed -i \
+ -e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+ -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+ Makefile || die
+}
+
+src_compile() {
+ emake static
+}
+
+src_install() {
+ DESTDIR="${D}" emake install
+
+ dodoc Changelog README.md
+}
diff --git a/net-analyzer/sslsplit/files/sslsplit-0.5.5-openssl3.patch b/net-analyzer/sslsplit/files/sslsplit-0.5.5-openssl3.patch
new file mode 100644
index 00000000000..10807bee389
--- /dev/null
+++ b/net-analyzer/sslsplit/files/sslsplit-0.5.5-openssl3.patch
@@ -0,0 +1,31 @@
+From: Soner Tari <sonertari@gmail.com>
+Date: Fri, 4 Feb 2022 19:46:58 +0300
+Subject: [PATCH] Fix build errors with OpenSSL 3.0.x, but not deprecation
+ warnings, issue #290
+
+This patch fixes errors only, so that build succeeds, but deprecation
+warnings remain. It seems we need considerable changes to replace those
+deprecated functions in the warnings.
+---
+
+Upstream-commit: e17de8454a65 ("Fix build errors with OpenSSL 3.0.x, but not deprecation warnings, issue #290")
+Upstream-issue: https://github.com/droe/sslsplit/issues/290
+
+diff --git a/pxyconn.c b/pxyconn.c
+index e69de20..09a8b80 100644
+--- a/pxyconn.c
++++ b/pxyconn.c
+@@ -72,6 +72,10 @@ bufferevent_openssl_set_allow_dirty_shutdown(UNUSED struct bufferevent *bev,
+ }
+ #endif /* LIBEVENT_VERSION_NUMBER < 0x02010000 */
+
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
++#define ERR_GET_FUNC(x) 0
++#define ERR_func_error_string(x) ""
++#endif
+
+ /*
+ * Maximum size of data to buffer per connection direction before
+--
+2.35.1
+
diff --git a/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild b/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild
index c6f530a4994..f156e951d87 100644
--- a/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild
+++ b/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild
@@ -23,7 +23,7 @@ else
fi
RDEPEND="
- dev-libs/libevent[ssl,threads]
+ dev-libs/libevent:=[ssl,threads]
dev-libs/openssl:0=
net-libs/libnet:1.1
net-libs/libpcap
@@ -32,6 +32,8 @@ DEPEND="${RDEPEND}
test? ( dev-libs/check )"
BDEPEND="virtual/pkgconfig"
+PATCHES=( "${FILESDIR}/${P}-openssl3.patch" )
+
src_prepare() {
default
diff --git a/net-analyzer/sslsplit/sslsplit-9999.ebuild b/net-analyzer/sslsplit/sslsplit-9999.ebuild
index c6f530a4994..17ad8b68ff9 100644
--- a/net-analyzer/sslsplit/sslsplit-9999.ebuild
+++ b/net-analyzer/sslsplit/sslsplit-9999.ebuild
@@ -23,7 +23,7 @@ else
fi
RDEPEND="
- dev-libs/libevent[ssl,threads]
+ dev-libs/libevent:=[ssl,threads]
dev-libs/openssl:0=
net-libs/libnet:1.1
net-libs/libpcap
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index f72537a77d0..835e0388826 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -1,2 +1,4 @@
DIST suricata-5.0.8.tar.gz 29272209 BLAKE2B 5c13aea176b6666477c620d1ed294310ee84ec706abbc740a23d66722297c09b61f253bbe17700cd58f8ce439987c9b13f312aba37d911b6522e4848e7c1b0cd SHA512 a3b355f158f72ed7b43304069ed81b1ebcb331a9fc3e7cfd2e4d04e33369cec1f654f80a2d3df86af74b631235c49068ff992c8715fe868e5ae6b5aff5642891
+DIST suricata-5.0.9.tar.gz 29365601 BLAKE2B 02ab99585233a47b1577e55060ba1141c339718e5bd39b6f4d38bb9384fd459aae353f313083048128507f9023a8bcfea3e5a5bcc9ea0c75cfc9c288ca9db6b6 SHA512 5097bb0d62df05343628579a880eb57182c36c757f707ecaa6c2a8f54e759d8e42357f55630f33bb84e8cd98b783745e1525bdf08ef370754860a3b6aecf2fa4
DIST suricata-6.0.4.tar.gz 32498036 BLAKE2B 083c08ab0878352c425e18184c07866640e5cbe4838749eeb934857bfb486e4b78e7f9ac724289e8ea30b33fe637484cc6da7bc78231e5419b747e22e5a9b6dc SHA512 8dccea669e50758def06fe3f3e8d5048d76b27a80b5f96a7b56d2ab6e4da358d8b17ec2d764e1b53cc6a1334ee0b14191cc80f5dcf18cc4d804d5c530290adf0
+DIST suricata-6.0.5.tar.gz 32605145 BLAKE2B 6fb85eee9a9e5d97eeed5b55f72230261a5cc9c28f0f6ea0cb39f795e1b0ea9655d7bcc3016812f42adc8a9a18e7234c371e05e907686c54214b29a506b38494 SHA512 8b15a8756846faed4120eef75641a6595d06ec9282a934f4d740bba6d01f08b4e876bf6c53559ab571aba5fab70dcc70d891c82978d6b60ab86ab0ae9660368e
diff --git a/net-analyzer/suricata/suricata-5.0.8.ebuild b/net-analyzer/suricata/suricata-5.0.8-r1.ebuild
index ed531092db9..d2ee545bc67 100644
--- a/net-analyzer/suricata/suricata-5.0.8.ebuild
+++ b/net-analyzer/suricata/suricata-5.0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -48,7 +48,7 @@ RDEPEND="${PYTHON_DEPS}
lz4? ( app-arch/lz4 )
nflog? ( net-libs/libnetfilter_log )
nfqueue? ( net-libs/libnetfilter_queue )
- redis? ( dev-libs/hiredis )"
+ redis? ( dev-libs/hiredis:= )"
DEPEND="${RDEPEND}
>=sys-devel/autoconf-2.69-r5
virtual/rust"
diff --git a/net-analyzer/suricata/suricata-5.0.9.ebuild b/net-analyzer/suricata/suricata-5.0.9.ebuild
new file mode 100644
index 00000000000..585a9b6114b
--- /dev/null
+++ b/net-analyzer/suricata/suricata-5.0.9.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools linux-info lua-single python-single-r1 systemd tmpfiles
+
+DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
+HOMEPAGE="https://suricata.io/"
+SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/5"
+KEYWORDS="~amd64 ~x86"
+IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened hyperscan lua lz4 nflog +nfqueue redis systemd test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bpf? ( af-packet )
+ lua? ( ${LUA_REQUIRED_USE} )"
+
+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.40
+ 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 )
+ hyperscan? ( dev-libs/hyperscan )
+ lua? ( ${LUA_DEPS} )
+ 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"
+ "${FILESDIR}/${PN}-5.0.6_configure-no-sphinx-pdflatex-automagic.patch"
+ "${FILESDIR}/${PN}-5.0.7_configure-no-hyperscan-automagic.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 hyperscan) \
+ $(use_enable lz4) \
+ $(use_enable nflog) \
+ $(use_enable nfqueue) \
+ $(use_enable redis hiredis) \
+ $(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) )
+ # 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} || die
+ 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
+ newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
+
+ insopts -m0644
+ insinto /etc/logrotate.d
+ newins etc/${PN}.logrotate ${PN}
+}
+
+pkg_postinst() {
+ tmpfiles_process ${PN}.conf
+
+ 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 [[ -z "${REPLACING_VERSIONS}" ]]; then
+ 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.4.ebuild b/net-analyzer/suricata/suricata-6.0.4-r1.ebuild
index 398159ce0ad..4404a037f1c 100644
--- a/net-analyzer/suricata/suricata-6.0.4.ebuild
+++ b/net-analyzer/suricata/suricata-6.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -42,13 +42,13 @@ RDEPEND="${PYTHON_DEPS}
sys-libs/libcap-ng
bpf? ( >=dev-libs/libbpf-0.1.0 )
cuda? ( dev-util/nvidia-cuda-toolkit )
- geoip? ( dev-libs/libmaxminddb )
+ geoip? ( dev-libs/libmaxminddb:= )
hyperscan? ( dev-libs/hyperscan )
lua? ( ${LUA_DEPS} )
lz4? ( app-arch/lz4 )
nflog? ( net-libs/libnetfilter_log )
nfqueue? ( net-libs/libnetfilter_queue )
- redis? ( dev-libs/hiredis )"
+ redis? ( dev-libs/hiredis:= )"
DEPEND="${RDEPEND}
>=sys-devel/autoconf-2.69-r5
virtual/rust"
diff --git a/net-analyzer/suricata/suricata-6.0.5.ebuild b/net-analyzer/suricata/suricata-6.0.5.ebuild
new file mode 100644
index 00000000000..1170a44de6b
--- /dev/null
+++ b/net-analyzer/suricata/suricata-6.0.5.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools linux-info lua-single python-single-r1 systemd tmpfiles
+
+DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
+HOMEPAGE="https://suricata.io/"
+SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/6"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened hyperscan lua lz4 nflog +nfqueue redis systemd test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bpf? ( af-packet )
+ lua? ( ${LUA_REQUIRED_USE} )"
+
+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.40
+ 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:= )
+ hyperscan? ( dev-libs/hyperscan )
+ lua? ( ${LUA_DEPS} )
+ 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.6_configure-no-sphinx-pdflatex-automagic.patch"
+ "${FILESDIR}/${PN}-5.0.7_configure-no-hyperscan-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 hyperscan) \
+ $(use_enable lz4) \
+ $(use_enable nflog) \
+ $(use_enable nfqueue) \
+ $(use_enable redis hiredis) \
+ $(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) )
+ # 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} || die
+ 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
+ newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
+
+ insopts -m0644
+ insinto /etc/logrotate.d
+ newins etc/${PN}.logrotate ${PN}
+}
+
+pkg_postinst() {
+ tmpfiles_process ${PN}.conf
+
+ 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/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index a8460aafcce..713c659ac15 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,5 +1,2 @@
-DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22
-DIST tcpdump-4.99.0-upstream.tar.gz 2008080 BLAKE2B 389939ea501edf66b7bb809c835feffebf15f30fbba559ce40963733a79ca271982336884acd7ff3d078decb1aaea0616d98091199918b520ef3d1fe0f194431 SHA512 03a434ec41c0026f237bc1e7a928b7ce67dbc342a8d982caded93d987bd356faf706a9d884231bd94f5e2a8580499fe95a28728e37a6672e371a1501ec5d6f79
-DIST tcpdump-4.99.0-upstream.tar.gz.sig 442 BLAKE2B a6cafbccdc1ecfb236a643b72114411e173cc898cda41edeac0c9755e48980f2d44f54c1f52b23dd992890b5aaa57e19430a600662e623832ccc62bfb7ac6fb4 SHA512 545770f09bec2f4ab3e723ab8582f1256eb0cb774ac2f329de17a45ee8256faea49469b796e17250d10c0455b305d39283c9b1d8b3c5a06c47a0d8088c874803
DIST tcpdump-4.99.1-upstream.tar.gz 2014324 BLAKE2B 0a10fe68afdfe80d3e7e661352fcaf1c47702df27fbed959f52fb0ec81543a1d4ce6b0de16a8b081de48dd43e09a13f5e1f0fb11d7590f92cbff29dc511bea12 SHA512 53d31355e1a6ef5a65bb3bf72454169fc80adf973a327a5768840e6ccf0550fbeb3c8a41f959635076d871df0619680321910a3a97879607f481cdaa8b7ceda7
DIST tcpdump-4.99.1-upstream.tar.gz.sig 442 BLAKE2B 9a80b1796ef777bd06d0b8953fe1ff446431d0ff1dffcd58e29a0b771f6734f70f3f0da7c36a1eaa1b6e57719d79c601872a84b7734208a7e8951cad9aca86ee SHA512 b438643701efbbb5579d9d51ed48756a47dd644e0acb10b0edff6d04f3ae4cea6528b40820a656407b73f983b2a634e0165a6c8c0fca3b557394a14e2f2384ab
diff --git a/net-analyzer/tcpdump/files/tcpdump-4.9.3-CVE-2020-8037.patch b/net-analyzer/tcpdump/files/tcpdump-4.9.3-CVE-2020-8037.patch
deleted file mode 100644
index 2852845eb74..00000000000
--- a/net-analyzer/tcpdump/files/tcpdump-4.9.3-CVE-2020-8037.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 32027e199368dad9508965aae8cd8de5b6ab5231 Mon Sep 17 00:00:00 2001
-From: Guy Harris <guy@alum.mit.edu>
-Date: Sat, 18 Apr 2020 14:04:59 -0700
-Subject: [PATCH] PPP: When un-escaping, don't allocate a too-large buffer.
-
-The buffer should be big enough to hold the captured data, but it
-doesn't need to be big enough to hold the entire on-the-network packet,
-if we haven't captured all of it.
-
-(backported from commit e4add0b010ed6f2180dcb05a13026242ed935334)
----
- print-ppp.c | 18 ++++++++++++++----
- 1 file changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/print-ppp.c b/print-ppp.c
-index 891761728..33fb03412 100644
---- a/print-ppp.c
-+++ b/print-ppp.c
-@@ -1367,19 +1367,29 @@ print_bacp_config_options(netdissect_options *ndo,
- return 0;
- }
-
-+/*
-+ * Un-escape RFC 1662 PPP in HDLC-like framing, with octet escapes.
-+ * The length argument is the on-the-wire length, not the captured
-+ * length; we can only un-escape the captured part.
-+ */
- static void
- ppp_hdlc(netdissect_options *ndo,
- const u_char *p, int length)
- {
-+ u_int caplen = ndo->ndo_snapend - p;
- u_char *b, *t, c;
- const u_char *s;
-- int i, proto;
-+ u_int i;
-+ int proto;
- const void *se;
-
-+ if (caplen == 0)
-+ return;
-+
- if (length <= 0)
- return;
-
-- b = (u_char *)malloc(length);
-+ b = (u_char *)malloc(caplen);
- if (b == NULL)
- return;
-
-@@ -1388,10 +1398,10 @@ ppp_hdlc(netdissect_options *ndo,
- * Do this so that we dont overwrite the original packet
- * contents.
- */
-- for (s = p, t = b, i = length; i > 0 && ND_TTEST(*s); i--) {
-+ for (s = p, t = b, i = caplen; i != 0; i--) {
- c = *s++;
- if (c == 0x7d) {
-- if (i <= 1 || !ND_TTEST(*s))
-+ if (i <= 1)
- break;
- i--;
- c = *s++ ^ 0x20;
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild
deleted file mode 100644
index 2a3d3a399da..00000000000
--- a/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A tool for network monitoring and data acquisition"
-HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump"
-SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+drop-root smi ssl samba suid test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- net-libs/libpcap
- drop-root? (
- acct-group/pcap
- acct-user/pcap
- sys-libs/libcap-ng
- )
- smi? ( net-libs/libsmi )
- ssl? (
- >=dev-libs/openssl-0.9.6m:0=
- )
- suid? (
- acct-group/pcap
- acct-user/pcap
- )
-"
-DEPEND="
- ${RDEPEND}
- test? (
- >=net-libs/libpcap-1.9.1
- dev-lang/perl
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-9999-libdir.patch
- "${FILESDIR}"/${PN}-4.9.3-CVE-2020-8037.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable samba smb) \
- $(use_with drop-root cap-ng) \
- $(use_with drop-root chroot '') \
- $(use_with smi) \
- $(use_with ssl crypto "${ESYSROOT}/usr") \
- $(usex drop-root "--with-user=pcap" "")
-}
-
-src_test() {
- if [[ ${EUID} -ne 0 ]] || ! use drop-root; then
- emake check
- else
- ewarn "If you want to run the test suite, make sure you either"
- ewarn "set FEATURES=userpriv or set USE=-drop-root"
- fi
-}
-
-src_install() {
- dosbin tcpdump
- doman tcpdump.1
- dodoc *.awk
- dodoc CHANGES CREDITS README.md
-
- if use suid; then
- fowners root:pcap /usr/sbin/tcpdump
- fperms 4110 /usr/sbin/tcpdump
- fi
-}
-
-pkg_postinst() {
- use suid && elog "To let normal users run tcpdump, add them to the pcap group."
-}
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
deleted file mode 100644
index e58bf2bc9cf..00000000000
--- a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A tool for network monitoring and data acquisition"
-HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump"
-
-if [[ ${PV} == *9999* ]] ; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
-else
- VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
- inherit verify-sig
-
- # Note: drop -upstream on bump, this is just because we switched to the official
- # distfiles for verify-sig
- SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz"
- SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )"
-
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+drop-root +smi +ssl +samba suid test"
-REQUIRED_USE="test? ( samba )"
-
-# Assorted failures: bug #768498
-RESTRICT="test"
-
-RDEPEND="
- net-libs/libpcap
- drop-root? (
- acct-group/pcap
- acct-user/pcap
- sys-libs/libcap-ng
- )
- smi? ( net-libs/libsmi )
- ssl? (
- >=dev-libs/openssl-0.9.6m:0=
- )
- suid? (
- acct-group/pcap
- acct-user/pcap
- )
-"
-DEPEND="
- ${RDEPEND}
- test? (
- >=net-libs/libpcap-1.9.1
- dev-lang/perl
- )
-"
-BDEPEND="drop-root? ( virtual/pkgconfig )"
-
-if [[ ${PV} != *9999* ]] ; then
- BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
-fi
-
-PATCHES=(
- "${FILESDIR}"/${PN}-9999-libdir.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable samba smb) \
- $(use_with drop-root cap-ng) \
- $(use_with drop-root chroot '') \
- $(use_with smi) \
- $(use_with ssl crypto "${ESYSROOT}/usr") \
- $(usex drop-root "--with-user=pcap" "")
-}
-
-src_test() {
- if [[ ${EUID} -ne 0 ]] || ! use drop-root ; then
- emake check
- else
- ewarn "If you want to run the test suite, make sure you either"
- ewarn "set FEATURES=userpriv or set USE=-drop-root"
- fi
-}
-
-src_install() {
- dosbin tcpdump
- doman tcpdump.1
- dodoc *.awk
- dodoc CHANGES CREDITS README.md
-
- if use suid ; then
- fowners root:pcap /usr/sbin/tcpdump
- fperms 4110 /usr/sbin/tcpdump
- fi
-}
-
-pkg_postinst() {
- use suid && elog "To let normal users run tcpdump, add them to the pcap group."
-}
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild
index 06157bef920..6dc1d3f4382 100644
--- a/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -34,7 +34,7 @@ RESTRICT="!test? ( test )"
#RESTRICT="test"
RDEPEND="
- net-libs/libpcap
+ >=net-libs/libpcap-1.10.1
drop-root? (
acct-group/pcap
acct-user/pcap
@@ -52,7 +52,6 @@ RDEPEND="
DEPEND="
${RDEPEND}
test? (
- >=net-libs/libpcap-1.9.1
dev-lang/perl
)
"
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index 7fb2b1d8d0c..ac9b01e80aa 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -31,7 +31,7 @@ REQUIRED_USE="test? ( samba )"
RESTRICT="test"
RDEPEND="
- net-libs/libpcap
+ >=net-libs/libpcap-1.10.1
drop-root? (
acct-group/pcap
acct-user/pcap
@@ -49,7 +49,6 @@ RDEPEND="
DEPEND="
${RDEPEND}
test? (
- >=net-libs/libpcap-1.9.1
dev-lang/perl
)
"
diff --git a/net-analyzer/tcpflow/Manifest b/net-analyzer/tcpflow/Manifest
index 2ca13347df5..1ade1d691c3 100644
--- a/net-analyzer/tcpflow/Manifest
+++ b/net-analyzer/tcpflow/Manifest
@@ -1,3 +1,4 @@
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-tag.tar.gz 915245 BLAKE2B 22a1540415d6321d4ba43035f386aaea177e9d3244ff1dcdedcb0c8a72f487a969372b76b85f6acec4f0f1430b51230ceb665466af388d2bfe123a57dcd4224b SHA512 9c0357ca816bf4316ce7a461e5d18c5043a6938828ce83a613a952d5804cc6b701028a666b352da922d69447ab7f5d4c9f66585872e7b116c0f1aebebc38682b
DIST tcpflow-1.6.1.tar.gz 915502 BLAKE2B 6560d11fe6a2b6bd77ddcffb47338e9af358a0f5ec07402ec81dae4cf87dd5cc26bf300df014927df8b8b6143e14553dd2a70cb63769dc4f2525cf9dd1967582 SHA512 ec5b9d5e5f0bc1d6582b9f2537c9ba6c8ae3d9c8f88fb0c67ef031146a515d19caa5ecd365492fb5daf8ddde77b58ea5190290b8e43b40abcdea5aaaef5e2e1c
diff --git a/net-analyzer/tcpflow/files/tcpflow-1.6.1-wformat-security.patch b/net-analyzer/tcpflow/files/tcpflow-1.6.1-wformat-security.patch
new file mode 100644
index 00000000000..092a08dd766
--- /dev/null
+++ b/net-analyzer/tcpflow/files/tcpflow-1.6.1-wformat-security.patch
@@ -0,0 +1,24 @@
+https://github.com/simsong/tcpflow/issues/238
+https://github.com/simsong/tcpflow/commit/a0697509c4657e2fd94f941e43a2d4c86ddf9fe4
+
+From: "Simson L. Garfinkel" <simsong@acm.org>
+Date: Thu, 11 Mar 2021 19:30:54 -0500
+Subject: [PATCH] Update datalink.cpp (#239)
+
+per https://salsa.debian.org/debian/tcpflow/-/blob/master/debian/patches/fix-werror-format-security.patch
+Closes https://github.com/simsong/tcpflow/issues/238
+--- a/src/datalink.cpp
++++ b/src/datalink.cpp
+@@ -171,10 +171,7 @@ void dl_ethernet(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
+ break;
+ }
+ } catch( std::logic_error e){
+- std::string s(std::string("warning: caught std::logic_error ")
+- + e.what()
+- + std::string(" in packet"));
+- DEBUG(6)(s.c_str());
++ DEBUG(6)("Warning: caught std::logic_error %s in packet",e.what());
+ }
+ }
+
+
diff --git a/net-analyzer/tcpflow/tcpflow-1.6.1-r1.ebuild b/net-analyzer/tcpflow/tcpflow-1.6.1-r1.ebuild
new file mode 100644
index 00000000000..07306743ad7
--- /dev/null
+++ b/net-analyzer/tcpflow/tcpflow-1.6.1-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+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/refs/tags/${P}.tar.gz -> ${P}-tag.tar.gz
+"
+S="${WORKDIR}"/${PN}-${P}
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="cairo test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="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}"
+BDEPEND="test? ( sys-apps/coreutils )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.5.0_alpha-libcapng.patch
+ "${FILESDIR}"/${PN}-1.5.2-gentoo.patch
+ "${FILESDIR}"/${PN}-1.6.1-wformat-security.patch
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ append-cxxflags -fpermissive
+
+ # Disable Python because it's Python 2.7 only, even as of 1.6.1!
+ export ac_cv_header_python2_7_Python_h=no
+ export ac_cv_lib_python2_7_Py_Initialize=no
+
+ CONFIG_SHELL="${BROOT}"/bin/bash econf $(usex cairo --enable-cairo=true --enable-cairo=false)
+}
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index ddd047da003..ad3c5de2681 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -1 +1,2 @@
DIST tcpreplay-4.3.4.tar.xz 739280 BLAKE2B 8b680363ee182fc7581f99cc4587d50e36285446d07a5be370e2439b31582ad88c786c11d662e28dadc5b69aee376889b1c0f6a86d61c106426ab6ab2c085012 SHA512 6d19cf492114c68a9fafcf7790c08f31607d2c0112e02fa41eed8747255bbbef85f281f74348e1d51f1d476b88f07d64715224618ec15268688baefaf7cc7124
+DIST tcpreplay-4.4.1.tar.xz 751036 BLAKE2B cf6a4e23f68fd0d6f23392c3ded14ea6486d275eeb8e278ce02d6b34e8b426e69841858cac49cc5ea952e0398f2960049789d16180b0896e38d665511237b352 SHA512 25a4a94b7c0c416b8ef57aba5640803dcd6e271fe8789f3f6e281529e336e326b35738d7673fd44ac4ded0faf577dc4c6255b926bd67b8ba5104a8bad81a98f1
diff --git a/net-analyzer/tcpreplay/files/tcpreplay-4.4.1-fix-bashism-configure.patch b/net-analyzer/tcpreplay/files/tcpreplay-4.4.1-fix-bashism-configure.patch
new file mode 100644
index 00000000000..f1d42427433
--- /dev/null
+++ b/net-analyzer/tcpreplay/files/tcpreplay-4.4.1-fix-bashism-configure.patch
@@ -0,0 +1,34 @@
+https://github.com/appneta/tcpreplay/pull/714
+
+From bd93776c50ec1d0574c72f253095afe22eb6bf73 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 13 Feb 2022 16:09:23 +0000
+Subject: [PATCH] build: fix bashism in configure
+
+configure scripts are run with /bin/sh which is supposed
+to be a POSIX-compliant shell, so if /bin/sh is provided
+by e.g. dash (like on Debian) rather than bash, we hit
+errors.
+
+This has no effect on functionality for bash &
+retains compatibility.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 11a1e4ea..4c577c42 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1808,7 +1808,7 @@ fi
+ dnl No 'make test' when cross compile
+
+ AC_MSG_CHECKING(for 'make test' profile)
+-if test "$host" == "$build" ; then
++if test "$host" = "$build" ; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_WARN(Unable to do tests when cross-compiling)
+
diff --git a/net-analyzer/tcpreplay/tcpreplay-999999.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.4.1.ebuild
index 52407c59ac7..931ea85bf4a 100644
--- a/net-analyzer/tcpreplay/tcpreplay-999999.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-4.4.1.ebuild
@@ -1,13 +1,20 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit autotools git-r3
+inherit autotools flag-o-matic
DESCRIPTION="Utilities for editing and replaying previously captured network traffic"
HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay"
-EGIT_REPO_URI="https://github.com/appneta/tcpreplay"
+if [[ ${PV} == *9999* ]] ; then
+ EGIT_REPO_URI="https://github.com/appneta/tcpreplay"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.xz"
+ KEYWORDS="amd64 ~arm ~sparc x86"
+fi
+
S="${WORKDIR}"/${P/_/-}
LICENSE="BSD GPL-3"
@@ -22,6 +29,7 @@ BDEPEND="
DEPEND="
dev-libs/libdnet
>=net-libs/libpcap-0.9
+ elibc_musl? ( sys-libs/fts-standalone )
pcapnav? ( net-libs/libpcapnav )
tcpdump? ( net-analyzer/tcpdump )
"
@@ -31,6 +39,7 @@ DOCS=( docs/{CHANGELOG,CREDIT,HACKING,TODO} )
PATCHES=(
"${FILESDIR}"/${PN}-4.3.0-enable-pcap_findalldevs.patch
+ "${FILESDIR}"/${PN}-4.4.1-fix-bashism-configure.patch
)
src_prepare() {
@@ -49,13 +58,14 @@ src_prepare() {
}
src_configure() {
- # By default it uses static linking. Avoid that, bug 252940
+ use elibc_musl && append-flags "-lfts"
+ # By default it uses static linking. Avoid that, bug #252940
econf \
$(use_enable debug) \
$(use_with pcapnav pcapnav-config "${BROOT}"/usr/bin/pcapnav-config) \
$(use_with tcpdump tcpdump "${ESYSROOT}"/usr/sbin/tcpdump) \
- --disable-local-libopts \
--enable-dynamic-link \
+ --enable-local-libopts \
--enable-shared \
--with-libdnet \
--with-testnic2=lo \
@@ -63,14 +73,15 @@ src_configure() {
}
src_test() {
- if [[ ! ${EUID} -eq 0 ]]; then
- ewarn "Some tests will be disabled due to FEATURES=userpriv"
+ if [[ ! ${EUID} -eq 0 ]] ; then
+ ewarn "Some tests were disabled due to FEATURES=userpriv"
ewarn "To run all tests issue the following command as root:"
ewarn " # make -C ${S}/test"
emake -j1 -C test tcpprep
else
emake -j1 test || {
- ewarn "Note that some tests require eth0 iface to be up." ;
- die "self test failed - see ${S}/test/test.log" ; }
+ ewarn "Note that some tests require eth0 iface to be up."
+ die "self test failed - see ${S}/test/test.log"
+ }
fi
}
diff --git a/net-analyzer/tcpreplay/tcpreplay-9999.ebuild b/net-analyzer/tcpreplay/tcpreplay-9999.ebuild
new file mode 100644
index 00000000000..01eca400dbe
--- /dev/null
+++ b/net-analyzer/tcpreplay/tcpreplay-9999.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Utilities for editing and replaying previously captured network traffic"
+HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay"
+if [[ ${PV} == *9999* ]] ; then
+ EGIT_REPO_URI="https://github.com/appneta/tcpreplay"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~sparc ~x86"
+fi
+
+S="${WORKDIR}"/${P/_/-}
+
+LICENSE="BSD GPL-3"
+SLOT="0"
+IUSE="debug pcapnav +tcpdump"
+
+# libpcapnav for pcapnav-config
+BDEPEND="
+ net-libs/libpcapnav
+ >=sys-devel/autogen-5.18.4[libopts]
+"
+DEPEND="
+ dev-libs/libdnet
+ >=net-libs/libpcap-0.9
+ elibc_musl? ( sys-libs/fts-standalone )
+ pcapnav? ( net-libs/libpcapnav )
+ tcpdump? ( net-analyzer/tcpdump )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( docs/{CHANGELOG,CREDIT,HACKING,TODO} )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.3.0-enable-pcap_findalldevs.patch
+ "${FILESDIR}"/${PN}-4.4.1-fix-bashism-configure.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e 's|#include <dnet.h>|#include <dnet/eth.h>|g' \
+ src/common/sendpacket.c || die
+ sed -i \
+ -e 's|@\([A-Z_]*\)@|$(\1)|g' \
+ -e '/tcpliveplay_CFLAGS/s|$| $(LDNETINC)|g' \
+ -e '/tcpliveplay_LDADD/s|$| $(LDNETLIB)|g' \
+ src/Makefile.am || die
+
+ eautoreconf
+}
+
+src_configure() {
+ use elibc_musl && append-flags "-lfts"
+ # By default it uses static linking. Avoid that, bug #252940
+ econf \
+ $(use_enable debug) \
+ $(use_with pcapnav pcapnav-config "${BROOT}"/usr/bin/pcapnav-config) \
+ $(use_with tcpdump tcpdump "${ESYSROOT}"/usr/sbin/tcpdump) \
+ --enable-dynamic-link \
+ --enable-local-libopts \
+ --enable-shared \
+ --with-libdnet \
+ --with-testnic2=lo \
+ --with-testnic=lo
+}
+
+src_test() {
+ if [[ ! ${EUID} -eq 0 ]] ; then
+ ewarn "Some tests were disabled due to FEATURES=userpriv"
+ ewarn "To run all tests issue the following command as root:"
+ ewarn " # make -C ${S}/test"
+ emake -j1 -C test tcpprep
+ else
+ emake -j1 test || {
+ ewarn "Note that some tests require eth0 iface to be up."
+ die "self test failed - see ${S}/test/test.log"
+ }
+ fi
+}
diff --git a/net-analyzer/tcpslice/tcpslice-1.5.ebuild b/net-analyzer/tcpslice/tcpslice-1.5.ebuild
index 3a527c4395d..f845244e6e0 100644
--- a/net-analyzer/tcpslice/tcpslice-1.5.ebuild
+++ b/net-analyzer/tcpslice/tcpslice-1.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
RDEPEND="net-libs/libpcap"
diff --git a/net-analyzer/telegraf/telegraf-1.18.3.ebuild b/net-analyzer/telegraf/telegraf-1.18.3.ebuild
index 0e48ecda727..215eb88df1b 100644
--- a/net-analyzer/telegraf/telegraf-1.18.3.ebuild
+++ b/net-analyzer/telegraf/telegraf-1.18.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -1229,7 +1229,7 @@ SRC_URI="https://github.com/influxdata/telegraf/archive/v${MY_PV}.tar.gz -> ${P}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
RESTRICT+=" test"
diff --git a/net-analyzer/termshark/Manifest b/net-analyzer/termshark/Manifest
new file mode 100644
index 00000000000..fe40fed940d
--- /dev/null
+++ b/net-analyzer/termshark/Manifest
@@ -0,0 +1,2 @@
+DIST termshark-2.3.0-deps.tar.xz 142126384 BLAKE2B 3693a5b5470c338a510aa964059e001f3f4d68a3f824191bb7debefa61976e30d10c77ce5e7ef68836732c7a317e2d9a20c170b3a4565b456c130b9b8999a16a SHA512 ccf3576bba18cf429610deea7c69479fae06368d12e584fd9bd0e3d7409069d6994fa3ecc27fe84f38bcc2606018587de1bf28cde103e9477e39351c94dd2c31
+DIST termshark-2.3.0.tar.gz 382710 BLAKE2B 7c2953188829d950bc005cc2b9d568ece6fdc636c1bdf2e6d29c03af5358894238aff072848e51e8298e317c6b5467c6e1a6823c1abd5a432c819ca44d5f4f9a SHA512 0ed780ec1ba86d2a6eb11c940f00475c750075d5e1ae4a6022f465572717126df941e933e2db7123d802b721f8e1187014f02d4c5dfd84c1a55009045dce5a88
diff --git a/net-analyzer/termshark/metadata.xml b/net-analyzer/termshark/metadata.xml
new file mode 100644
index 00000000000..09186a43186
--- /dev/null
+++ b/net-analyzer/termshark/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>mario.haustein@hrz.tu-chemnitz.de</email>
+ <name>Mario Haustein</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>sam@gentoo.org</email>
+ <name>Sam James</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">gcla/termshark</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/termshark/termshark-2.3.0.ebuild b/net-analyzer/termshark/termshark-2.3.0.ebuild
new file mode 100644
index 00000000000..5a3dcf379bb
--- /dev/null
+++ b/net-analyzer/termshark/termshark-2.3.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="A terminal UI for tshark, inspired by Wireshark"
+HOMEPAGE="https://termshark.io/"
+SRC_URI="https://github.com/gcla/termshark/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD-2 BSD MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# termshark doesn't link against wireshark. It reads data via IPC during
+# runtime.
+RDEPEND="
+ net-analyzer/wireshark[dumpcap,pcap,tshark]
+"
+
+src_compile() {
+ ego build ./...
+}
+
+src_test() {
+ ego test ./...
+}
+
+src_install() {
+ GOBIN="${S}/bin" ego install ./...
+
+ dobin bin/${PN}
+ dodoc README.md
+ dodoc docs/*
+}
diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
index dfe496e6db3..ee572afb33b 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1,2 +1,2 @@
DIST testssl-3.0.5.tar.gz 9224554 BLAKE2B fed4f02f4c5db3975f711e5e1fa0f0018b5e89f8a3afbd94763ec86dc4f739ee25504769b61fc1dd0000ce7ce400f4d3267116cd21d14b003d9b6fd5706a84cb SHA512 0f3fa081f047bf2d3fb2f3b65fcdbec976af54143a2d8ffbece6eff7545cc2a6e134247f9533fb1614d52d900fc66d7f50c97f02678b5dfb9842c3c69c0f81f0
-DIST testssl-3.0.6.tar.gz 9217988 BLAKE2B 840eb0027f6b3e9ae919c9d8765c138a10ef9789e14dadc7d1e6e27fef2e906e8182309b2ef504312fc7577fc84b25d4efa59121c4c641a6bbaf91ab14259f18 SHA512 a118cd3e6d8e560f6c739356551091e6186e87bdaec24c8bc987c3503b5c22276f69a5fafc1f73cfd65528844ca7c37f3ee473cfb1de0646067ee0a48089eb26
+DIST testssl-3.0.7.tar.gz 9219774 BLAKE2B d3b6abd5bb46e26ccb13afd9c9440e80fd80566db2bf04bb72b254dbebdc69957a0bae82436ce0b3f826f7c829a0cf73589eedc60735c629d010c8cb76e196a0 SHA512 703099f3c7d7d040f064466c721e30ee594a8d495add113b899b14d21848c8488e2d447c1af87ecd3d0d2b00dbeecc3a7914c26721b5b1936cfa818cf6599d53
diff --git a/net-analyzer/testssl/metadata.xml b/net-analyzer/testssl/metadata.xml
index e8cf29fae17..ed6a51a4cbe 100644
--- a/net-analyzer/testssl/metadata.xml
+++ b/net-analyzer/testssl/metadata.xml
@@ -3,6 +3,7 @@
<pkgmetadata>
<maintainer type="person">
<email>kensington@gentoo.org</email>
+ <name>Michael Palimaka</name>
</maintainer>
<use>
<flag name="bundled-openssl">Install precompiled versions of OpenSSL for greater testing coverage</flag>
diff --git a/net-analyzer/testssl/testssl-3.0.6.ebuild b/net-analyzer/testssl/testssl-3.0.7.ebuild
index 1e810aacaae..a3a08229615 100644
--- a/net-analyzer/testssl/testssl-3.0.6.ebuild
+++ b/net-analyzer/testssl/testssl-3.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.t
LICENSE="GPL-2 bundled-openssl? ( openssl )"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
IUSE="bundled-openssl kerberos"
RDEPEND="
diff --git a/net-analyzer/thrulay/thrulay-0.9-r1.ebuild b/net-analyzer/thrulay/thrulay-0.9-r1.ebuild
index 388b9ba4e26..97d1f5c8c50 100644
--- a/net-analyzer/thrulay/thrulay-0.9-r1.ebuild
+++ b/net-analyzer/thrulay/thrulay-0.9-r1.ebuild
@@ -11,7 +11,8 @@ SRC_URI="
http://www.internet2.edu/~shalunov/thrulay/${P}.tar.gz
mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="BSD"
+# init.d is GPL-2
+LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86"
diff --git a/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild b/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild
index bda787fe72f..50d2d48db74 100644
--- a/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild
+++ b/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
inherit toolchain-funcs
MY_P="${P/_/}"
-DESCRIPTION="Blinks keyboard LEDs indicating outgoing and incoming network packets on selected network interface"
+DESCRIPTION="Blinks keyboard LEDs indicating outgoing and incoming network packets"
HOMEPAGE="http://www.hut.fi/~jlohikos/tleds_orig.html"
SRC_URI="
http://www.hut.fi/~jlohikos/tleds/public/${MY_P/11/10}.tgz
diff --git a/net-analyzer/traceroute/traceroute-2.1.0.ebuild b/net-analyzer/traceroute/traceroute-2.1.0-r2.ebuild
index 5bc894ba920..ca9e2e6708c 100644
--- a/net-analyzer/traceroute/traceroute-2.1.0.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.1.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit flag-o-matic toolchain-funcs
@@ -11,11 +11,10 @@ SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="static"
-RDEPEND="!<net-misc/iputils-20121221-r1
- !net-misc/iputils[traceroute6]"
+RDEPEND="!net-misc/iputils[traceroute6(-)]"
src_compile() {
use static && append-ldflags -static
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index 398dbd978b5..5a8ce57dfe4 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -1,4 +1,2 @@
-DIST vnstat-1.17.tar.gz 238397 BLAKE2B 73aaffda3c91a1146b1d6a21f637272be227a15a7964aad90fb76c407c5f7fb0085e6f9f54408e8ebc667475c15f260d701c5924737f20921ebc0a35affd52be SHA512 c9c119a89054dacdc15026c766a20d88336d7689dd4264530d0347fcc58f3cbfc806b271e0f83e76c3b4a31ab793a628ee7d7b696943da919ee4cd2fdb481cc3
-DIST vnstat-1.17.tar.gz.asc 819 BLAKE2B 3186e28dc29edb37eb0bbef9b29f1ea682e4a9de208b69b83a8bc99c81f272eb6865176aaa30e415bf8423d94f385e0725e1256eeb822c3152638eaace23b749 SHA512 c26af29daefe6431c1769812d04ba5bff92ac1241a6a49df11e28f0e51b21d4eb84ff1f1fb133a388fd8ac59967162bc5d60d5f02c409d34be5414acd34f7818
-DIST vnstat-2.8.tar.gz 290644 BLAKE2B 21ff801ce6abb135c26eb937eadb447bea9fd3dcb2af123051edb9861e088d8fc217f84ef2d924fe8b480388cfc761d0259f8abb2312ae49c2840643787d49bd SHA512 207aa1699df298ce3008153701782634a96a239599d17a5b2f1fbb298a9cf8edb35298e2de1f4f93415ddf34e0bdb831f95984b47fdd7f89ecc6aeb4821a0afd
-DIST vnstat-2.8.tar.gz.asc 833 BLAKE2B 097d37e1916924901f10d09bba882357c0eb81cf71fca921dbc642735ec8c0bde97f7ab63cd3953718c21687e6f39099cf2446210f41f3698b39b74116c4c025 SHA512 d5448d68da92d434cc6a34e007002c81ed8d97e533bf99364d3f65b4125bd6f21fe2f6f6efb97775ecc4ba4afd09e12add71ae2299a2d990a7a9d0a591c32811
+DIST vnstat-2.9.tar.gz 300796 BLAKE2B 1671fe49f3add0087431b57aaa69d4c6280066a299e6899c00cd5bf6ec21380d1457295f884f683ebfb89959eea08a9d900e898a865e3f6ff2a82ecf354d974a SHA512 883f273c02f6d91478991d95deffba9d90457a1bb0b9dd818c01398365df97ffb72dda88299231d9076756192b05524b6f8820470c9caf6ee6a12e5914a82176
+DIST vnstat-2.9.tar.gz.asc 833 BLAKE2B 4dd17e02e6c0c5232354ea8c4dea1d86ac43015ac66c60dc227b143aa5352e5a1eb0870932662778b2350928b124e2bbc56dfa13cfe7c2fd74538d84c00f9b4c SHA512 bf57974afb028fef7ec311a15bb1dcf275f10b845c5512efe73711b622b5912c4de0ff0553db4152389d2421a468c888191eab8fca08212e164f997ad1e04778
diff --git a/net-analyzer/vnstat/files/vnstat-2.2-conf.patch b/net-analyzer/vnstat/files/vnstat-2.2-conf.patch
deleted file mode 100644
index 7bea5d8ffe9..00000000000
--- a/net-analyzer/vnstat/files/vnstat-2.2-conf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cfg/vnstat.conf
-+++ b/cfg/vnstat.conf
-@@ -143,7 +143,7 @@
- LogFile "/var/log/vnstat/vnstat.log"
-
- # file used as daemon pid / lock file
--PidFile "/var/run/vnstat/vnstat.pid"
-+PidFile "/run/vnstat/vnstat.pid"
-
- # 1 = 64-bit, 0 = 32-bit, -1 = old style logic, -2 = automatic detection
- 64bitInterfaceCounters -2
diff --git a/net-analyzer/vnstat/files/vnstat-2.2-drop-root.patch b/net-analyzer/vnstat/files/vnstat-2.2-drop-root.patch
deleted file mode 100644
index 2ed3ec1404a..00000000000
--- a/net-analyzer/vnstat/files/vnstat-2.2-drop-root.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/cfg/vnstat.conf
-+++ b/cfg/vnstat.conf
-@@ -69,10 +69,10 @@
- ##
-
- # switch to given user when started as root (leave empty to disable)
--DaemonUser ""
-+DaemonUser "vnstat"
-
- # switch to given group when started as root (leave empty to disable)
--DaemonGroup ""
-+DaemonGroup "vnstat"
-
- # try to detect interface maximum bandwidth, 0 = disable feature
- # MaxBandwidth will be used as fallback value when enabled
diff --git a/net-analyzer/vnstat/files/vnstat-2.2-run.patch b/net-analyzer/vnstat/files/vnstat-2.2-run.patch
deleted file mode 100644
index bb9222b5fe2..00000000000
--- a/net-analyzer/vnstat/files/vnstat-2.2-run.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/common.h
-+++ b/src/common.h
-@@ -229,7 +229,7 @@
- #define CREATEDIRS 1
- #define UPDATEFILEOWNER 1
- #define LOGFILE "/var/log/vnstat/vnstat.log"
--#define PIDFILE "/var/run/vnstat/vnstat.pid"
-+#define PIDFILE "/run/vnstat/vnstat.pid"
- #define IS64BIT -2
-
- /* no transparency by default */
diff --git a/net-analyzer/vnstat/files/vnstat-2.9-conf.patch b/net-analyzer/vnstat/files/vnstat-2.9-conf.patch
new file mode 100644
index 00000000000..d2cfa3977cf
--- /dev/null
+++ b/net-analyzer/vnstat/files/vnstat-2.9-conf.patch
@@ -0,0 +1,39 @@
+diff --git a/cfg/vnstat.conf b/cfg/vnstat.conf
+index f404de5..d2bd928 100644
+--- a/cfg/vnstat.conf
++++ b/cfg/vnstat.conf
+@@ -80,10 +80,10 @@
+ ##
+
+ # switch to given user when started as root (leave empty to disable)
+-;DaemonUser ""
++;DaemonUser "vnstat"
+
+ # switch to given group when started as root (leave empty to disable)
+-;DaemonGroup ""
++;DaemonGroup "vnstat"
+
+ # try to detect interface maximum bandwidth, 0 = disable feature
+ # MaxBandwidth will be used as fallback value when enabled
+@@ -161,7 +161,7 @@
+ ;LogFile "/var/log/vnstat/vnstat.log"
+
+ # file used as daemon pid / lock file
+-;PidFile "/var/run/vnstat/vnstat.pid"
++;PidFile "/run/vnstat/vnstat.pid"
+
+ # 1 = 64-bit, 0 = 32-bit, -1 = old style logic, -2 = automatic detection
+ ;64bitInterfaceCounters -2
+diff --git a/src/common.h b/src/common.h
+index bb2fb56..f148004 100644
+--- a/src/common.h
++++ b/src/common.h
+@@ -241,7 +241,7 @@ and most can be changed later from the config file.
+ #define CREATEDIRS 1
+ #define UPDATEFILEOWNER 1
+ #define LOGFILE "/var/log/vnstat/vnstat.log"
+-#define PIDFILE "/var/run/vnstat/vnstat.pid"
++#define PIDFILE "/run/vnstat/vnstat.pid"
+ #define IS64BIT -2
+ #define WALDB 0
+ #define WALDBCHECKPOINTINTERVALMINS 240
diff --git a/net-analyzer/vnstat/files/vnstat.cron b/net-analyzer/vnstat/files/vnstat.cron
deleted file mode 100644
index 69068132768..00000000000
--- a/net-analyzer/vnstat/files/vnstat.cron
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# run vnstat if installed and at least one database exists
-
-# Uncomment the following to enable
-
-#if [ -x /usr/bin/vnstat ] && [ `ls /var/lib/vnstat/ | wc -l` -ge 1 ] ; then
-# exec /usr/bin/vnstat -u
-#fi
diff --git a/net-analyzer/vnstat/files/vnstatd.confd b/net-analyzer/vnstat/files/vnstatd.confd
deleted file mode 100644
index 17901419aac..00000000000
--- a/net-analyzer/vnstat/files/vnstatd.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-# /etc/conf.d/vnstatd: config file for /etc/init.d/vnstatd
-
-# Adjust scheduling priority on vnstatd (default: 0)
-#VNSTATD_NICELEVEL="0"
-
-# Pass extra options to vnstatd
-#VNSTATD_EXTRAOPTS="--config /etc/vnstat.conf"
diff --git a/net-analyzer/vnstat/files/vnstatd.initd-r1 b/net-analyzer/vnstat/files/vnstatd.initd-r1
deleted file mode 100644
index a8d61efe0f2..00000000000
--- a/net-analyzer/vnstat/files/vnstatd.initd-r1
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-
-depend() {
- use net
-}
-
-VNSTATD_PIDFILE="${VNSTATD_PIDFILE:-/run/vnstatd/vnstatd.pid}"
-
-start() {
- ebegin "Starting vnstatd"
- checkpath -q -d -m 755 -o vnstat:vnstat /run/vnstatd
- checkpath -q -d -m 755 -o vnstat:vnstat /var/lib/vnstat
- start-stop-daemon --start --quiet \
- --pidfile "${VNSTATD_PIDFILE}" \
- --user vnstat --group vnstat \
- --nicelevel ${VNSTATD_NICELEVEL:-0} \
- --exec /usr/bin/vnstatd -- \
- -d ${VNSTATD_EXTRAOPTS} -p ${VNSTATD_PIDFILE}
- eend $?
-}
-
-stop() {
- ebegin "Stopping vnstatd"
- start-stop-daemon --stop --quiet \
- --pidfile "${VNSTATD_PIDFILE}"
- eend $?
-}
-
-reload() {
- ebegin "Reloading vnstatd configuration"
- kill -HUP $(cat "${VNSTATD_PIDFILE}") 2>&1 >/dev/null
- eend $?
-}
diff --git a/net-analyzer/vnstat/vnstat-1.17-r1.ebuild b/net-analyzer/vnstat/vnstat-1.17-r1.ebuild
deleted file mode 100644
index d02d852bedf..00000000000
--- a/net-analyzer/vnstat/vnstat-1.17-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/teemutoivola.asc
-inherit flag-o-matic toolchain-funcs verify-sig
-
-DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
-HOMEPAGE="https://humdi.net/vnstat/"
-SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
-SRC_URI+=" verify-sig? ( https://humdi.net/vnstat/${P}.tar.gz.asc )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 sparc x86"
-IUSE="gd selinux test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="gd? ( media-libs/gd[png] )"
-DEPEND="
- ${RDEPEND}
- test? ( dev-libs/check )
-"
-RDEPEND+=" acct-group/vnstat
- acct-user/vnstat
- selinux? ( sec-policy/selinux-vnstatd )"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-teemutoivola )"
-
-src_prepare() {
- default
-
- tc-export CC
-
- sed -i \
- -e 's|vnstat[.]log|vnstatd.log|' \
- -e 's|vnstat[.]pid|vnstatd/vnstatd.pid|' \
- -e 's|/var/run|/run|' \
- cfg/${PN}.conf || die
-
- sed -i \
- -e '/PIDFILE/s|/var/run|/run|' \
- src/common.h || die
-}
-
-src_configure() {
- tc-export CC
-
- # Fails to build with GCC 10
- append-flags -fcommon
-
- default
-}
-
-src_compile() {
- emake ${PN} ${PN}d $(usex gd ${PN}i '')
-}
-
-src_install() {
- use gd && dobin vnstati
- dobin vnstat vnstatd
-
- exeinto /etc/cron.hourly
- newexe "${FILESDIR}"/vnstat.cron vnstat
-
- insinto /etc
- doins cfg/vnstat.conf
- fowners root:vnstat /etc/vnstat.conf
-
- newconfd "${FILESDIR}"/vnstatd.confd vnstatd
- newinitd "${FILESDIR}"/vnstatd.initd-r1 vnstatd
-
- use gd && doman man/vnstati.1
- doman man/vnstat.1 man/vnstatd.1
-
- newdoc INSTALL README.setup
- dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
-}
diff --git a/net-analyzer/vnstat/vnstat-2.8.ebuild b/net-analyzer/vnstat/vnstat-2.9.ebuild
index b596f789e0c..b2186d2f4e6 100644
--- a/net-analyzer/vnstat/vnstat-2.8.ebuild
+++ b/net-analyzer/vnstat/vnstat-2.9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit systemd tmpfiles
@@ -18,7 +18,7 @@ else
SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://humdi.net/vnstat/${P}.tar.gz.asc )"
- KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
+ KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv sparc x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-teemutoivola )"
fi
@@ -41,9 +41,7 @@ DEPEND="
RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )"
PATCHES=(
- "${FILESDIR}"/${PN}-2.2-conf.patch
- "${FILESDIR}"/${PN}-2.2-drop-root.patch
- "${FILESDIR}"/${PN}-2.2-run.patch
+ "${FILESDIR}"/${PN}-2.9-conf.patch
)
src_compile() {
diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-9999.ebuild
index 407176bb06b..3ff50568be3 100644
--- a/net-analyzer/vnstat/vnstat-9999.ebuild
+++ b/net-analyzer/vnstat/vnstat-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit systemd tmpfiles
@@ -18,7 +18,7 @@ else
SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
SRC_URI+=" verify-sig? ( https://humdi.net/vnstat/${P}.tar.gz.asc )"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-teemutoivola )"
fi
@@ -41,9 +41,7 @@ DEPEND="
RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )"
PATCHES=(
- "${FILESDIR}"/${PN}-2.2-conf.patch
- "${FILESDIR}"/${PN}-2.2-drop-root.patch
- "${FILESDIR}"/${PN}-2.2-run.patch
+ "${FILESDIR}"/${PN}-2.9-conf.patch
)
src_compile() {
diff --git a/net-analyzer/wapiti/Manifest b/net-analyzer/wapiti/Manifest
index 51f1417d576..cbbe91b2185 100644
--- a/net-analyzer/wapiti/Manifest
+++ b/net-analyzer/wapiti/Manifest
@@ -1 +1,2 @@
DIST wapiti3-3.0.5.tar.gz 573630 BLAKE2B 4f6425c54542e3fcf12f50a7ebe4aeeb38083bd04e6a9415466a24ca907e787149b6462972cb6c9d29f4c89bf1f941ae2566b126746bee3697172f342befd7fb SHA512 c1bfdcd4114ec508b4b16e7a4389b23b25326816c7daf0e7fb634ce08b59b983dec92f92287a18cbe7ecde9a06a04da98cfd744f818efc57c606be143fe7db4d
+DIST wapiti3-3.1.2.tar.gz 654586 BLAKE2B 6abbb35060ef554e8b803a82744527a361fe3803871b39dc078938c4af70a3f6e1a2adeec95c0ff487aff650d92a3638cb655439d342c2b516a5279ee02af472 SHA512 cd16d5b265a49441ad45341630ea6a2df150172b774d3282ee229b5a73274eed293ad35c6fc5e26443dc96f1437dcd28b77240210840c65cb3f1f7b6e9234c2d
diff --git a/net-analyzer/wapiti/wapiti-3.1.2.ebuild b/net-analyzer/wapiti/wapiti-3.1.2.ebuild
new file mode 100644
index 00000000000..8d4a9ed067d
--- /dev/null
+++ b/net-analyzer/wapiti/wapiti-3.1.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='xml'
+
+inherit distutils-r1
+
+MY_P=${PN}3-${PV}
+DESCRIPTION="Web-application vulnerability scanner"
+HOMEPAGE="http://wapiti.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Requires httpx-ntlm (to package)
+#IUSE="ntlm"
+
+# httpx requires brotli and socks, so depending on
+# dev-python/socksio and dev-python/brotlicffi
+RDEPEND="dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+ dev-python/brotlicffi[${PYTHON_USEDEP}]
+ dev-python/httpx[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/mako[${PYTHON_USEDEP}]
+ >=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
+ dev-python/socksio[${PYTHON_USEDEP}]
+ dev-python/tld[${PYTHON_USEDEP}]
+ dev-python/yaswfp[${PYTHON_USEDEP}]"
+
+distutils_enable_tests --install pytest
+# Tests also require unpackaged respx
+BDEPEND+=" test? (
+ dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+ dev-python/pytest-cov[${PYTHON_USEDEP}]
+ dev-python/responses[${PYTHON_USEDEP}]
+ )"
+# Many tests require execution of local test php server
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+ sed -e 's/"pytest-runner"//' \
+ -e "/DOC_DIR =/s/wapiti/${PF}/" \
+ -i setup.py || die
+ distutils-r1_python_prepare_all
+}
diff --git a/net-analyzer/wapiti/wapiti-9999.ebuild b/net-analyzer/wapiti/wapiti-9999.ebuild
index 95c1263aa07..e9d25d0eedf 100644
--- a/net-analyzer/wapiti/wapiti-9999.ebuild
+++ b/net-analyzer/wapiti/wapiti-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE='xml'
inherit distutils-r1 git-r3
@@ -15,25 +15,33 @@ EGIT_REPO_URI="https://git.code.sf.net/p/wapiti/git wapiti-git"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="kerberos ntlm"
+# Requires httpx-ntlm (to package)
+#IUSE="ntlm"
+# httpx requires brotli and socks, so depending on
+# dev-python/socksio and dev-python/brotlicffi
RDEPEND="dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+ dev-python/brotlicffi[${PYTHON_USEDEP}]
+ dev-python/httpx[${PYTHON_USEDEP}]
dev-python/lxml[${PYTHON_USEDEP}]
dev-python/mako[${PYTHON_USEDEP}]
>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
+ dev-python/socksio[${PYTHON_USEDEP}]
dev-python/tld[${PYTHON_USEDEP}]
- dev-python/yaswfp[${PYTHON_USEDEP}]
- kerberos? ( dev-python/requests-kerberos[${PYTHON_USEDEP}] )
- ntlm? ( dev-python/requests-ntlm[${PYTHON_USEDEP}] )"
+ dev-python/yaswfp[${PYTHON_USEDEP}]"
distutils_enable_tests --install pytest
-BDEPEND+=" test? ( dev-python/responses[${PYTHON_USEDEP}] )"
+# Tests also require unpackaged respx
+BDEPEND+=" test? (
+ dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+ dev-python/pytest-cov[${PYTHON_USEDEP}]
+ dev-python/responses[${PYTHON_USEDEP}]
+ )"
# Many tests require execution of local test php server
RESTRICT="test"
python_prepare_all() {
sed -e 's/"pytest-runner"//' \
- -e "/find_packages/s/()/(exclude=['tests*'])/" \
-e "/DOC_DIR =/s/wapiti/${PF}/" \
-i setup.py || die
distutils-r1_python_prepare_all
diff --git a/net-analyzer/webfuzzer/webfuzzer-0.2.0-r2.ebuild b/net-analyzer/webfuzzer/webfuzzer-0.2.0-r2.ebuild
index 66622a2b52d..f0f3240d23e 100644
--- a/net-analyzer/webfuzzer/webfuzzer-0.2.0-r2.ebuild
+++ b/net-analyzer/webfuzzer/webfuzzer-0.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,7 +19,7 @@ PATCHES=(
)
src_compile() {
- emake CC=$(tc-getCC)
+ emake CC="$(tc-getCC)"
}
src_install() {
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 6e13f800ccf..85502d80dca 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,5 @@
-DIST wireshark-3.4.10.tar.xz 32344804 BLAKE2B fe2ececd4a02530176725d62524fe000816f7f12dd58082d4966dfe7e5e0b90be669ed216c5a664f6496e74cb5dc5e4fb5beeaf513570ae503e3181692635563 SHA512 8a57d5279e9f3821b6ba3dceba89ad77fa8d0cf8cf421eab4d32e039497b429444c147b31abebd65b11b0b3ff73cf10d484480bcf0aedb206011819df8ab0257
DIST wireshark-3.4.11.tar.xz 32354216 BLAKE2B 3e08d01f2d89f5ddd74c4e2215e6852f30c7419234a45b52a25aa9119995ec2c2882cc3993dce7941e6e73230eb4d295bf0785dda5fe8c3df99f9efdb1e42bfd SHA512 cfef2c3e56279baadb7f41a1f46fde9214a467972f69914c14a8153ea2f2adcb55832413bcaf7a3f8d98b4b62d0574f12144de6c06ff382b4fa8b071903993dc
-DIST wireshark-3.6.0.tar.xz 39687684 BLAKE2B 17af7046662087a18d0708ab0b5bc00bd4d43db848e14217e046dd551e57decd0a258f67c7fd82e1e10e0dceb249618e41ded5a6cd2e0a79d2ee5b7bf397cea7 SHA512 7c8afdee8957eb794030e0818a686c0efabc8ad9547449f434fc7299c7b7e624347698fdc7a42afac150eb86c8ca3d1d6360c29525bb35946619c4636f721094
-DIST wireshark-3.6.1.tar.xz 39632140 BLAKE2B 49a7385946001a3b4a9890751cfea678c8aefcf8180e1a3008085a453d34e458d60d071975eeb585b92c6d9a210b732cc9fdb4fd952f1a9d74decad79c145fe0 SHA512 8b036d623010a5c4ece22de869847b3d999dac1c1e874e957c091a65c18351d9a1cc400828a70caf3c9f9900f8971dc585a5fafb7b08d446cd5d1d68938b0e81
+DIST wireshark-3.6.2.tar.xz 39654296 BLAKE2B 585cf925892ec9d5b6413ccc53c49035eba8a7cd9206f1354f0a808daec9b0f20fc72b3427a2b592f196dd6b2ab67fd35e73d152a20c16fb0f0153c6a03d3156 SHA512 cd4a8077629632e9a924600f9af2ffd01917726fd64504d6f3b4a2a1cb5340c9c0bac23e4abab63743952a0a78efd2e09bb125b127d24e85eca6fa41928fd070
+DIST wireshark-3.6.3.tar.xz 39935892 BLAKE2B 3b636867d946f0cf748eb719874e815c919ee9cedd21a7e9034d54b4cb87ae4a09ec02a199e1ec8051e421fe2929983d659f340ccfd12ab35e1ecd52000964fd SHA512 4415216f791caee23757f3c754dd88ce8fd8eb8d2d64c1bd011b40c7451a1ef56cf41bcf1cdcf41221f196bf17be550f9271f05b82a017a02cac5c241785b7e6
+DIST wireshark-3.6.5.tar.xz 39939340 BLAKE2B 4df1abce2563f20e91fac169ef1ab65851a5f63423aceba487db8cd4b954c4a2ba5673e032878b33a43992cb2ee4628899eee8b0065220cd0c79a8c98a589ef0 SHA512 9aa60721401fbd1f3c6b912312792433c9f8a09583cf684a4f1a24c839f4786a54a0abbfd88c04ba222e5a7af09f7bc67c292a0f944c9b717a71509655fe2fe5
+DIST wireshark-3.6.6.tar.xz 39950276 BLAKE2B cb74c4ed307b83ba509fa3b56356a33df11d9d1effb29054f73f248ca1c7107806676539d0802cc71e07687831a838145194104183afa4ae1825eb1fb85062b1 SHA512 c32d5aafb3091dc1475896a3c4cfcb5a47af002e53f011a65697271c611e690743153841f5db1021a6cbea6d427dc661dce7b85208832251200258fb46aad84b
diff --git a/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch b/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch
deleted file mode 100644
index dd497c51391..00000000000
--- a/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://gitlab.com/wireshark/wireshark/-/commit/411df7ca34027d87fe6ecc06a07c816a401c4cb5
-https://gitlab.com/wireshark/wireshark/-/issues/17766
-https://bugs.gentoo.org/823720
-
-From: Gerald Combs <gerald@wireshark.org>
-Date: Mon, 6 Dec 2021 19:01:10 -0800
-Subject: [PATCH] CMake: Remove the update_tools_help target.
-
-Remove the update_tools_help target. Despite the comment, the weekly
-update job doesn't use it, we don't have targets for our other update
-scripts, and it currently causes issues if BUILD_tshark is disabled.
-Fixes #17766.
---- a/docbook/CMakeLists.txt
-+++ b/docbook/CMakeLists.txt
-@@ -33,16 +33,6 @@ set(COMMON_GRAPHICS
-
- set(GUIDE_INSTALL_DIRS)
-
--# This is automatically updated each week. You probably don't need to run it
--# or depend on it.
--add_custom_target(update_tools_help
-- COMMAND ${CMAKE_COMMAND} -E env PYTHONIOENCODING=UTF-8
-- ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/update-tools-help.py
-- --program-path $<TARGET_FILE_DIR:tshark>
-- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
--)
--set_docbook_target_properties(update_tools_help)
--
- set(WSUG_TITLE "Wireshark User's Guide")
-
- set(WSUG_FILES
-GitLab
diff --git a/net-analyzer/wireshark/wireshark-3.4.11.ebuild b/net-analyzer/wireshark/wireshark-3.4.11.ebuild
index 509b6ba5799..d1c09690a52 100644
--- a/net-analyzer/wireshark/wireshark-3.4.11.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.11.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
S="${WORKDIR}/${P/_/}"
- KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
fi
LICENSE="GPL-2"
diff --git a/net-analyzer/wireshark/wireshark-3.6.1.ebuild b/net-analyzer/wireshark/wireshark-3.6.2.ebuild
index 98c2b9131b7..760d4c694ac 100644
--- a/net-analyzer/wireshark/wireshark-3.6.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
LUA_COMPAT=( lua5-{1..2} )
PYTHON_COMPAT=( python3_{8..10} )
@@ -18,7 +18,7 @@ else
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
S="${WORKDIR}/${P/_/}"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
diff --git a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild b/net-analyzer/wireshark/wireshark-3.6.3.ebuild
index 520a2dc646a..4d449ccaf2e 100644
--- a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
LUA_COMPAT=( lua5-{1..2} )
PYTHON_COMPAT=( python3_{8..10} )
-inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
DESCRIPTION="A network protocol analyzer formerly known as ethereal"
HOMEPAGE="https://www.wireshark.org/"
@@ -18,7 +18,7 @@ else
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
S="${WORKDIR}/${P/_/}"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
@@ -96,7 +96,6 @@ RDEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
- "${FILESDIR}"/${PN}-3.6.0-fix-no-tshark.patch
)
pkg_setup() {
@@ -192,7 +191,9 @@ src_test() {
--verbose
# Skip known failing tests
- -E "(suite_decryption|suite_extcaps|suite_nameres)"
+ # extcaps needs a bunch of external programs
+ -E "(suite_extcaps)"
+ #-E "(suite_decryption|suite_extcaps|suite_nameres)"
)
cmake_src_test
@@ -247,9 +248,7 @@ src_install() {
}
pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
+ xdg_pkg_postinst
# Add group for users allowed to sniff.
chgrp pcap "${EROOT}"/usr/bin/dumpcap
@@ -264,9 +263,3 @@ pkg_postinst() {
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.6.5.ebuild b/net-analyzer/wireshark/wireshark-3.6.5.ebuild
new file mode 100644
index 00000000000..fffca934301
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.6.5.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+
+if [[ ${PV} == *9999* ]] ; then
+ EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark"
+ inherit git-r3
+else
+ SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
+ S="${WORKDIR}/${P/_/}"
+
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
+IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
+IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt"
+IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
+IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+ plugin-ifdemo? ( plugins )"
+
+RESTRICT="!test? ( test )"
+
+# bug #753062 for speexdsp
+RDEPEND="acct-group/pcap
+ >=dev-libs/glib-2.38:2
+ >=net-dns/c-ares-1.5:=
+ dev-libs/libgcrypt:=
+ media-libs/speexdsp
+ 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? ( ${LUA_DEPS} )
+ lz4? ( app-arch/lz4:= )
+ maxminddb? ( dev-libs/libmaxminddb:= )
+ minizip? ( sys-libs/zlib[minizip] )
+ netlink? ( dev-libs/libnl:3 )
+ opus? ( media-libs/opus )
+ pcap? ( net-libs/libpcap )
+ qt5? (
+ dev-qt/qtcore:5
+ 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:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+ dev-lang/perl
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ doc? (
+ app-doc/doxygen
+ dev-ruby/asciidoctor
+ )
+ qt5? (
+ dev-qt/linguist-tools:5
+ )
+ test? (
+ $(python_gen_any_dep '
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ ')
+ )"
+RDEPEND="${RDEPEND}
+ qt5? ( virtual/freedesktop-icon-theme )
+ selinux? ( sec-policy/selinux-wireshark )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.6.0-redhat.patch
+ "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
+)
+
+python_check_deps() {
+ use test || return 0
+
+ python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" &&
+ python_has_version -b "dev-python/pytest-xdist[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use lua && lua-single_pkg_setup
+
+ python-any-r1_pkg_setup
+}
+
+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+=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
+ $(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=ON
+ -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
+
+ # https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html
+ epytest \
+ --disable-capture \
+ --skip-missing-programs=all \
+ --program-path "${BUILD_DIR}"/run
+}
+
+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
+
+ # If trying to remove this, try build e.g. libvirt first!
+ # At last check, Fedora is still doing this too.
+ local dir dirs=(
+ epan
+ epan/crypt
+ epan/dfilter
+ epan/dissectors
+ epan/ftypes
+ wiretap
+ wsutil
+ wsutil/wmem
+ )
+
+ for dir in "${dirs[@]}" ; do
+ insinto /usr/include/wireshark/${dir}
+ doins ${dir}/*.h
+ done
+
+ 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 "${ED}"/usr/share/appdata ]] ; then
+ rm -r "${ED}"/usr/share/appdata || die
+ fi
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ # 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."
+}
diff --git a/net-analyzer/wireshark/wireshark-3.4.10.ebuild b/net-analyzer/wireshark/wireshark-3.6.6.ebuild
index c3e28e4115a..38bd8ecc25a 100644
--- a/net-analyzer/wireshark/wireshark-3.4.10.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.6.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
-inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
DESCRIPTION="A network protocol analyzer formerly known as ethereal"
HOMEPAGE="https://www.wireshark.org/"
@@ -18,7 +18,7 @@ else
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
S="${WORKDIR}/${P/_/}"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
@@ -29,12 +29,14 @@ IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +rand
IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+ plugin-ifdemo? ( plugins )"
+
RESTRICT="!test? ( test )"
# bug #753062 for speexdsp
-CDEPEND="
- acct-group/pcap
- >=dev-libs/glib-2.32:2
+RDEPEND="acct-group/pcap
+ >=dev-libs/glib-2.38:2
>=net-dns/c-ares-1.5:=
dev-libs/libgcrypt:=
media-libs/speexdsp
@@ -69,18 +71,12 @@ CDEPEND="
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="
+ zstd? ( app-arch/zstd:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
dev-lang/perl
- sys-devel/bison
sys-devel/flex
+ sys-devel/gettext
virtual/pkgconfig
doc? (
app-doc/doxygen
@@ -90,28 +86,31 @@ BDEPEND="
dev-qt/linguist-tools:5
)
test? (
- dev-python/pytest
- dev-python/pytest-xdist
- )
-"
-RDEPEND="
- ${CDEPEND}
+ $(python_gen_any_dep '
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ ')
+ )"
+RDEPEND="${RDEPEND}
qt5? ( virtual/freedesktop-icon-theme )
- selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
- lua? ( ${LUA_REQUIRED_USE} )
- plugin-ifdemo? ( plugins )
-"
+ selinux? ( sec-policy/selinux-wireshark )"
PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
- "${FILESDIR}"/${PN}-9999-ui-needs-wiretap.patch
)
+python_check_deps() {
+ use test || return 0
+
+ python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" &&
+ python_has_version -b "dev-python/pytest-xdist[${PYTHON_USEDEP}]"
+}
+
pkg_setup() {
use lua && lua-single_pkg_setup
+
+ python-any-r1_pkg_setup
}
src_configure() {
@@ -119,7 +118,7 @@ src_